substitute references to "sources" by now talking about "medias",

should be more understandable and more consistent with urpmi

64 files changed, 40317 insertions, 40126 deletions

diff --git a/Makefile b/Makefile
index 20239e55..e5baf8eb 100644
--- a/Makefile
+++ b/Makefile
@@ -34,6 +34,7 @@ install: $(ALL)
 	done
 	install -d $(SBINDIR)
 	install rpmdrake edit-urpm-sources.pl $(SBINDIR)
+	ln -s edit-urpm-sources.pl $(SBINDIR)/edit-urpm-medias
 	perl -pi -e 's|use strict.*||;s|use vars.*||;s|use diagnostics.*||;s|#-.*||' $(SBINDIR)/*
 	ln -s -f rpmdrake $(SBINDIR)/rpmdrake-remove
 	ln -s -f rpmdrake $(SBINDIR)/MandrakeUpdate
diff --git a/edit-urpm-sources.pl b/edit-urpm-sources.pl
index 5973d152..5850b108 100755
--- a/edit-urpm-sources.pl
+++ b/edit-urpm-sources.pl
@@ -42,7 +42,7 @@ my $urpm;
 my ($mainw, $remove, $edit, $list_tv);
 
 sub add_callback {
-    my $w = ugtk2->new(N("Add a source"), grab => 1, center => 1, transient => $mainw->{rwindow});
+    my $w = ugtk2->new(N("Add a media"), grab => 1, center => 1, transient => $mainw->{rwindow});
     my %radios_infos = (local => { name => N("Local files"), url => N("Path:"), dirsel => 1 },
 			ftp => { name => N("FTP server"), url => N("URL:"), loginpass => 1 },
 			http => { name => N("HTTP server"), url => N("URL:") },
@@ -109,8 +109,8 @@ really want to replace it?"), yesno => 1) or return 0;
     my ($type, %i, %make_url);
     gtkadd($w->{window},
 	   gtkpack(Gtk2::VBox->new(0,5),
-		   Gtk2::Label->new(N("Adding a source:")),
-		   gtkpack__(Gtk2::HBox->new(0, 0), Gtk2::Label->new(but(N("Type of source:"))), @modes_buttons),
+		   Gtk2::Label->new(N("Adding a media:")),
+		   gtkpack__(Gtk2::HBox->new(0, 0), Gtk2::Label->new(but(N("Type of media:"))), @modes_buttons),
 		   $notebook,
 		   Gtk2::HSeparator->new,
 		   gtkpack(create_hbox(),
@@ -170,11 +170,11 @@ sub edit_callback {
     my $row = selrow();
     $row == -1 and return;
     my $medium = $urpm->{media}[$row];
-    my $w = ugtk2->new(N("Edit a source"), grab => 1, center => 1, transient => $mainw->{rwindow});
+    my $w = ugtk2->new(N("Edit a media"), grab => 1, center => 1, transient => $mainw->{rwindow});
     my ($url_entry, $hdlist_entry, $url, $with_hdlist);
     gtkadd($w->{window},
 	   gtkpack_(Gtk2::VBox->new(0,5),
-		    0, Gtk2::Label->new(N("Editing source \"%s\":", $medium->{name})),
+		    0, Gtk2::Label->new(N("Editing media \"%s\":", $medium->{name})),
 		    0, create_packtable({},
 					[ N("URL:"), $url_entry = gtkentry($medium->{url}) ],
 					[ N("Relative path to synthesis/hdlist:"), $hdlist_entry = gtkentry($medium->{with_hdlist}) ]),
@@ -244,7 +244,7 @@ sub proxy_callback {
 }
 
 sub mainwindow {
-    $mainw = ugtk2->new(N("Configure sources"), center => 1);
+    $mainw = ugtk2->new(N("Configure medias"), center => 1);
 
     my $list = Gtk2::ListStore->new(Gtk2::GType->BOOLEAN, Gtk2::GType->STRING);
     $list_tv = Gtk2::TreeView->new_with_model($list);
@@ -252,7 +252,7 @@ sub mainwindow {
     $list_tv->set_rules_hint(1);
 
     $list_tv->append_column(Gtk2::TreeViewColumn->new_with_attributes(N("Enabled?"), my $tr = Gtk2::CellRendererToggle->new, 'active' => 0));
-    $list_tv->append_column(Gtk2::TreeViewColumn->new_with_attributes(N("Source"), Gtk2::CellRendererText->new, 'text' => 1));
+    $list_tv->append_column(Gtk2::TreeViewColumn->new_with_attributes(N("Media"), Gtk2::CellRendererText->new, 'text' => 1));
 
     $tr->signal_connect(toggled => sub {
 			    my (undef, $path) = @_;
@@ -298,9 +298,9 @@ if (!member(basename($0), @$already_splashed)) {
 N("%s
 
 Is it ok to continue?",
-N("Welcome to the packages source editor!
+N("Welcome to the Software Medias Manager!
 
-This tool will help you configure the packages sources you wish to use on
+This tool will help you configure the packages medias you wish to use on
 your computer. They will then be available to install new software package
 or to perform updates.")), yesno => 1) or myexit -1;
     push @$already_splashed, basename($0);
diff --git a/po/af.po b/po/af.po
index 3cfc3ed2..5ab4d58c 100644
--- a/po/af.po
+++ b/po/af.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: Tue Sep 19 2000 08:40:28+0200\n"
 "Last-Translator: Schalk W. Cronjé <schalkc@ntaba.co.za>\n"
 "Language-Team: Afrikaans <lia@af.org.za>\n"
@@ -16,14 +16,21 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KTranslator v 0.6.0\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
+msgid "Enabled?"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
 msgstr ""
 
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Portugal"
+msgstr "Poort:"
+
 #: ../rpmdrake:1
 #, c-format
 msgid ""
@@ -36,125 +43,163 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
+msgid "by group"
 msgstr ""
 
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Name:"
+msgstr "Naam"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Italy"
+msgstr "Installering:"
+
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
+msgid "How to choose manually your mirror"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
+msgid "Some packages need to be removed"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
+msgstr ""
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"%s"
-msgstr "Installasievoorbereiding"
+msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during removal"
-msgstr "Daar was probleme tydens installasie"
+#, c-format
+msgid "everything was installed correctly"
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, removing packages..."
+msgid "%s KB"
+msgstr "%.1f KB"
+
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"Wag asb.\n"
-"Pakkette word sorteer"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, reading packages database..."
+#, c-format
+msgid ""
+"Welcome to the software removal tool!\n"
+"\n"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
+msgstr ""
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr ""
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
 msgstr ""
-"Wag asb.\n"
-"Pakkette word sorteer"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"There was a problem during the installation:\n"
+"There was a problem during the removal of packages:\n"
 "\n"
 "%s"
 msgstr "Installasievoorbereiding"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Geïnstalleer"
+msgid "Size: "
+msgstr "Grootte"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Installasievoorbereiding"
+msgid "Security updates"
+msgstr "Vertoon slegs sekuriteitsopgraderings"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Installasievoorbereiding"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "All requested packages were installed successfully."
+msgid "Already existing update medias"
 msgstr ""
+"Wag asb.\n"
+"Media word sorteer"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
+msgid "Maximum information"
 msgstr ""
 
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Proxy..."
+msgstr "Fout..."
+
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
-"\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "everything was installed correctly"
+msgid "United Kingdom"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Daar was probleme tydens installasie"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
+msgid "in names"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Installasievoorbereiding"
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
+"I can't find any suitable mirror.\n"
 "\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
 
+#
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Remove .%s"
+msgstr "Verwyder media"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+msgid "Finland"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -167,345 +212,339 @@ msgid ""
 "Do you want to continue installation?"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Verifying packages signatures..."
+msgid "Examining distant file of media `%s'..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
+msgid "Verifying packages signatures..."
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "France"
+msgstr "Afdwing"
+
+#. -PO: Keep it short, this is gonna be on a button
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "Kanselleer"
+msgid "More info"
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Ok"
-msgstr "OK"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+msgid "Reload the packages list"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Change medium"
+msgid "Choose a mirror..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Initializing..."
-msgstr "Installering:"
+msgid "Some packages can't be installed"
+msgstr "Pakket kan nie installeer word nie"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Package installation..."
+msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Installasievoorbereiding"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unable to get source packages."
-msgstr "Kies u pakkette"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspect..."
-msgstr ""
+msgid "All packages,"
+msgstr " Pakkette:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Installation finished"
-msgstr "Geïnstalleer"
+msgid "Type of media:"
+msgstr "Tipes media:"
 
+#
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Do nothing"
-msgstr "CUPS word gelaai"
+msgid "in files"
+msgstr "Plaaslik"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
+msgid "All requested packages were installed successfully."
 msgstr ""
 
-#
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Remove .%s"
-msgstr "Verwyder media"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr ""
 
-#: ../rpmdrake:1
+#
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "changes:"
-msgstr " Pakkette:"
+msgid "Local files"
+msgstr "Plaaslik"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspecting %s"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Please wait, finding available packages..."
-msgstr ""
-"Wag asb.\n"
-"Pakkette word sorteer"
+msgid "Israel"
+msgstr "Installering:"
 
-#
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, adding medium..."
-msgstr ""
-"Wag asb.\n"
-"Media word sorteer"
+msgid "Help"
+msgstr "/_Help"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
-"\n"
-"Then, restart MandrakeUpdate."
+msgid "HTTP server"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "How to choose manually your mirror"
-msgstr ""
+#, fuzzy, c-format
+msgid "Installation failed"
+msgstr "Geïnstalleer"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
+msgid "Use .%s as main file"
 msgstr ""
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Search results"
+msgstr "Soek"
+
+#
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid " failed!"
+msgstr "Plaaslik"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Already existing update sources"
+msgid "Brazil"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
+msgid "Find:"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Fatal error"
+msgid "All packages, alphabetical"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Installasievoorbereiding"
+msgid "Please wait, searching..."
+msgstr ""
+"Wag asb.\n"
+"Pakkette word verwyder"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Mandrake Update"
-msgstr "Normale opdaterings"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Software Packages Removal"
+msgid "Please wait, reading packages database..."
 msgstr ""
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Quit"
-msgstr "Verlaat"
+"Wag asb.\n"
+"Pakkette word sorteer"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Install"
-msgstr "Geïnstalleer"
-
-#
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Remove"
-msgstr "Verwyder drukker"
+msgid "unknown package "
+msgstr "Kan nie pakket oopmaak nie"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Help"
-msgstr "/_Help"
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr ""
 
-#
 #: ../rpmdrake:1
 #, c-format
-msgid "Search"
-msgstr "Soek"
+msgid "Reset the selection"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Find:"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
 "\n"
-"Is it ok to continue?"
 msgstr ""
+"Om alle afhanklikhede te bevredig moet hierdie\n"
+"pakkette verwyder word:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some packages need to be removed"
+msgid "Costa Rica"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
+"There was a problem during the installation:\n"
 "\n"
-"Do you really want to install all the selected packages?"
-msgstr ""
+"%s"
+msgstr "Installasievoorbereiding"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Too many packages are selected"
+#
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, removing medium..."
 msgstr ""
+"Wag asb.\n"
+"Media word sorteer"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Maximum information"
-msgstr ""
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Normal information"
-msgstr "Normale opdaterings"
+msgid "Password:"
+msgstr "Wagwoord:"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Update source(s)"
-msgstr "Dateer media op"
+msgid "Taiwan"
+msgstr "Latvies"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reload the packages list"
+msgid "User:"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Reset the selection"
+#
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, updating medium..."
 msgstr ""
+"Wag asb.\n"
+"Media word sorteer"
 
-#
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "in files"
-msgstr "Plaaslik"
+msgid "Please wait, listing packages..."
+msgstr ""
+"Wag asb.\n"
+"Pakkette word sorteer"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "in descriptions"
-msgstr "Beskrywings"
+msgid "Information on packages"
+msgstr "Kan nie pakket oopmaak nie"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "in names"
-msgstr ""
+msgid "Cancel"
+msgstr "Kanselleer"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
+msgid "Everything installed successfully"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by source repository"
+msgid "Select the media(s) you wish to update:"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "by selection state"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Please wait, updating media..."
 msgstr ""
+"Wag asb.\n"
+"Media word sorteer"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by size"
+msgid "A fatal error occurred: %s."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "All packages,"
-msgstr " Pakkette:"
+msgid "in descriptions"
+msgstr "Beskrywings"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure proxies"
+msgstr ""
+"Dateer\n"
+"media op"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "All packages, alphabetical"
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Mandrake choices"
+msgid "Please choose"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Normal updates"
-msgstr "Normale opdaterings"
+msgid "Selected size: %d MB"
+msgstr "%d geselekteerde pakkette: %.1fMB"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Bugfixes updates"
-msgstr "Vertoon foutkorreksiegraderings"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Security updates"
-msgstr "Vertoon slegs sekuriteitsopgraderings"
+msgid "Initializing..."
+msgstr "Installering:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Description: "
-msgstr "Beskrywings"
+msgid "Save changes"
+msgstr "Pakkette:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Reason for update: "
+msgid "Error during download"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Summary: "
-msgstr "Opsomming"
+msgid "Package installation..."
+msgstr "Installasievoorbereiding"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -513,701 +552,655 @@ msgid "Importance: "
 msgstr "Belangrikhied: %s"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s KB"
-msgstr "%.1f KB"
+#, c-format
+msgid ""
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
+msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Size: "
-msgstr "Grootte"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Version: "
-msgstr "Weergawe:"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Unable to create medium."
+msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Name: "
-msgstr "Naam: %s"
+#, c-format
+msgid ""
+"The installation is finished; %s.\n"
+"\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
+msgid "Browse..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Source: "
-msgstr "Bron"
+msgid "Some packages can't be removed"
+msgstr "Pakket kan nie installeer word nie"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
+msgid "Info..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Changelog:\n"
+msgid "You need to insert the medium to continue"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Files:\n"
-msgstr "/_Lêer"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Copying file for media `%s'..."
+msgstr ""
 
-#: ../rpmdrake:1
+#
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Selected size: %d MB"
-msgstr "%d geselekteerde pakkette: %.1fMB"
+msgid "Remove"
+msgstr "Verwyder drukker"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "%d geselekteerde pakkette: %.1f MB"
+msgid "Preparing packages installation..."
+msgstr "Installasievoorbereiding"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
+msgid "by media repository"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "No mirror"
+msgstr "spieël"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
+msgid "You need to fill up at least the two first entries."
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "bots met %s-%s-%s"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Pakket kan nie installeer word nie"
+msgid "Install"
+msgstr "Geïnstalleer"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
+msgid "Japan"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Additional packages needed"
-msgstr ""
+#, fuzzy, c-format
+msgid "Do nothing"
+msgstr "CUPS word gelaai"
 
+#
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "Pakket kan nie installeer word nie"
+msgid "No update"
+msgstr "Doen opdaterings"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Description: "
+msgstr "Beskrywings"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Removing these packages would break your system, sorry:\n"
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
 "\n"
+"Do you really want to install all the selected packages?"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"Om alle afhanklikhede te bevredig moet hierdie\n"
-"pakkette verwyder word:"
+msgid "Name: "
+msgstr "Naam: %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some additional packages need to be removed"
+msgid "Inspect..."
 msgstr ""
 
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing media \"%s\":"
+msgstr "Media"
+
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "Installasievoorbereiding"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "More information on package..."
-msgstr ""
+msgid "Australia"
+msgstr "Australia"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Information on packages"
-msgstr "Kan nie pakket oopmaak nie"
+msgid "Installation finished"
+msgstr "Geïnstalleer"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "More info"
+msgid "by update availability"
 msgstr ""
 
-#
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Poland"
+msgstr "Yslandies"
+
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Addable"
+msgid "Version: "
+msgstr "Weergawe:"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
-"Installeer\n"
-"geselekteer"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Upgradable"
 msgstr "Opgradeer"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-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."
+msgid " done."
 msgstr ""
 
-#
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No update"
-msgstr "Doen opdaterings"
+msgid "Software Packages Installation"
+msgstr "Installasievoorbereiding"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "(none)"
+msgid "Additional packages needed"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, listing packages..."
+msgid "Bugfixes updates"
+msgstr "Vertoon foutkorreksiegraderings"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
-"Wag asb.\n"
-"Pakkette word sorteer"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr "Duitsland"
+
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "unknown package "
-msgstr "Kan nie pakket oopmaak nie"
+msgid "Russia"
+msgstr "Asie"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "One of the following packages is needed:"
-msgstr ""
-"Om alle afhanklikhede te bevredig moet hierdie\n"
-"pakkette verwyder word:"
+msgid "Norway"
+msgstr "Norweegs"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Please choose"
-msgstr ""
+#, fuzzy, c-format
+msgid "Problem during installation"
+msgstr "Daar was probleme tydens installasie"
 
+#
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Search"
+msgstr "Soek"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Not selected"
-msgstr "bots met %s-%s-%s"
+msgid "Edit a media"
+msgstr "Media"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Selected"
-msgstr "Kies geen"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
+msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Search results"
-msgstr "Soek"
+#, c-format
+msgid ""
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Stop"
 msgstr "Sektor"
 
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
+msgstr "Opgradeer"
+
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, searching..."
+msgid "Please wait, removing packages..."
 msgstr ""
 "Wag asb.\n"
-"Pakkette word verwyder"
+"Pakkette word sorteer"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Search results (none)"
-msgstr "Soek"
+msgid "Normal information"
+msgstr "Normale opdaterings"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Other"
-msgstr "Ander"
+msgid "Media: "
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to the packages source editor!\n"
-"\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
+msgid "Downloading package `%s' (%s/%s)..."
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "%d geselekteerde pakkette: %.1f MB"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Save and quit"
+msgid "Media"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Fout..."
+msgid "Spain"
+msgstr "Spaans"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Update..."
-msgstr "Opgradeer"
+msgid "Normal updates"
+msgstr "Normale opdaterings"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
+msgid "by selection state"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Source"
-msgstr "Bron"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr ""
+msgid "Login:"
+msgstr "Inteken:"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Configure sources"
-msgstr ""
-"Dateer\n"
-"media op"
+msgid "Adding a media:"
+msgstr "Media"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Password:"
-msgstr "Wagwoord:"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Austria"
+msgstr "Australia"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "User:"
+msgid "Fatal error"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Update..."
+msgstr "Opgradeer"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
+msgid "Starting download of `%s'..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
+msgid "(none)"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
-msgstr ""
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Configure proxies"
-msgstr ""
-"Dateer\n"
-"media op"
-
-#
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Please wait, updating medium..."
+"Removing these packages would break your system, sorry:\n"
+"\n"
 msgstr ""
-"Wag asb.\n"
-"Media word sorteer"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
+msgid "Installing package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
+msgid "Currently installed version: "
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Save changes"
-msgstr "Pakkette:"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr ""
+msgid "Other"
+msgstr "Ander"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
+msgid "Reason for update: "
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "Media"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Edit a source"
-msgstr "Media"
-
-#
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Please wait, removing medium..."
+msgid "Please choose the desired mirror."
 msgstr ""
 "Wag asb.\n"
-"Media word sorteer"
+"Die spieëllys word afgehaal"
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Type of source:"
-msgstr "Tipes media:"
+#, c-format
+msgid "Edit"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Adding a source:"
-msgstr "Media"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
+msgid "Please wait, finding available packages..."
 msgstr ""
+"Wag asb.\n"
+"Pakkette word sorteer"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
+msgid "Relative path to synthesis/hdlist:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Name:"
-msgstr "Naam"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Login:"
-msgstr "Inteken:"
+msgid "Search results (none)"
+msgstr "Soek"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Choose a mirror..."
+msgid "Danmark"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Browse..."
+msgid "China"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Path or mount point:"
+msgid "United States"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "changes:"
+msgstr " Pakkette:"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Removable device"
+msgid "Some additional packages need to be removed"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr ""
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
+msgid "No"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Path:"
-msgstr "Poort:"
+msgid "Configure medias"
+msgstr ""
+"Dateer\n"
+"media op"
 
-#
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Local files"
-msgstr "Plaaslik"
+msgid "Add a media"
+msgstr "Media"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Add a source"
-msgstr "Media"
+msgid "Summary: "
+msgstr "Opsomming"
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Canada"
+msgstr "Kanadees (Quebec)"
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Unable to create medium."
-msgstr ""
+#, fuzzy, c-format
+msgid "Greece"
+msgstr "Grieks"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Update"
-msgstr "Opgradeer"
+msgid ""
+"There was an error downloading the mirrors list:\n"
+"\n"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
+msgid "Unable to get source packages, sorry. %s"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Please wait, updating media..."
-msgstr ""
-"Wag asb.\n"
-"Media word sorteer"
+msgid "Path:"
+msgstr "Poort:"
 
-#
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid " failed!"
-msgstr "Plaaslik"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid " done."
-msgstr ""
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Download of `%s', speed:%s"
-msgstr ""
+msgid "Problem during removal"
+msgstr "Daar was probleme tydens installasie"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Selected"
+msgstr "Kies geen"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Starting download of `%s'..."
+msgid "Netherlands"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Examining distant file of source `%s'..."
+#
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Addable"
 msgstr ""
+"Installeer\n"
+"geselekteer"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining file of source `%s'..."
+msgid "(Not available)"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Copying file for source `%s'..."
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please choose the desired mirror."
-msgstr ""
-"Wag asb.\n"
-"Die spieëllys word afgehaal"
+msgid "Not selected"
+msgstr "bots met %s-%s-%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
+msgid "Software Packages Removal"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "No mirror"
-msgstr "spieël"
+msgid "Sweden"
+msgstr "Sien"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"There was an error downloading the mirrors list:\n"
 "\n"
-"%s\n"
-"The network, or MandrakeSoft website, are maybe unavailable.\n"
-"Please try again later."
+"\n"
+"Error(s) reported:\n"
+"%s"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
+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.pm:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgid "Examining file of media `%s'..."
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
+msgid "Download of `%s', speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "United States"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "One of the following packages is needed:"
 msgstr ""
+"Om alle afhanklikhede te bevredig moet hierdie\n"
+"pakkette verwyder word:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "China"
-msgstr ""
+msgid "Quit"
+msgstr "Verlaat"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Taiwan"
-msgstr "Latvies"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Sweden"
-msgstr "Sien"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Russia"
-msgstr "Asie"
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Portugal"
-msgstr "Poort:"
+msgid "Update media(s)"
+msgstr "Dateer media op"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Poland"
-msgstr "Yslandies"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "OK"
 
-#: ../rpmdrake.pm:1
+#
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Norway"
-msgstr "Norweegs"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Netherlands"
+msgid "Please wait, adding medium..."
 msgstr ""
+"Wag asb.\n"
+"Media word sorteer"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Korea"
-msgstr "Afdwing"
+msgid "Unable to get source packages."
+msgstr "Kies u pakkette"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
+msgid "Too many packages are selected"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Italy"
-msgstr "Installering:"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Israel"
-msgstr "Installering:"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Greece"
-msgstr "Grieks"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "France"
-msgstr "Afdwing"
-
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Finland"
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Spain"
-msgstr "Spaans"
+msgid "%s conflicts with %s"
+msgstr "bots met %s-%s-%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Danmark"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Germany"
-msgstr "Duitsland"
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
+msgid "Mandrake choices"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
+msgid "Changelog:\n"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Canada"
-msgstr "Kanadees (Quebec)"
+msgid "Korea"
+msgstr "Afdwing"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Brazil"
+msgid "Removable device"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1215,29 +1208,38 @@ msgstr ""
 msgid "Belgium"
 msgstr "Belgies"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Australia"
+msgid "Change medium"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Austria"
-msgstr "Australia"
+msgid "Mandrake Update"
+msgstr "Normale opdaterings"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
+msgid "by size"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
+msgid "FTP server"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Files:\n"
+msgstr "/_Lêer"
+
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Yes"
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
 msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:86
@@ -1516,6 +1518,13 @@ msgid "Software Sources Manager"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Source: "
+#~ msgstr "Bron"
+
+#~ msgid "Source"
+#~ msgstr "Bron"
+
+#, fuzzy
 #~ msgid "Please wait, removing packages to allow others to be upgraded..."
 #~ msgstr ""
 #~ "Wag asb.\n"
diff --git a/po/ar.po b/po/ar.po
index 89bd590c..0c4cfdc8 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: 2001-06-25 11:21+0200\n"
 "Last-Translator: Mohammed Gamal <f2c2001@yahoo.com>\n"
 "Language-Team: Arabic\n"
@@ -13,16 +13,20 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"هل من الممكن المتابعة؟"
+msgid "Enabled?"
+msgstr "متاح؟"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "المسار أو نقطة التحميل:"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Portugal"
+msgstr "البرتغال"
 
 #: ../rpmdrake:1
 #, c-format
@@ -41,104 +45,54 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"أهلا بك �ي تحديث Mandrake!\n"
-"\n"
-"هذه الأداة ستساعدك �ي اختيار التحديثات التي تريد تثبيتها على\n"
-"جهازك."
+msgid "by group"
+msgstr "بالمجموعة"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
-msgstr ""
-"أهلا بك �ي أداة ازالة البرامج.\n"
-"\n"
-"هذه الأداة ستسمح لك باختيار البرامج التي تريد ازالتها\n"
-"من جهازك."
+msgid "Name:"
+msgstr "الإسم:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"كان هناك خطأ أثناء تثبيت الحزم:\n"
-"\n"
-"%s"
+msgid "Italy"
+msgstr "تثبيت"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Problem during removal"
-msgstr "ظهرت مشاكل أثناء الحذ�"
+msgid "How to choose manually your mirror"
+msgstr "كي�ية اختيار المرآة يدوياً"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "انتظر من �ضلك, جاري ازالة الحزم..."
+msgid "URL:"
+msgstr "العنوان:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "انتظر من �ضلك, جاري قراءة قاعدة بيانات الحزم..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"كان هناك خطأ أثناء تثبيت الحزم:\n"
-"\n"
-"%s"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "تثبيت الكل"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "جاري تحضير الحزم للتثبيت..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "جاري تحضير الحزم للتثبيت..."
+msgid "Some packages need to be removed"
+msgstr "بعض الحزم يجب ازالتها"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "تم تثبيت كل الحزم المطلوبة بنجاح."
+msgid "More information on package..."
+msgstr "معلومات أكثر حول الحزمة..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "تم تثبيت كل شئ بنجاح"
+msgid "Yes"
+msgstr "نعم"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
 msgstr ""
-"انتهى التثبيت; %s.\n"
+"نظرا للاعتمادات, �إن الحزمة/الحزم التالية يجب أن\n"
+"الرجوع عن اختيارها الآن:\n"
 "\n"
-"تم انشاء بعض مل�ات التهيئة مثل `.rpmnew' أو `.rpmsave',\n"
-"يمكنك الآن التحقق من بعضها لكي تقوم بالمطلوب منها:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -146,457 +100,451 @@ msgid "everything was installed correctly"
 msgstr "تم تثبيت كل شئ بنجاح"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "ظهرت مشاكل أثناء التثبيت"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "جاري تثبيت الحزمة `%s' (%s/%s)..."
+msgid "%s KB"
+msgstr "%s KB"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "جاري تحضير الحزم للتثبيت..."
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"يمكنك أيضا اختيار المرآة يدويا: لعمل ذلك,\n"
+"قم بتشغيل مدير مصادر البرمجيات, ثم أض� مصدر 'تحديثات\n"
+"أمنية'.\n"
+"\n"
+"ثم أعد تشغيل أداة تحديث Mandrake."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
+"Welcome to the software removal tool!\n"
 "\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
 msgstr ""
+"أهلا بك �ي أداة ازالة البرامج.\n"
 "\n"
-"\n"
-"الأخطاء المقررة:\n"
-"%s"
+"هذه الأداة ستسمح لك باختيار البرامج التي تريد ازالتها\n"
+"من جهازك."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"�شل التثبيت, بعض المل�ات م�قودة.\n"
-"ربما تحتاج الى تحديث �اعدة بيانات المصادر."
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "لكي يتم ح�ظ التغييرات, تحتاج الى ادخال الوسيط �ي السواقة."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "اح�ظ و اخرج"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
+"There was a problem during the removal of packages:\n"
 "\n"
-"Do you want to continue installation?"
+"%s"
 msgstr ""
-"يجب ازالة الحزم التالية لكي تتم ترقية الحزم الأخرى:\n"
-"\n"
-"%s\n"
+"كان هناك خطأ أثناء تثبيت الحزم:\n"
 "\n"
-"هل من الممكن المتابعة؟"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "جاري تنزيل الحزمة `%s' (%s/%s)..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Cancel"
-msgstr "الغاء"
+msgid "Size: "
+msgstr "الحجم: "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Ok"
-msgstr "موا�ق"
+msgid "Security updates"
+msgstr "تحديثات أمنية"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "�ضلاً أدخل الوسيط المسمى \"%s\" الى الجهاز [%s]"
+msgid "Already existing update medias"
+msgstr "خطأ أثناء اضا�ة وسيط التحديث"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Change medium"
-msgstr "غير الوسيط"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Initializing..."
-msgstr "جاري البدء..."
+msgid "Maximum information"
+msgstr "أقضى المعلومات"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "جاري تحضير الحزم للتثبيت..."
+msgid "Proxy..."
+msgstr "خطأ..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "آس�, يجب عليك أن تكون مستخدم جذر لتثبيت الحزم."
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Unable to get source packages."
-msgstr "تعذر الحصول على الحزم المصدرية"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspect..."
-msgstr "تحقَّق..."
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
+msgstr ""
+"�شل التثبيت, بعض المل�ات م�قودة.\n"
+"ربما تحتاج الى تحديث �اعدة بيانات المصادر."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Installation finished"
-msgstr "انتهى التثبيت"
+msgid "United Kingdom"
+msgstr "المملكة المتحدة"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "لا ت�عل شيئاً"
+msgid "in names"
+msgstr "�ي الأسماء"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "استخدم .%s كمل� رئيسي"
+msgid ""
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
+msgstr ""
+"تعذر ايجاد أي مرآة مناسبة.\n"
+"\n"
+"قد تكون هناك أسباب عديدة لهذه المشكلة: السبب الأكثر حدوثاً هو\n"
+":أن يكون نوع المعالج الخاص بك غير مدعوم\n"
+"من تحديثات Mandrake Linux الرسمية."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Remove .%s"
 msgstr "احذ� .%s"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "changes:"
-msgstr "التغييرات:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspecting %s"
-msgstr "جاري التحقق من %s"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Please wait, finding available packages..."
-msgstr "اتنظر من �ضلك, جاري ايجاد الحزم المتو�رة..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "انتظر من �ضلك, جاري اضا�ة الوسيط..."
+msgid "Finland"
+msgstr "�نلندا"
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
+"The following packages have bad signatures:\n"
 "\n"
-"Then, restart MandrakeUpdate."
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"يمكنك أيضا اختيار المرآة يدويا: لعمل ذلك,\n"
-"قم بتشغيل مدير مصادر البرمجيات, ثم أض� مصدر 'تحديثات\n"
-"أمنية'.\n"
+"يجب ازالة الحزم التالية لكي تتم ترقية الحزم الأخرى:\n"
 "\n"
-"ثم أعد تشغيل أداة تحديث Mandrake."
+"%s\n"
+"\n"
+"هل من الممكن المتابعة؟"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "How to choose manually your mirror"
-msgstr "كي�ية اختيار المرآة يدوياً"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Examining distant file of media `%s'..."
+msgstr "جاري اختبار المل� البعيد للمصدر `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
+msgid "Verifying packages signatures..."
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Already existing update sources"
-msgstr ""
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "France"
+msgstr "اجبار"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "More info"
+msgstr "مزيد من المعلومات"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
+"%s\n"
 "\n"
 "Is it ok to continue?"
 msgstr ""
-"أحتاج للإتصال بالمرآة للحصول على أخر حزم التحديثات.\n"
-"�ضلاً تأكد من أن الشبكة الخاصة بك تعمل حالياً.\n"
+"%s\n"
 "\n"
 "هل من الممكن المتابعة؟"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Reload the packages list"
+msgstr "أعد تحميل قائمة الحزم"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "اختار المرآة..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Fatal error"
-msgstr "خطأ �ي المل�"
+msgid "Some packages can't be installed"
+msgstr "لا يمكن تثبيت الحزمة"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
+msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "جاري تحضير الحزم للتثبيت..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "تحديث Mandrake"
+msgid "All packages,"
+msgstr "كل الحزم,"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Software Packages Removal"
-msgstr "حذ� حزم البرامج"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Type of media:"
+msgstr "نوع المصدر:"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Quit"
-msgstr "خروج"
+msgid "in files"
+msgstr "�ي المل�ات"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "تثبيت"
+msgid "All requested packages were installed successfully."
+msgstr "تم تثبيت كل الحزم المطلوبة بنجاح."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove"
-msgstr "احذ�"
+msgid "Proxy hostname:"
+msgstr "اسم مستضي� البروكسي"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Help"
-msgstr "مساعدة"
+msgid "Local files"
+msgstr "مل�ات محلية"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search"
-msgstr "ابحث"
+msgid "Inspecting %s"
+msgstr "جاري التحقق من %s"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Find:"
-msgstr "ابحث عن:"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Israel"
+msgstr "تثبيت"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"يجب ازالة الحزم التالية لكي تتم ترقية الحزم الأخرى:\n"
-"\n"
-"%s\n"
-"\n"
-"هل من الممكن المتابعة؟"
+msgid "Help"
+msgstr "مساعدة"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "بعض الحزم يجب ازالتها"
+msgid "HTTP server"
+msgstr "خادم HTTP"
 
 #: ../rpmdrake:1
-#, c-format
-msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
-"\n"
-"Do you really want to install all the selected packages?"
-msgstr ""
-"تحذير: يبدو أنك تحاول تثبيت الكثير من الحزم\n"
-"بحيث يمكن ألا تكون هناك مساحة �ارغة على القرص\n"
-"أثناء أو بعد تثبيت الحزم, هذا �ي منتهى الخطورة\n"
-"و يجب أخذه �ي الإعتبار بحذر.\n"
-"\n"
-"هل تريد �علا تثبيت الحزم؟"
+#, fuzzy, c-format
+msgid "Installation failed"
+msgstr "تثبيت الكل"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "تم اختيار حزم كثيرة"
+msgid "Use .%s as main file"
+msgstr "استخدم .%s كمل� رئيسي"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "أقضى المعلومات"
+msgid "Search results"
+msgstr "نتائج البحث"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Normal information"
-msgstr "معلومات عادية"
+msgid " failed!"
+msgstr " �شل!"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Update source(s)"
-msgstr "حدّث المصدر/المصادر"
+msgid "Brazil"
+msgstr "البرازيل"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "أعد تحميل قائمة الحزم"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr "هناك وسيط بهذا الإسم مسبقاً, هل تريد استبداله �علاً؟"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "أعد الإختيار من جديد"
+msgid "Find:"
+msgstr "ابحث عن:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "�ي المل�ات"
+msgid "All packages, alphabetical"
+msgstr "كل الحزم, أبجدياً"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "�ي الوص�"
+msgid "Please wait, searching..."
+msgstr "انتظر من �ضلك, جاري البحث..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "�ي الأسماء"
+msgid "Please wait, reading packages database..."
+msgstr "انتظر من �ضلك, جاري قراءة قاعدة بيانات الحزم..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by update availability"
-msgstr "بتواجد التحديث"
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "لم يمكن �تح الحزمة"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by source repository"
-msgstr "بمخزن المصدر"
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "�ضلاً أدخل الوسيط المسمى \"%s\" الى الجهاز [%s]"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by selection state"
-msgstr "بحالة الإختيار"
+msgid "Reset the selection"
+msgstr "أعد الإختيار من جديد"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by size"
-msgstr "بالحجم"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"اذا كنت تحتاج الى بروكسي, أدخل اسم المستضي� و المن�ذ (على الشكل التالي: <اسم "
+"المستضي�[:المن�ذ[>):"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-msgstr "بالمجموعة"
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
+"نظرا للاعتمادات, �إن الحزمة/الحزم التالية يجب أن\n"
+"تحذ�:\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "All packages,"
-msgstr "كل الحزم,"
+msgid "Costa Rica"
+msgstr "كوستاريكا"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "All packages, alphabetical"
-msgstr "كل الحزم, أبجدياً"
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"كان هناك خطأ أثناء تثبيت الحزم:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "اختيارات Mandrake"
+msgid "Please wait, removing medium..."
+msgstr "انتظر من �ضلك, جاري اضا�ة الوسيط...."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
-msgstr "تحديثات عادية"
+msgid "Password:"
+msgstr "كلمة المرور:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "تحديثات ازالة العيوب"
+msgid "Taiwan"
+msgstr "تايوان"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Security updates"
-msgstr "تحديثات أمنية"
+msgid "User:"
+msgstr "اسم المستخدم:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Description: "
-msgstr "وص�:"
+msgid "Please wait, updating medium..."
+msgstr "انتظر من �ضلك, جاري تحديث الوسيط..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reason for update: "
-msgstr "سبب التحديث:"
+msgid "Please wait, listing packages..."
+msgstr "انتظر من �ضلك, جاري سرد الحزم..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Summary: "
-msgstr "نبذة: "
+#, fuzzy, c-format
+msgid "Information on packages"
+msgstr "لم يمكن �تح الحزمة"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Importance: "
-msgstr "الأهمية: "
+msgid "Cancel"
+msgstr "الغاء"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Everything installed successfully"
+msgstr "تم تثبيت كل شئ بنجاح"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Size: "
-msgstr "الحجم: "
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Select the media(s) you wish to update:"
+msgstr "اختر المصدر/المصادر التي تريد تحديثها:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Version: "
-msgstr "الإصدار: "
+msgid "Please wait, updating media..."
+msgstr "انتظر من �ضلك, جاري تحديث الوسائط..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "الإسم: "
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "الإصدار المثبت حالياً:"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"يجب ازالة الحزم التالية لكي تتم ترقية الحزم الأخرى:\n"
+"\n"
+"%s\n"
+"\n"
+"هل من الممكن المتابعة؟"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Source: "
-msgstr "اجبار"
+#, c-format
+msgid "in descriptions"
+msgstr "�ي الوص�"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(Not available)"
-msgstr "(غير موجود)"
+msgid "Configure proxies"
+msgstr "تهيئة البروكسي"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "سحل التغييرات:\n"
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"أحتاج للإتصال بموقع MandrakeSoft للحصول على قائمة المرايا.\n"
+"�ضلاً تأكد من أن الشبكة الخاصة بك تعمل حالياً.\n"
+"\n"
+"هل من الممكن المتابعة؟"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Files:\n"
-msgstr "المل�ات:\n"
+msgid "Please choose"
+msgstr "�ضلاً اختر"
 
 #: ../rpmdrake:1
 #, c-format
@@ -605,43 +553,28 @@ msgstr "الحجم المختار: %d ميغابايت"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "تم اختيار: %d ميغابايت / المساحة المتو�رة �ي القرص: %d ميغابايت"
+msgid "Initializing..."
+msgstr "جاري البدء..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
-msgstr ""
-"نظرا للاعتمادات, �إن الحزمة/الحزم التالية يجب أن\n"
-"الرجوع عن اختيارها الآن:\n"
-"\n"
+msgid "Save changes"
+msgstr "اح�ظ التغييرات"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr ""
-"ع�واً, لا يمكن اختيار الحزمة/الحزم التالية:\n"
-"\n"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "خطأ أثناء التنزيل"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "تتعارض مع"
+msgid "Package installation..."
+msgstr "جاري تحضير الحزم للتثبيت..."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "لا يمكن تثبيت الحزمة"
+#, c-format
+msgid "Importance: "
+msgstr "الأهمية: "
 
 #: ../rpmdrake:1
 #, c-format
@@ -654,453 +587,455 @@ msgstr ""
 "التالية:\n"
 "\n"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "هناك حزم اضا�ية مطلوبة"
+msgid "Add..."
+msgstr "أض�..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "لا يمكن تثبيت الحزمة"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "تعذر انشاء الوسيط"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Removing these packages would break your system, sorry:\n"
+"The installation is finished; %s.\n"
 "\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
 msgstr ""
-"ازالة هذه الحزم قد تكسر نظامك, عذراً:\n"
+"انتهى التثبيت; %s.\n"
 "\n"
+"تم انشاء بعض مل�ات التهيئة مثل `.rpmnew' أو `.rpmsave',\n"
+"يمكنك الآن التحقق من بعضها لكي تقوم بالمطلوب منها:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"نظرا للاعتمادات, �إن الحزمة/الحزم التالية يجب أن\n"
-"تحذ�:\n"
-"\n"
+msgid "Browse..."
+msgstr "استعرض..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "لا يمكن تثبيت الحزمة"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "هذه الحزم الاضا�ية يجب أن تحذ�"
+msgid "Info..."
+msgstr "معلومات..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "More information on package..."
-msgstr "معلومات أكثر حول الحزمة..."
+msgid "You need to insert the medium to continue"
+msgstr "تحتاج الى ادخال الوسيط للمتابعة"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Information on packages"
-msgstr "لم يمكن �تح الحزمة"
+msgid "Copying file for media `%s'..."
+msgstr "جاري نسخ المل� للمصدر `%s'..."
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "احذ�"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "More info"
-msgstr "مزيد من المعلومات"
+msgid "Preparing packages installation..."
+msgstr "جاري تحضير الحزم للتثبيت..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "by media repository"
+msgstr "بمخزن المصدر"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "قابلة للإضا�ة"
+msgid "No mirror"
+msgstr "لا مرايا"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Upgradable"
-msgstr "قابلة للترقية"
+msgid "You need to fill up at least the two first entries."
+msgstr "يجب عليك ملء الحقلين الأولين على الأقل."
 
 #: ../rpmdrake:1
 #, c-format
-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 ""
-"قائمة التحديث �ارغة. هذا إما يعني أنه\n"
-"لا توجد تحديثات للحزم الموجودة على جهازك,\n"
-"أو أنك قمت بتثبيت كل التحديثات مسبقا."
+msgid "Install"
+msgstr "تثبيت"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "No update"
-msgstr "لا تحديث"
+msgid "Japan"
+msgstr "اليابان"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "(none)"
-msgstr "(لا شئ)"
+msgid "Do nothing"
+msgstr "لا ت�عل شيئاً"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "انتظر من �ضلك, جاري سرد الحزم..."
+msgid "No update"
+msgstr "لا تحديث"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "لم يمكن �تح الحزمة"
+#, c-format
+msgid "Description: "
+msgstr "وص�:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "أحد هذه الحزم مطلوب:"
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr ""
+"تحذير: يبدو أنك تحاول تثبيت الكثير من الحزم\n"
+"بحيث يمكن ألا تكون هناك مساحة �ارغة على القرص\n"
+"أثناء أو بعد تثبيت الحزم, هذا �ي منتهى الخطورة\n"
+"و يجب أخذه �ي الإعتبار بحذر.\n"
+"\n"
+"هل تريد �علا تثبيت الحزم؟"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "�ضلاً اختر"
+msgid "Name: "
+msgstr "الإسم: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Inspect..."
+msgstr "تحقَّق..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Not selected"
-msgstr "تم ايجاد تعارضات"
+msgid "Editing media \"%s\":"
+msgstr "جاري تحرير المصدر \"%s\":"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Selected"
-msgstr "مختار"
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "جاري تحضير الحزم للتثبيت..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results"
-msgstr "نتائج البحث"
+msgid "Australia"
+msgstr "أوستراليا"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Stop"
-msgstr "ق�"
+msgid "Installation finished"
+msgstr "انتهى التثبيت"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "انتظر من �ضلك, جاري البحث..."
+msgid "by update availability"
+msgstr "بتواجد التحديث"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results (none)"
-msgstr "نتائج البحث (لا شئ)"
+msgid "Poland"
+msgstr "بولندا"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Other"
-msgstr "أخرى"
+msgid "Version: "
+msgstr "الإصدار: "
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the packages source editor!\n"
-"\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
-msgstr ""
-"أهلا بك �ي محرر مصادر الحزم!\n"
-"\n"
-"هذه الأداة ستساعدك على تهيئة مصادر الحزم التي قد تريد استخدامها على\n"
-"حاسوبك. عندها ستكون هذه المصادر موجودة لتثبيت حزم برمجية جديدة\n"
-"أو لعمل التحديثات."
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "يجب عليك تحديد امس مستخدم/كلمة مرور للمصادقة �ي البروكسي:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
-msgstr "اح�ظ و اخرج"
+msgid "Upgradable"
+msgstr "قابلة للترقية"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid " done."
+msgstr " تم."
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "خطأ..."
+msgid "Software Packages Installation"
+msgstr "جاري تحضير الحزم للتثبيت..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Update..."
-msgstr "حدّث..."
+msgid "Additional packages needed"
+msgstr "هناك حزم اضا�ية مطلوبة"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "أض�..."
+msgid "Bugfixes updates"
+msgstr "تحديثات ازالة العيوب"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "حرّر"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Source"
-msgstr "اجبار"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "تنزيل `%s', الوقت المتبقي:%s, السرعة:%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Enabled?"
-msgstr "متاح؟"
+msgid "Germany"
+msgstr "ألمانيا"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Configure sources"
-msgstr "تهيئة المصادر"
+msgid "Russia"
+msgstr "روسيا"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Password:"
-msgstr "كلمة المرور:"
+msgid "Norway"
+msgstr "النرويج"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "User:"
-msgstr "اسم المستخدم:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during installation"
+msgstr "ظهرت مشاكل أثناء التثبيت"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "يجب عليك تحديد امس مستخدم/كلمة مرور للمصادقة �ي البروكسي:"
+msgid "Search"
+msgstr "ابحث"
 
 #: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Edit a media"
+msgstr "تحرير مصدر"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "اسم مستضي� البروكسي"
+msgid "Czech Republic"
+msgstr "جمهورية التشيك"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"اذا كنت تحتاج الى بروكسي, أدخل اسم المستضي� و المن�ذ (على الشكل التالي: <اسم "
-"المستضي�[:المن�ذ[>):"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "تهيئة البروكسي"
+msgid "Stop"
+msgstr "ق�"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "انتظر من �ضلك, جاري تحديث الوسيط..."
+msgid "Update"
+msgstr "حدّث"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "لكي يتم ح�ظ التغييرات, تحتاج الى ادخال الوسيط �ي السواقة."
+msgid "Please wait, removing packages..."
+msgstr "انتظر من �ضلك, جاري ازالة الحزم..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "تحتاج الى ادخال الوسيط للمتابعة"
+msgid "Normal information"
+msgstr "معلومات عادية"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "اح�ظ التغييرات"
+msgid "Media: "
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "المسار الى مل� التخليق أو hdlist:"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "جاري تنزيل الحزمة `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "العنوان:"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "تم اختيار: %d ميغابايت / المساحة المتو�رة �ي القرص: %d ميغابايت"
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "جاري تحرير المصدر \"%s\":"
+#, c-format
+msgid "Media"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit a source"
-msgstr "تحرير مصدر"
+msgid "Spain"
+msgstr "أسبانيا"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "انتظر من �ضلك, جاري اضا�ة الوسيط...."
+msgid "Normal updates"
+msgstr "تحديثات عادية"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Type of source:"
-msgstr "نوع المصدر:"
+msgid "by selection state"
+msgstr "بحالة الإختيار"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Adding a source:"
-msgstr "جاري اضا�ة مصدر"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "انتظر من �ضلك, جاري تنزيل عناوين المرايا من موقع MandrakeSoft"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
-msgstr "هناك وسيط بهذا الإسم مسبقاً, هل تريد استبداله �علاً؟"
+msgid "Login:"
+msgstr "اسم الدخول:"
 
 #: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Adding a media:"
+msgstr "جاري اضا�ة مصدر"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "يجب عليك ملء الحقلين الأولين على الأقل."
+msgid "Austria"
+msgstr "النمسا"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Fatal error"
+msgstr "خطأ �ي المل�"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Name:"
-msgstr "الإسم:"
+msgid "Update..."
+msgstr "حدّث..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "جاري التأكد من توقيع `%s'..."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Login:"
-msgstr "اسم الدخول:"
+msgid "(none)"
+msgstr "(لا شئ)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr "اختار المرآة..."
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
+"ازالة هذه الحزم قد تكسر نظامك, عذراً:\n"
+"\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
-msgstr "استعرض..."
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "جاري تثبيت الحزمة `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Path or mount point:"
-msgstr "المسار أو نقطة التحميل:"
+msgid "Currently installed version: "
+msgstr "الإصدار المثبت حالياً:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Removable device"
-msgstr "الأجهزة القابلة للإزالة"
+msgid "Other"
+msgstr "أخرى"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "خادم HTTP"
+msgid "Reason for update: "
+msgstr "سبب التحديث:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "خادم FTP"
+msgid "Please choose the desired mirror."
+msgstr "�ضلاً اختر المرآة المطلوبة."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Path:"
-msgstr "المسار:"
+msgid "Edit"
+msgstr "حرّر"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "مل�ات محلية"
+msgid "Please wait, finding available packages..."
+msgstr "اتنظر من �ضلك, جاري ايجاد الحزم المتو�رة..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Add a source"
-msgstr "أض� مصدر"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr "تعذر تحديث الوسيط;  سيتم تعطيله آلياً"
+msgid "Relative path to synthesis/hdlist:"
+msgstr "المسار الى مل� التخليق أو hdlist:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Unable to create medium."
-msgstr "تعذر انشاء الوسيط"
+msgid "Search results (none)"
+msgstr "نتائج البحث (لا شئ)"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Update"
-msgstr "حدّث"
+msgid "Danmark"
+msgstr "الدنمارك"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "اختر المصدر/المصادر التي تريد تحديثها:"
+msgid "China"
+msgstr "الصين"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "انتظر من �ضلك, جاري تحديث الوسائط..."
+msgid "United States"
+msgstr "الولايات المتحدة"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " failed!"
-msgstr " �شل!"
+msgid "changes:"
+msgstr "التغييرات:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " done."
-msgstr " تم."
+msgid "Some additional packages need to be removed"
+msgstr "هذه الحزم الاضا�ية يجب أن تحذ�"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "تنزيل `%s', السرعة:%s"
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "تنزيل `%s', الوقت المتبقي:%s, السرعة:%s"
+msgid "No"
+msgstr "لا"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "جاري التأكد من توقيع `%s'..."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "جاري اختبار المل� البعيد للمصدر `%s'..."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Examining file of source `%s'..."
-msgstr "جاري اختبار المل� للمصدر `%s'..."
+msgid "Configure medias"
+msgstr "تهيئة المصادر"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Copying file for source `%s'..."
-msgstr "جاري نسخ المل� للمصدر `%s'..."
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a media"
+msgstr "أض� مصدر"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please choose the desired mirror."
-msgstr "�ضلاً اختر المرآة المطلوبة."
+msgid "Summary: "
+msgstr "نبذة: "
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
-msgstr ""
-"تعذر ايجاد أي مرآة مناسبة.\n"
-"\n"
-"قد تكون هناك أسباب عديدة لهذه المشكلة: السبب الأكثر حدوثاً هو\n"
-":أن يكون نوع المعالج الخاص بك غير مدعوم\n"
-"من تحديثات Mandrake Linux الرسمية."
+msgid "Canada"
+msgstr "كندا"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No mirror"
-msgstr "لا مرايا"
+msgid "Greece"
+msgstr "اليونان"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1117,178 +1052,243 @@ msgstr ""
 "الشبكة, أو موقع MandrakeSoft قد يكون غير موجود.\n"
 "�ضلا حاول مرة أخرى �ي وقت لاحق."
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Error during download"
-msgstr "خطأ أثناء التنزيل"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr "آس�, يجب عليك أن تكون مستخدم جذر لتثبيت الحزم."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr "انتظر من �ضلك, جاري تنزيل عناوين المرايا من موقع MandrakeSoft"
+msgid "Path:"
+msgstr "المسار:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"أحتاج للإتصال بموقع MandrakeSoft للحصول على قائمة المرايا.\n"
-"�ضلاً تأكد من أن الشبكة الخاصة بك تعمل حالياً.\n"
-"\n"
-"هل من الممكن المتابعة؟"
+msgid "Problem during removal"
+msgstr "ظهرت مشاكل أثناء الحذ�"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United States"
-msgstr "الولايات المتحدة"
+msgid "Selected"
+msgstr "مختار"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "الصين"
+msgid "Netherlands"
+msgstr "هولندا"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "المملكة المتحدة"
+msgid "Addable"
+msgstr "قابلة للإضا�ة"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "تايوان"
+msgid "(Not available)"
+msgstr "(غير موجود)"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Sweden"
-msgstr "السويد"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
+msgstr ""
+"ع�واً, لا يمكن اختيار الحزمة/الحزم التالية:\n"
+"\n"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Russia"
-msgstr "روسيا"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Not selected"
+msgstr "تم ايجاد تعارضات"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Portugal"
-msgstr "البرتغال"
+msgid "Software Packages Removal"
+msgstr "حذ� حزم البرامج"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Poland"
-msgstr "بولندا"
+msgid "Sweden"
+msgstr "السويد"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Norway"
-msgstr "النرويج"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
+msgstr ""
+"\n"
+"\n"
+"الأخطاء المقررة:\n"
+"%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Netherlands"
-msgstr "هولندا"
+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 ""
+"قائمة التحديث �ارغة. هذا إما يعني أنه\n"
+"لا توجد تحديثات للحزم الموجودة على جهازك,\n"
+"أو أنك قمت بتثبيت كل التحديثات مسبقا."
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Korea"
-msgstr "اجبار"
+msgid "Examining file of media `%s'..."
+msgstr "جاري اختبار المل� للمصدر `%s'..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Japan"
-msgstr "اليابان"
+msgid "Download of `%s', speed:%s"
+msgstr "تنزيل `%s', السرعة:%s"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Italy"
-msgstr "تثبيت"
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "أحد هذه الحزم مطلوب:"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Israel"
-msgstr "تثبيت"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "خروج"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Greece"
-msgstr "اليونان"
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"أحتاج للإتصال بالمرآة للحصول على أخر حزم التحديثات.\n"
+"�ضلاً تأكد من أن الشبكة الخاصة بك تعمل حالياً.\n"
+"\n"
+"هل من الممكن المتابعة؟"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "France"
-msgstr "اجبار"
+msgid "Update media(s)"
+msgstr "حدّث المصدر/المصادر"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Finland"
-msgstr "�نلندا"
+msgid "Ok"
+msgstr "موا�ق"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Spain"
-msgstr "أسبانيا"
+msgid "Please wait, adding medium..."
+msgstr "انتظر من �ضلك, جاري اضا�ة الوسيط..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Danmark"
-msgstr "الدنمارك"
+msgid "Unable to get source packages."
+msgstr "تعذر الحصول على الحزم المصدرية"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "ألمانيا"
+msgid "Too many packages are selected"
+msgstr "تم اختيار حزم كثيرة"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"أهلا بك �ي محرر مصادر الحزم!\n"
+"\n"
+"هذه الأداة ستساعدك على تهيئة مصادر الحزم التي قد تريد استخدامها على\n"
+"حاسوبك. عندها ستكون هذه المصادر موجودة لتثبيت حزم برمجية جديدة\n"
+"أو لعمل التحديثات."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
+msgstr "تتعارض مع"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
-msgstr "جمهورية التشيك"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"أهلا بك �ي تحديث Mandrake!\n"
+"\n"
+"هذه الأداة ستساعدك �ي اختيار التحديثات التي تريد تثبيتها على\n"
+"جهازك."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "كوستاريكا"
+msgid "Mandrake choices"
+msgstr "اختيارات Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Canada"
-msgstr "كندا"
+msgid "Changelog:\n"
+msgstr "سحل التغييرات:\n"
 
 #: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Korea"
+msgstr "اجبار"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Brazil"
-msgstr "البرازيل"
+msgid "Removable device"
+msgstr "الأجهزة القابلة للإزالة"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "بلجيكا"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "أوستراليا"
+msgid "Change medium"
+msgstr "غير الوسيط"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "النمسا"
+msgid "Mandrake Update"
+msgstr "تحديث Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
-msgstr "معلومات..."
+msgid "by size"
+msgstr "بالحجم"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "لا"
+msgid "FTP server"
+msgstr "خادم FTP"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "نعم"
+msgid "Files:\n"
+msgstr "المل�ات:\n"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr "تعذر تحديث الوسيط;  سيتم تعطيله آلياً"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -1562,6 +1562,14 @@ msgstr "احذ� البرنامج"
 msgid "Software Sources Manager"
 msgstr "مدير مصادر البرمجيات"
 
+#, fuzzy
+#~ msgid "Source: "
+#~ msgstr "اجبار"
+
+#, fuzzy
+#~ msgid "Source"
+#~ msgstr "اجبار"
+
 #~ msgid ""
 #~ "some packages failed to install\n"
 #~ "correctly"
@@ -1598,9 +1606,6 @@ msgstr "مدير مصادر البرمجيات"
 #~ "\n"
 #~ "هل تريد المحاولة مع مرآة أخرى؟"
 
-#~ msgid "Error adding update medium"
-#~ msgstr "خطأ أثناء اضا�ة وسيط التحديث"
-
 #~ msgid "Please wait, contacting mirror to initialize updates packages."
 #~ msgstr "انتظر من �ضلك, جاري الإتصال بالمرآة لبدء تحديث الحزم."
 
diff --git a/po/az.po b/po/az.po
index 8fc4f82a..6f0faf43 100644
--- a/po/az.po
+++ b/po/az.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: 2003-02-22 19:26+0200\n"
 "Last-Translator: Mətin �mirov <metin@karegen.com>\n"
 "Language-Team: Azerbaijani Turkish <linuxaz@azerimal.net>\n"
@@ -14,14 +14,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
+msgid "Enabled?"
 msgstr ""
 
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Path or mount point:"
+msgstr "bağlama nöqtəsi:"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Portugal"
+msgstr "Qapı:"
+
 #: ../rpmdrake:1
 #, c-format
 msgid ""
@@ -34,131 +41,167 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
+msgid "by group"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Name:"
+msgstr "Ad"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Paketlər quraşdırılırkən xəta yarandı:\n"
-"\n"
-"%s"
+msgid "Italy"
+msgstr "QurulmuÅŸlar"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during removal"
-msgstr "Qurma əsnasında problemlər oldu"
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, removing packages..."
-msgstr "Xahiş edirik rpm paketləri çıxardana qədər gözləyin"
+#, c-format
+msgid "Some packages need to be removed"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, reading packages database..."
+msgid "More information on package..."
 msgstr ""
 
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Bəli"
+
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"There was a problem during the installation:\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"%s"
 msgstr ""
-"Paketlər quraşdırılırkən xəta yarandı:\n"
-"\n"
-"%s"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Qurula Bilən"
+msgid "everything was installed correctly"
+msgstr "Paket onsuz da quruludur"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Paketlər yükləmə üçün hazırlanır..."
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Paketlər yükləmə üçün hazırlanır..."
+#, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
+msgid ""
+"Welcome to the software removal tool!\n"
+"\n"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Everything installed successfully"
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
+msgid "Save and quit"
+msgstr ""
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"There was a problem during the removal of packages:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"%s"
 msgstr ""
+"Paketlər quraşdırılırkən xəta yarandı:\n"
+"\n"
+"%s"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "everything was installed correctly"
-msgstr "Paket onsuz da quruludur"
+msgid "Size: "
+msgstr "Böyüklük"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
+msgstr "Təhlükəsizlik güncəlləmələri"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Qurma əsnasında problemlər oldu"
+msgid "Already existing update medias"
+msgstr "Asılılıqlar yoxlanılır..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Quraşdırılan paket `%s' (%s/%s)..."
+msgid "Maximum information"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Paketlər yükləmə üçün hazırlanır..."
+msgid "Proxy..."
+msgstr "Xəta..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
 msgstr ""
 
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr "Birləşmiş Krallıq"
+
 #: ../rpmdrake:1
 #, c-format
+msgid "in names"
+msgstr ""
+
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
+msgid "Remove .%s"
+msgstr "Çıxardıla Bilən"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Finland"
+msgstr "Axtar:"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -172,504 +215,422 @@ msgstr ""
 "\n"
 "Yenə də bu paketi keçib davam etmək istəyirsiniz?"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Verifying packages signatures..."
+msgid "Examining distant file of media `%s'..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "`%s' Paketi endirilir (%s/%s)..."
+msgid "Verifying packages signatures..."
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Cancel"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "France"
 msgstr "Ləğv et"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Ok"
-msgstr "Oldu"
-
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+msgid "More info"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Change medium"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Initializing..."
-msgstr "Qurulur..."
+#, fuzzy, c-format
+msgid "Reload the packages list"
+msgstr "%s paketi imzalanmayıb"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Paketlər yükləmə üçün hazırlanır..."
+msgid "Choose a mirror..."
+msgstr "�ksi seçin:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Paketləri quraşdırmaq üçün ali istifadəçi olmalısınız, bağışlayın."
+msgid "Some packages can't be installed"
+msgstr "`%s' paketi qurula bilmir\n"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unable to get source packages."
-msgstr "Çox pis, oxuna bilməyən və ya tapılmayan paketlər"
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "Paketlər yükləmə üçün hazırlanır..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Inspect..."
-msgstr ""
+#, fuzzy, c-format
+msgid "All packages,"
+msgstr "o paket, o bayt"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Installation finished"
-msgstr "Qurula Bilən"
+msgid "Type of media:"
+msgstr "Mənbə növü:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Do nothing"
-msgstr "amma oxşamır"
+msgid "in files"
+msgstr "Yerli"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
+msgid "All requested packages were installed successfully."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Remove .%s"
-msgstr "Çıxardıla Bilən"
+msgid "Proxy hostname:"
+msgstr "Vəkil verici istifadəçi adı:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "changes:"
-msgstr "Paketlər"
+msgid "Local files"
+msgstr "Yerli"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspecting %s"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, finding available packages..."
-msgstr "mövcud paketlərin siyahısını yenidən yüklə"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Please wait, adding medium..."
-msgstr "Asılılıqlar yoxlanılır..."
+msgid "Israel"
+msgstr "QurulmuÅŸlar"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
-"\n"
-"Then, restart MandrakeUpdate."
-msgstr ""
+msgid "Help"
+msgstr "Yardım"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "How to choose manually your mirror"
+msgid "HTTP server"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
-msgstr ""
+#, fuzzy, c-format
+msgid "Installation failed"
+msgstr "Qurula Bilən"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Already existing update sources"
+msgid "Use .%s as main file"
 msgstr ""
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Search results"
+msgstr "Axtarış Nəticələri"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid " failed!"
+msgstr "Yerli"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
+msgstr "Braziliya"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Find:"
+msgstr "Axtar:"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Fayl xətası"
+#, c-format
+msgid "All packages, alphabetical"
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Paketlər yükləmə üçün hazırlanır..."
+msgid "Please wait, searching..."
+msgstr "Xahiş edirik rpm paketləri çıxardana qədər gözləyin"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Mandrake Update"
+#, c-format
+msgid "Please wait, reading packages database..."
 msgstr ""
-"Mandrake\n"
-"Güncəlləmə"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Software Packages Removal"
-msgstr " Proqram Tə'minatı İdarəçisi "
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Quit"
-msgstr "Çıx"
+msgid "unknown package "
+msgstr "`%s' paketi açıla bilmir\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Qurulur"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Remove"
-msgstr "Çıxardıla Bilən"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Help"
-msgstr "Yardım"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Search"
-msgstr "Axtarış Nəticələri"
+msgid "Reset the selection"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Find:"
-msgstr "Axtar:"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
 "\n"
-"Is it ok to continue?"
 msgstr ""
+"Bütün asılılıqlara cavab vermək üçün\n"
+"bu paketlər silinəcəklər:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr ""
+msgid "Costa Rica"
+msgstr "Kosta Rika"
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
+"There was a problem during the installation:\n"
 "\n"
-"Do you really want to install all the selected packages?"
+"%s"
 msgstr ""
+"Paketlər quraşdırılırkən xəta yarandı:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Too many packages are selected"
-msgstr "Paketlər onsuz da quruludur"
+msgid "Please wait, removing medium..."
+msgstr "Asılılıqlar yoxlanılır..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Maximum information"
-msgstr ""
+msgid "Password:"
+msgstr "Parol:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Normal information"
-msgstr "normal güncəlləmələr"
+msgid "Taiwan"
+msgstr "Tayland"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Update source(s)"
-msgstr "Mənbələri Düzəlt"
+msgid "User:"
+msgstr "İstifadəçi adı:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Reload the packages list"
-msgstr "%s paketi imzalanmayıb"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Reset the selection"
-msgstr ""
+msgid "Please wait, updating medium..."
+msgstr "Asılılıqlar yoxlanılır..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "in files"
-msgstr "Yerli"
+msgid "Please wait, listing packages..."
+msgstr "Xahiş edirik rpm paketləri çıxardana qədər gözləyin"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "in descriptions"
-msgstr "Ä°zahatlar"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "in names"
-msgstr ""
+msgid "Information on packages"
+msgstr "Paket açıla bilmir"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "by update availability"
-msgstr ""
+msgid "Cancel"
+msgstr "Ləğv et"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by source repository"
+msgid "Everything installed successfully"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "by selection state"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Select the media(s) you wish to update:"
 msgstr ""
+"Xahiş edirik, güncəlləmək\n"
+"istədiyiniz mənbəni seçin"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "by size"
-msgstr "Dərinliklər"
+msgid "Please wait, updating media..."
+msgstr "Asılılıqlar yoxlanılır..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
+msgid "A fatal error occurred: %s."
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "All packages,"
-msgstr "o paket, o bayt"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Mandrake choices"
-msgstr "MandrakeUpdate"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Normal updates"
-msgstr "normal güncəlləmələr"
+msgid "in descriptions"
+msgstr "Ä°zahatlar"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Bugfixes updates"
-msgstr "Təhlükəsizlik güncəlləmələri"
+msgid "Configure proxies"
+msgstr "Mənbəni quraq?"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Security updates"
-msgstr "Təhlükəsizlik güncəlləmələri"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Description: "
-msgstr "Ä°zahatlar"
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reason for update: "
+msgid "Please choose"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Summary: "
-msgstr "Qısaca"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "Importance: "
+msgid "Selected size: %d MB"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Size: "
-msgstr "Böyüklük"
+msgid "Initializing..."
+msgstr "Qurulur..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Version: "
-msgstr "Buraxılış:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Name: "
-msgstr "Ad: "
+msgid "Save changes"
+msgstr "Paketlər"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Currently installed version: "
-msgstr ""
+msgid "Error during download"
+msgstr "Endirərkən xəta"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Source: "
-msgstr "Qaynaq"
+msgid "Package installation..."
+msgstr "Paketlər yükləmə üçün hazırlanır..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "(Not available)"
+msgid "Importance: "
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Changelog:\n"
+msgid ""
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Files:\n"
-msgstr "/_Fayl"
-
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected size: %d MB"
+msgid "Add..."
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr ""
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Unable to create medium."
+msgstr "Raport faylı yaradıla bilmir, çıxılır.\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"The installation is finished; %s.\n"
 "\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
+msgid "Browse..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "bununla toqquÅŸur"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be installed"
+msgid "Some packages can't be removed"
 msgstr "`%s' paketi qurula bilmir\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
+msgid "Info..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
+msgid "You need to insert the medium to continue"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "`%s' paketi qurula bilmir\n"
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
+msgid "Copying file for media `%s'..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"Bütün asılılıqlara cavab vermək üçün\n"
-"bu paketlər silinəcəklər:"
+msgid "Remove"
+msgstr "Çıxardıla Bilən"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-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:"
+msgid "Preparing packages installation..."
+msgstr "Paketlər yükləmə üçün hazırlanır..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "More information on package..."
+msgid "by media repository"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Information on packages"
-msgstr "Paket açıla bilmir"
+msgid "No mirror"
+msgstr "Xətasz"
 
-#. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "More info"
+msgid "You need to fill up at least the two first entries."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Addable"
-msgstr ""
+msgid "Install"
+msgstr "Qurulur"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Upgradable"
-msgstr ""
+msgid "Japan"
+msgstr "Yaponiya"
 
 #: ../rpmdrake:1
-#, c-format
-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 ""
+#, fuzzy, c-format
+msgid "Do nothing"
+msgstr "amma oxşamır"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -677,226 +638,206 @@ msgid "No update"
 msgstr "normal güncəlləmələr"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "(none)"
-msgstr "(heç biri)"
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, listing packages..."
-msgstr "Xahiş edirik rpm paketləri çıxardana qədər gözləyin"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "`%s' paketi açıla bilmir\n"
+msgid "Description: "
+msgstr "Ä°zahatlar"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "One of the following packages is needed:"
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr ""
+msgid "Name: "
+msgstr "Ad: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr "Toqquşmalar tapıldı"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Selected"
-msgstr "Hamısını Seç"
+msgid "Inspect..."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Search results"
-msgstr "Axtarış Nəticələri"
+msgid "Editing media \"%s\":"
+msgstr "Mənbələri Düzəlt"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Stop"
-msgstr "Sektor"
+msgid "No package found for installation."
+msgstr "Paketlər yükləmə üçün hazırlanır..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Please wait, searching..."
-msgstr "Xahiş edirik rpm paketləri çıxardana qədər gözləyin"
+msgid "Australia"
+msgstr "serial"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Search results (none)"
-msgstr "Axtarış Nəticələri"
+msgid "Installation finished"
+msgstr "Qurula Bilən"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Other"
-msgstr "Digər"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid ""
-"Welcome to the packages source editor!\n"
-"\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
+msgid "by update availability"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Save and quit"
-msgstr ""
+msgid "Poland"
+msgstr "PolÅŸa"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Xəta..."
+msgid "Version: "
+msgstr "Buraxılış:"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update..."
+msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
+msgid "Upgradable"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "Düzəlt"
+msgid " done."
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Source"
-msgstr "Qaynaq"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Software Packages Installation"
+msgstr "Paketlər yükləmə üçün hazırlanır..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Enabled?"
+msgid "Additional packages needed"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Configure sources"
-msgstr "Mənbəni quraq?"
+msgid "Bugfixes updates"
+msgstr "Təhlükəsizlik güncəlləmələri"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Password:"
-msgstr "Parol:"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "User:"
-msgstr "İstifadəçi adı:"
+msgid "Germany"
+msgstr "Almanca"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr ""
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Russia"
+msgstr "Rusca"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Proxy hostname:"
-msgstr "Vəkil verici istifadəçi adı:"
+msgid "Norway"
+msgstr "Norveçcə"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during installation"
+msgstr "Qurma əsnasında problemlər oldu"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Configure proxies"
-msgstr "Mənbəni quraq?"
+msgid "Search"
+msgstr "Axtarış Nəticələri"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Please wait, updating medium..."
-msgstr "Asılılıqlar yoxlanılır..."
+msgid "Edit a media"
+msgstr "Mənbələri Düzəlt"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr ""
+msgid "Czech Republic"
+msgstr "Çex Respublikası"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
+msgid ""
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Save changes"
-msgstr "Paketlər"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "hdlist-in nisbi cığırı: "
+msgid "Stop"
+msgstr "Sektor"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "Update"
+msgstr "Güncəllə"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "Mənbələri Düzəlt"
+msgid "Please wait, removing packages..."
+msgstr "Xahiş edirik rpm paketləri çıxardana qədər gözləyin"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Edit a source"
-msgstr "Mənbələri Düzəlt"
+msgid "Normal information"
+msgstr "normal güncəlləmələr"
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Please wait, removing medium..."
-msgstr "Asılılıqlar yoxlanılır..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Media: "
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Type of source:"
-msgstr "Mənbə növü:"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "`%s' Paketi endirilir (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Adding a source:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr ""
-"Lütfən Gözləyin\n"
-"Mənbə əlavə edilir"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
+msgid "Media"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr ""
+msgid "Spain"
+msgstr "Ä°spaniya"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Name:"
-msgstr "Ad"
+msgid "Normal updates"
+msgstr "normal güncəlləmələr"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
+msgstr ""
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
@@ -905,143 +846,153 @@ msgstr "giriÅŸ:"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Choose a mirror..."
-msgstr "�ksi seçin:"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Browse..."
+msgid "Adding a media:"
 msgstr ""
+"Lütfən Gözləyin\n"
+"Mənbə əlavə edilir"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Path or mount point:"
-msgstr "bağlama nöqtəsi:"
+msgid "Austria"
+msgstr "serial"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Fatal error"
+msgstr "Fayl xətası"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Removable device"
+msgid "Update..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "`%s' paketinin imzası yoxlanır..."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr ""
+msgid "(none)"
+msgstr "(heç biri)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "FTP server"
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Path:"
-msgstr "cığır:"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Local files"
-msgstr "Yerli"
+#: ../rpmdrake:1
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Quraşdırılan paket `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Add a source"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
 msgstr ""
-"Lütfən Gözləyin\n"
-"Mənbə əlavə edilir"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
+msgid "Other"
+msgstr "Digər"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Unable to create medium."
-msgstr "Raport faylı yaradıla bilmir, çıxılır.\n"
+msgid "Please choose the desired mirror."
+msgstr ""
+"Lütfən Gözləyin\n"
+"�ks siyahısı alınır"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "Güncəllə"
+msgid "Edit"
+msgstr "Düzəlt"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr ""
-"Xahiş edirik, güncəlləmək\n"
-"istədiyiniz mənbəni seçin"
+msgid "Please wait, finding available packages..."
+msgstr "mövcud paketlərin siyahısını yenidən yüklə"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Please wait, updating media..."
-msgstr "Asılılıqlar yoxlanılır..."
+msgid "Relative path to synthesis/hdlist:"
+msgstr "hdlist-in nisbi cığırı: "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid " failed!"
-msgstr "Yerli"
+msgid "Search results (none)"
+msgstr "Axtarış Nəticələri"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid " done."
+msgid "Danmark"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr ""
+msgid "China"
+msgstr "Çin"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr ""
+msgid "United States"
+msgstr "Birləşmiş Ştatlar"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "`%s' paketinin imzası yoxlanır..."
+msgid "changes:"
+msgstr "Paketlər"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Examining distant file of source `%s'..."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+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.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr ""
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr ""
+msgid "No"
+msgstr "Xeyir"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Please choose the desired mirror."
+msgid "Configure medias"
+msgstr "Mənbəni quraq?"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a media"
 msgstr ""
 "Lütfən Gözləyin\n"
-"�ks siyahısı alınır"
+"Mənbə əlavə edilir"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Summary: "
+msgstr "Qısaca"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
-msgstr ""
+msgid "Canada"
+msgstr "Kanada"
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "No mirror"
-msgstr "Xətasz"
+msgid "Greece"
+msgstr "Yunanca"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1053,174 +1004,223 @@ msgid ""
 "Please try again later."
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Error during download"
-msgstr "Endirərkən xəta"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Paketləri quraşdırmaq üçün ali istifadəçi olmalısınız, bağışlayın."
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Path:"
+msgstr "cığır:"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during removal"
+msgstr "Qurma əsnasında problemlər oldu"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Selected"
+msgstr "Hamısını Seç"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
+msgid "Netherlands"
+msgstr "Hollandiya"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
+msgid "Addable"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United States"
-msgstr "Birləşmiş Ştatlar"
+msgid "(Not available)"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "China"
-msgstr "Çin"
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
+msgstr ""
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "United Kingdom"
-msgstr "Birləşmiş Krallıq"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Not selected"
+msgstr "Toqquşmalar tapıldı"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Taiwan"
-msgstr "Tayland"
+msgid "Software Packages Removal"
+msgstr " Proqram Tə'minatı İdarəçisi "
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Sweden"
 msgstr "İsveçcə"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Russia"
-msgstr "Rusca"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
+msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Portugal"
-msgstr "Qapı:"
+#: ../rpmdrake:1
+#, c-format
+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.pm:1
 #, c-format
-msgid "Poland"
-msgstr "PolÅŸa"
+msgid "Examining file of media `%s'..."
+msgstr ""
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Norway"
-msgstr "Norveçcə"
+#, c-format
+msgid "Download of `%s', speed:%s"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Netherlands"
-msgstr "Hollandiya"
+msgid "One of the following packages is needed:"
+msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Korea"
-msgstr "Daha Çox"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Çıx"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "Yaponiya"
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Italy"
-msgstr "QurulmuÅŸlar"
+msgid "Update media(s)"
+msgstr "Mənbələri Düzəlt"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Israel"
-msgstr "QurulmuÅŸlar"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "Oldu"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Greece"
-msgstr "Yunanca"
+msgid "Please wait, adding medium..."
+msgstr "Asılılıqlar yoxlanılır..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "France"
-msgstr "Ləğv et"
+msgid "Unable to get source packages."
+msgstr "Çox pis, oxuna bilməyən və ya tapılmayan paketlər"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Finland"
-msgstr "Axtar:"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Spain"
-msgstr "Ä°spaniya"
+msgid "Too many packages are selected"
+msgstr "Paketlər onsuz da quruludur"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Danmark"
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Germany"
-msgstr "Almanca"
+msgid "%s conflicts with %s"
+msgstr "bununla toqquÅŸur"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Çex Respublikası"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Costa Rica"
-msgstr "Kosta Rika"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mandrake choices"
+msgstr "MandrakeUpdate"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Canada"
-msgstr "Kanada"
+msgid "Changelog:\n"
+msgstr ""
 
 #: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Korea"
+msgstr "Daha Çox"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Brazil"
-msgstr "Braziliya"
+msgid "Removable device"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Belgium"
 msgstr "Belçika dili"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Australia"
-msgstr "serial"
+msgid "Mandrake Update"
+msgstr ""
+"Mandrake\n"
+"Güncəlləmə"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Austria"
-msgstr "serial"
+msgid "by size"
+msgstr "Dərinliklər"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Info..."
+msgid "FTP server"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "No"
-msgstr "Xeyir"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Files:\n"
+msgstr "/_Fayl"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Yes"
-msgstr "Bəli"
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -1495,6 +1495,13 @@ msgid "Software Sources Manager"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Source: "
+#~ msgstr "Qaynaq"
+
+#~ msgid "Source"
+#~ msgstr "Qaynaq"
+
+#, fuzzy
 #~ msgid ""
 #~ "some packages failed to install\n"
 #~ "correctly"
diff --git a/po/bg.po b/po/bg.po
index e098c48f..f78e4b00 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: 2003-04-30 18:07+0300\n"
 "Last-Translator: Boyan Ivanov <boyan17@bulgaria.com>\n"
 "Language-Team: Bulgarian\n"
@@ -16,13 +16,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
+msgid "Enabled?"
+msgstr "Äà ðàçðåøà?"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Ïúò èëè òî÷êà íà ìîíòèðàíå:"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Portugal"
+msgstr "Ïîðò:"
 
 #: ../rpmdrake:1
 #, c-format
@@ -42,16 +49,74 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "by group"
+msgstr "ïî ãðóïà"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Name:"
+msgstr "Èìå"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Italy"
+msgstr "Èíñòàëàöèÿ"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Êàê äà èçáåðåòå ðú÷íî âàøèÿò îãëåäàëåí ñúðâúð"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "Íÿêîè ïàêåòè òðÿáâà äà áúäàò ïðåìàõíàòè"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
+msgstr "Ïîâå÷å èíôîðìàöèÿ îò ïàêåò..."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Äà"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Welcome to MandrakeUpdate!\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
 msgstr ""
-"Äîáðå äîøëè â MandrakeÎáíîâÿâàíå!\n"
+"Ïîðàäè çàâèñèìîñò, ñëåäíèòå ïàêåòè òðÿáâà äà áúäàò îòêàçàíè\n"
+"îò èçáîðà ñåãà:\n"
 "\n"
-"Òîçè èíñòðóìåíò ùå âè ïîìîãíå äà èçáåðåòå îáíîâÿâàíå íà âàøèÿò ñîôòóåðr\n"
-"âúðõó ñèñòåìàòà."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "âñè÷êè áÿõà èíñòàëèðàíè êîðåêòíî"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "%s KB"
+msgstr "%.1f KB"
+
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -66,40 +131,23 @@ msgstr ""
 "Òîçè èíñòðóìåíò ùå âè ïîìîãíå äà èçáåðåòå êîè ñîôòóåðíè ïàêåòè ñêàòå äà\n"
 "èçòðèåòå îò ñèñòåìàòà."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:1
+#, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
+"In order to save the changes, you need to insert the medium in the drive."
 msgstr ""
-"Ïîëó÷è ñå ãðåøêà ïî âðåìå íà èíñòàëàöèÿòà íà:\n"
-"\n"
-"%s"
+"Çà äà çàïàçèòå ïðîìåíèòå, âèå òðÿáâà ïúðâî äà ïîñòàâèòå èçòî÷íèêà â "
+"óñòðîéñòâîòî."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Problem during removal"
-msgstr "Ïîÿâèõà ñå ïðîáëåìè ïî âðåìå íà ïðåìàõâàíåòî"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, removing packages..."
-msgstr ""
-"Ìîëà èç÷àêàéòå\n"
-"Ïàêåòèòå ñå ñîðòèðàò"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, reading packages database..."
-msgstr ""
-"Ìîëà èç÷àêàéòå\n"
-"Ïàêåòèòå ñå ñîðòèðàò"
+msgid "Save and quit"
+msgstr "Çàïèñâà è èçëèçà"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"There was a problem during the installation:\n"
+"There was a problem during the removal of packages:\n"
 "\n"
 "%s"
 msgstr ""
@@ -109,79 +157,67 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Èíñòàëèðàé âñè÷êî"
+msgid "Size: "
+msgstr "Ðàçìåð"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Ïîäãîòâÿíå íà ïàêåòèòå çà èíñòàëàöèÿ"
+msgid "Security updates"
+msgstr "Îáíîâÿâàíèÿ ñâúðçàíè ñúñ ñèãóðíîñòòà"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Ïîäãîòâÿíå íà ïàêåòèòå çà èíñòàëàöèÿ"
+msgid "Already existing update medias"
+msgstr "Ãðåøêà ïðè äîáàâÿíå íà èçòî÷íèê çà îáíîâÿâàíå"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Âñè÷êè çàÿâåíè ïàêåòè áÿõà èíñòàëèðàíè êîðåêòíî."
+msgid "Maximum information"
+msgstr "Ìàêñèìóì èíôîðìàöèÿ"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Everything installed successfully"
-msgstr "Âñè÷êè áÿõà èíñòàëèðàíè êîðåêòíî"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Proxy..."
+msgstr "Ãðåøêà..."
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The installation is finished; %s.\n"
-"\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
 msgstr ""
-"Èíñòàëèðàíåòî çàâúðøè; %s.\n"
-"\n"
-"Íÿêîé êîíôèãóðàöèîííè ôàéëîâå áÿõà ñúçäàäåíè êàòî .rpmnew' èëè `.rpmsave'.\n"
-"Âèå òðÿáâà äà ïðåãëåäàòå íÿêîé îò òÿõ çà äà ïðåäïðèåìåòå äåéñòâèå:"
+"Èíñòàëèðàíåòî ïðîïàäíà, íÿêîé îò ôàéëîâåòå ëèïñâàò.\n"
+"Âèå òðÿáâà äà îáíîâèòå èçòî÷íèêà íà âàøàòà áàçà äàííè."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "everything was installed correctly"
-msgstr "âñè÷êè áÿõà èíñòàëèðàíè êîðåêòíî"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Ïîÿâèõà ñå ïðîáëåìè ïî âðåìå íà èíñòàëàöèÿòà"
+msgid "United Kingdom"
+msgstr "Îáåäèíåíîòî êðàëñòâî"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Èíñòàëèðàíå íà ïàêåò `%s' (%s/%s)..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Ïîäãîòâÿíå íà ïàêåòèòå çà èíñòàëàöèÿ"
+msgid "in names"
+msgstr "ïî èìåíà"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
+"I can't find any suitable mirror.\n"
 "\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"Èíñòàëèðàíåòî ïðîïàäíà, íÿêîé îò ôàéëîâåòå ëèïñâàò.\n"
-"Âèå òðÿáâà äà îáíîâèòå èçòî÷íèêà íà âàøàòà áàçà äàííè."
+msgid "Remove .%s"
+msgstr "Ïðåìàõâà .%s"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "Ôèíëàíäèÿ"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -198,199 +234,275 @@ msgstr ""
 "\n"
 "Èñêàòå ëè äà ïðîäúëæèòå âúïðåêè òîâà (ïðîïóñêàéêè òîçè ïàêåò)?"
 
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Examining distant file of media `%s'..."
+msgstr ""
+
 #: ../rpmdrake:1
 #, c-format
 msgid "Verifying packages signatures..."
 msgstr ""
 
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "France"
+msgstr "Èãíîðèðàé"
+
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "More info"
+msgstr "Ïîâå÷å èíôîðìàöèÿ"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Èçòåãëÿíå íà ïàêåò `%s' (%s/%s)..."
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "Îòêàç"
+msgid "Reload the packages list"
+msgstr "Ïðåçàðåæäà ñïèñúê ñ ïàêåòèòå"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Ok"
-msgstr "Äîáðå"
+msgid "Choose a mirror..."
+msgstr "Èçáåðåòå ñúðâúð:..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Ìîëÿ, ïîñòàâåòå èçòî÷íèê ñ èìå \"%s\" íà óñòðîéñòâî [%s]"
+msgid "Some packages can't be installed"
+msgstr "Ïàêåòúò íå ìîæå äà áúäå èíñòàëèðàí"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "Ïîäãîòâÿíå íà ïàêåòèòå çà èíñòàëàöèÿ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Change medium"
-msgstr "Ñìåíÿ èçòî÷íèê"
+msgid "All packages,"
+msgstr "Âñè÷êè ïàêåòè,"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Type of media:"
+msgstr "Òèï íà èçòî÷íèêà:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "Èíèöèàëèçàöèÿ:"
+msgid "in files"
+msgstr "ïî ôàéëîâå"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "Âñè÷êè çàÿâåíè ïàêåòè áÿõà èíñòàëèðàíè êîðåêòíî."
+
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Ïîäãîòâÿíå íà ïàêåòèòå çà èíñòàëàöèÿ"
+msgid "Proxy hostname:"
+msgstr "Ïîòðåáèòåë çà ïðîêñè:"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "Ëîêàëíè ôàéëîâå"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr "Ïðåãëåæäàì %s"
+
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Òðÿáâà äà ñòå root, çà äà èíñòàëèðàòå ïàêåòè, ñúæàëÿâàì"
+msgid "Israel"
+msgstr "Èíñòàëàöèÿ"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unable to get source packages."
-msgstr "Èçáåðåòå æåëàíèòå ïàêåòè"
+msgid "Help"
+msgstr "/_Ïîìîù"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Inspect..."
-msgstr "Ïðåãëåæäà..."
+msgid "HTTP server"
+msgstr "HTTP ñåðâåð"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Installation finished"
-msgstr "Èíñòàëèðàíè"
+msgid "Installation failed"
+msgstr "Èíñòàëèðàé âñè÷êî"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Íå ïðàâè íèùî"
+msgid "Use .%s as main file"
+msgstr "Èçïîëçâà .%s êàòî ãëàâåí ôàéë"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Èçïîëçâà .%s êàòî ãëàâåí ôàéë"
+msgid "Search results"
+msgstr "Ðåçóëòàò îò òúðñåíå"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid " failed!"
+msgstr "ïî ôàéëîâå"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
+msgstr "Áðàçèëèÿ"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Ïðåìàõâà .%s"
+msgid "Find:"
+msgstr "Òúðñè:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "changes:"
-msgstr "ïðîìåíè:"
+msgid "All packages, alphabetical"
+msgstr "Âñè÷êè ïàêåòè ïî àçáó÷åí ðåä"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Ïðåãëåæäàì %s"
+msgid "Please wait, searching..."
+msgstr "Ìîëÿ èç÷àêàéòå, òúðñÿ..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, finding available packages..."
+msgid "Please wait, reading packages database..."
 msgstr ""
 "Ìîëà èç÷àêàéòå\n"
 "Ïàêåòèòå ñå ñîðòèðàò"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "Íåìîãà äà îòâîðÿ ïàêåòúò"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Ìîëÿ, ïîñòàâåòå èçòî÷íèê ñ èìå \"%s\" íà óñòðîéñòâî [%s]"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, adding medium..."
+msgid "Reset the selection"
+msgstr "Íóëèðà èçáðàíîòî"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
 msgstr ""
-"Ìîëÿ Èç÷àêàéòå\n"
-"Äîáàâÿ ñå èçòî÷íèê..."
+"Àêî ñå íóæäàåòå îò ïðîêñè, âúâåäåòå èìå íà õîñò è îïöèîíàëíî ïîðò (ñèíòàêñèñ:"
+"<proxyhost[:port]>):"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
 "\n"
-"Then, restart MandrakeUpdate."
 msgstr ""
+"Çà äà ñå óäîâîëåòâîðÿò çàâèñèìîñòèòå,\n"
+"ñëåäíèòå ïàêåòè òðÿáâà áúäàò ïðåìàõíàòè:\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "Êàê äà èçáåðåòå ðú÷íî âàøèÿò îãëåäàëåí ñúðâúð"
+msgid "Costa Rica"
+msgstr "Êîñòà Ðèêà"
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
+"There was a problem during the installation:\n"
 "\n"
-"Then, restart MandrakeUpdate."
+"%s"
 msgstr ""
+"Ïîëó÷è ñå ãðåøêà ïî âðåìå íà èíñòàëàöèÿòà íà:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Already existing update sources"
+msgid "Please wait, removing medium..."
 msgstr ""
+"Ìîëÿ Èç÷àêàéòå\n"
+"Ïðåìàõâà ñå èçòî÷íèê"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
+msgid "Password:"
+msgstr "Ïàðîëà:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Taiwan"
+msgstr "Òàéâàí"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Ãðåøêà â ôàéë"
+msgid "User:"
+msgstr "Ïîòðåáèòåë:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Ïîäãîòâÿíå íà ïàêåòèòå çà èíñòàëàöèÿ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr ""
+"Ìîëÿ Èç÷àêàéòå\n"
+"Îáíîâÿâà ñå èíôîðìàöèÿòà çà òîçè èçòî÷íèê..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Mandrake Update"
-msgstr "MandrakeUpdate Íàñòðîéêè"
+msgid "Please wait, listing packages..."
+msgstr ""
+"Ìîëà èç÷àêàéòå\n"
+"Ïàêåòèòå ñå ñîðòèðàò"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Software Packages Removal"
-msgstr "Èçòðèâàíå íà ïàêåòè"
+#, fuzzy, c-format
+msgid "Information on packages"
+msgstr "Íåìîãà äà îòâîðÿ ïàêåòúò"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "Èçõîä"
+msgid "Cancel"
+msgstr "Îòêàç"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Èíñòàëàöèÿ"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Remove"
-msgstr "Èçòðèâà"
+msgid "Everything installed successfully"
+msgstr "Âñè÷êè áÿõà èíñòàëèðàíè êîðåêòíî"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Help"
-msgstr "/_Ïîìîù"
+msgid "Select the media(s) you wish to update:"
+msgstr "Ìîëÿ èçáåðåòå èçòî÷íèöè êîèòî èñêàòå äà ñå ïîäíîâÿò:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search"
-msgstr "Òúðñè"
+msgid "Please wait, updating media..."
+msgstr "Ìîëÿ, èç÷àêàéòå. Îáíîâÿâà ñå èçòî÷íèê..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Òúðñè:"
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -403,155 +515,178 @@ msgid ""
 msgstr ""
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "in descriptions"
+msgstr "Îïèñàíèÿ"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Íÿêîè ïàêåòè òðÿáâà äà áúäàò ïðåìàõíàòè"
+msgid "Configure proxies"
+msgstr "Êîíôèãóðèðàíå íà ïðîêñèòà"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
 "\n"
-"Do you really want to install all the selected packages?"
+"Is it ok to continue?"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Òâúðäå ìíîãî ïàêåòè ñà èçáðàíè"
+msgid "Please choose"
+msgstr "Ìîëÿ èçáåðåòå"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Maximum information"
-msgstr "Ìàêñèìóì èíôîðìàöèÿ"
+#, fuzzy, c-format
+msgid "Selected size: %d MB"
+msgstr "%d èçáðàíè ïàêåòè: %.1f MB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Normal information"
-msgstr "Íîðìàëíà èíôîðìàöèÿ"
+msgid "Initializing..."
+msgstr "Èíèöèàëèçàöèÿ:"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update source(s)"
-msgstr "Îáíîâè èçòî÷íèöèòå"
+msgid "Save changes"
+msgstr "Çàïàçâà ïðîìåíèòå"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Ïðåçàðåæäà ñïèñúê ñ ïàêåòèòå"
+msgid "Error during download"
+msgstr "Ãðåøêà ïðè èçòåãëÿíå"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reset the selection"
-msgstr "Íóëèðà èçáðàíîòî"
+#, fuzzy, c-format
+msgid "Package installation..."
+msgstr "Ïîäãîòâÿíå íà ïàêåòèòå çà èíñòàëàöèÿ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "ïî ôàéëîâå"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "in descriptions"
-msgstr "Îïèñàíèÿ"
+msgid "Importance: "
+msgstr "Âàæíîñò: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "ïî èìåíà"
+msgid ""
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
+msgstr ""
+"Çà äà ñå çàäîâîëÿò çàâèñèìîñòèòå, ñëåäíèòå ïàêåòè òðÿáâà ñúùî\n"
+"äà áúäàò èíñòàëèðàíè:\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by update availability"
-msgstr "ïî âúçìîæíîñò çà îáíîâÿâàíå"
+msgid "Add..."
+msgstr "Äîáàâÿ..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by source repository"
-msgstr "ïî èçòî÷íèê íà ñúõðàíåíèå"
+msgid "Unable to create medium."
+msgstr "Íåâúçìîæíîñò çà ñúçäàâàíå íà èçòî÷íèê."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by selection state"
-msgstr "ïî ñúñòîÿíèå"
+msgid ""
+"The installation is finished; %s.\n"
+"\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
+msgstr ""
+"Èíñòàëèðàíåòî çàâúðøè; %s.\n"
+"\n"
+"Íÿêîé êîíôèãóðàöèîííè ôàéëîâå áÿõà ñúçäàäåíè êàòî .rpmnew' èëè `.rpmsave'.\n"
+"Âèå òðÿáâà äà ïðåãëåäàòå íÿêîé îò òÿõ çà äà ïðåäïðèåìåòå äåéñòâèå:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by size"
-msgstr "ïî ãîëåìèíà"
+msgid "Browse..."
+msgstr "Òúðñè..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "Ïàêåòúò íå ìîæå äà áúäå èíñòàëèðàí"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by group"
-msgstr "ïî ãðóïà"
+msgid "Info..."
+msgstr "Èíôîðìàöèÿ..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "All packages,"
-msgstr "Âñè÷êè ïàêåòè,"
+msgid "You need to insert the medium to continue"
+msgstr "Âèå òðÿáâà äà ïîñòàâèòå èçòî÷íèêà çà äà ïðîäúëæèòå"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Âñè÷êè ïàêåòè ïî àçáó÷åí ðåä"
+msgid "Copying file for media `%s'..."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Ìàíäðåéê èçáðàíè"
+msgid "Remove"
+msgstr "Èçòðèâà"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Normal updates"
-msgstr "Ñòàíäàðòíè Îáíîâÿâàíèÿ"
+msgid "Preparing packages installation..."
+msgstr "Ïîäãîòâÿíå íà ïàêåòèòå çà èíñòàëàöèÿ"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Bugfixes updates"
-msgstr "Îáíîâÿâàíèÿòà ñâúðçàíè ñúñ ïîäîáðåíèÿ"
+msgid "by media repository"
+msgstr "ïî èçòî÷íèê íà ñúõðàíåíèå"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Security updates"
-msgstr "Îáíîâÿâàíèÿ ñâúðçàíè ñúñ ñèãóðíîñòòà"
+msgid "No mirror"
+msgstr "ñúðâúð:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Description: "
-msgstr "Îïèñàíèÿ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to fill up at least the two first entries."
+msgstr "Òðÿáâà äà ïîïúëíèòå ïîíå ïúðâèòå 2 òî÷êè."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Ïðè÷èíà çà îáíîâÿâàíå: "
+msgid "Install"
+msgstr "Èíñòàëàöèÿ"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Summary: "
-msgstr "Ðåçþìå"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Japan"
+msgstr "ßïîíèÿ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Importance: "
-msgstr "Âàæíîñò: "
+msgid "Do nothing"
+msgstr "Íå ïðàâè íèùî"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "%s KB"
-msgstr "%.1f KB"
+msgid "No update"
+msgstr "Îáíîâè"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Size: "
-msgstr "Ðàçìåð"
+msgid "Description: "
+msgstr "Îïèñàíèÿ"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Version: "
-msgstr "Âåðñèÿ:"
+#, c-format
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -560,84 +695,63 @@ msgstr "Èìå: %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Òåêóùî èíñòàëèðàíà âåðñèÿ: "
+msgid "Inspect..."
+msgstr "Ïðåãëåæäà..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Source: "
-msgstr "Ñîðñ"
+msgid "Editing media \"%s\":"
+msgstr "Ðåäàêòèðàíå íà èçòî÷íèê \"%s\":"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "(Not available)"
-msgstr "(Íå å íàëè÷åí)"
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "Ïîäãîòâÿíå íà ïàêåòèòå çà èíñòàëàöèÿ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr ""
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Files:\n"
-msgstr "/_Ôàéë"
+msgid "Australia"
+msgstr "Àâñòðàëèÿ"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Selected size: %d MB"
-msgstr "%d èçáðàíè ïàêåòè: %.1f MB"
+msgid "Installation finished"
+msgstr "Èíñòàëèðàíè"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Èçáðàíè: %d ÌÁ / Ñâîáîäíî äèñêîâî ïðîñòðàíñòâî: %d ÌÁ"
+msgid "by update availability"
+msgstr "ïî âúçìîæíîñò çà îáíîâÿâàíå"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
-msgstr ""
-"Ïîðàäè çàâèñèìîñò, ñëåäíèòå ïàêåòè òðÿáâà äà áúäàò îòêàçàíè\n"
-"îò èçáîðà ñåãà:\n"
-"\n"
+msgid "Poland"
+msgstr "Ïîëøà"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr ""
-"Ñúæàëÿâàì, ñëåäíèòå ïàêåòè íå ìîãàò äà áúäàò èçáðàíè:\n"
-"\n"
+msgid "Version: "
+msgstr "Âåðñèÿ:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "âëèçà â êîíôëèêò ñ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Âèå òðÿáâà äà çàäàäåòå èìå/ïàðîëà çà èäåíòèôèêàöèÿ ïðåä ïðîêñèòî:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Ïàêåòúò íå ìîæå äà áúäå èíñòàëèðàí"
+msgid "Upgradable"
+msgstr "Îáíîâÿâàíå"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
+msgid " done."
 msgstr ""
-"Çà äà ñå çàäîâîëÿò çàâèñèìîñòèòå, ñëåäíèòå ïàêåòè òðÿáâà ñúùî\n"
-"äà áúäàò èíñòàëèðàíè:\n"
-"\n"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Software Packages Installation"
+msgstr "Ïîäãîòâÿíå íà ïàêåòèòå çà èíñòàëàöèÿ"
 
 #: ../rpmdrake:1
 #, c-format
@@ -646,625 +760,511 @@ msgstr "Òðÿáâà äîïúëíèòåëíè ïàêåòè"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "Ïàêåòúò íå ìîæå äà áúäå èíñòàëèðàí"
+msgid "Bugfixes updates"
+msgstr "Îáíîâÿâàíèÿòà ñâúðçàíè ñúñ ïîäîáðåíèÿ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
+msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
-"Ïðåìàõâàíåòî íà òåçè ïàêåòè áè ðàçáèëî ñèñòåìàòà âè, ñúæàëÿâàì:\n"
-"\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"Çà äà ñå óäîâîëåòâîðÿò çàâèñèìîñòèòå,\n"
-"ñëåäíèòå ïàêåòè òðÿáâà áúäàò ïðåìàõíàòè:\n"
-"\n"
+msgid "Germany"
+msgstr "Ãåðìàíèÿ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Íÿêîé äîïúëíèòåëíè ïàêåòè òðÿáâà äà ñå èçòðèÿò"
+msgid "Russia"
+msgstr "Ðóñèÿ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "More information on package..."
-msgstr "Ïîâå÷å èíôîðìàöèÿ îò ïàêåò..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Information on packages"
-msgstr "Íåìîãà äà îòâîðÿ ïàêåòúò"
+msgid "Norway"
+msgstr "Íîðâåãèÿ"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "More info"
-msgstr "Ïîâå÷å èíôîðìàöèÿ"
+msgid "Problem during installation"
+msgstr "Ïîÿâèõà ñå ïðîáëåìè ïî âðåìå íà èíñòàëàöèÿòà"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Addable"
-msgstr "Âúçìîæíè çà äîáàâÿíå"
+msgid "Search"
+msgstr "Òúðñè"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Upgradable"
-msgstr "Îáíîâÿâàíå"
+msgid "Edit a media"
+msgstr "Ðåäàêòèðàíå íà èçòî÷íèöè"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
+msgstr "×åõèÿ"
 
 #: ../rpmdrake:1
 #, c-format
 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."
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "No update"
-msgstr "Îáíîâè"
+#, c-format
+msgid "Stop"
+msgstr "Ñòîï"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(none)"
-msgstr "(íÿìà)"
+msgid "Update"
+msgstr "Îáíîâÿâàíå"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, listing packages..."
+msgid "Please wait, removing packages..."
 msgstr ""
 "Ìîëà èç÷àêàéòå\n"
 "Ïàêåòèòå ñå ñîðòèðàò"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "Íåìîãà äà îòâîðÿ ïàêåòúò"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "One of the following packages is needed:"
-msgstr "Åäèí îò ñëåäíèòå ïàêåòè å íåîáõîäèì:"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Ìîëÿ èçáåðåòå"
+msgid "Normal information"
+msgstr "Íîðìàëíà èíôîðìàöèÿ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr "Âúçíèêíàõà íåñúâìåñòèìîñòè"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Selected"
+msgid "Media: "
 msgstr ""
-"Èçáåðè\n"
-"âñè÷êè"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Search results"
-msgstr "Ðåçóëòàò îò òúðñåíå"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Stop"
-msgstr "Ñòîï"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Please wait, searching..."
-msgstr "Ìîëÿ èç÷àêàéòå, òúðñÿ..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Ðåçóëòàò îò òúðñåíåòî (íÿìà)"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "Èçòåãëÿíå íà ïàêåò `%s' (%s/%s)..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Other"
-msgstr "Äðóã"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Èçáðàíè: %d ÌÁ / Ñâîáîäíî äèñêîâî ïðîñòðàíñòâî: %d ÌÁ"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the packages source editor!\n"
-"\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
+msgid "Media"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Save and quit"
-msgstr "Çàïèñâà è èçëèçà"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Ãðåøêà..."
+msgid "Spain"
+msgstr "Èñïàíèÿ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Update..."
-msgstr "Îáíîâÿâàíå"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add..."
-msgstr "Äîáàâÿ..."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Edit"
-msgstr "Ðåäàêòèðà"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Source"
-msgstr "Ñîðñ"
+msgid "Normal updates"
+msgstr "Ñòàíäàðòíè Îáíîâÿâàíèÿ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Enabled?"
-msgstr "Äà ðàçðåøà?"
+msgid "by selection state"
+msgstr "ïî ñúñòîÿíèå"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Configure sources"
-msgstr "Êîíôèãóðèðàíå íà èçòî÷íèê"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
+"Ìîëÿ, ïî÷àêàéòå. Èçòåãëÿì îãëåäàëíèòå àäðåñè îò web ñàéòà íà MandrakeSoft."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Password:"
-msgstr "Ïàðîëà:"
+msgid "Login:"
+msgstr "Ïîòðåáèòåëñêî èìå:"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "User:"
-msgstr "Ïîòðåáèòåë:"
+msgid "Adding a media:"
+msgstr "Äîáàâÿíå íà èçòî÷íèê:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "Âèå òðÿáâà äà çàäàäåòå èìå/ïàðîëà çà èäåíòèôèêàöèÿ ïðåä ïðîêñèòî:"
+msgid "Austria"
+msgstr "Àâñòðèÿ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy hostname:"
-msgstr "Ïîòðåáèòåë çà ïðîêñè:"
+msgid "Fatal error"
+msgstr "Ãðåøêà â ôàéë"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
-msgstr ""
-"Àêî ñå íóæäàåòå îò ïðîêñè, âúâåäåòå èìå íà õîñò è îïöèîíàëíî ïîðò (ñèíòàêñèñ:"
-"<proxyhost[:port]>):"
+#, fuzzy, c-format
+msgid "Update..."
+msgstr "Îáíîâÿâàíå"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure proxies"
-msgstr "Êîíôèãóðèðàíå íà ïðîêñèòà"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "Ïðîâåðêà íà ïîäïèñúò íà `%s'..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr ""
-"Ìîëÿ Èç÷àêàéòå\n"
-"Îáíîâÿâà ñå èíôîðìàöèÿòà çà òîçè èçòî÷íèê..."
+msgid "(none)"
+msgstr "(íÿìà)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
+"Removing these packages would break your system, sorry:\n"
+"\n"
 msgstr ""
-"Çà äà çàïàçèòå ïðîìåíèòå, âèå òðÿáâà ïúðâî äà ïîñòàâèòå èçòî÷íèêà â "
-"óñòðîéñòâîòî."
+"Ïðåìàõâàíåòî íà òåçè ïàêåòè áè ðàçáèëî ñèñòåìàòà âè, ñúæàëÿâàì:\n"
+"\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "Âèå òðÿáâà äà ïîñòàâèòå èçòî÷íèêà çà äà ïðîäúëæèòå"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Èíñòàëèðàíå íà ïàêåò `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "Çàïàçâà ïðîìåíèòå"
+msgid "Currently installed version: "
+msgstr "Òåêóùî èíñòàëèðàíà âåðñèÿ: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Ðåëàòèâåí ïúò äî äèðåêòîðèÿ èëè hdlist: "
+msgid "Other"
+msgstr "Äðóã"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "Reason for update: "
+msgstr "Ïðè÷èíà çà îáíîâÿâàíå: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "Ðåäàêòèðàíå íà èçòî÷íèê \"%s\":"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Edit a source"
-msgstr "Ðåäàêòèðàíå íà èçòî÷íèöè"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Please wait, removing medium..."
+msgid "Please choose the desired mirror."
 msgstr ""
-"Ìîëÿ Èç÷àêàéòå\n"
-"Ïðåìàõâà ñå èçòî÷íèê"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Type of source:"
-msgstr "Òèï íà èçòî÷íèêà:"
+"Ìîëÿ èç÷àêàéòå\n"
+"Ïîëó÷âàì ñïèñúêà ñ îãëåäàëíè ñúðâúðè"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Äîáàâÿíå íà èçòî÷íèê:"
+msgid "Edit"
+msgstr "Ðåäàêòèðà"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, finding available packages..."
 msgstr ""
+"Ìîëà èç÷àêàéòå\n"
+"Ïàêåòèòå ñå ñîðòèðàò"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Òðÿáâà äà ïîïúëíèòå ïîíå ïúðâèòå 2 òî÷êè."
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Ðåëàòèâåí ïúò äî äèðåêòîðèÿ èëè hdlist: "
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Name:"
-msgstr "Èìå"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
+msgstr "Ðåçóëòàò îò òúðñåíåòî (íÿìà)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Login:"
-msgstr "Ïîòðåáèòåëñêî èìå:"
+msgid "Danmark"
+msgstr "Äàíèÿ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr "Èçáåðåòå ñúðâúð:..."
+msgid "China"
+msgstr "Êèòàé"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Browse..."
-msgstr "Òúðñè..."
+msgid "United States"
+msgstr "ÑÀÙ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Path or mount point:"
-msgstr "Ïúò èëè òî÷êà íà ìîíòèðàíå:"
+msgid "changes:"
+msgstr "ïðîìåíè:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Removable device"
-msgstr "Ïðåìåñòâàåìî óñòðîéñòâî"
+msgid "Some additional packages need to be removed"
+msgstr "Íÿêîé äîïúëíèòåëíè ïàêåòè òðÿáâà äà ñå èçòðèÿò"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "HTTP ñåðâåð"
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "FTP ñúðâúð"
+msgid "No"
+msgstr "Íå"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Path:"
-msgstr "Ïîðò:"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Local files"
-msgstr "Ëîêàëíè ôàéëîâå"
+msgid "Configure medias"
+msgstr "Êîíôèãóðèðàíå íà èçòî÷íèê"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add a source"
+#, fuzzy, c-format
+msgid "Add a media"
 msgstr "Äîáàâÿ íà èçòî÷íèê"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr "Íå ìîãà äà îáíîâÿ èçòî÷íèê; òîé ùå áúäå àâòîìàè÷íî çàáðàíåí."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Unable to create medium."
-msgstr "Íåâúçìîæíîñò çà ñúçäàâàíå íà èçòî÷íèê."
+msgid "Summary: "
+msgstr "Ðåçþìå"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Update"
-msgstr "Îáíîâÿâàíå"
+msgid "Canada"
+msgstr "Êàíàäà"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Ìîëÿ èçáåðåòå èçòî÷íèöè êîèòî èñêàòå äà ñå ïîäíîâÿò:"
+msgid "Greece"
+msgstr "Ãúðöèÿ"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Ìîëÿ, èç÷àêàéòå. Îáíîâÿâà ñå èçòî÷íèê..."
+msgid ""
+"There was an error downloading the mirrors list:\n"
+"\n"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid " failed!"
-msgstr "ïî ôàéëîâå"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid " done."
-msgstr ""
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Òðÿáâà äà ñòå root, çà äà èíñòàëèðàòå ïàêåòè, ñúæàëÿâàì"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Download of `%s', speed:%s"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Path:"
+msgstr "Ïîðò:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr ""
+msgid "Problem during removal"
+msgstr "Ïîÿâèõà ñå ïðîáëåìè ïî âðåìå íà ïðåìàõâàíåòî"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "Ïðîâåðêà íà ïîäïèñúò íà `%s'..."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Examining distant file of source `%s'..."
+msgid "Selected"
 msgstr ""
+"Èçáåðè\n"
+"âñè÷êè"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr ""
+msgid "Netherlands"
+msgstr "Õîëàíäèÿ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr ""
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Please choose the desired mirror."
-msgstr ""
-"Ìîëÿ èç÷àêàéòå\n"
-"Ïîëó÷âàì ñïèñúêà ñ îãëåäàëíè ñúðâúðè"
+msgid "Addable"
+msgstr "Âúçìîæíè çà äîáàâÿíå"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
-msgstr ""
+msgid "(Not available)"
+msgstr "(Íå å íàëè÷åí)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No mirror"
-msgstr "ñúðâúð:"
-
-#: ../rpmdrake.pm:1
-#, c-format
 msgid ""
-"There was an error downloading the mirrors list:\n"
+"Sorry, the following package(s) can't be selected:\n"
 "\n"
 "%s\n"
-"The network, or MandrakeSoft website, are maybe unavailable.\n"
-"Please try again later."
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
 msgstr ""
+"Ñúæàëÿâàì, ñëåäíèòå ïàêåòè íå ìîãàò äà áúäàò èçáðàíè:\n"
+"\n"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Not selected"
+msgstr "Âúçíèêíàõà íåñúâìåñòèìîñòè"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
-msgstr "Ãðåøêà ïðè èçòåãëÿíå"
+msgid "Software Packages Removal"
+msgstr "Èçòðèâàíå íà ïàêåòè"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
-"Ìîëÿ, ïî÷àêàéòå. Èçòåãëÿì îãëåäàëíèòå àäðåñè îò web ñàéòà íà MandrakeSoft."
+msgid "Sweden"
+msgstr "Øâåöèÿ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
 "\n"
-"Is it ok to continue?"
+"\n"
+"Error(s) reported:\n"
+"%s"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United States"
-msgstr "ÑÀÙ"
+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.pm:1
 #, c-format
-msgid "China"
-msgstr "Êèòàé"
+msgid "Examining file of media `%s'..."
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Îáåäèíåíîòî êðàëñòâî"
+msgid "Download of `%s', speed:%s"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Òàéâàí"
+msgid "One of the following packages is needed:"
+msgstr "Åäèí îò ñëåäíèòå ïàêåòè å íåîáõîäèì:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Sweden"
-msgstr "Øâåöèÿ"
+msgid "Quit"
+msgstr "Èçõîä"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Russia"
-msgstr "Ðóñèÿ"
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Portugal"
-msgstr "Ïîðò:"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Poland"
-msgstr "Ïîëøà"
+msgid "Update media(s)"
+msgstr "Îáíîâè èçòî÷íèöèòå"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Norway"
-msgstr "Íîðâåãèÿ"
+msgid "Ok"
+msgstr "Äîáðå"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Netherlands"
-msgstr "Õîëàíäèÿ"
+msgid "Please wait, adding medium..."
+msgstr ""
+"Ìîëÿ Èç÷àêàéòå\n"
+"Äîáàâÿ ñå èçòî÷íèê..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Korea"
-msgstr "Èãíîðèðàé"
+msgid "Unable to get source packages."
+msgstr "Èçáåðåòå æåëàíèòå ïàêåòè"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "ßïîíèÿ"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Italy"
-msgstr "Èíñòàëàöèÿ"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Israel"
-msgstr "Èíñòàëàöèÿ"
+msgid "Too many packages are selected"
+msgstr "Òâúðäå ìíîãî ïàêåòè ñà èçáðàíè"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Greece"
-msgstr "Ãúðöèÿ"
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "France"
-msgstr "Èãíîðèðàé"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Finland"
-msgstr "Ôèíëàíäèÿ"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Spain"
-msgstr "Èñïàíèÿ"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Danmark"
-msgstr "Äàíèÿ"
+msgid "%s conflicts with %s"
+msgstr "âëèçà â êîíôëèêò ñ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "Ãåðìàíèÿ"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Äîáðå äîøëè â MandrakeÎáíîâÿâàíå!\n"
+"\n"
+"Òîçè èíñòðóìåíò ùå âè ïîìîãíå äà èçáåðåòå îáíîâÿâàíå íà âàøèÿò ñîôòóåðr\n"
+"âúðõó ñèñòåìàòà."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
-msgstr "×åõèÿ"
+msgid "Mandrake choices"
+msgstr "Ìàíäðåéê èçáðàíè"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Êîñòà Ðèêà"
+msgid "Changelog:\n"
+msgstr ""
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Canada"
-msgstr "Êàíàäà"
+#, fuzzy, c-format
+msgid "Korea"
+msgstr "Èãíîðèðàé"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Brazil"
-msgstr "Áðàçèëèÿ"
+msgid "Removable device"
+msgstr "Ïðåìåñòâàåìî óñòðîéñòâî"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Áåëãèÿ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Àâñòðàëèÿ"
+msgid "Change medium"
+msgstr "Ñìåíÿ èçòî÷íèê"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Austria"
-msgstr "Àâñòðèÿ"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mandrake Update"
+msgstr "MandrakeUpdate Íàñòðîéêè"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
-msgstr "Èíôîðìàöèÿ..."
+msgid "by size"
+msgstr "ïî ãîëåìèíà"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "Íå"
+msgid "FTP server"
+msgstr "FTP ñúðâúð"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Files:\n"
+msgstr "/_Ôàéë"
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Yes"
-msgstr "Äà"
+#, fuzzy, c-format
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr "Íå ìîãà äà îáíîâÿ èçòî÷íèê; òîé ùå áúäå àâòîìàè÷íî çàáðàíåí."
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -1537,6 +1537,13 @@ msgstr "Èçòðèâà ñîôòóåð"
 msgid "Software Sources Manager"
 msgstr "Ìåíèäæúð çà ñîôòóåðíè èçòî÷íèöè"
 
+#, fuzzy
+#~ msgid "Source: "
+#~ msgstr "Ñîðñ"
+
+#~ msgid "Source"
+#~ msgstr "Ñîðñ"
+
 #~ msgid ""
 #~ "some packages failed to install\n"
 #~ "correctly"
@@ -1555,9 +1562,6 @@ msgstr "Ìåíèäæúð çà ñîôòóåðíè èçòî÷íèöè"
 #~ msgid "Program missing"
 #~ msgstr "Ïðîãðàìà ëèïñâà"
 
-#~ msgid "Error adding update medium"
-#~ msgstr "Ãðåøêà ïðè äîáàâÿíå íà èçòî÷íèê çà îáíîâÿâàíå"
-
 #~ msgid "Please wait, contacting mirror to initialize updates packages."
 #~ msgstr ""
 #~ "Ìîëÿ ïî÷àêàéòå, êîíòàêòóâàì ñ îãëåäàëåí ñúðâúð çà èíèöèàëèçèðàíå "
diff --git a/po/br.po b/po/br.po
index e7366ad8..659caf6e 100644
--- a/po/br.po
+++ b/po/br.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: 2001-07-12 15:39+0200\n"
 "Last-Translator: Jañ-Mai Drapier <jan-mai.drapier@mail.dotcom.fr>\n"
 "Language-Team: Brezhoneg <ofisk.bzh@wanadoo.fr>\n"
@@ -14,14 +14,21 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
+msgid "Enabled?"
 msgstr ""
 
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Path or mount point:"
+msgstr "Poent marc'hañ : "
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Portugal"
+msgstr "Porzh :"
+
 #: ../rpmdrake:1
 #, c-format
 msgid ""
@@ -33,86 +40,51 @@ msgid ""
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
-msgstr ""
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr "Kudennoù ho staliadur"
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Problem during removal"
-msgstr "O prientiñ ar staliadur"
+msgid "by group"
+msgstr "Strollad labour"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Please wait, removing packages..."
-msgstr "Gortozit mar plij, o prientiñ ar staliadur"
+msgid "Name:"
+msgstr "Anv"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Gortozit mar plij, o prientiñ ar staliadur"
+msgid "Italy"
+msgstr "Staliañ"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr "Kudennoù ho staliadur"
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Staliañ an holl"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Kudennoù ho staliadur"
+msgid "Some packages need to be removed"
+msgstr "Ar pakadoù a-heul a zo war-nes bezañ staliet/lamet"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Kudennoù ho staliadur"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "All requested packages were installed successfully."
-msgstr ""
+msgid "More information on package..."
+msgstr "O klask ar pakadoù hegerz"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Everything installed successfully"
+msgid "Yes"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -121,114 +93,98 @@ msgid "everything was installed correctly"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Kudennoù ho staliadur"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
+msgid "%s KB"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Kudennoù ho staliadur"
-
-#: ../rpmdrake:1
 #, c-format
 msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
 "\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"Then, restart MandrakeUpdate."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"Welcome to the software removal tool!\n"
+"\n"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you want to continue installation?"
+"In order to save the changes, you need to insert the medium in the drive."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Verifying packages signatures..."
+msgid "Save and quit"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr ""
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Cancel"
-msgstr "Nullañ"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Ok"
-msgstr "Mat eo"
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr "Kudennoù ho staliadur"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Lakait ur bladennig gwerc'h el lenner %s"
+msgid "Size: "
+msgstr "Ment"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Change medium"
-msgstr "Kemmañ ar spister"
+msgid "Security updates"
+msgstr "Bremanaat Mandrake"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Initializing..."
-msgstr "Staliañ:"
+msgid "Already existing update medias"
+msgstr "Gortozit mar plij, o prientiñ ar staliadur"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Kudennoù ho staliadur"
+msgid "Maximum information"
+msgstr "Diskouez titouroù"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Proxy..."
+msgstr "Fazi..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Unable to get source packages."
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Inspect..."
+msgid "United Kingdom"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Installation finished"
-msgstr "Diuzit renkad ar staliadur"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Do nothing"
-msgstr "N'ev ket lodañ"
+msgid "in names"
+msgstr "Anv ar domani"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Use .%s as main file"
+msgid ""
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
 
 #: ../rpmdrake:1
@@ -236,789 +192,784 @@ msgstr ""
 msgid "Remove .%s"
 msgstr "Dibarzhoù ar voullerez lpd a-bell"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "changes:"
-msgstr " Pakadoù : "
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Inspecting %s"
-msgstr "Adskrivañ %s"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Gortozit e-keit ha ma kerc'han roll ar pakadoù bremanaet, mar plij..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Please wait, adding medium..."
-msgstr "Gortozit mar plij, o prientiñ ar staliadur"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
+"The following packages have bad signatures:\n"
 "\n"
-"Then, restart MandrakeUpdate."
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "How to choose manually your mirror"
+msgid "Examining distant file of media `%s'..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
+msgid "Verifying packages signatures..."
 msgstr ""
 
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "France"
+msgstr "Nullañ"
+
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "Already existing update sources"
+msgid "More info"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
+"%s\n"
 "\n"
 "Is it ok to continue?"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+#, fuzzy, c-format
+msgid "Reload the packages list"
+msgstr "Bremanaat pakadoù hep ken"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Choose a mirror..."
+msgstr "Dibabit ur skramm"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Ne m'eus ket gallet skrivañ\n"
+msgid "Some packages can't be installed"
+msgstr "Ne m'eus ket gallet staliañ pakad"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
+msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Kudennoù ho staliadur"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Mandrake Update"
-msgstr "MandrakeUpdate, doare 7.2\n"
+msgid "All packages,"
+msgstr " Pakadoù : "
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Type of media:"
+msgstr "Dibabit pakadoù da staliañ"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Software Packages Removal"
-msgstr "Anv rannet"
+msgid "in files"
+msgstr "mkraid sac'het"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Quit"
-msgstr "Kuitaat"
+msgid "All requested packages were installed successfully."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Proxy hostname:"
+msgstr "Anv an ostiz a-bell"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Install"
-msgstr "Staliañ"
+msgid "Local files"
+msgstr "Restroù lec'hel"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Remove"
-msgstr "Dibarzhoù ar voullerez lpd a-bell"
+msgid "Inspecting %s"
+msgstr "Adskrivañ %s"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Israel"
+msgstr "Staliañ"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Help"
 msgstr "/_Skoazell"
 
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "HTTP server"
+msgstr "Servijer HTTP"
+
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Search"
-msgstr "Klask"
+msgid "Installation failed"
+msgstr "Staliañ an holl"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
+msgid "Use .%s as main file"
 msgstr ""
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Search results"
+msgstr "Servijer DNS"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid " failed!"
+msgstr "mkraid sac'het"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
-"\n"
-"Is it ok to continue?"
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages need to be removed"
-msgstr "Ar pakadoù a-heul a zo war-nes bezañ staliet/lamet"
+#, c-format
+msgid "Find:"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
-"\n"
-"Do you really want to install all the selected packages?"
+msgid "All packages, alphabetical"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Too many packages are selected"
-msgstr "Hemañ a zo ur pakad ret, n'hell ket bezañ andiuzet"
+msgid "Please wait, searching..."
+msgstr "Gortozit mar plij, o prientiñ ar staliadur"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Maximum information"
-msgstr "Diskouez titouroù"
+msgid "Please wait, reading packages database..."
+msgstr "Gortozit mar plij, o prientiñ ar staliadur"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Normal information"
-msgstr "Diskouez titouroù"
-
-#: ../rpmdrake:1 ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Update source(s)"
-msgstr "Etre"
+msgid "unknown package "
+msgstr "Ne m'eus ket gallet digeriñ pakad"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Reload the packages list"
-msgstr "Bremanaat pakadoù hep ken"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Lakait ur bladennig gwerc'h el lenner %s"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Reset the selection"
 msgstr "Diuz pakadoù unan hag unan"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "in files"
-msgstr "mkraid sac'het"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "in descriptions"
-msgstr "Deskrivadurioù"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "in names"
-msgstr "Anv ar domani"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by source repository"
+msgid "Costa Rica"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "by selection state"
-msgstr "Diuz pakadoù unan hag unan"
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr "Kudennoù ho staliadur"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "by size"
-msgstr "Adventañ"
+msgid "Please wait, removing medium..."
+msgstr "O termeniñ al live surentez"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "by group"
-msgstr "Strollad labour"
+msgid "Password:"
+msgstr "Tremenger"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "All packages,"
-msgstr " Pakadoù : "
+msgid "Taiwan"
+msgstr "Iraniek"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "All packages, alphabetical"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "User:"
+msgstr "Anv arveriad"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, updating medium..."
+msgstr "O termeniñ al live surentez"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Mandrake choices"
-msgstr "MandrakeConsulting"
+msgid "Please wait, listing packages..."
+msgstr "Gortozit e-keit ha ma kerc'han roll ar pakadoù bremanaet, mar plij..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Normal updates"
-msgstr "Bremanaat Linux-Mandrake"
+msgid "Information on packages"
+msgstr "Ne m'eus ket gallet digeriñ pakad"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
+msgstr "Nullañ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Bugfixes updates"
+msgid "Everything installed successfully"
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Select the media(s) you wish to update:"
+msgstr ""
+
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Security updates"
-msgstr "Bremanaat Mandrake"
+msgid "Please wait, updating media..."
+msgstr "Gortozit mar plij, o prientiñ ar staliadur"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Description: "
-msgstr "Deskrivadurioù"
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reason for update: "
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Summary: "
-msgstr "Diverrañ"
+msgid "in descriptions"
+msgstr "Deskrivadurioù"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Importance: "
-msgstr "Talvoudegezh : %s\n"
+msgid "Configure proxies"
+msgstr "Kefluniañ servijoù"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "%s KB"
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Size: "
-msgstr "Ment"
+msgid "Please choose"
+msgstr "Dibabit seurt ho logodenn, mar plij."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Version: "
-msgstr "Doare :"
+msgid "Selected size: %d MB"
+msgstr "Ment : %d Ko\n"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Name: "
-msgstr "Anv : %s"
+msgid "Initializing..."
+msgstr "Staliañ:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Save changes"
+msgstr "Meuziad Lañsañ"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Currently installed version: "
+msgid "Error during download"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Source: "
-msgstr "Servijer"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "(Not available)"
-msgstr "parzhadur hegerz ebet"
+msgid "Package installation..."
+msgstr "Kudennoù ho staliadur"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Changelog:\n"
-msgstr "Nullañ"
+msgid "Importance: "
+msgstr "Talvoudegezh : %s\n"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Files:\n"
-msgstr "/_Restr"
+msgid ""
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
+msgstr "Ar pakadoù a-heul a zo war-nes bezañ distaliet"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Selected size: %d MB"
-msgstr "Ment : %d Ko\n"
+msgid "Add..."
+msgstr "Ouzhpennañ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
+msgid "Unable to create medium."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"The installation is finished; %s.\n"
 "\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Browse..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr "Ar pakadoù a-heul a zo war-nes bezañ distaliet"
+msgid "Some packages can't be removed"
+msgstr "Ne m'eus ket gallet staliañ pakad"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Info..."
+msgstr "Titouroù"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "%s conflicts with %s"
+msgid "You need to insert the medium to continue"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Copying file for media `%s'..."
+msgstr ""
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Ne m'eus ket gallet staliañ pakad"
+msgid "Remove"
+msgstr "Dibarzhoù ar voullerez lpd a-bell"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
-msgstr "Ar pakadoù a-heul a zo war-nes bezañ distaliet"
+msgid "Preparing packages installation..."
+msgstr "Kudennoù ho staliadur"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Additional packages needed"
+msgid "by media repository"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "Ne m'eus ket gallet staliañ pakad"
+msgid "No mirror"
+msgstr "melezou :"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
+msgid "You need to fill up at least the two first entries."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
+msgid "Install"
+msgstr "Staliañ"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Japan"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Ar pakadoù a-heul a zo war-nes bezañ staliet/lamet"
+msgid "Do nothing"
+msgstr "N'ev ket lodañ"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "More information on package..."
-msgstr "O klask ar pakadoù hegerz"
+msgid "No update"
+msgstr "Bremanaat Linux-Mandrake"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Information on packages"
-msgstr "Ne m'eus ket gallet digeriñ pakad"
+msgid "Description: "
+msgstr "Deskrivadurioù"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "More info"
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Addable"
-msgstr "Taolenn"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Upgradable"
-msgstr "Bremanaat"
+msgid "Name: "
+msgstr "Anv : %s"
 
 #: ../rpmdrake:1
 #, c-format
-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."
+msgid "Inspect..."
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "No update"
-msgstr "Bremanaat Linux-Mandrake"
-
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "(none)"
-msgstr "ebet"
+msgid "Editing media \"%s\":"
+msgstr "Etre"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, listing packages..."
-msgstr "Gortozit e-keit ha ma kerc'han roll ar pakadoù bremanaet, mar plij..."
+msgid "No package found for installation."
+msgstr "Kudennoù ho staliadur"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "unknown package "
-msgstr "Ne m'eus ket gallet digeriñ pakad"
+msgid "Australia"
+msgstr "a-steud"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "One of the following packages is needed:"
-msgstr "Ar pakadoù a-heul a zo war-nes bezañ staliet/lamet"
+msgid "Installation finished"
+msgstr "Diuzit renkad ar staliadur"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please choose"
-msgstr "Dibabit seurt ho logodenn, mar plij."
+#, c-format
+msgid "by update availability"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "rpmdrake"
-msgstr "Moullerez"
+msgid "Poland"
+msgstr "Islandek"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Not selected"
-msgstr "Lugerezh ar voullerez"
+msgid "Version: "
+msgstr "Doare :"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Selected"
-msgstr ""
-"Diuz\n"
-"an holl"
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Ret eo deoc'h kaout ur parzhadur disloañ"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Search results"
-msgstr "Servijer DNS"
+msgid "Upgradable"
+msgstr "Bremanaat"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Stop"
-msgstr "Rann"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid " done."
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, searching..."
-msgstr "Gortozit mar plij, o prientiñ ar staliadur"
+msgid "Software Packages Installation"
+msgstr "Kudennoù ho staliadur"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Search results (none)"
-msgstr "Klask"
+#, c-format
+msgid "Additional packages needed"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Other"
-msgstr "All"
+msgid "Bugfixes updates"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Welcome to the packages source editor!\n"
-"\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
+msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Save and quit"
-msgstr ""
+msgid "Germany"
+msgstr "Alaman"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Fazi..."
+msgid "Russia"
+msgstr "Rusiek"
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Update..."
-msgstr "Bremanaat Linux-Mandrake"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
+msgstr "Norvegek"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Add..."
-msgstr "Ouzhpennañ"
+msgid "Problem during installation"
+msgstr "Kudennoù ho staliadur"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Edit"
-msgstr "Kuitaat"
+msgid "Search"
+msgstr "Klask"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Source"
-msgstr "Dilec'hiañ"
+msgid "Edit a media"
+msgstr "Etre"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Enabled?"
-msgstr ""
+msgid "Czech Republic"
+msgstr "Tchek"
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Configure sources"
-msgstr "Kefluniañ servijoù"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Password:"
-msgstr "Tremenger"
+msgid "Stop"
+msgstr "Rann"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "User:"
-msgstr "Anv arveriad"
+msgid "Update"
+msgstr "Bremanaat Linux-Mandrake"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "Ret eo deoc'h kaout ur parzhadur disloañ"
+msgid "Please wait, removing packages..."
+msgstr "Gortozit mar plij, o prientiñ ar staliadur"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy hostname:"
-msgstr "Anv an ostiz a-bell"
+msgid "Normal information"
+msgstr "Diskouez titouroù"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+msgid "Media: "
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Configure proxies"
-msgstr "Kefluniañ servijoù"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Please wait, updating medium..."
-msgstr "O termeniñ al live surentez"
+#: ../rpmdrake:1
+#, c-format
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
+msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "You need to insert the medium to continue"
+msgid "Media"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Save changes"
-msgstr "Meuziad Lañsañ"
+msgid "Spain"
+msgstr "Spagnol"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Normal updates"
+msgstr "Bremanaat Linux-Mandrake"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "by selection state"
+msgstr "Diuz pakadoù unan hag unan"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "Login:"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "Etre"
+msgid "Adding a media:"
+msgstr "Ouzhpennañ un arveriad"
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Edit a source"
-msgstr "Etre"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
+msgstr "Aostria"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, removing medium..."
-msgstr "O termeniñ al live surentez"
+msgid "Fatal error"
+msgstr "Ne m'eus ket gallet skrivañ\n"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Type of source:"
-msgstr "Dibabit pakadoù da staliañ"
+msgid "Update..."
+msgstr "Bremanaat Linux-Mandrake"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Starting download of `%s'..."
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Adding a source:"
-msgstr "Ouzhpennañ un arveriad"
+msgid "(none)"
+msgstr "ebet"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
+"Removing these packages would break your system, sorry:\n"
+"\n"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
+msgid "Installing package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Name:"
-msgstr "Anv"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Login:"
+msgid "Currently installed version: "
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Choose a mirror..."
-msgstr "Dibabit ur skramm"
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "All"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
+msgid "Reason for update: "
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Path or mount point:"
-msgstr "Poent marc'hañ : "
+msgid "Please choose the desired mirror."
+msgstr "Gortozit e-keit ha ma kerc'han roll ar melezourioù, mar plij..."
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Removable device"
-msgstr "Lemel ar steudad"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "HTTP server"
-msgstr "Servijer HTTP"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "FTP server"
-msgstr "Servijer FTP"
+msgid "Edit"
+msgstr "Kuitaat"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Path:"
-msgstr "Porzh :"
+msgid "Please wait, finding available packages..."
+msgstr "Gortozit e-keit ha ma kerc'han roll ar pakadoù bremanaet, mar plij..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Local files"
-msgstr "Restroù lec'hel"
+msgid "Relative path to synthesis/hdlist:"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Add a source"
-msgstr "Ouzhpennañ un arveriad"
+msgid "Search results (none)"
+msgstr "Klask"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
+msgid "Danmark"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to create medium."
+msgid "China"
 msgstr ""
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Update"
-msgstr "Bremanaat Linux-Mandrake"
-
-#: ../rpmdrake.pm:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr ""
+msgid "United States"
+msgstr "Amerika"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, updating media..."
-msgstr "Gortozit mar plij, o prientiñ ar staliadur"
+msgid "changes:"
+msgstr " Pakadoù : "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid " failed!"
-msgstr "mkraid sac'het"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid " done."
-msgstr ""
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Download of `%s', speed:%s"
-msgstr ""
+msgid "Some additional packages need to be removed"
+msgstr "Ar pakadoù a-heul a zo war-nes bezañ staliet/lamet"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "rpmdrake"
+msgstr "Moullerez"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Starting download of `%s'..."
+msgid "No"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure medias"
+msgstr "Kefluniañ servijoù"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Examining file of source `%s'..."
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a media"
+msgstr "Ouzhpennañ un arveriad"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Copying file for source `%s'..."
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Summary: "
+msgstr "Diverrañ"
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Please choose the desired mirror."
-msgstr "Gortozit e-keit ha ma kerc'han roll ar melezourioù, mar plij..."
+msgid "Canada"
+msgstr "Kanadian (Kebek)"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
-msgstr ""
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "No mirror"
-msgstr "melezou :"
+msgid "Greece"
+msgstr "Gres"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1030,173 +981,222 @@ msgid ""
 "Please try again later."
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Error during download"
-msgstr ""
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgid "Unable to get source packages, sorry. %s"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Path:"
+msgstr "Porzh :"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "United States"
-msgstr "Amerika"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during removal"
+msgstr "O prientiñ ar staliadur"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "China"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Selected"
 msgstr ""
+"Diuz\n"
+"an holl"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United Kingdom"
-msgstr ""
+msgid "Netherlands"
+msgstr "Izelvroioù"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Taiwan"
-msgstr "Iraniek"
+msgid "Addable"
+msgstr "Taolenn"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Sweden"
-msgstr "Suis"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "(Not available)"
+msgstr "parzhadur hegerz ebet"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Russia"
-msgstr "Rusiek"
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
+msgstr "Ar pakadoù a-heul a zo war-nes bezañ distaliet"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Portugal"
-msgstr "Porzh :"
+msgid "Not selected"
+msgstr "Lugerezh ar voullerez"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Poland"
-msgstr "Islandek"
+msgid "Software Packages Removal"
+msgstr "Anv rannet"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Norway"
-msgstr "Norvegek"
+msgid "Sweden"
+msgstr "Suis"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Netherlands"
-msgstr "Izelvroioù"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
+msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Korea"
-msgstr "Dilec'hiañ"
+#: ../rpmdrake:1
+#, c-format
+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.pm:1
 #, c-format
-msgid "Japan"
+msgid "Examining file of media `%s'..."
 msgstr ""
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Italy"
-msgstr "Staliañ"
+#, c-format
+msgid "Download of `%s', speed:%s"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Israel"
-msgstr "Staliañ"
+msgid "One of the following packages is needed:"
+msgstr "Ar pakadoù a-heul a zo war-nes bezañ staliet/lamet"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Greece"
-msgstr "Gres"
+msgid "Quit"
+msgstr "Kuitaat"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "France"
-msgstr "Nullañ"
+msgid "Update media(s)"
+msgstr "Etre"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Finland"
-msgstr ""
+msgid "Ok"
+msgstr "Mat eo"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Spain"
-msgstr "Spagnol"
+msgid "Please wait, adding medium..."
+msgstr "Gortozit mar plij, o prientiñ ar staliadur"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Danmark"
+msgid "Unable to get source packages."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Too many packages are selected"
+msgstr "Hemañ a zo ur pakad ret, n'hell ket bezañ andiuzet"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Germany"
-msgstr "Alaman"
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Tchek"
+msgid "%s conflicts with %s"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Canada"
-msgstr "Kanadian (Kebek)"
+msgid "Mandrake choices"
+msgstr "MandrakeConsulting"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Changelog:\n"
+msgstr "Nullañ"
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Brazil"
-msgstr ""
+#, fuzzy, c-format
+msgid "Korea"
+msgstr "Dilec'hiañ"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Removable device"
+msgstr "Lemel ar steudad"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Beljik"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Australia"
-msgstr "a-steud"
+msgid "Change medium"
+msgstr "Kemmañ ar spister"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Austria"
-msgstr "Aostria"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mandrake Update"
+msgstr "MandrakeUpdate, doare 7.2\n"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Info..."
-msgstr "Titouroù"
+msgid "by size"
+msgstr "Adventañ"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr ""
+msgid "FTP server"
+msgstr "Servijer FTP"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Files:\n"
+msgstr "/_Restr"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Yes"
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
 msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:86
@@ -1475,6 +1475,14 @@ msgid "Software Sources Manager"
 msgstr "Anv rannet"
 
 #, fuzzy
+#~ msgid "Source: "
+#~ msgstr "Servijer"
+
+#, fuzzy
+#~ msgid "Source"
+#~ msgstr "Dilec'hiañ"
+
+#, fuzzy
 #~ msgid ""
 #~ "some packages failed to install\n"
 #~ "correctly"
diff --git a/po/bs.po b/po/bs.po
index 4c914243..dfb2cd30 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: 2002-08-22 17:29+0200\n"
 "Last-Translator: Vedran Ljubovic <vljubovic@smartnet.ba>\n"
 "Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -13,16 +13,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"Želite li da nastavim?"
+msgid "Enabled?"
+msgstr "Uklju�eno?"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Put ili ta�ka montiranja:"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Portugal"
+msgstr "Port:"
 
 #: ../rpmdrake:1
 #, c-format
@@ -41,16 +45,79 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "by group"
+msgstr "po grupi"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Name:"
+msgstr "Ime"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Italy"
+msgstr "Instaliraj"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Kako da ru�no izaberete vaš mirror"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "Neke pakete treba obrisati"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
+msgstr "Više informacija o paketu..."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Da"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Welcome to MandrakeUpdate!\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
 msgstr ""
-"Dobrodošli u MandrakeUpdate!\n"
+"Da bismo zadovoljili sve zavisnosti, sljedeće pakete trebate\n"
+"odzna�iti:\n"
 "\n"
-"Ovaj alat će vam pomoći da izaberete update koje želite instalirati na\n"
-"vaš ra�unar."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "sve je uspješno instalirano"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "%s KB"
+msgstr "%.1f KB"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"Možete također izabrati vaš željeni mirror ru�no: da biste to\n"
+"uradili, pokrenite Upravitelj izvorima softvera, zatim dodajte\n"
+"izvor za 'Sigurnosne update'.\n"
+"\n"
+"Onda restartujte MandrakeUpdate."
 
 #: ../rpmdrake:1
 #, c-format
@@ -65,40 +132,21 @@ msgstr ""
 "Ovaj alat će vam pomoći da izaberete koji softver želite ukloniti sa vašeg\n"
 "ra�unara."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:1
+#, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Došlo je do greške prilikom instalacije paketa:\n"
-"\n"
-"%s"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during removal"
-msgstr "Došlo je do problema prilikom instalacije"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, removing packages..."
-msgstr ""
-"Molimo sa�ekajte\n"
-"Sortiram pakete"
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "Ako želite spasiti izmjene, morate ubaciti medij u uređaj"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, reading packages database..."
-msgstr ""
-"Molimo sa�ekajte\n"
-"Sortiram pakete"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Snimi i izađi"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"There was a problem during the installation:\n"
+"There was a problem during the removal of packages:\n"
 "\n"
 "%s"
 msgstr ""
@@ -108,80 +156,72 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Instaliraj sve"
+msgid "Size: "
+msgstr "Veli�ina"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Pripremam pakete za instalaciju..."
+msgid "Security updates"
+msgstr "Prikaži sigurnosne update"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Pripremam pakete za instalaciju..."
+msgid "Already existing update medias"
+msgstr "Greška u dodavanju update medija"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Svi traženi paketi su uspješno instalirani."
+msgid "Maximum information"
+msgstr "Maksimalne informacije"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Everything installed successfully"
-msgstr "Sve je uspješno instalirano"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Proxy..."
+msgstr "Greška..."
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The installation is finished; %s.\n"
-"\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
 msgstr ""
-"Instalacija je završena; %s.\n"
-"\n"
-"Neke konfiguracione datoteke su napravljene, kao npr. `.rpmnew' ili `."
-"rpmsave',\n"
-"sada ih možete ispitati kako biste preduzeli neke akcije:"
+"Instalacija nije uspjela, nedostaju neke od datoteka.\n"
+"Vjerovatno trebate update-ovati vašu bazu izvora."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "everything was installed correctly"
-msgstr "sve je uspješno instalirano"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Došlo je do problema prilikom instalacije"
+msgid "United Kingdom"
+msgstr "Ujedinjeno kraljevstvo"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Instaliram paket `%s' (%s/%s)..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Pripremam pakete za instalaciju..."
+msgid "in names"
+msgstr "u imenima"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
+"I can't find any suitable mirror.\n"
 "\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
+"Ne mogu naći nijedan pogodan mirror.\n"
+"\n"
+"Može biti više razloga za ovaj problem, od kojih je naj�ešći to da\n"
+"arhitektura vašeg procesora nije podržana od strane Mandrake Linux\n"
+"oficijelnih update-a."
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"Instalacija nije uspjela, nedostaju neke od datoteka.\n"
-"Vjerovatno trebate update-ovati vašu bazu izvora."
+msgid "Remove .%s"
+msgstr "Ukloni .%s"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "Finska"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -198,206 +238,276 @@ msgstr ""
 "\n"
 "Mogu li nastaviti?"
 
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Examining distant file of media `%s'..."
+msgstr ""
+
 #: ../rpmdrake:1
 #, c-format
 msgid "Verifying packages signatures..."
 msgstr ""
 
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "France"
+msgstr "Na silu"
+
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Downloadujem paket `%s' (%s/%s)..."
+msgid "More info"
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Cancel"
-msgstr "Odustani"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Želite li da nastavim?"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid "Reload the packages list"
+msgstr "Ponovo u�itaj listu paketa"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Izaberite neki mirror..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Molim ubacite medij pod imenom \"%s\" u uređaj [%s]"
+msgid "Some packages can't be installed"
+msgstr "Paket ne može biti instaliran"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "Pripremam pakete za instalaciju..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Change medium"
-msgstr "Promjeni medij"
+msgid "All packages,"
+msgstr "Svi paketi,"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Type of media:"
+msgstr "Tip izvora:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "Inicijaliziram..."
+msgid "in files"
+msgstr "u datotekama"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "Svi traženi paketi su uspješno instalirani."
+
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Pripremam pakete za instalaciju..."
+msgid "Proxy hostname:"
+msgstr "Proxy korisni�ko ime:"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "Lokalne datoteke"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr "Ispitujem %s"
+
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Morate biti root da bi instalirali pakete, žalim."
+msgid "Israel"
+msgstr "Instaliraj"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unable to get source packages."
-msgstr "Izaberite pakete"
+msgid "Help"
+msgstr "/_Pomoć"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Inspect..."
-msgstr "Ispitaj..."
+msgid "HTTP server"
+msgstr "HTTP server"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Installation finished"
-msgstr "Instaliran"
+msgid "Installation failed"
+msgstr "Instaliraj sve"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Ne radi ništa"
+msgid "Use .%s as main file"
+msgstr "Koristi .%s kao glavnu datoteku"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Koristi .%s kao glavnu datoteku"
+msgid "Search results"
+msgstr "Rezultati pretrage"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid " failed!"
+msgstr "u datotekama"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
+msgstr "Brazil"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"Već postoji medij sa tim imenom, da li ga stvarno\n"
+"želite zamjeniti?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Ukloni .%s"
+msgid "Find:"
+msgstr "Pronađi:"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "changes:"
-msgstr "Snimi izmjene"
+#, c-format
+msgid "All packages, alphabetical"
+msgstr "Svi paketi, abecedno"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Ispitujem %s"
+msgid "Please wait, searching..."
+msgstr "Molim sa�ekajte, tražim..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, finding available packages..."
+msgid "Please wait, reading packages database..."
 msgstr ""
 "Molimo sa�ekajte\n"
 "Sortiram pakete"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Please wait, adding medium..."
-msgstr "Molim sa�ekajte, dodajem medij..."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "Ne mogu otvoriti paket"
 
 #: ../rpmdrake:1
-#, c-format
-msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
-"\n"
-"Then, restart MandrakeUpdate."
-msgstr ""
-"Možete također izabrati vaš željeni mirror ru�no: da biste to\n"
-"uradili, pokrenite Upravitelj izvorima softvera, zatim dodajte\n"
-"izvor za 'Sigurnosne update'.\n"
-"\n"
-"Onda restartujte MandrakeUpdate."
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Molim ubacite medij pod imenom \"%s\" u uređaj [%s]"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "Kako da ru�no izaberete vaš mirror"
+msgid "Reset the selection"
+msgstr "Poništi izbor"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
 msgstr ""
+"Ako vam je potreban proxy, ovdje unesite ime ra�unara i eventualno port "
+"(sintaksa: <proxyhost[:port]>):"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Already existing update sources"
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
 msgstr ""
+"Da bismo zadovoljili sve zavisnosti, sljedeće pakete takođe treba\n"
+"ukloniti:\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
+msgid "Costa Rica"
+msgstr "Kostarika"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
+"There was a problem during the installation:\n"
 "\n"
-"Is it ok to continue?"
+"%s"
 msgstr ""
-"Moram kontaktirati mirror kako bi dobavio najnovije pakete\n"
-"za update. Molim provjerite da li je vaša mreža u funkciji.\n"
+"Došlo je do greške prilikom instalacije paketa:\n"
 "\n"
-"Mogu li nastaviti?"
+"%s"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Please wait, removing medium..."
+msgstr "Molim sa�ekajte, brišem medij..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Greška u datoteci"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "Å ifra:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "Tajvan"
+
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Pripremam pakete za instalaciju..."
+msgid "User:"
+msgstr "Korisni�ko ime:"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr "Molim sa�ekajte, osvježavam medij..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Mandrake Update"
-msgstr "MandrakeUpdate Opcije"
+msgid "Please wait, listing packages..."
+msgstr ""
+"Molimo sa�ekajte\n"
+"Sortiram pakete"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Software Packages Removal"
-msgstr "Uklanjanje softverskih paketa"
+#, fuzzy, c-format
+msgid "Information on packages"
+msgstr "Ne mogu otvoriti paket"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "Izlaz"
+msgid "Cancel"
+msgstr "Odustani"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Instaliraj"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Remove"
-msgstr "Briši"
+msgid "Everything installed successfully"
+msgstr "Sve je uspješno instalirano"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Help"
-msgstr "/_Pomoć"
+msgid "Select the media(s) you wish to update:"
+msgstr "Izaberite izvorne koje želite unaprijediti:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search"
-msgstr "Pretraga"
+msgid "Please wait, updating media..."
+msgstr "Molim sa�ekajte, unaprjeđujem medije..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Pronađi:"
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -415,161 +525,189 @@ msgstr ""
 "Mogu li nastaviti?"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "in descriptions"
+msgstr "Opisi"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Neke pakete treba obrisati"
+msgid "Configure proxies"
+msgstr "Konfiguriši proxije"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
 "\n"
-"Do you really want to install all the selected packages?"
+"Is it ok to continue?"
 msgstr ""
-"Upozorenje: izgleda da pokušavate dodati toliko paketa\n"
-"da će vaš datote�ni sistem ostati bez slobodnog prostora\n"
-"na disku, tokom ili nakon instalacije paketa ; ovo je posebno\n"
-"opasno i trebate to pažljivo razmotriti.\n"
+"Sada je potrebno kontaktirati MandrakeSoft stranicu kako bi dobili\n"
+"listu mirrora. Molim provjerite da li je vaša mreža trenutno u funkciji.\n"
 "\n"
-"Želite li stvarno instalirati sve izabrane pakete?"
+"Mogu li nastaviti?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Izabrano je previše paketa"
+msgid "Please choose"
+msgstr "Molim izaberite"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Maximum information"
-msgstr "Maksimalne informacije"
+#, fuzzy, c-format
+msgid "Selected size: %d MB"
+msgstr "%d izabranih paketa: %.1f MB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Normal information"
-msgstr "Normalne informacije"
+msgid "Initializing..."
+msgstr "Inicijaliziram..."
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update source(s)"
-msgstr "Osvježi izvore"
+msgid "Save changes"
+msgstr "Snimi izmjene"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Ponovo u�itaj listu paketa"
+msgid "Error during download"
+msgstr "Greška prilikom downloada"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reset the selection"
-msgstr "Poništi izbor"
+#, fuzzy, c-format
+msgid "Package installation..."
+msgstr "Pripremam pakete za instalaciju..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "u datotekama"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "in descriptions"
-msgstr "Opisi"
+msgid "Importance: "
+msgstr "Zna�aj: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "u imenima"
+msgid ""
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
+msgstr ""
+"Da bismo zadovoljili sve zavisnosti, sljedeće pakete takođe treba\n"
+"instalirati:\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by update availability"
-msgstr "po dostupnosti update-a"
+msgid "Add..."
+msgstr "Dodaj..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by source repository"
-msgstr "po izvornom spremištu"
+msgid "Unable to create medium."
+msgstr "Ne mogu kreirati medij."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by selection state"
-msgstr "po stanju izabranosti"
+msgid ""
+"The installation is finished; %s.\n"
+"\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
+msgstr ""
+"Instalacija je završena; %s.\n"
+"\n"
+"Neke konfiguracione datoteke su napravljene, kao npr. `.rpmnew' ili `."
+"rpmsave',\n"
+"sada ih možete ispitati kako biste preduzeli neke akcije:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by size"
-msgstr "po veli�ini"
+msgid "Browse..."
+msgstr "Potraži..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "Paket ne može biti instaliran"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by group"
-msgstr "po grupi"
+msgid "Info..."
+msgstr "Info..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "All packages,"
-msgstr "Svi paketi,"
+msgid "You need to insert the medium to continue"
+msgstr "Morate ubaciti medij u uređaj za nastavak"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Svi paketi, abecedno"
+msgid "Copying file for media `%s'..."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Mandrake izbori"
+msgid "Remove"
+msgstr "Briši"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Normal updates"
-msgstr "Normalni update"
+msgid "Preparing packages installation..."
+msgstr "Pripremam pakete za instalaciju..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Bugfixes updates"
-msgstr "Prikaži ispravke grešaka"
+msgid "by media repository"
+msgstr "po izvornom spremištu"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Security updates"
-msgstr "Prikaži sigurnosne update"
+msgid "No mirror"
+msgstr "mirror:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Description: "
-msgstr "Opisi"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to fill up at least the two first entries."
+msgstr "Trebate popuniti najmanje prva dva polja."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Razlog za update: "
+msgid "Install"
+msgstr "Instaliraj"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Summary: "
-msgstr "Opis"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Japan"
+msgstr "Japan"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Importance: "
-msgstr "Zna�aj: "
+msgid "Do nothing"
+msgstr "Ne radi ništa"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "%s KB"
-msgstr "%.1f KB"
+msgid "No update"
+msgstr "Izvrši update"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Size: "
-msgstr "Veli�ina"
+msgid "Description: "
+msgstr "Opisi"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Version: "
-msgstr "Verzija:"
+#, c-format
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr ""
+"Upozorenje: izgleda da pokušavate dodati toliko paketa\n"
+"da će vaš datote�ni sistem ostati bez slobodnog prostora\n"
+"na disku, tokom ili nakon instalacije paketa ; ovo je posebno\n"
+"opasno i trebate to pažljivo razmotriti.\n"
+"\n"
+"Želite li stvarno instalirati sve izabrane pakete?"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -578,84 +716,63 @@ msgstr "Ime: %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Trenutno instalirana verzija: "
+msgid "Inspect..."
+msgstr "Ispitaj..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Source: "
-msgstr "Izvor"
+msgid "Editing media \"%s\":"
+msgstr "Izmijena izvora \"%s\":"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "(Not available)"
-msgstr "(Nijedan nije dostupan)"
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "Pripremam pakete za instalaciju..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Changelog:\n"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Files:\n"
-msgstr "/_Datoteka"
+msgid "Australia"
+msgstr "Australija"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Selected size: %d MB"
-msgstr "%d izabranih paketa: %.1f MB"
+msgid "Installation finished"
+msgstr "Instaliran"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Izabrano: %d MB / Slobodan prostor: %d MB"
+msgid "by update availability"
+msgstr "po dostupnosti update-a"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
-msgstr ""
-"Da bismo zadovoljili sve zavisnosti, sljedeće pakete trebate\n"
-"odzna�iti:\n"
-"\n"
+msgid "Poland"
+msgstr "Poljska"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr ""
-"Žalim, sljedeće pakete ne možete izabrati:\n"
-"\n"
+msgid "Version: "
+msgstr "Verzija:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "je u konfliktu sa"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Možete navesti korisni�ko ime / šifru za proxy identifikaciju."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Paket ne može biti instaliran"
+msgid "Upgradable"
+msgstr "Update"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
+msgid " done."
 msgstr ""
-"Da bismo zadovoljili sve zavisnosti, sljedeće pakete takođe treba\n"
-"instalirati:\n"
-"\n"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Software Packages Installation"
+msgstr "Pripremam pakete za instalaciju..."
 
 #: ../rpmdrake:1
 #, c-format
@@ -664,643 +781,526 @@ msgstr "Potrebni su dodatni paketi"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "Paket ne može biti instaliran"
+msgid "Bugfixes updates"
+msgstr "Prikaži ispravke grešaka"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
-"Žalim, uklanjanje ovog paketa bi izazvalo rušenje sistema:\n"
-"\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"Da bismo zadovoljili sve zavisnosti, sljedeće pakete takođe treba\n"
-"ukloniti:\n"
-"\n"
+msgid "Germany"
+msgstr "Njema�ka"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Potrebno je obrisati neke dodatne pakete"
+msgid "Russia"
+msgstr "Rusija"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "More information on package..."
-msgstr "Više informacija o paketu..."
+msgid "Norway"
+msgstr "Norveška"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Information on packages"
-msgstr "Ne mogu otvoriti paket"
-
-#. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:1
-#, c-format
-msgid "More info"
-msgstr ""
+msgid "Problem during installation"
+msgstr "Došlo je do problema prilikom instalacije"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Addable"
-msgstr "Može se dodati"
+msgid "Search"
+msgstr "Pretraga"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Upgradable"
-msgstr "Update"
+msgid "Edit a media"
+msgstr "Izmijeni izvor"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
+msgstr "Češka"
 
 #: ../rpmdrake:1
 #, c-format
 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."
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"Lista update-a je prazna. Ovo zna�i da ili ne postoji update\n"
-"za pakete koji su instalirani na vašem ra�unaru, ili da ste ih\n"
-"već posjedujete."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "No update"
-msgstr "Izvrši update"
+#, c-format
+msgid "Stop"
+msgstr "Stani"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(none)"
-msgstr "(ništa)"
+msgid "Update"
+msgstr "Update"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, listing packages..."
+msgid "Please wait, removing packages..."
 msgstr ""
 "Molimo sa�ekajte\n"
 "Sortiram pakete"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "Ne mogu otvoriti paket"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Potreban je jedan od sljedećih paketa:"
+msgid "Normal information"
+msgstr "Normalne informacije"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Molim izaberite"
+msgid "Media: "
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr "Otkriveni su konflikti"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "Downloadujem paket `%s' (%s/%s)..."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Selected"
-msgstr ""
-"Izaberi\n"
-"sve"
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Izabrano: %d MB / Slobodan prostor: %d MB"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search results"
-msgstr "Rezultati pretrage"
+msgid "Media"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Stop"
-msgstr "Stani"
+msgid "Spain"
+msgstr "Å panija"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Please wait, searching..."
-msgstr "Molim sa�ekajte, tražim..."
+#, fuzzy, c-format
+msgid "Normal updates"
+msgstr "Normalni update"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Rezultati pretrage (ništa)"
+msgid "by selection state"
+msgstr "po stanju izabranosti"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Other"
-msgstr "Ostalo"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "Molim sa�ekajte, skidam adrese mirrora sa MandrakeSoft web stranice."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the packages source editor!\n"
-"\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
-msgstr ""
-"Dobrodošli u editor izvora paketa!\n"
-"\n"
-"Ovaj alat vam omogućuje da podesite izvore paketa koje želite koristiti na\n"
-"vašem ra�unaru. Tada će oni biti dostupni kako biste mogli instalirati "
-"nove \n"
-"softverske pakete ili unaprjeđivati vaš sistem."
+msgid "Login:"
+msgstr "Login:"
 
 #: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Adding a media:"
+msgstr "Dodajem izvor:"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Save and quit"
-msgstr "Snimi i izađi"
+msgid "Austria"
+msgstr "Austrija"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Greška..."
+msgid "Fatal error"
+msgstr "Greška u datoteci"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Update..."
 msgstr "Update"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add..."
-msgstr "Dodaj..."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Edit"
-msgstr "Izmjeni"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Source"
-msgstr "Izvor"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "Uklju�eno?"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure sources"
-msgstr "Podesi izvore"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Password:"
-msgstr "Å ifra:"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "User:"
-msgstr "Korisni�ko ime:"
+msgid "Starting download of `%s'..."
+msgstr "Provjeravam potpis `%s'..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "Možete navesti korisni�ko ime / šifru za proxy identifikaciju."
+msgid "(none)"
+msgstr "(ništa)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy hostname:"
-msgstr "Proxy korisni�ko ime:"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
 msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+"Removing these packages would break your system, sorry:\n"
+"\n"
 msgstr ""
-"Ako vam je potreban proxy, ovdje unesite ime ra�unara i eventualno port "
-"(sintaksa: <proxyhost[:port]>):"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure proxies"
-msgstr "Konfiguriši proxije"
+"Žalim, uklanjanje ovog paketa bi izazvalo rušenje sistema:\n"
+"\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Molim sa�ekajte, osvježavam medij..."
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Instaliram paket `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "Ako želite spasiti izmjene, morate ubaciti medij u uređaj"
+msgid "Currently installed version: "
+msgstr "Trenutno instalirana verzija: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "Morate ubaciti medij u uređaj za nastavak"
+msgid "Other"
+msgstr "Ostalo"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "Snimi izmjene"
+msgid "Reason for update: "
+msgstr "Razlog za update: "
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Relativni put do synthesis/hdlist:"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Please choose the desired mirror."
+msgstr ""
+"Molimo sa�ekajte\n"
+"Skidam listu mirrora"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "Edit"
+msgstr "Izmjeni"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "Izmijena izvora \"%s\":"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Edit a source"
-msgstr "Izmijeni izvor"
+msgid "Please wait, finding available packages..."
+msgstr ""
+"Molimo sa�ekajte\n"
+"Sortiram pakete"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Molim sa�ekajte, brišem medij..."
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Relativni put do synthesis/hdlist:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Type of source:"
-msgstr "Tip izvora:"
+msgid "Search results (none)"
+msgstr "Rezultati pretrage (ništa)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Dodajem izvor:"
+msgid "Danmark"
+msgstr "Danska"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
-msgstr ""
-"Već postoji medij sa tim imenom, da li ga stvarno\n"
-"želite zamjeniti?"
+msgid "China"
+msgstr "Kina"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Trebate popuniti najmanje prva dva polja."
+msgid "United States"
+msgstr "SAD"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Name:"
-msgstr "Ime"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Login:"
-msgstr "Login:"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Choose a mirror..."
-msgstr "Izaberite neki mirror..."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Browse..."
-msgstr "Potraži..."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Path or mount point:"
-msgstr "Put ili ta�ka montiranja:"
+msgid "changes:"
+msgstr "Snimi izmjene"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Removable device"
-msgstr "Izmjenjivi uređaj"
+msgid "Some additional packages need to be removed"
+msgstr "Potrebno je obrisati neke dodatne pakete"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "HTTP server"
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "FTP server"
+msgid "No"
+msgstr "Ne"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Path:"
-msgstr "Port:"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Local files"
-msgstr "Lokalne datoteke"
+msgid "Configure medias"
+msgstr "Podesi izvore"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Add a source"
+msgid "Add a media"
 msgstr "Dodajem izvor:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr "Ne mogu da osvježim medij; on će biti automatski isklju�en."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Unable to create medium."
-msgstr "Ne mogu kreirati medij."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Update"
-msgstr "Update"
+msgid "Summary: "
+msgstr "Opis"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Izaberite izvorne koje želite unaprijediti:"
+msgid "Canada"
+msgstr "Kanada"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Molim sa�ekajte, unaprjeđujem medije..."
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid " failed!"
-msgstr "u datotekama"
+msgid "Greece"
+msgstr "Gr�ka"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid " done."
+msgid ""
+"There was an error downloading the mirrors list:\n"
+"\n"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
+"Došlo je do greške prilikom skidanja liste mirrora:\n"
+"\n"
+"%s\n"
+"Mreža ili MandrakeSoft web stranica su možda nedostupni.\n"
+"Molim probajte ponovo kasnije."
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Download of `%s', speed:%s"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Morate biti root da bi instalirali pakete, žalim."
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Path:"
+msgstr "Port:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "Provjeravam potpis `%s'..."
+msgid "Problem during removal"
+msgstr "Došlo je do problema prilikom instalacije"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Examining distant file of source `%s'..."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Selected"
 msgstr ""
+"Izaberi\n"
+"sve"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr ""
+msgid "Netherlands"
+msgstr "Nizozemska"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr ""
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Please choose the desired mirror."
-msgstr ""
-"Molimo sa�ekajte\n"
-"Skidam listu mirrora"
+msgid "Addable"
+msgstr "Može se dodati"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
-msgstr ""
-"Ne mogu naći nijedan pogodan mirror.\n"
-"\n"
-"Može biti više razloga za ovaj problem, od kojih je naj�ešći to da\n"
-"arhitektura vašeg procesora nije podržana od strane Mandrake Linux\n"
-"oficijelnih update-a."
+msgid "(Not available)"
+msgstr "(Nijedan nije dostupan)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No mirror"
-msgstr "mirror:"
-
-#: ../rpmdrake.pm:1
-#, c-format
 msgid ""
-"There was an error downloading the mirrors list:\n"
+"Sorry, the following package(s) can't be selected:\n"
 "\n"
 "%s\n"
-"The network, or MandrakeSoft website, are maybe unavailable.\n"
-"Please try again later."
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
 msgstr ""
-"Došlo je do greške prilikom skidanja liste mirrora:\n"
+"Žalim, sljedeće pakete ne možete izabrati:\n"
 "\n"
-"%s\n"
-"Mreža ili MandrakeSoft web stranica su možda nedostupni.\n"
-"Molim probajte ponovo kasnije."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Not selected"
+msgstr "Otkriveni su konflikti"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
-msgstr "Greška prilikom downloada"
+msgid "Software Packages Removal"
+msgstr "Uklanjanje softverskih paketa"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr "Molim sa�ekajte, skidam adrese mirrora sa MandrakeSoft web stranice."
+msgid "Sweden"
+msgstr "Å vedska"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
 "\n"
-"Is it ok to continue?"
-msgstr ""
-"Sada je potrebno kontaktirati MandrakeSoft stranicu kako bi dobili\n"
-"listu mirrora. Molim provjerite da li je vaša mreža trenutno u funkciji.\n"
 "\n"
-"Mogu li nastaviti?"
+"Error(s) reported:\n"
+"%s"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United States"
-msgstr "SAD"
+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 ""
+"Lista update-a je prazna. Ovo zna�i da ili ne postoji update\n"
+"za pakete koji su instalirani na vašem ra�unaru, ili da ste ih\n"
+"već posjedujete."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "Kina"
+msgid "Examining file of media `%s'..."
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Ujedinjeno kraljevstvo"
+msgid "Download of `%s', speed:%s"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Tajvan"
+msgid "One of the following packages is needed:"
+msgstr "Potreban je jedan od sljedećih paketa:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Sweden"
-msgstr "Å vedska"
+msgid "Quit"
+msgstr "Izlaz"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Russia"
-msgstr "Rusija"
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Moram kontaktirati mirror kako bi dobavio najnovije pakete\n"
+"za update. Molim provjerite da li je vaša mreža u funkciji.\n"
+"\n"
+"Mogu li nastaviti?"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Portugal"
-msgstr "Port:"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Poland"
-msgstr "Poljska"
+msgid "Update media(s)"
+msgstr "Osvježi izvore"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Norway"
-msgstr "Norveška"
+msgid "Ok"
+msgstr "Ok"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Netherlands"
-msgstr "Nizozemska"
+msgid "Please wait, adding medium..."
+msgstr "Molim sa�ekajte, dodajem medij..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Korea"
-msgstr "Na silu"
+msgid "Unable to get source packages."
+msgstr "Izaberite pakete"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "Japan"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Italy"
-msgstr "Instaliraj"
+msgid "Too many packages are selected"
+msgstr "Izabrano je previše paketa"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Israel"
-msgstr "Instaliraj"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Greece"
-msgstr "Gr�ka"
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"Dobrodošli u editor izvora paketa!\n"
+"\n"
+"Ovaj alat vam omogućuje da podesite izvore paketa koje želite koristiti na\n"
+"vašem ra�unaru. Tada će oni biti dostupni kako biste mogli instalirati "
+"nove \n"
+"softverske pakete ili unaprjeđivati vaš sistem."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "France"
-msgstr "Na silu"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Finland"
-msgstr "Finska"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Spain"
-msgstr "Å panija"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Danmark"
-msgstr "Danska"
+msgid "%s conflicts with %s"
+msgstr "je u konfliktu sa"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "Njema�ka"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Dobrodošli u MandrakeUpdate!\n"
+"\n"
+"Ovaj alat će vam pomoći da izaberete update koje želite instalirati na\n"
+"vaš ra�unar."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Češka"
+msgid "Mandrake choices"
+msgstr "Mandrake izbori"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Kostarika"
+msgid "Changelog:\n"
+msgstr "Changelog:\n"
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Canada"
-msgstr "Kanada"
+#, fuzzy, c-format
+msgid "Korea"
+msgstr "Na silu"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Brazil"
-msgstr "Brazil"
+msgid "Removable device"
+msgstr "Izmjenjivi uređaj"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Belgija"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Australija"
+msgid "Change medium"
+msgstr "Promjeni medij"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Austria"
-msgstr "Austrija"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mandrake Update"
+msgstr "MandrakeUpdate Opcije"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
-msgstr "Info..."
+msgid "by size"
+msgstr "po veli�ini"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "Ne"
+msgid "FTP server"
+msgstr "FTP server"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Files:\n"
+msgstr "/_Datoteka"
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Yes"
-msgstr "Da"
+#, fuzzy, c-format
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr "Ne mogu da osvježim medij; on će biti automatski isklju�en."
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -1575,6 +1575,13 @@ msgstr "Ukloni softver"
 msgid "Software Sources Manager"
 msgstr "Upravitelj izvorima softvera"
 
+#, fuzzy
+#~ msgid "Source: "
+#~ msgstr "Izvor"
+
+#~ msgid "Source"
+#~ msgstr "Izvor"
+
 #~ msgid ""
 #~ "some packages failed to install\n"
 #~ "correctly"
@@ -1614,9 +1621,6 @@ msgstr "Upravitelj izvorima softvera"
 #~ "\n"
 #~ "Želite li probati neki drugi mirror?"
 
-#~ msgid "Error adding update medium"
-#~ msgstr "Greška u dodavanju update medija"
-
 #~ msgid "Please wait, contacting mirror to initialize updates packages."
 #~ msgstr ""
 #~ "Molim sa�ekajte, kontaktiram mirror za inicijalizaciju update paketa."
diff --git a/po/ca.po b/po/ca.po
index 451b5ffa..7bdb1f8e 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: 2003-03-03 21:35+0200\n"
 "Last-Translator: Softcatalà <traddrake@softcatala.org>\n"
 "Language-Team: Catalan <info@softcatala.org>\n"
@@ -16,16 +16,20 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"Esteu d'acord en continuar?"
+msgid "Enabled?"
+msgstr "Habilitat?"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Camí o punt de muntatge:"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Portugal"
+msgstr "Port:"
 
 #: ../rpmdrake:1
 #, c-format
@@ -45,17 +49,80 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "by group"
+msgstr "per grup"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Name:"
+msgstr "Nom"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Italy"
+msgstr "Instal·lació"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Com escollir manualment la rèplica"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "S'han d'eliminar alguns paquets"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
+msgstr "Més informació del paquet..."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Sí"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Welcome to MandrakeUpdate!\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
 msgstr ""
-"Benvinguts al MandrakeUpdate!\n"
+"A causa de les dependències, els següent(s) paquet(s) s'han de "
+"deseleccionar\n"
+"ara:\n"
 "\n"
-"Aquesta eina us ajudarà a escollir les actualitzacions que voleu instal·lar "
-"en el vostre\n"
-"ordinador."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "tot s'ha instal·lat correctament"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "%s KB"
+msgstr "%.1f KB"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"Podeu escollir la rèplica desitjada manualment: per a fer-ho,\n"
+"executeu el Manejador de Fonts de Programari, i afegiu una font de\n"
+"`Actualitzacions de Seguretat'.\n"
+"\n"
+"Aleshores, reinicieu MandrakeUpdate."
 
 #: ../rpmdrake:1
 #, c-format
@@ -70,40 +137,21 @@ msgstr ""
 "Aqueta eina us ajudarà a escollir quin programari voleu eliminar del\n"
 "vostre ordinador."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:1
+#, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Hi ha hagut un error durant la instal·lació de paquets:\n"
-"\n"
-"%s"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during removal"
-msgstr "Hi ha hagut un problema durant la instal·lació"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, removing packages..."
-msgstr ""
-"Si us plau, espereu\n"
-"S'estan ordenant els paquets"
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "Per tal de desar els canvis, heu d'inserir el support en la unitat."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, reading packages database..."
-msgstr ""
-"Si us plau, espereu\n"
-"S'estan ordenant els paquets"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Desa i surt"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"There was a problem during the installation:\n"
+"There was a problem during the removal of packages:\n"
 "\n"
 "%s"
 msgstr ""
@@ -113,80 +161,72 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Instal·la'ls tots"
+msgid "Size: "
+msgstr "Mida"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "S'estan preparant els paquets per a la instal·lació..."
+msgid "Security updates"
+msgstr "Mostra les actualitzacions de seguretat"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "S'estan preparant els paquets per a la instal·lació..."
+msgid "Already existing update medias"
+msgstr "S'ha produït un error afegint el suport d'actualització"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Tots els paquets demanats s'han instal·lat correctament."
+msgid "Maximum information"
+msgstr "Màxima informació"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Everything installed successfully"
-msgstr "Tot s'ha instal·lat correctament"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Proxy..."
+msgstr "Error..."
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The installation is finished; %s.\n"
-"\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
 msgstr ""
-"La instal·lació ha finalitzat; %s.\n"
-"\n"
-"Alguns fitxers de configuració han estat creats com a `.rpmnew' or `."
-"rpmsave',\n"
-"ara podeu inspeccionar-los per a empendre accions:"
+"Instal·lació fallida, alguns fitxers no s'han trobat.\n"
+"Voldreu actualitzar la vostra base de dades de fonts."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "everything was installed correctly"
-msgstr "tot s'ha instal·lat correctament"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Hi ha hagut problemes durant la instal·lació"
+msgid "United Kingdom"
+msgstr "Regne Unit"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "S'està instal·lant el paquet '%s' (%s/%s)..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "S'estan preparant els paquets per a la instal·lació..."
+msgid "in names"
+msgstr "en noms"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
+"I can't find any suitable mirror.\n"
 "\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
+"No he pogut trobar cap rèplica adecuada.\n"
+"\n"
+"Hi poden haver diverses raons per aquest problema; el cas més freqüent es\n"
+"quan l'arquitectura del seu processador no és suportada \n"
+"per Mandrake Linux Official Updates."
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"Instal·lació fallida, alguns fitxers no s'han trobat.\n"
-"Voldreu actualitzar la vostra base de dades de fonts."
+msgid "Remove .%s"
+msgstr "Elimina .%s"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "Finlàndia"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -203,205 +243,275 @@ msgstr ""
 "\n"
 "Esteu d'acord en continuar?"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Verifying packages signatures..."
+msgid "Examining distant file of media `%s'..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "S'està descarregant el paquet '%s' (%s/%s)..."
+msgid "Verifying packages signatures..."
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "France"
+msgstr "Imposa"
+
+#. -PO: Keep it short, this is gonna be on a button
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "Cancel·la"
+msgid "More info"
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Ok"
-msgstr "D'acord"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Esteu d'acord en continuar?"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Per favor, inserteu el suport anomenat \"%s\" en el dispositiu [%s]"
+#, c-format
+msgid "Reload the packages list"
+msgstr "Recarrega la llista de paquets"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Change medium"
-msgstr "Canvieu el suport"
+msgid "Choose a mirror..."
+msgstr "Escolliu una rèplica..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Initializing..."
-msgstr "S'està inicialitzant..."
+#, fuzzy, c-format
+msgid "Some packages can't be installed"
+msgstr "No es pot instal·lar el paquet"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Package installation..."
+msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "S'estan preparant els paquets per a la instal·lació..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Perdoneu, necessiteu ser root per instal·lar paquets."
+msgid "All packages,"
+msgstr "Paquets: "
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Unable to get source packages."
-msgstr "Trieu els paquets"
+msgid "Type of media:"
+msgstr "Tipus de font:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "s'està inspeccionant..."
+msgid "in files"
+msgstr "en fitxers"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "Tots els paquets demanats s'han instal·lat correctament."
+
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Installation finished"
-msgstr "Instal·lat"
+msgid "Proxy hostname:"
+msgstr "Nom d'usuari del servidor intermediari:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Do nothing"
-msgstr "No facis res"
+msgid "Local files"
+msgstr "Fitxers locals"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Utilitza .%s com a fitxer principal"
+msgid "Inspecting %s"
+msgstr "Inspeccionant %s"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Israel"
+msgstr "Instal·lació"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Help"
+msgstr "/_Ajuda"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Elimina .%s"
+msgid "HTTP server"
+msgstr "Servidor HTTP"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "changes:"
-msgstr "Paquets: "
+msgid "Installation failed"
+msgstr "Instal·la'ls tots"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Inspeccionant %s"
+msgid "Use .%s as main file"
+msgstr "Utilitza .%s com a fitxer principal"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Search results"
+msgstr "Resultats de la cerca"
+
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Please wait, finding available packages..."
-msgstr ""
-"Si us plau, espereu mentre es cerca la llista de paquets d'actualització..."
+msgid " failed!"
+msgstr "en fitxers"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "Si us plau espereu, s'està afegint el suport..."
+msgid "Brazil"
+msgstr "Brasil"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
-"\n"
-"Then, restart MandrakeUpdate."
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 msgstr ""
-"Podeu escollir la rèplica desitjada manualment: per a fer-ho,\n"
-"executeu el Manejador de Fonts de Programari, i afegiu una font de\n"
-"`Actualitzacions de Seguretat'.\n"
-"\n"
-"Aleshores, reinicieu MandrakeUpdate."
+"Ja hi ha un support amb aquest nom, realment\n"
+"voleu reemplaçar-lo?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "Com escollir manualment la rèplica"
+msgid "Find:"
+msgstr "Cerca:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
-msgstr ""
+msgid "All packages, alphabetical"
+msgstr "Tots els paquets, alfabèticament"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Already existing update sources"
+msgid "Please wait, searching..."
+msgstr "Si us plau espereu, s'està buscant..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, reading packages database..."
 msgstr ""
+"Si us plau, espereu\n"
+"S'estan ordenant els paquets"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "No es pot obrir el paquet"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Per favor, inserteu el suport anomenat \"%s\" en el dispositiu [%s]"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Reset the selection"
+msgstr "Esborra la selecció"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
 msgstr ""
-"Necessito contactar amb la rèplica per a obtenir les últimes\n"
-"actualitzacions de paquets. Comproveu que la xarxa funcioni ara.\n"
-"\n"
-"Esteu d'acord en continuar?"
+"Si necessiteu un servidor intermediari, entreu el nom de l'ordinador central "
+"i un port opcional (sintaxi: <proxyhost[:port]>):"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
 msgstr ""
+"Per poder satisfer totes les dependències, els següent(s) paquet(s)\n"
+"cal que s'eliminin:\n"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Error de fitxer"
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Hi ha hagut un error durant la instal·lació de paquets:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr "Si us plau espereu, s'està afegint el suport..."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "Contrasenya:"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "Taiwan"
+
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "S'estan preparant els paquets per a la instal·lació..."
+msgid "User:"
+msgstr "Nom d'usuari:"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr "Si us plau, espereu, s'està actualitzant el suport..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Mandrake Update"
-msgstr "Preferències del MandrakeUpdate"
+msgid "Please wait, listing packages..."
+msgstr ""
+"Si us plau, espereu\n"
+"S'estan ordenant els paquets"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Software Packages Removal"
-msgstr "Eliminació de Paquets de Programari"
+#, fuzzy, c-format
+msgid "Information on packages"
+msgstr "No es pot obrir el paquet"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "Surt"
+msgid "Cancel"
+msgstr "Cancel·la"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Instal·lació"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Remove"
-msgstr "Suprimir"
+msgid "Everything installed successfully"
+msgstr "Tot s'ha instal·lat correctament"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Help"
-msgstr "/_Ajuda"
+msgid "Select the media(s) you wish to update:"
+msgstr "Seleccioneu la(es) font(s) que voleu actualitzar:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search"
-msgstr "Cerca"
+msgid "Please wait, updating media..."
+msgstr "Si us plau espereu, actualitzant dades..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Cerca:"
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -419,161 +529,190 @@ msgstr ""
 "Esteu d'acord en continuar?"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "in descriptions"
+msgstr "Descripcions"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "S'han d'eliminar alguns paquets"
+msgid "Configure proxies"
+msgstr "Configureu els servidors intermediaris(proxies)"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
 "\n"
-"Do you really want to install all the selected packages?"
+"Is it ok to continue?"
 msgstr ""
-"Avís: sembla ser que voleu afegir massa paquets; la qual cosa farà\n"
-"que el vostre sistema de fitxers pogui quedar-se sense espai lliure,\n"
-"durant o després de la instal·lació; això és particularment\n"
-"perillós i ho hauríeu de considerar seriosament.\n"
+"Necessito contactar amb la pàgina web de MandrakeSoft per a baixar la llista "
+"de rèpliques.\n"
+"Comproveu per favor que la vostra xarxa funcioni.\n"
 "\n"
-"Realment voleu instal·lar els paquets seleccionats?"
+"Esteu d'acord en continuar?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "S'han seleccionat massa paquets"
+msgid "Please choose"
+msgstr "Si us plau escolliu"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Maximum information"
-msgstr "Màxima informació"
+#, fuzzy, c-format
+msgid "Selected size: %d MB"
+msgstr "%d paquets seleccionats: %.1f MB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Normal information"
-msgstr "Informació normal"
-
-#: ../rpmdrake:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Update source(s)"
-msgstr "Actualitza la(es) font(s)"
+msgid "Initializing..."
+msgstr "S'està inicialitzant..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Recarrega la llista de paquets"
+msgid "Save changes"
+msgstr "Desa canvis"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Reset the selection"
-msgstr "Esborra la selecció"
+msgid "Error during download"
+msgstr "S'ha produït un error durant la descàrrega"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "in files"
-msgstr "en fitxers"
+#, fuzzy, c-format
+msgid "Package installation..."
+msgstr "S'estan preparant els paquets per a la instal·lació..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "in descriptions"
-msgstr "Descripcions"
+msgid "Importance: "
+msgstr "Importància: %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "en noms"
+msgid ""
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
+msgstr ""
+"Per a satisfer les dependències, també s'han d'instal·lar els següent(s)\n"
+"paquet(s):\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by update availability"
-msgstr "per disponibilitat d'actualització"
+msgid "Add..."
+msgstr "Afegir..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by source repository"
-msgstr "per dipòsit de fonts"
+msgid "Unable to create medium."
+msgstr "No es pot crear el support."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by selection state"
-msgstr "per estat de selecció"
+msgid ""
+"The installation is finished; %s.\n"
+"\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
+msgstr ""
+"La instal·lació ha finalitzat; %s.\n"
+"\n"
+"Alguns fitxers de configuració han estat creats com a `.rpmnew' or `."
+"rpmsave',\n"
+"ara podeu inspeccionar-los per a empendre accions:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by size"
-msgstr "per mida"
+msgid "Browse..."
+msgstr "Navega..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by group"
-msgstr "per grup"
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "No es pot instal·lar el paquet"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "All packages,"
-msgstr "Paquets: "
+msgid "Info..."
+msgstr "Informacions"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Tots els paquets, alfabèticament"
+msgid "You need to insert the medium to continue"
+msgstr "Heu d'inserir el support per a continuar"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Opcions de Mandrake"
+msgid "Copying file for media `%s'..."
+msgstr ""
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "Suprimir"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Normal updates"
-msgstr "Actualitzacions normals"
+msgid "Preparing packages installation..."
+msgstr "S'estan preparant els paquets per a la instal·lació..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Bugfixes updates"
-msgstr "Mostra les actualitzacions de reparació d'errors"
+msgid "by media repository"
+msgstr "per dipòsit de fonts"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Security updates"
-msgstr "Mostra les actualitzacions de seguretat"
+msgid "No mirror"
+msgstr "rèplica:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Description: "
-msgstr "Descripcions"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to fill up at least the two first entries."
+msgstr "Es necessita que ompliu les dues primeres entrades."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Rao d'actualització: "
+msgid "Install"
+msgstr "Instal·lació"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Summary: "
-msgstr "Resum"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Japan"
+msgstr "Japó"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Importance: "
-msgstr "Importància: %s"
+#, c-format
+msgid "Do nothing"
+msgstr "No facis res"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "%s KB"
-msgstr "%.1f KB"
+msgid "No update"
+msgstr "Realitza les actualitzacions"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Size: "
-msgstr "Mida"
+msgid "Description: "
+msgstr "Descripcions"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Version: "
-msgstr "Versió:"
+#, c-format
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr ""
+"Avís: sembla ser que voleu afegir massa paquets; la qual cosa farà\n"
+"que el vostre sistema de fitxers pogui quedar-se sense espai lliure,\n"
+"durant o després de la instal·lació; això és particularment\n"
+"perillós i ho hauríeu de considerar seriosament.\n"
+"\n"
+"Realment voleu instal·lar els paquets seleccionats?"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -582,85 +721,65 @@ msgstr "Nom: %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Versió actualment instal·lada: "
+msgid "Inspect..."
+msgstr "s'està inspeccionant..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Source: "
-msgstr "Font"
+msgid "Editing media \"%s\":"
+msgstr "Editant les fonts \"%s\":"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "(Not available)"
-msgstr "(No disponible)"
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "S'estan preparant els paquets per a la instal·lació..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Changelog:\n"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Files:\n"
-msgstr "/_Fitxer"
+msgid "Australia"
+msgstr "Austràlia"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Selected size: %d MB"
-msgstr "%d paquets seleccionats: %.1f MB"
+msgid "Installation finished"
+msgstr "Instal·lat"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Seleccionats: %d MB / Espai lliure en disc: %d MB"
+msgid "by update availability"
+msgstr "per disponibilitat d'actualització"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
-msgstr ""
-"A causa de les dependències, els següent(s) paquet(s) s'han de "
-"deseleccionar\n"
-"ara:\n"
-"\n"
+msgid "Poland"
+msgstr "Polònia"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr ""
-"Ho sento, no he pogut seleccionar els següent(s) paquet(s):\n"
-"\n"
+msgid "Version: "
+msgstr "Versió:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "conflictes amb"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+"Podeu especificar un usuari/contraenya en la autentificació del servidor "
+"intermediari:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "No es pot instal·lar el paquet"
+msgid "Upgradable"
+msgstr "Actualitza"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
+msgid " done."
 msgstr ""
-"Per a satisfer les dependències, també s'han d'instal·lar els següent(s)\n"
-"paquet(s):\n"
-"\n"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Software Packages Installation"
+msgstr "S'estan preparant els paquets per a la instal·lació..."
 
 #: ../rpmdrake:1
 #, c-format
@@ -669,643 +788,524 @@ msgstr "Es necessiten paquets addicionals"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "No es pot instal·lar el paquet"
+msgid "Bugfixes updates"
+msgstr "Mostra les actualitzacions de reparació d'errors"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
+msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"Per poder satisfer totes les dependències, els següent(s) paquet(s)\n"
-"cal que s'eliminin:\n"
+msgid "Germany"
+msgstr "Alemanya"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Cal esborrar paquets addicionals"
+msgid "Russia"
+msgstr "Rússia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "More information on package..."
-msgstr "Més informació del paquet..."
+msgid "Norway"
+msgstr "Noruega"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Information on packages"
-msgstr "No es pot obrir el paquet"
-
-#. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:1
-#, c-format
-msgid "More info"
-msgstr ""
+msgid "Problem during installation"
+msgstr "Hi ha hagut problemes durant la instal·lació"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Addable"
-msgstr "Afegible"
+msgid "Search"
+msgstr "Cerca"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Upgradable"
-msgstr "Actualitza"
+msgid "Edit a media"
+msgstr "Edita una font"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
+msgstr "República Txeca"
 
 #: ../rpmdrake:1
 #, c-format
 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."
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"La llista d'actualitzacions és buida. Això significa que no hi ha\n"
-"actualitzacions disponibles per als paquets instal·lats en el vostre "
-"ordinador,\n"
-"o que ja els heu instal·lat tots."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "No update"
-msgstr "Realitza les actualitzacions"
+#, c-format
+msgid "Stop"
+msgstr "Para"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(none)"
-msgstr "(cap)"
+msgid "Update"
+msgstr "Actualitza"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, listing packages..."
+msgid "Please wait, removing packages..."
 msgstr ""
 "Si us plau, espereu\n"
 "S'estan ordenant els paquets"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "No es pot obrir el paquet"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Es necessita un dels següents paquets:"
+msgid "Normal information"
+msgstr "Informació normal"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Si us plau escolliu"
+msgid "Media: "
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr "S'han detectat conflictes"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Selected"
-msgstr "No en seleccionis cap"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "S'està descarregant el paquet '%s' (%s/%s)..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results"
-msgstr "Resultats de la cerca"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Seleccionats: %d MB / Espai lliure en disc: %d MB"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Stop"
-msgstr "Para"
+msgid "Media"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Si us plau espereu, s'està buscant..."
+msgid "Spain"
+msgstr "Espanya"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Search results (none)"
-msgstr "Resultats de la cerca (cap)"
+#, fuzzy, c-format
+msgid "Normal updates"
+msgstr "Actualitzacions normals"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Other"
-msgstr "Altres"
+msgid "by selection state"
+msgstr "per estat de selecció"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Welcome to the packages source editor!\n"
-"\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
-"Benvinguts a l'editor de paquests fonts!\n"
-"\n"
-"Aquesta eina us ajudarà a configurar les fonts dels paquests que voleu "
-"utilitzar en\n"
-"el vostre ordinador. Això permetrà que s'instal·lin nous paquets de "
-"programari \n"
-"o que es facin actualitzacions del sistema."
+"Per favor espereu, baixant les adreces de les rèpliques des de la web de "
+"MandrakeSoft."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Save and quit"
-msgstr "Desa i surt"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Error..."
+msgid "Login:"
+msgstr "Entrada:"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Update..."
-msgstr "Actualitza"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add..."
-msgstr "Afegir..."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Edit"
-msgstr "Edita"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Source"
-msgstr "Font"
+msgid "Adding a media:"
+msgstr "Afegint una font:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Enabled?"
-msgstr "Habilitat?"
+msgid "Austria"
+msgstr "Àustria"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure sources"
-msgstr "Configureu les fonts"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Fatal error"
+msgstr "Error de fitxer"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Password:"
-msgstr "Contrasenya:"
+#, fuzzy, c-format
+msgid "Update..."
+msgstr "Actualitza"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "User:"
-msgstr "Nom d'usuari:"
+msgid "Starting download of `%s'..."
+msgstr "S'està verificant la signatura de '%s' ..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr ""
-"Podeu especificar un usuari/contraenya en la autentificació del servidor "
-"intermediari:"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Proxy hostname:"
-msgstr "Nom d'usuari del servidor intermediari:"
+msgid "(none)"
+msgstr "(cap)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+"Removing these packages would break your system, sorry:\n"
+"\n"
 msgstr ""
-"Si necessiteu un servidor intermediari, entreu el nom de l'ordinador central "
-"i un port opcional (sintaxi: <proxyhost[:port]>):"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure proxies"
-msgstr "Configureu els servidors intermediaris(proxies)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Si us plau, espereu, s'està actualitzant el suport..."
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "S'està instal·lant el paquet '%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "Per tal de desar els canvis, heu d'inserir el support en la unitat."
+msgid "Currently installed version: "
+msgstr "Versió actualment instal·lada: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "Heu d'inserir el support per a continuar"
+msgid "Other"
+msgstr "Altres"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "Desa canvis"
+msgid "Reason for update: "
+msgstr "Rao d'actualització: "
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Camí relatiu a la síntesi/hdlist: "
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Please choose the desired mirror."
+msgstr "Si us plau, seleccioneu una rèplica d'aquesta llista"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "Edit"
+msgstr "Edita"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "Editant les fonts \"%s\":"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Edit a source"
-msgstr "Edita una font"
+msgid "Please wait, finding available packages..."
+msgstr ""
+"Si us plau, espereu mentre es cerca la llista de paquets d'actualització..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Si us plau espereu, s'està afegint el suport..."
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Camí relatiu a la síntesi/hdlist: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Type of source:"
-msgstr "Tipus de font:"
+msgid "Search results (none)"
+msgstr "Resultats de la cerca (cap)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Afegint una font:"
+msgid "Danmark"
+msgstr "Dinamarca"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
-msgstr ""
-"Ja hi ha un support amb aquest nom, realment\n"
-"voleu reemplaçar-lo?"
+msgid "China"
+msgstr "Xina"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Es necessita que ompliu les dues primeres entrades."
+msgid "United States"
+msgstr "Estats Units"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Name:"
-msgstr "Nom"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Login:"
-msgstr "Entrada:"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Choose a mirror..."
-msgstr "Escolliu una rèplica..."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Browse..."
-msgstr "Navega..."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Path or mount point:"
-msgstr "Camí o punt de muntatge:"
+msgid "changes:"
+msgstr "Paquets: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Removable device"
-msgstr "Dispositius extraïbles"
+msgid "Some additional packages need to be removed"
+msgstr "Cal esborrar paquets addicionals"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "Servidor HTTP"
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "Servidor FTP"
+msgid "No"
+msgstr "No"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Path:"
-msgstr "Port:"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Local files"
-msgstr "Fitxers locals"
+msgid "Configure medias"
+msgstr "Configureu les fonts"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add a source"
+#, fuzzy, c-format
+msgid "Add a media"
 msgstr "Afegeix una font"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr "No es pot actualitzar el support; es deshabilitarà automàticament."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Unable to create medium."
-msgstr "No es pot crear el support."
+msgid "Summary: "
+msgstr "Resum"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Update"
-msgstr "Actualitza"
+msgid "Canada"
+msgstr "Canadà"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Seleccioneu la(es) font(s) que voleu actualitzar:"
+msgid "Greece"
+msgstr "Grècia"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Si us plau espereu, actualitzant dades..."
+msgid ""
+"There was an error downloading the mirrors list:\n"
+"\n"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
+msgstr ""
+"Hi ha hagut un error baixant la llista de rèpliques:\n"
+"\n"
+"%s\n"
+"La xarxa, o la web de MandrakeSoft, deuen ser inaccessibles.\n"
+"Per favor, proveu-ho més tard."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid " failed!"
-msgstr "en fitxers"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid " done."
-msgstr ""
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Perdoneu, necessiteu ser root per instal·lar paquets."
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Download of `%s', speed:%s"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Path:"
+msgstr "Port:"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during removal"
+msgstr "Hi ha hagut un problema durant la instal·lació"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "S'està verificant la signatura de '%s' ..."
+msgid "Selected"
+msgstr "No en seleccionis cap"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr ""
+msgid "Netherlands"
+msgstr "Paísos Baixos"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr ""
+msgid "Addable"
+msgstr "Afegible"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr ""
+msgid "(Not available)"
+msgstr "(No disponible)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please choose the desired mirror."
-msgstr "Si us plau, seleccioneu una rèplica d'aquesta llista"
-
-#: ../rpmdrake.pm:1
-#, c-format
 msgid ""
-"I can't find any suitable mirror.\n"
+"Sorry, the following package(s) can't be selected:\n"
 "\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
-msgstr ""
-"No he pogut trobar cap rèplica adecuada.\n"
+"%s\n"
 "\n"
-"Hi poden haver diverses raons per aquest problema; el cas més freqüent es\n"
-"quan l'arquitectura del seu processador no és suportada \n"
-"per Mandrake Linux Official Updates."
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "No mirror"
-msgstr "rèplica:"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid ""
-"There was an error downloading the mirrors list:\n"
+"Reasons follow:\n"
 "\n"
-"%s\n"
-"The network, or MandrakeSoft website, are maybe unavailable.\n"
-"Please try again later."
+"%s"
 msgstr ""
-"Hi ha hagut un error baixant la llista de rèpliques:\n"
+"Ho sento, no he pogut seleccionar els següent(s) paquet(s):\n"
 "\n"
-"%s\n"
-"La xarxa, o la web de MandrakeSoft, deuen ser inaccessibles.\n"
-"Per favor, proveu-ho més tard."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Not selected"
+msgstr "S'han detectat conflictes"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
-msgstr "S'ha produït un error durant la descàrrega"
+msgid "Software Packages Removal"
+msgstr "Eliminació de Paquets de Programari"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
-"Per favor espereu, baixant les adreces de les rèpliques des de la web de "
-"MandrakeSoft."
+msgid "Sweden"
+msgstr "Suècia"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
 "\n"
-"Is it ok to continue?"
-msgstr ""
-"Necessito contactar amb la pàgina web de MandrakeSoft per a baixar la llista "
-"de rèpliques.\n"
-"Comproveu per favor que la vostra xarxa funcioni.\n"
 "\n"
-"Esteu d'acord en continuar?"
+"Error(s) reported:\n"
+"%s"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United States"
-msgstr "Estats Units"
+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 ""
+"La llista d'actualitzacions és buida. Això significa que no hi ha\n"
+"actualitzacions disponibles per als paquets instal·lats en el vostre "
+"ordinador,\n"
+"o que ja els heu instal·lat tots."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "Xina"
+msgid "Examining file of media `%s'..."
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Regne Unit"
+msgid "Download of `%s', speed:%s"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Taiwan"
+msgid "One of the following packages is needed:"
+msgstr "Es necessita un dels següents paquets:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Sweden"
-msgstr "Suècia"
+msgid "Quit"
+msgstr "Surt"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Russia"
-msgstr "Rússia"
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Necessito contactar amb la rèplica per a obtenir les últimes\n"
+"actualitzacions de paquets. Comproveu que la xarxa funcioni ara.\n"
+"\n"
+"Esteu d'acord en continuar?"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Portugal"
-msgstr "Port:"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Poland"
-msgstr "Polònia"
+msgid "Update media(s)"
+msgstr "Actualitza la(es) font(s)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Norway"
-msgstr "Noruega"
+msgid "Ok"
+msgstr "D'acord"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Netherlands"
-msgstr "Paísos Baixos"
+msgid "Please wait, adding medium..."
+msgstr "Si us plau espereu, s'està afegint el suport..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Korea"
-msgstr "Imposa"
+msgid "Unable to get source packages."
+msgstr "Trieu els paquets"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "Japó"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Italy"
-msgstr "Instal·lació"
+msgid "Too many packages are selected"
+msgstr "S'han seleccionat massa paquets"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Israel"
-msgstr "Instal·lació"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Greece"
-msgstr "Grècia"
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"Benvinguts a l'editor de paquests fonts!\n"
+"\n"
+"Aquesta eina us ajudarà a configurar les fonts dels paquests que voleu "
+"utilitzar en\n"
+"el vostre ordinador. Això permetrà que s'instal·lin nous paquets de "
+"programari \n"
+"o que es facin actualitzacions del sistema."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "France"
-msgstr "Imposa"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Finland"
-msgstr "Finlàndia"
+msgid "%s conflicts with %s"
+msgstr "conflictes amb"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Spain"
-msgstr "Espanya"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Benvinguts al MandrakeUpdate!\n"
+"\n"
+"Aquesta eina us ajudarà a escollir les actualitzacions que voleu instal·lar "
+"en el vostre\n"
+"ordinador."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Danmark"
-msgstr "Dinamarca"
+msgid "Mandrake choices"
+msgstr "Opcions de Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "Alemanya"
+msgid "Changelog:\n"
+msgstr "Changelog:\n"
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Czech Republic"
-msgstr "República Txeca"
+#, fuzzy, c-format
+msgid "Korea"
+msgstr "Imposa"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Costa Rica"
+msgid "Removable device"
+msgstr "Dispositius extraïbles"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "Canadà"
+msgid "Belgium"
+msgstr "Bèlgica"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Brazil"
-msgstr "Brasil"
+msgid "Change medium"
+msgstr "Canvieu el suport"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Belgium"
-msgstr "Bèlgica"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mandrake Update"
+msgstr "Preferències del MandrakeUpdate"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Austràlia"
+msgid "by size"
+msgstr "per mida"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Austria"
-msgstr "Àustria"
+msgid "FTP server"
+msgstr "Servidor FTP"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Info..."
-msgstr "Informacions"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "No"
-msgstr "No"
+msgid "Files:\n"
+msgstr "/_Fitxer"
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Yes"
-msgstr "Sí"
+#, fuzzy, c-format
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr "No es pot actualitzar el support; es deshabilitarà automàticament."
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -1579,6 +1579,13 @@ msgstr "Elimina el Programari"
 msgid "Software Sources Manager"
 msgstr "Manejador de Fonts del Programari"
 
+#, fuzzy
+#~ msgid "Source: "
+#~ msgstr "Font"
+
+#~ msgid "Source"
+#~ msgstr "Font"
+
 #~ msgid ""
 #~ "some packages failed to install\n"
 #~ "correctly"
@@ -1621,9 +1628,6 @@ msgstr "Manejador de Fonts del Programari"
 #~ "\n"
 #~ "Voleu provar algun altra rèplica?"
 
-#~ msgid "Error adding update medium"
-#~ msgstr "S'ha produït un error afegint el suport d'actualització"
-
 #, fuzzy
 #~ msgid "Please wait, contacting mirror to initialize updates packages."
 #~ msgstr ""
diff --git a/po/cs.po b/po/cs.po
index f70c684c..b39f08b1 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: 2003-03-03 20:20GMT\n"
 "Last-Translator: Michal Bukovjan <bukm@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -17,16 +17,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"Mohu pokra�ovat?"
+msgid "Enabled?"
+msgstr "Povolen?"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Cesta nebo přípojný bod:"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Portugal"
+msgstr "Portugalsko"
 
 #: ../rpmdrake:1
 #, c-format
@@ -46,104 +50,54 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"Vítejte v aplikaci Mandrake Update!\n"
-"\n"
-"Tento nástroj vám pomůže vybrat aktualizace, které chcete instalovat na\n"
-"vašem po�íta�i."
+msgid "by group"
+msgstr "podle skupiny"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
-msgstr ""
-"Vítejte v nástroji na odebírání balí�ků!\n"
-"\n"
-"Tento nástroj vám pomůže vybrat, které balí�ky chcete odstranit ze svého\n"
-"po�íta�e."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Při instalaci balí�ků došlo k chybě:\n"
-"\n"
-"%s"
+msgid "Name:"
+msgstr "Jméno:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Problem during removal"
-msgstr "Problém při odebírání"
+msgid "Italy"
+msgstr "Itálie"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "Prosím po�kejte, odebírám balí�ky..."
+msgid "How to choose manually your mirror"
+msgstr "Jak ru�ně vybrat vaše zrcadlo"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Prosím po�kejte, na�ítám databázi balí�ků..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Při instalaci balí�ků došlo k chybě:\n"
-"\n"
-"%s"
+msgid "URL:"
+msgstr "URL:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation failed"
-msgstr "Instalace selhala"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Připravuji balí�ky k instalaci..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Připravuji balí�ky k instalaci..."
+msgid "Some packages need to be removed"
+msgstr "Některé balí�ky musí být odebrány"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Všechny požadované balí�ky byly uspěšně nainstalovány."
+msgid "More information on package..."
+msgstr "Více informací o balí�ku..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Všechno bylo úspěšně nainstalováno."
+msgid "Yes"
+msgstr "Ano"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
 msgstr ""
-"Instalace byla dokon�ena; %s.\n"
+"Kvůli jejich závislostem je třeba nyní zrušit výběr následujících\n"
+"balí�ků:\n"
 "\n"
-"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:1
 #, fuzzy, c-format
@@ -151,459 +105,453 @@ msgid "everything was installed correctly"
 msgstr "Všechno bylo úspěšně nainstalováno."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Při instalaci nastaly problémy"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Instaluji balí�ek `%s' (%s/%s)..."
+msgid "%s KB"
+msgstr "%s kB"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Připravuji balí�ky k instalaci..."
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"Své požadované zrcadlo si můžete zvolit také ru�ně; chcete-li tak\n"
+"u�init, spusťte aplikaci Správce zdrojů software, a přidejte zdroj\n"
+"`Bezpe�nostní aktualizace'.\n"
+"\n"
+"Poté znovu spusťte aplikaci MandrakeUpdate."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
+"Welcome to the software removal tool!\n"
 "\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
 msgstr ""
+"Vítejte v nástroji na odebírání balí�ků!\n"
 "\n"
-"\n"
-"Nahlášené chyby:\n"
-"%s"
+"Tento nástroj vám pomůže vybrat, které balí�ky chcete odstranit ze svého\n"
+"po�íta�e."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"Instalace selhala, některé soubory chybí.\n"
-"Možná byste měl aktualizovat vaši databázi zdrojů."
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "Chcete-li uložit změny, musíte do zařízení vložit médium."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Uložit a ukon�it"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
+"There was a problem during the removal of packages:\n"
 "\n"
-"Do you want to continue installation?"
+"%s"
 msgstr ""
-"Následující balí�ky musí být odebrány, aby jiné mohly být aktualizovány:\n"
-"\n"
-"%s\n"
+"Při instalaci balí�ků došlo k chybě:\n"
 "\n"
-"Mohu pokra�ovat?"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Stahuji balí�ek `%s' (%s/%s)..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Cancel"
-msgstr "Zrušit"
+msgid "Size: "
+msgstr "Velikost: "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid "Security updates"
+msgstr "Bezpe�nostní aktualizace"
 
 #: ../rpmdrake:1
 #, fuzzy, 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:1
-#, c-format
-msgid "Change medium"
-msgstr "Změnit zdroj"
+msgid "Already existing update medias"
+msgstr "Chyba při přidávání zdroje pro aktualizaci"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "Inicializuji..."
+msgid "Maximum information"
+msgstr "VÅ¡echny informace"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Připravuji balí�ky k instalaci..."
+msgid "Proxy..."
+msgstr "Chyba..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
 msgstr ""
-"Promiňte, ale abyste mohl instalovat balí�ky, musíte být přihlášen jako "
-"uživatel root."
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Unable to get source packages."
-msgstr "Nelze získat balí�ky se zdroji."
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspect..."
-msgstr "Prozkoumat..."
+"Instalace selhala, některé soubory chybí.\n"
+"Možná byste měl aktualizovat vaši databázi zdrojů."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Installation finished"
-msgstr "Instalace dokon�ena"
+msgid "United Kingdom"
+msgstr "Velká Británie"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Nedělat nic"
+msgid "in names"
+msgstr "v názvech"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Použít .%s jako hlavní soubor"
+msgid ""
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
+msgstr ""
+"Nelze nalézt žádné vhodné zrcadlo.\n"
+"\n"
+"Tento problém může nastat z mnoha pří�in, nej�astější je případ,\n"
+"kdy architektura vašeho procesoru není podporovaná službou\n"
+"oficiálních aktualizací distribuce Mandrake Linux."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Remove .%s"
 msgstr "Odebrat .%s"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "changes:"
-msgstr "změny:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspecting %s"
-msgstr "Prohlížím %s"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Prosím po�kejte, hledám dostupné balí�ky..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "Prosím po�kejte, přidávám zdroj..."
+msgid "Finland"
+msgstr "Finsko"
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
+"The following packages have bad signatures:\n"
 "\n"
-"Then, restart MandrakeUpdate."
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"Své požadované zrcadlo si můžete zvolit také ru�ně; chcete-li tak\n"
-"u�init, spusťte aplikaci Správce zdrojů software, a přidejte zdroj\n"
-"`Bezpe�nostní aktualizace'.\n"
+"Následující balí�ky musí být odebrány, aby jiné mohly být aktualizovány:\n"
 "\n"
-"Poté znovu spusťte aplikaci MandrakeUpdate."
+"%s\n"
+"\n"
+"Mohu pokra�ovat?"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "How to choose manually your mirror"
-msgstr "Jak ru�ně vybrat vaše zrcadlo"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Examining distant file of media `%s'..."
+msgstr "Zkoumá se vzdálený soubor zdroje `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
+msgid "Verifying packages signatures..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Already existing update sources"
-msgstr ""
+msgid "France"
+msgstr "Francie"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "More info"
+msgstr "Více informací"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
+"%s\n"
 "\n"
 "Is it ok to continue?"
 msgstr ""
-"Je třeba kontaktovat zrcadlo a stáhnout poslední informace o balí�cích\n"
-"k aktualizaci. Ověřte prosím, zda vaše síť běží v pořádku.\n"
+"%s\n"
 "\n"
 "Mohu pokra�ovat?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Reload the packages list"
+msgstr "Znovu na�íst seznam balí�ků"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Vyberte zrcadlo..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Chyba souboru"
+msgid "Some packages can't be installed"
+msgstr "Balí�ek `%s' nelze nainstalovat\n"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
+msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Připravuji balí�ky k instalaci..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Mandrake Update"
+msgid "All packages,"
+msgstr "Všechny balí�ky,"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Software Packages Removal"
-msgstr "Odstranění balí�ků software"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Type of media:"
+msgstr "Typ zdroje:"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Quit"
-msgstr "Konec"
+msgid "in files"
+msgstr "v souborech"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Instalovat"
+msgid "All requested packages were installed successfully."
+msgstr "Všechny požadované balí�ky byly uspěšně nainstalovány."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove"
-msgstr "Odstranit"
+msgid "Proxy hostname:"
+msgstr "Název po�íta�e proxy:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Help"
-msgstr "Nápověda"
+msgid "Local files"
+msgstr "Lokální soubory"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search"
-msgstr "Hledat"
+msgid "Inspecting %s"
+msgstr "Prohlížím %s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Find:"
-msgstr "Najít:"
+msgid "Israel"
+msgstr "Izrael"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Následující balí�ky musí být odebrány, aby jiné mohly být aktualizovány:\n"
-"\n"
-"%s\n"
-"\n"
-"Mohu pokra�ovat?"
+msgid "Help"
+msgstr "Nápověda"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Některé balí�ky musí být odebrány"
+msgid "HTTP server"
+msgstr "HTTP server"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
-"\n"
-"Do you really want to install all the selected packages?"
-msgstr ""
-"Varování: Zdá se, že se pokoušíte přidat takové množství\n"
-"balí�ků, že vám během instalace nebo po ní může dojít místo\n"
-"na disku; to je velmi nebezpe�né a proto by se mělo\n"
-"postupovat opatrnÄ›.\n"
-"\n"
-"Opravdu chcete nainstalovat všechny vybrané balí�ky?"
+msgid "Installation failed"
+msgstr "Instalace selhala"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Je vybráno příliš mnoho balí�ků"
+msgid "Use .%s as main file"
+msgstr "Použít .%s jako hlavní soubor"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "VÅ¡echny informace"
+msgid "Search results"
+msgstr "Výsledky hledání"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Normal information"
-msgstr "Běžné informace"
+msgid " failed!"
+msgstr " selhalo!"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Update source(s)"
-msgstr "Aktualizovat zdroj(e)"
+msgid "Brazil"
+msgstr "Brazílie"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Znovu na�íst seznam balí�ků"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"Takto pojmenovaný zdroj již existuje, chcete\n"
+"jej opravdu nahradit?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "Nulovat výběr"
+msgid "Find:"
+msgstr "Najít:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "v souborech"
+msgid "All packages, alphabetical"
+msgstr "Všechny balí�ky, abecedně"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "v popisech"
+msgid "Please wait, searching..."
+msgstr "Prosím po�kejte, hledám..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "v názvech"
+msgid "Please wait, reading packages database..."
+msgstr "Prosím po�kejte, na�ítám databázi balí�ků..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by update availability"
-msgstr "podle dostupnosti aktualizace"
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "Nelze otevřít balí�ek `%s'\n"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by source repository"
-msgstr "podle umístění zdroje"
+#, fuzzy, 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:1
 #, c-format
-msgid "by selection state"
-msgstr "podle stavu výběru"
+msgid "Reset the selection"
+msgstr "Nulovat výběr"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by size"
-msgstr "podle velikosti"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"Pokud potřebujete proxy, zadejte název po�íta�e a volitelně port (ve tvaru "
+"<proxyhost[:port]>):"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-msgstr "podle skupiny"
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
+"Kvůli jejich závislostem je třeba odstranit také následující\n"
+"balí�ky:\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "All packages,"
-msgstr "Všechny balí�ky,"
+msgid "Costa Rica"
+msgstr "Kostarika"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "All packages, alphabetical"
-msgstr "Všechny balí�ky, abecedně"
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Při instalaci balí�ků došlo k chybě:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Volby Mandrake"
+msgid "Please wait, removing medium..."
+msgstr "Prosím po�kejte, odstraňuji zdroj..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
-msgstr "Běžné aktualizace"
+msgid "Password:"
+msgstr "Heslo:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Opravy chyb"
+msgid "Taiwan"
+msgstr "Taiwan"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Security updates"
-msgstr "Bezpe�nostní aktualizace"
+msgid "User:"
+msgstr "Uživatel:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Description: "
-msgstr "Popis: "
+msgid "Please wait, updating medium..."
+msgstr "Prosím po�kejte, aktualizuji zdroj..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Důvod pro aktualizaci: "
+msgid "Please wait, listing packages..."
+msgstr "Prosím po�kejte, vypisuji balí�ky..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Summary: "
-msgstr "Shrnutí: "
+msgid "Information on packages"
+msgstr "Informace o balí�cích"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Importance: "
-msgstr "Důležitost: "
+msgid "Cancel"
+msgstr "Zrušit"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s kB"
+msgid "Everything installed successfully"
+msgstr "Všechno bylo úspěšně nainstalováno."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Size: "
-msgstr "Velikost: "
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Select the media(s) you wish to update:"
+msgstr "Vyberte zdroj(e), které si přejete aktualizovat:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Version: "
-msgstr "Verze: "
+msgid "Please wait, updating media..."
+msgstr "Prosím po�kejte, aktualizuji zdroje..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "Název: "
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Nyní nainstalovaná verze: "
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Následující balí�ky musí být odebrány, aby jiné mohly být aktualizovány:\n"
+"\n"
+"%s\n"
+"\n"
+"Mohu pokra�ovat?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Source: "
-msgstr "Zdroj: "
+msgid "in descriptions"
+msgstr "v popisech"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(Not available)"
-msgstr "(Není k dispozici)"
+msgid "Configure proxies"
+msgstr "Nastavit proxy"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Změny:\n"
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Je třeba kontaktovat webové stránky spole�nosti MandrakeSoft a stáhnout\n"
+"seznam zrcadel. Zkontrolujte prosím, zda-li je připojení k síti v pořádku.\n"
+"\n"
+"Mohu pokra�ovat?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Files:\n"
-msgstr "Soubory:\n"
+msgid "Please choose"
+msgstr "Prosím vyberte"
 
 #: ../rpmdrake:1
 #, c-format
@@ -612,43 +560,28 @@ msgstr "Velikost výběru: %d MB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Vybráno: %d MB / Volné místo na disku: %d MB"
+msgid "Initializing..."
+msgstr "Inicializuji..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
-msgstr ""
-"Kvůli jejich závislostem je třeba nyní zrušit výběr následujících\n"
-"balí�ků:\n"
-"\n"
+msgid "Save changes"
+msgstr "Uložit změny"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr ""
-"Promiňte, ale následující balí�ky nelze vybrat:\n"
-"\n"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "Chyba při stahování"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "je v konfliktu s"
+msgid "Package installation..."
+msgstr "Připravuji balí�ky k instalaci..."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Balí�ek `%s' nelze nainstalovat\n"
+#, c-format
+msgid "Importance: "
+msgstr "Důležitost: "
 
 #: ../rpmdrake:1
 #, c-format
@@ -661,311 +594,307 @@ msgstr ""
 "balí�ky:\n"
 "\n"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "Jsou potřeba další balí�ky"
+msgid "Add..."
+msgstr "Přidat..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "Balí�ek `%s' nelze nainstalovat\n"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "Nelze vytvořit zdroj."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Removing these packages would break your system, sorry:\n"
+"The installation is finished; %s.\n"
 "\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
 msgstr ""
-"Odstranění těchto balí�ků by poškodilo váš systém, omlouváme se:\n"
+"Instalace byla dokon�ena; %s.\n"
 "\n"
+"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:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"Kvůli jejich závislostem je třeba odstranit také následující\n"
-"balí�ky:\n"
-"\n"
+msgid "Browse..."
+msgstr "Probírat..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "Balí�ek `%s' nelze nainstalovat\n"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Je třeba odstranit některé další balí�ky"
+msgid "Info..."
+msgstr "Informace..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "More information on package..."
-msgstr "Více informací o balí�ku..."
+msgid "You need to insert the medium to continue"
+msgstr "Chcete-li pokra�ovat, musíte vložit médium"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Copying file for media `%s'..."
+msgstr "Kopíruje se soubor pro zdroj `%s'..."
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Information on packages"
-msgstr "Informace o balí�cích"
+msgid "Remove"
+msgstr "Odstranit"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "More info"
-msgstr "Více informací"
+msgid "Preparing packages installation..."
+msgstr "Připravuji balí�ky k instalaci..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "by media repository"
+msgstr "podle umístění zdroje"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "Lze přidat"
+msgid "No mirror"
+msgstr "Není zrcadlo"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Upgradable"
-msgstr "Lze aktualizovat"
+msgid "You need to fill up at least the two first entries."
+msgstr "Musíte vyplnit alespoň první dvě polí�ka."
 
 #: ../rpmdrake:1
 #, c-format
-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 ""
-"Seznam aktualizací je prázdný. To znamená, že bu� nejsou k dispozici\n"
-"žádné aktualizace pro balí�ky instalované na vašem po�íta�i, nebo už\n"
-"máte všechny aktualizace nainstalované."
+msgid "Install"
+msgstr "Instalovat"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "No update"
-msgstr "Žádná aktualizace"
+msgid "Japan"
+msgstr "Japonsko"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "(none)"
-msgstr "(žádná)"
+msgid "Do nothing"
+msgstr "Nedělat nic"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Prosím po�kejte, vypisuji balí�ky..."
+msgid "No update"
+msgstr "Žádná aktualizace"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "Nelze otevřít balí�ek `%s'\n"
+#, c-format
+msgid "Description: "
+msgstr "Popis: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Je třeba jeden z následujících balí�ků:"
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr ""
+"Varování: Zdá se, že se pokoušíte přidat takové množství\n"
+"balí�ků, že vám během instalace nebo po ní může dojít místo\n"
+"na disku; to je velmi nebezpe�né a proto by se mělo\n"
+"postupovat opatrnÄ›.\n"
+"\n"
+"Opravdu chcete nainstalovat všechny vybrané balí�ky?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Prosím vyberte"
+msgid "Name: "
+msgstr "Název: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Inspect..."
+msgstr "Prozkoumat..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Not selected"
-msgstr "Nalezeny konflikty"
+msgid "Editing media \"%s\":"
+msgstr "Upravuji zdroj \"%s\":"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Selected"
-msgstr "Vybraný"
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "Připravuji balí�ky k instalaci..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results"
-msgstr "Výsledky hledání"
+msgid "Australia"
+msgstr "Austrálie"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Stop"
-msgstr "Stop"
+msgid "Installation finished"
+msgstr "Instalace dokon�ena"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Prosím po�kejte, hledám..."
+msgid "by update availability"
+msgstr "podle dostupnosti aktualizace"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Výsledky hledání (žádné)"
+msgid "Poland"
+msgstr "Polsko"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Other"
-msgstr "Jiné"
+msgid "Version: "
+msgstr "Verze: "
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the packages source editor!\n"
-"\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
-msgstr ""
-"Vítejte do editoru zdrojů balí�ků!\n"
-"\n"
-"Tento nástroj vám pomůže nastavit zdroje balí�ků, které si přejete na vašem\n"
-"po�íta�i používat. Tyto zdroje pak budou k dispozici při instalaci nových\n"
-"balí�ků software nebo při jejich aktualizaci."
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Pro ověření přístupu k proxy lze zadat uživatelské jméno a heslo:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
-msgstr "Uložit a ukon�it"
+msgid "Upgradable"
+msgstr "Lze aktualizovat"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid " done."
+msgstr " hotovo."
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Chyba..."
+msgid "Software Packages Installation"
+msgstr "Připravuji balí�ky k instalaci..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Update..."
-msgstr "Aktualizovat..."
+msgid "Additional packages needed"
+msgstr "Jsou potřeba další balí�ky"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "Přidat..."
+msgid "Bugfixes updates"
+msgstr "Opravy chyb"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "Upravit"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "Stahování `%s', zbývající �as: %s, rychlost: %s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Source"
-msgstr "Zdroj"
+msgid "Germany"
+msgstr "Německo"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Enabled?"
-msgstr "Povolen?"
+msgid "Russia"
+msgstr "Rusko"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Configure sources"
-msgstr "Nastavit zdroje"
+msgid "Norway"
+msgstr "Norsko"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Password:"
-msgstr "Heslo:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during installation"
+msgstr "Při instalaci nastaly problémy"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "User:"
-msgstr "Uživatel:"
+msgid "Search"
+msgstr "Hledat"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "Pro ověření přístupu k proxy lze zadat uživatelské jméno a heslo:"
+#, fuzzy, c-format
+msgid "Edit a media"
+msgstr "Upravit zdroj"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "Název po�íta�e proxy:"
+msgid "Czech Republic"
+msgstr "Česká republika"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"Pokud potřebujete proxy, zadejte název po�íta�e a volitelně port (ve tvaru "
-"<proxyhost[:port]>):"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Nastavit proxy"
+msgid "Stop"
+msgstr "Stop"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Prosím po�kejte, aktualizuji zdroj..."
+msgid "Update"
+msgstr "Aktualizovat"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "Chcete-li uložit změny, musíte do zařízení vložit médium."
+msgid "Please wait, removing packages..."
+msgstr "Prosím po�kejte, odebírám balí�ky..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "Chcete-li pokra�ovat, musíte vložit médium"
+msgid "Normal information"
+msgstr "Běžné informace"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "Uložit změny"
+msgid "Media: "
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Relativní cesta pro soubor hdlist nebo syntézu:"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "Stahuji balí�ek `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "Upravuji zdroj \"%s\":"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Vybráno: %d MB / Volné místo na disku: %d MB"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit a source"
-msgstr "Upravit zdroj"
+msgid "Media"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Prosím po�kejte, odstraňuji zdroj..."
+msgid "Spain"
+msgstr "Španělsko"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Type of source:"
-msgstr "Typ zdroje:"
+msgid "Normal updates"
+msgstr "Běžné aktualizace"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Přidávám zdroj:"
+msgid "by selection state"
+msgstr "podle stavu výběru"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
-"Takto pojmenovaný zdroj již existuje, chcete\n"
-"jej opravdu nahradit?"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Musíte vyplnit alespoň první dvě polí�ka."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Name:"
-msgstr "Jméno:"
+"Prosím po�kejte, stahuji adresy zrcadel ze stránek spole�nosti MandrakeSoft."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -973,143 +902,148 @@ msgid "Login:"
 msgstr "Přihlášení:"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Choose a mirror..."
-msgstr "Vyberte zrcadlo..."
+#, fuzzy, c-format
+msgid "Adding a media:"
+msgstr "Přidávám zdroj:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Browse..."
-msgstr "Probírat..."
+msgid "Austria"
+msgstr "Rakousko"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Path or mount point:"
-msgstr "Cesta nebo přípojný bod:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Fatal error"
+msgstr "Chyba souboru"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Removable device"
-msgstr "Vyjímatelné zařízení"
+msgid "Update..."
+msgstr "Aktualizovat..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "Kontroluji signaturu `%s'..."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "HTTP server"
+msgid "(none)"
+msgstr "(žádná)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "FTP server"
-msgstr "FTP server"
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
+"Odstranění těchto balí�ků by poškodilo váš systém, omlouváme se:\n"
+"\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Path:"
-msgstr "Cesta:"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Instaluji balí�ek `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "Lokální soubory"
+msgid "Currently installed version: "
+msgstr "Nyní nainstalovaná verze: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add a source"
-msgstr "Přidat zdroj"
+msgid "Other"
+msgstr "Jiné"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr "Nelze aktualizovat zdroj, bude automaticky vypnut."
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "Důvod pro aktualizaci: "
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to create medium."
-msgstr "Nelze vytvořit zdroj."
+msgid "Please choose the desired mirror."
+msgstr "Vyberte prosím vhodné zrcadlo."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "Aktualizovat"
+msgid "Edit"
+msgstr "Upravit"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Vyberte zdroj(e), které si přejete aktualizovat:"
+msgid "Please wait, finding available packages..."
+msgstr "Prosím po�kejte, hledám dostupné balí�ky..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Prosím po�kejte, aktualizuji zdroje..."
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Relativní cesta pro soubor hdlist nebo syntézu:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " failed!"
-msgstr " selhalo!"
+msgid "Search results (none)"
+msgstr "Výsledky hledání (žádné)"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid " done."
-msgstr " hotovo."
+msgid "Danmark"
+msgstr "Dánsko"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "Stahování `%s', rychlost: %s"
+msgid "China"
+msgstr "Čína"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "Stahování `%s', zbývající �as: %s, rychlost: %s"
+msgid "United States"
+msgstr "Spojené státy"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "Kontroluji signaturu `%s'..."
+#: ../rpmdrake:1
+#, c-format
+msgid "changes:"
+msgstr "změny:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "Zkoumá se vzdálený soubor zdroje `%s'..."
+msgid "Some additional packages need to be removed"
+msgstr "Je třeba odstranit některé další balí�ky"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "Zkoumá se soubor zdroje `%s'..."
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "Kopíruje se soubor pro zdroj `%s'..."
+msgid "No"
+msgstr "Ne"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure medias"
+msgstr "Nastavit zdroje"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a media"
+msgstr "Přidat zdroj"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Please choose the desired mirror."
-msgstr "Vyberte prosím vhodné zrcadlo."
+msgid "Summary: "
+msgstr "Shrnutí: "
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
-msgstr ""
-"Nelze nalézt žádné vhodné zrcadlo.\n"
-"\n"
-"Tento problém může nastat z mnoha pří�in, nej�astější je případ,\n"
-"kdy architektura vašeho procesoru není podporovaná službou\n"
-"oficiálních aktualizací distribuce Mandrake Linux."
+msgid "Canada"
+msgstr "Kanada"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No mirror"
-msgstr "Není zrcadlo"
+msgid "Greece"
+msgstr "Řecko"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1126,179 +1060,245 @@ msgstr ""
 "Je možné, že síť nebo stránky spole�nosti MandrakeSoft nejsou k dispozici.\n"
 "Zkuste to prosím později."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr ""
+"Promiňte, ale abyste mohl instalovat balí�ky, musíte být přihlášen jako "
+"uživatel root."
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Error during download"
-msgstr "Chyba při stahování"
+msgid "Path:"
+msgstr "Cesta:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
-"Prosím po�kejte, stahuji adresy zrcadel ze stránek spole�nosti MandrakeSoft."
+msgid "Problem during removal"
+msgstr "Problém při odebírání"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Je třeba kontaktovat webové stránky spole�nosti MandrakeSoft a stáhnout\n"
-"seznam zrcadel. Zkontrolujte prosím, zda-li je připojení k síti v pořádku.\n"
-"\n"
-"Mohu pokra�ovat?"
+msgid "Selected"
+msgstr "Vybraný"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United States"
-msgstr "Spojené státy"
+msgid "Netherlands"
+msgstr "Nizozemí"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "China"
-msgstr "Čína"
+msgid "Addable"
+msgstr "Lze přidat"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Velká Británie"
+msgid "(Not available)"
+msgstr "(Není k dispozici)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
+msgstr ""
+"Promiňte, ale následující balí�ky nelze vybrat:\n"
+"\n"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Not selected"
+msgstr "Nalezeny konflikty"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Taiwan"
+msgid "Software Packages Removal"
+msgstr "Odstranění balí�ků software"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Sweden"
 msgstr "Švédsko"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Russia"
-msgstr "Rusko"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
+msgstr ""
+"\n"
+"\n"
+"Nahlášené chyby:\n"
+"%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Portugal"
-msgstr "Portugalsko"
+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 ""
+"Seznam aktualizací je prázdný. To znamená, že bu� nejsou k dispozici\n"
+"žádné aktualizace pro balí�ky instalované na vašem po�íta�i, nebo už\n"
+"máte všechny aktualizace nainstalované."
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Poland"
-msgstr "Polsko"
+#, fuzzy, c-format
+msgid "Examining file of media `%s'..."
+msgstr "Zkoumá se soubor zdroje `%s'..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Norway"
-msgstr "Norsko"
+msgid "Download of `%s', speed:%s"
+msgstr "Stahování `%s', rychlost: %s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Netherlands"
-msgstr "Nizozemí"
+msgid "One of the following packages is needed:"
+msgstr "Je třeba jeden z následujících balí�ků:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Korea"
-msgstr "Korea"
+msgid "Quit"
+msgstr "Konec"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "Japonsko"
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Je třeba kontaktovat zrcadlo a stáhnout poslední informace o balí�cích\n"
+"k aktualizaci. Ověřte prosím, zda vaše síť běží v pořádku.\n"
+"\n"
+"Mohu pokra�ovat?"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Italy"
-msgstr "Itálie"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update media(s)"
+msgstr "Aktualizovat zdroj(e)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Israel"
-msgstr "Izrael"
+msgid "Ok"
+msgstr "Ok"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Greece"
-msgstr "Řecko"
+msgid "Please wait, adding medium..."
+msgstr "Prosím po�kejte, přidávám zdroj..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "France"
-msgstr "Francie"
+msgid "Unable to get source packages."
+msgstr "Nelze získat balí�ky se zdroji."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "Finsko"
+msgid "Too many packages are selected"
+msgstr "Je vybráno příliš mnoho balí�ků"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Spain"
-msgstr "Španělsko"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"Vítejte do editoru zdrojů balí�ků!\n"
+"\n"
+"Tento nástroj vám pomůže nastavit zdroje balí�ků, které si přejete na vašem\n"
+"po�íta�i používat. Tyto zdroje pak budou k dispozici při instalaci nových\n"
+"balí�ků software nebo při jejich aktualizaci."
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Danmark"
-msgstr "Dánsko"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
+msgstr "je v konfliktu s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "Německo"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Vítejte v aplikaci Mandrake Update!\n"
+"\n"
+"Tento nástroj vám pomůže vybrat aktualizace, které chcete instalovat na\n"
+"vašem po�íta�i."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Česká republika"
+msgid "Mandrake choices"
+msgstr "Volby Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Kostarika"
+msgid "Changelog:\n"
+msgstr "Změny:\n"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "Kanada"
+msgid "Korea"
+msgstr "Korea"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Brazil"
-msgstr "Brazílie"
+msgid "Removable device"
+msgstr "Vyjímatelné zařízení"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Belgie"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Austrálie"
+msgid "Change medium"
+msgstr "Změnit zdroj"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "Rakousko"
+msgid "Mandrake Update"
+msgstr "Mandrake Update"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
-msgstr "Informace..."
+msgid "by size"
+msgstr "podle velikosti"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "Ne"
+msgid "FTP server"
+msgstr "FTP server"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "Ano"
+msgid "Files:\n"
+msgstr "Soubory:\n"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr "Nelze aktualizovat zdroj, bude automaticky vypnut."
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -1571,6 +1571,12 @@ msgstr "Odebrat software"
 msgid "Software Sources Manager"
 msgstr "Správce zdrojů software"
 
+#~ msgid "Source: "
+#~ msgstr "Zdroj: "
+
+#~ msgid "Source"
+#~ msgstr "Zdroj"
+
 #~ msgid ""
 #~ "some packages failed to install\n"
 #~ "correctly"
@@ -1608,9 +1614,6 @@ msgstr "Správce zdrojů software"
 #~ "\n"
 #~ "Chcete zkusit jiné zrcadlo?"
 
-#~ msgid "Error adding update medium"
-#~ msgstr "Chyba při přidávání zdroje pro aktualizaci"
-
 #~ msgid "Please wait, contacting mirror to initialize updates packages."
 #~ msgstr ""
 #~ "Prosím po�kejte, kontaktuji zrcadlo a inicializuji aktualizace balí�ků."
diff --git a/po/cy.po b/po/cy.po
index f035bf68..2b3baf0a 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: 2003-02-17 22:21-0000\n"
 "Last-Translator: Rhoslyn Prys <rhoslyn.prys@meddal.org.uk>\n"
 "Language-Team: Cymraeg/Welsh <cy@li.org>\n"
@@ -14,16 +14,20 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"Ydi hi'n iawn parhau?"
+msgid "Enabled?"
+msgstr "Galluogwyd?"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Llwybr neu bwynt gosod:"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Portugal"
+msgstr "Portiwgal"
 
 #: ../rpmdrake:1
 #, c-format
@@ -42,103 +46,53 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"Croeso i MandrakeUpdate!\n"
-"Bydd yr offeryn hwn yn eich cynorthwyo i ddewis diweddariadau i'w gosod\n"
-"ar eich cyfrifiadur."
+msgid "by group"
+msgstr "yn ôl grwp"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
-msgstr ""
-"Croeso i'r offeryn tynnu meddalwedd!\n"
-"\n"
-"Bydd yr offeryn hwn yn eich cynorthwyo o ddewis pa feddalwedd rydych\n"
-"am ei dynnu oddi ar eich cyfrifiadur."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Digwyddodd gwall wrth osod pecyn:\n"
-"\n"
-"%s"
+msgid "Name:"
+msgstr "Enw:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Problem during removal"
-msgstr "Problem wrth dynnu"
+msgid "Italy"
+msgstr "Yr Eidal"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "Arhoswch tynnu'r pecynnau..."
+msgid "How to choose manually your mirror"
+msgstr "Sut i ddewis drych gyda llaw."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Arhoswch, darlen cronfa ddata'r pecynnau..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Digwyddodd gwall wrth osod pecyn:\n"
-"\n"
-"%s"
+msgid "URL:"
+msgstr "URL:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation failed"
-msgstr "Methodd y gosodiad"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Paratoi pecynnau i'w gosod"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Paratoi pecynnau i'w gosod"
+msgid "Some packages need to be removed"
+msgstr "Rhaid tynnu rhai pecynnau"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Gosodwyd pob pecyn angenrheidiol yn llwyddiannus."
+msgid "More information on package..."
+msgstr "Rhagor o wybodaethar becyn..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Gosodwyd popeth yn llwyddiannus"
+msgid "Yes"
+msgstr "Iawn"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
 msgstr ""
-"Mae'r gosod wedi gorffen;%s.\n"
-"\n"
-"Cafodd rhai ffeiliau ffurfweddu eu creu fel  `.rpmnew' neu `.rpmsave',\n"
-"mae modd eu harchwilio i weithredu arnynt:"
+"Oherwydd eu dibyniaethau, rhaid i'r pecyn(nau) canlynol gael\n"
+"eu dad-ddewis nawr:\n"
 
 #: ../rpmdrake:1
 #, c-format
@@ -146,451 +100,453 @@ msgid "everything was installed correctly"
 msgstr "gosodwyd popeth yn llwyddiannus"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Digwyddodd anhawster wrth osod"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Gosod pecyn `%s' (%s/%s)..."
+msgid "%s KB"
+msgstr "%s KB"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Paratoi pecynnau i'w gosod"
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"Cewch ddewis eich drych eich hun, i wneud hynny\n"
+"cychwynnwch y Rheolwr Ffynonellau Meddalwedd, ac ychwanegu\n"
+"ffynhonnell 'Diweddariadau Diogelwch'.\n"
+"\n"
+"Yna ailgychwynnwch MandrakeUpdate."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
+"Welcome to the software removal tool!\n"
 "\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
 msgstr ""
+"Croeso i'r offeryn tynnu meddalwedd!\n"
 "\n"
-"\n"
-"Gwall(au) wedi eu hadrodd:\n"
-"%s"
+"Bydd yr offeryn hwn yn eich cynorthwyo o ddewis pa feddalwedd rydych\n"
+"am ei dynnu oddi ar eich cyfrifiadur."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"Methodd y gosodiad, mae rhai ffeiliau ar goll.\n"
-"Efallai'r hoffech ddiweddaru eich cronfa ddata o ffynonellau."
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "Er mwyn cadw'r newidiadau, rhaid gosod y cyfrwng yn y gyrrwr."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Cadw a gadael"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
+"There was a problem during the removal of packages:\n"
 "\n"
-"Do you want to continue installation?"
+"%s"
 msgstr ""
-"Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
-"\n"
-"%s\n"
+"Digwyddodd gwall wrth osod pecyn:\n"
 "\n"
-"Ydi hi'n iawn parhau?"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Llwytho pecyn `%s' (%s/%s) i lawr..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Cancel"
-msgstr "Dileu"
+msgid "Size: "
+msgstr "Maint: "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Ok"
-msgstr "Iawn"
+msgid "Security updates"
+msgstr "Diweddariadau diogelwch"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Rhowch gyfrwng \"%s\" ar ddyfais [%s]"
+msgid "Already existing update medias"
+msgstr "Gwall wrth ychwanegu cyfrwng diweddaru"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Change medium"
-msgstr "Newid cyfrwng"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Initializing..."
-msgstr "Ymgychwyn..."
+msgid "Maximum information"
+msgstr "Gwybodath lawn"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Paratoi pecynnau i'w gosod"
+msgid "Proxy..."
+msgstr "Gwall..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Rhaid eich bod yn wraidd i osod pecyn."
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Unable to get source packages."
-msgstr "Methu estyn pecynnau ffynhonnell."
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspect..."
-msgstr "Archwilio..."
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
+msgstr ""
+"Methodd y gosodiad, mae rhai ffeiliau ar goll.\n"
+"Efallai'r hoffech ddiweddaru eich cronfa ddata o ffynonellau."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Installation finished"
-msgstr "Gorffennodd y gosodiad"
+msgid "United Kingdom"
+msgstr "Y Deyrnas Unideg"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Gwneud dim"
+msgid "in names"
+msgstr "enwau"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Defnyddio .%s fel y brif ffeil"
+msgid ""
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
+msgstr ""
+"Methu canfod drych addas.\n"
+"\n"
+"Gall fod amryw o resymau; y mwyaf tebygol yw'r achos pan nad\n"
+"yw pensaernïaeth eich prosesydd yn cael ei gynnal gan Diweddariadau\n"
+"Swyddogol Mandrake Linux."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Remove .%s"
 msgstr "Tynnu .%s"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "changes:"
-msgstr "newidiadau:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspecting %s"
-msgstr "Archwilio %s"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Arhoswch, canfod pecynnau sydd ar gael..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "Arhoswch, ychwanegu cyfrwng..."
+msgid "Finland"
+msgstr "Ffindir"
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
+"The following packages have bad signatures:\n"
 "\n"
-"Then, restart MandrakeUpdate."
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"Cewch ddewis eich drych eich hun, i wneud hynny\n"
-"cychwynnwch y Rheolwr Ffynonellau Meddalwedd, ac ychwanegu\n"
-"ffynhonnell 'Diweddariadau Diogelwch'.\n"
+"Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
 "\n"
-"Yna ailgychwynnwch MandrakeUpdate."
+"%s\n"
+"\n"
+"Ydi hi'n iawn parhau?"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "How to choose manually your mirror"
-msgstr "Sut i ddewis drych gyda llaw."
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Examining distant file of media `%s'..."
+msgstr "Archwilio ffeil pell y ffynhonell '%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
+msgid "Verifying packages signatures..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Already existing update sources"
-msgstr ""
+msgid "France"
+msgstr "Ffrainc"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "More info"
+msgstr "Mwy o wybodaeth"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
+"%s\n"
 "\n"
 "Is it ok to continue?"
 msgstr ""
-"Rhaid i mi gysylltu â'r drych i gael y diweddariad diogelwch diweddaraf.\n"
-"Gwiriwch fod y rhyngrwyd yn rhedeg.\n"
+"%s\n"
 "\n"
 "Ydi hi'n iawn parhau?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Reload the packages list"
+msgstr "Ail lwytho'r rhestr pecynnau"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Dewis drych..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Gwall ffeil"
+msgid "Some packages can't be installed"
+msgstr "Nid oes modd gosod pecyn '%s'\n"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
+msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Paratoi pecynnau i'w gosod"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Diweddaru Mandrake"
+msgid "All packages,"
+msgstr "Pob pecyn,"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Software Packages Removal"
-msgstr "Tynnu Pecynnau Meddalwedd"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Type of media:"
+msgstr "Math o ffynonellau:"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Quit"
-msgstr "Gadael"
+msgid "in files"
+msgstr "mewn ffeiliau"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Gosod"
+msgid "All requested packages were installed successfully."
+msgstr "Gosodwyd pob pecyn angenrheidiol yn llwyddiannus."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove"
-msgstr "Tynnu"
+msgid "Proxy hostname:"
+msgstr "Enw gwesteiwr y dirprwy:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Help"
-msgstr "Cymorth"
+msgid "Local files"
+msgstr "Ffeiliau lleol"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search"
-msgstr "Chwilio"
+msgid "Inspecting %s"
+msgstr "Archwilio %s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Find:"
-msgstr "Canfod:"
+msgid "Israel"
+msgstr "Israel"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
-"\n"
-"%s\n"
-"\n"
-"Ydi hi'n iawn parhau?"
+msgid "Help"
+msgstr "Cymorth"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Rhaid tynnu rhai pecynnau"
+msgid "HTTP server"
+msgstr "Gwasanaethwr HTTP"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
-"\n"
-"Do you really want to install all the selected packages?"
-msgstr "Rhybudd:"
+msgid "Installation failed"
+msgstr "Methodd y gosodiad"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Mae gormod o becynnau wedi eu dewis"
+msgid "Use .%s as main file"
+msgstr "Defnyddio .%s fel y brif ffeil"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "Gwybodath lawn"
+msgid "Search results"
+msgstr "Canlyniadau'r chwilio"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Normal information"
-msgstr "Gwybodaeth arferol"
+msgid " failed!"
+msgstr " methwyd!"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Update source(s)"
-msgstr "Diweddaru ffynonellau"
+msgid "Brazil"
+msgstr "Brasil"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Ail lwytho'r rhestr pecynnau"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"Mae yna gyfrwng o'r enw yna eisoes, hoffech chi\n"
+"ei amnewid?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "Ailosod y dewis"
+msgid "Find:"
+msgstr "Canfod:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "mewn ffeiliau"
+msgid "All packages, alphabetical"
+msgstr "Pob pecyn, trefn yr wyddor"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "disgrifiadau"
+msgid "Please wait, searching..."
+msgstr "Arhoswch, chwilio..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "enwau"
+msgid "Please wait, reading packages database..."
+msgstr "Arhoswch, darlen cronfa ddata'r pecynnau..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by update availability"
-msgstr "yn ôl diweddariad"
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "Methu agor pecyn `%s'\n"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by source repository"
-msgstr "yn ôl ffynhonnell eu tarddiad"
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Rhowch gyfrwng \"%s\" ar ddyfais [%s]"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by selection state"
-msgstr "yn ôl cyflwr dewis"
+msgid "Reset the selection"
+msgstr "Ailosod y dewis"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by size"
-msgstr "yn ôl maint"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"Os oes angen dirprwy arnoch, rhowch enw gwesteiwr a phorth dewisol "
+"(cystrawen: <proxyhost[:port]>):"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-msgstr "yn ôl grwp"
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
+"Oherwydd eu dibyniaethau, rhaid tynnu'r pecynnau canlynol \n"
+"hefyd: \n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "All packages,"
-msgstr "Pob pecyn,"
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "All packages, alphabetical"
-msgstr "Pob pecyn, trefn yr wyddor"
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Digwyddodd gwall wrth osod pecyn:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Dewisiadau Mandrake"
+msgid "Please wait, removing medium..."
+msgstr "Arhoswch, tynnu cyfrwng..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
-msgstr "Diweddariadau arferol"
+msgid "Password:"
+msgstr "Cyfrinair:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Diweddariad cywiro gwallau"
+msgid "Taiwan"
+msgstr "Taiwan"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Security updates"
-msgstr "Diweddariadau diogelwch"
+msgid "User:"
+msgstr "Defnyddiwr:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Description: "
-msgstr "Disgrifiadau: "
+msgid "Please wait, updating medium..."
+msgstr "Arhoswch, diweddaru'r cyfrwng..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Rheswm am y diweddariad:"
+msgid "Please wait, listing packages..."
+msgstr "Arhoswch, rhestri pecynnau..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Summary: "
-msgstr "Crynodeb: "
+msgid "Information on packages"
+msgstr "Gwybodaeth am becynnau"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Importance: "
-msgstr "Pwysigrwydd: "
+msgid "Cancel"
+msgstr "Dileu"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Everything installed successfully"
+msgstr "Gosodwyd popeth yn llwyddiannus"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Size: "
-msgstr "Maint: "
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Select the media(s) you wish to update:"
+msgstr "Dewiswch y ffynhonellau i'w diweddaru:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Version: "
-msgstr "Fersiwn: "
+msgid "Please wait, updating media..."
+msgstr "Arhoswch, diweddaru cyfrwng..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "Enw: "
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Fersiwn sydd wedi ei osod ar hyn o bryd:"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
+"\n"
+"%s\n"
+"\n"
+"Ydi hi'n iawn parhau?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Source: "
-msgstr "Ffynhonell: "
+msgid "in descriptions"
+msgstr "disgrifiadau"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(Not available)"
-msgstr "(Dim ar gael)"
+msgid "Configure proxies"
+msgstr "Ffurfweddu'r dirprwyon"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Cofnod Newid:\n"
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Mae angen i mi gysylltu â safle gwe MandrakeSoft i gael y rhestr\n"
+"drychau. Gwiriwch fod eich rhwydwaith yn rhedeg.\n"
+"\n"
+"Ydi hi'n iawn parhau?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Files:\n"
-msgstr "Ffeiliau:\n"
+msgid "Please choose"
+msgstr "Dewiswch"
 
 #: ../rpmdrake:1
 #, c-format
@@ -599,42 +555,28 @@ msgstr "Maint dewisiwyd: %d MB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Dewiswyd: %d MB / Lle gwag ar ddisg: %d MB"
+msgid "Initializing..."
+msgstr "Ymgychwyn..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
-msgstr ""
-"Oherwydd eu dibyniaethau, rhaid i'r pecyn(nau) canlynol gael\n"
-"eu dad-ddewis nawr:\n"
+msgid "Save changes"
+msgstr "Cadw newidiadau"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr ""
-"Yn anffodus, nid oes modd dewis y pecyn(nau) canlynol:\n"
-"\n"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "Gwall wrth lwytho i lawr"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr " gwrthdaro gyda"
+msgid "Package installation..."
+msgstr "Paratoi pecynnau i'w gosod"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Nid oes modd gosod pecyn '%s'\n"
+#, c-format
+msgid "Importance: "
+msgstr "Pwysigrwydd: "
 
 #: ../rpmdrake:1
 #, c-format
@@ -647,311 +589,301 @@ msgstr ""
 "hefyd:\n"
 "\n"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "Pecynnau ychwanegol angenrheidiol"
+msgid "Add..."
+msgstr "Ychwanegu..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "Nid oes modd gosod pecyn '%s'\n"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "Methu creu cyfrwng."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Removing these packages would break your system, sorry:\n"
+"The installation is finished; %s.\n"
 "\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
 msgstr ""
-"Bydd tynnu'r pecynnau hyn yn torri eich system, sori\n"
+"Mae'r gosod wedi gorffen;%s.\n"
 "\n"
+"Cafodd rhai ffeiliau ffurfweddu eu creu fel  `.rpmnew' neu `.rpmsave',\n"
+"mae modd eu harchwilio i weithredu arnynt:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"Oherwydd eu dibyniaethau, rhaid tynnu'r pecynnau canlynol \n"
-"hefyd: \n"
-"\n"
+msgid "Browse..."
+msgstr "Pori..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "Nid oes modd gosod pecyn '%s'\n"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Mae angen tynnu rhai pecynnau ychwanegol"
+msgid "Info..."
+msgstr "Gwybodaeth..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "More information on package..."
-msgstr "Rhagor o wybodaethar becyn..."
+msgid "You need to insert the medium to continue"
+msgstr "Rhaid gosod y cyfrwng i mewn i barhau"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Copying file for media `%s'..."
+msgstr "Copïo ffeil fel ffynhonell '%s'..."
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Information on packages"
-msgstr "Gwybodaeth am becynnau"
+msgid "Remove"
+msgstr "Tynnu"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "More info"
-msgstr "Mwy o wybodaeth"
+msgid "Preparing packages installation..."
+msgstr "Paratoi pecynnau i'w gosod"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "by media repository"
+msgstr "yn ôl ffynhonnell eu tarddiad"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "Ychwanegadwy"
+msgid "No mirror"
+msgstr "Dim drych"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Upgradable"
-msgstr "Diweddariadwy"
+msgid "You need to fill up at least the two first entries."
+msgstr "Mae angen llanw o leiaf y ddau gofnod cyntaf"
 
 #: ../rpmdrake:1
 #, c-format
-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 ""
-"Mae'r rhestr diweddariadau'n wag. Mae hyn yn golygu un ai\n"
-"nad oes diweddariad ar gyfer y pecynnau ar eich cyfrifiadur,\n"
-"neu rydych wedi eu gosod i gyd yn barod."
+msgid "Install"
+msgstr "Gosod"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "No update"
-msgstr "Dim diweddariad"
+msgid "Japan"
+msgstr "Siapan"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "(none)"
-msgstr "(dim)"
+msgid "Do nothing"
+msgstr "Gwneud dim"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Arhoswch, rhestri pecynnau..."
+msgid "No update"
+msgstr "Dim diweddariad"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "Methu agor pecyn `%s'\n"
+#, c-format
+msgid "Description: "
+msgstr "Disgrifiadau: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Mae angen un o'r pecynnau canlynol:"
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr "Rhybudd:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Dewiswch"
+msgid "Name: "
+msgstr "Enw: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Inspect..."
+msgstr "Archwilio..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Not selected"
-msgstr "Canfyddwyd gwrthdaro"
+msgid "Editing media \"%s\":"
+msgstr "Golygu ffynhonnell \"%s\":"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Selected"
-msgstr "Dewiswyd"
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "Paratoi pecynnau i'w gosod"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results"
-msgstr "Canlyniadau'r chwilio"
+msgid "Australia"
+msgstr "Awstralia"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Stop"
-msgstr "Atal"
+msgid "Installation finished"
+msgstr "Gorffennodd y gosodiad"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Arhoswch, chwilio..."
+msgid "by update availability"
+msgstr "yn ôl diweddariad"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Canlyniadau'r chwilio (dim)"
+msgid "Poland"
+msgstr "Gwlad Pwyl"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Other"
-msgstr "Arall"
+msgid "Version: "
+msgstr "Fersiwn: "
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the packages source editor!\n"
-"\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
-msgstr ""
-"Croeso i'r golygydd ffynhonnell pecynnau!\n"
-"\n"
-"Bydd yr offeryn yn eich cynorthwyo i ffurfweddu'r ffynhonnell pecynnau\n"
-"rydych am eu defnyddio ar eich cyfrifiadur. Byddant ar gael i'w gosod fel\n"
-"pecynnau newydd neu er mwyn diweddaru."
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Mae modd i chi enwi defnyddiwr /cyfrinair ar gyfer dilysiad dirprwy:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
-msgstr "Cadw a gadael"
+msgid "Upgradable"
+msgstr "Diweddariadwy"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid " done."
+msgstr " gorffen.."
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Gwall..."
+msgid "Software Packages Installation"
+msgstr "Paratoi pecynnau i'w gosod"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Update..."
-msgstr "Diweddau..."
+msgid "Additional packages needed"
+msgstr "Pecynnau ychwanegol angenrheidiol"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "Ychwanegu..."
+msgid "Bugfixes updates"
+msgstr "Diweddariad cywiro gwallau"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "Golygu"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "Llwytho '%s' i lawr, amser yn weddill:%s, cyflymdra:%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Source"
-msgstr "Ffynhonell"
+msgid "Germany"
+msgstr "Yr Almaen"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Enabled?"
-msgstr "Galluogwyd?"
+msgid "Russia"
+msgstr "Rwsia"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Configure sources"
-msgstr "Ffurfweddu'r ffynonellau"
+msgid "Norway"
+msgstr "Norwy"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Password:"
-msgstr "Cyfrinair:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during installation"
+msgstr "Digwyddodd anhawster wrth osod"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "User:"
-msgstr "Defnyddiwr:"
+msgid "Search"
+msgstr "Chwilio"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "Mae modd i chi enwi defnyddiwr /cyfrinair ar gyfer dilysiad dirprwy:"
+#, fuzzy, c-format
+msgid "Edit a media"
+msgstr "Golygu ffynhonnell"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "Enw gwesteiwr y dirprwy:"
+msgid "Czech Republic"
+msgstr "Gweriniaeth Tsiec"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"Os oes angen dirprwy arnoch, rhowch enw gwesteiwr a phorth dewisol "
-"(cystrawen: <proxyhost[:port]>):"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Ffurfweddu'r dirprwyon"
+msgid "Stop"
+msgstr "Atal"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Arhoswch, diweddaru'r cyfrwng..."
+msgid "Update"
+msgstr "Diweddaru"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "Er mwyn cadw'r newidiadau, rhaid gosod y cyfrwng yn y gyrrwr."
+msgid "Please wait, removing packages..."
+msgstr "Arhoswch tynnu'r pecynnau..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "Rhaid gosod y cyfrwng i mewn i barhau"
+msgid "Normal information"
+msgstr "Gwybodaeth arferol"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "Cadw newidiadau"
+msgid "Media: "
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Llwybr perthynol i synthesis/hdlist:"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "Llwytho pecyn `%s' (%s/%s) i lawr..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "Golygu ffynhonnell \"%s\":"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Dewiswyd: %d MB / Lle gwag ar ddisg: %d MB"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit a source"
-msgstr "Golygu ffynhonnell"
+msgid "Media"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Arhoswch, tynnu cyfrwng..."
+msgid "Spain"
+msgstr "Sbaen"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Type of source:"
-msgstr "Math o ffynonellau:"
+msgid "Normal updates"
+msgstr "Diweddariadau arferol"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Ychwanegu ffynhonnell"
+msgid "by selection state"
+msgstr "yn ôl cyflwr dewis"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
-"Mae yna gyfrwng o'r enw yna eisoes, hoffech chi\n"
-"ei amnewid?"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Mae angen llanw o leiaf y ddau gofnod cyntaf"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Name:"
-msgstr "Enw:"
+"Arhoswch, llwytho i lawr cyfeiriaidau drychau o safle gwe MandrakeSoft."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -959,143 +891,148 @@ msgid "Login:"
 msgstr "Mewngofnod:"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Choose a mirror..."
-msgstr "Dewis drych..."
+#, fuzzy, c-format
+msgid "Adding a media:"
+msgstr "Ychwanegu ffynhonnell"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Browse..."
-msgstr "Pori..."
+msgid "Austria"
+msgstr "Awstria"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Path or mount point:"
-msgstr "Llwybr neu bwynt gosod:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Fatal error"
+msgstr "Gwall ffeil"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Removable device"
-msgstr "Dyfais symudol"
+msgid "Update..."
+msgstr "Diweddau..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "Gwirio llofnod `%s'..."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "Gwasanaethwr HTTP"
+msgid "(none)"
+msgstr "(dim)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "FTP server"
-msgstr "Gwasanaethwr FTP"
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
+"Bydd tynnu'r pecynnau hyn yn torri eich system, sori\n"
+"\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Path:"
-msgstr "Llwybr:"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Gosod pecyn `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "Ffeiliau lleol"
+msgid "Currently installed version: "
+msgstr "Fersiwn sydd wedi ei osod ar hyn o bryd:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add a source"
-msgstr "Ychwanegu ffynhonnell"
+msgid "Other"
+msgstr "Arall"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr "Methu diweddaru'r cyfrwng; bydd yn cael ei anablu'n awtomatig."
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "Rheswm am y diweddariad:"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to create medium."
-msgstr "Methu creu cyfrwng."
+msgid "Please choose the desired mirror."
+msgstr "Dewiswch ddrych"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "Diweddaru"
+msgid "Edit"
+msgstr "Golygu"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Dewiswch y ffynhonellau i'w diweddaru:"
+msgid "Please wait, finding available packages..."
+msgstr "Arhoswch, canfod pecynnau sydd ar gael..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Arhoswch, diweddaru cyfrwng..."
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Llwybr perthynol i synthesis/hdlist:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " failed!"
-msgstr " methwyd!"
+msgid "Search results (none)"
+msgstr "Canlyniadau'r chwilio (dim)"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid " done."
-msgstr " gorffen.."
+msgid "Danmark"
+msgstr "Denmarc"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "Llwytho '%s' i lawr, cyflymdra:%s"
+msgid "China"
+msgstr "Tseina"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "Llwytho '%s' i lawr, amser yn weddill:%s, cyflymdra:%s"
+msgid "United States"
+msgstr "Yr Unod Daleithiau"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "Gwirio llofnod `%s'..."
+#: ../rpmdrake:1
+#, c-format
+msgid "changes:"
+msgstr "newidiadau:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "Archwilio ffeil pell y ffynhonell '%s'..."
+msgid "Some additional packages need to be removed"
+msgstr "Mae angen tynnu rhai pecynnau ychwanegol"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "Archwilio ffeil y ffynhonell '%s'..."
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "Copïo ffeil fel ffynhonell '%s'..."
+msgid "No"
+msgstr "Na"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure medias"
+msgstr "Ffurfweddu'r ffynonellau"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a media"
+msgstr "Ychwanegu ffynhonnell"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Please choose the desired mirror."
-msgstr "Dewiswch ddrych"
+msgid "Summary: "
+msgstr "Crynodeb: "
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
-msgstr ""
-"Methu canfod drych addas.\n"
-"\n"
-"Gall fod amryw o resymau; y mwyaf tebygol yw'r achos pan nad\n"
-"yw pensaernïaeth eich prosesydd yn cael ei gynnal gan Diweddariadau\n"
-"Swyddogol Mandrake Linux."
+msgid "Canada"
+msgstr "Canada"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No mirror"
-msgstr "Dim drych"
+msgid "Greece"
+msgstr "Groeg"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1112,179 +1049,242 @@ msgstr ""
 "Nid yw'r rhwydwaith, neu safle MandrakeSoft, ar gael.\n"
 "Ceisiwch eto."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Rhaid eich bod yn wraidd i osod pecyn."
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Error during download"
-msgstr "Gwall wrth lwytho i lawr"
+msgid "Path:"
+msgstr "Llwybr:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
-"Arhoswch, llwytho i lawr cyfeiriaidau drychau o safle gwe MandrakeSoft."
+msgid "Problem during removal"
+msgstr "Problem wrth dynnu"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Mae angen i mi gysylltu â safle gwe MandrakeSoft i gael y rhestr\n"
-"drychau. Gwiriwch fod eich rhwydwaith yn rhedeg.\n"
-"\n"
-"Ydi hi'n iawn parhau?"
+msgid "Selected"
+msgstr "Dewiswyd"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United States"
-msgstr "Yr Unod Daleithiau"
+msgid "Netherlands"
+msgstr "Yr Iseldiroedd"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "China"
-msgstr "Tseina"
+msgid "Addable"
+msgstr "Ychwanegadwy"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Y Deyrnas Unideg"
+msgid "(Not available)"
+msgstr "(Dim ar gael)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
+msgstr ""
+"Yn anffodus, nid oes modd dewis y pecyn(nau) canlynol:\n"
+"\n"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Not selected"
+msgstr "Canfyddwyd gwrthdaro"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Taiwan"
+msgid "Software Packages Removal"
+msgstr "Tynnu Pecynnau Meddalwedd"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Sweden"
 msgstr "Sweden"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Russia"
-msgstr "Rwsia"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
+msgstr ""
+"\n"
+"\n"
+"Gwall(au) wedi eu hadrodd:\n"
+"%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Portugal"
-msgstr "Portiwgal"
+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 ""
+"Mae'r rhestr diweddariadau'n wag. Mae hyn yn golygu un ai\n"
+"nad oes diweddariad ar gyfer y pecynnau ar eich cyfrifiadur,\n"
+"neu rydych wedi eu gosod i gyd yn barod."
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Poland"
-msgstr "Gwlad Pwyl"
+#, fuzzy, c-format
+msgid "Examining file of media `%s'..."
+msgstr "Archwilio ffeil y ffynhonell '%s'..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Norway"
-msgstr "Norwy"
+msgid "Download of `%s', speed:%s"
+msgstr "Llwytho '%s' i lawr, cyflymdra:%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Netherlands"
-msgstr "Yr Iseldiroedd"
+msgid "One of the following packages is needed:"
+msgstr "Mae angen un o'r pecynnau canlynol:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Korea"
-msgstr "Corea"
+msgid "Quit"
+msgstr "Gadael"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "Siapan"
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Rhaid i mi gysylltu â'r drych i gael y diweddariad diogelwch diweddaraf.\n"
+"Gwiriwch fod y rhyngrwyd yn rhedeg.\n"
+"\n"
+"Ydi hi'n iawn parhau?"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Italy"
-msgstr "Yr Eidal"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update media(s)"
+msgstr "Diweddaru ffynonellau"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Israel"
-msgstr "Israel"
+msgid "Ok"
+msgstr "Iawn"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Greece"
-msgstr "Groeg"
+msgid "Please wait, adding medium..."
+msgstr "Arhoswch, ychwanegu cyfrwng..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "France"
-msgstr "Ffrainc"
+msgid "Unable to get source packages."
+msgstr "Methu estyn pecynnau ffynhonnell."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "Ffindir"
+msgid "Too many packages are selected"
+msgstr "Mae gormod o becynnau wedi eu dewis"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Spain"
-msgstr "Sbaen"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"Croeso i'r golygydd ffynhonnell pecynnau!\n"
+"\n"
+"Bydd yr offeryn yn eich cynorthwyo i ffurfweddu'r ffynhonnell pecynnau\n"
+"rydych am eu defnyddio ar eich cyfrifiadur. Byddant ar gael i'w gosod fel\n"
+"pecynnau newydd neu er mwyn diweddaru."
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Danmark"
-msgstr "Denmarc"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
+msgstr " gwrthdaro gyda"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "Yr Almaen"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Croeso i MandrakeUpdate!\n"
+"Bydd yr offeryn hwn yn eich cynorthwyo i ddewis diweddariadau i'w gosod\n"
+"ar eich cyfrifiadur."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Gweriniaeth Tsiec"
+msgid "Mandrake choices"
+msgstr "Dewisiadau Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Costa Rica"
+msgid "Changelog:\n"
+msgstr "Cofnod Newid:\n"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "Canada"
+msgid "Korea"
+msgstr "Corea"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Brazil"
-msgstr "Brasil"
+msgid "Removable device"
+msgstr "Dyfais symudol"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Gwlad Belg"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Awstralia"
+msgid "Change medium"
+msgstr "Newid cyfrwng"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "Awstria"
+msgid "Mandrake Update"
+msgstr "Diweddaru Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
-msgstr "Gwybodaeth..."
+msgid "by size"
+msgstr "yn ôl maint"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "Na"
+msgid "FTP server"
+msgstr "Gwasanaethwr FTP"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "Iawn"
+msgid "Files:\n"
+msgstr "Ffeiliau:\n"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr "Methu diweddaru'r cyfrwng; bydd yn cael ei anablu'n awtomatig."
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -1557,6 +1557,12 @@ msgstr "Tynnu Meddalwedd"
 msgid "Software Sources Manager"
 msgstr "Rheolwr Ffynhonnell Meddalwedd"
 
+#~ msgid "Source: "
+#~ msgstr "Ffynhonell: "
+
+#~ msgid "Source"
+#~ msgstr "Ffynhonell"
+
 #~ msgid ""
 #~ "some packages failed to install\n"
 #~ "correctly"
@@ -1593,9 +1599,6 @@ msgstr "Rheolwr Ffynhonnell Meddalwedd"
 #~ "\n"
 #~ "Hoffech chi fynd at ddrych arall?"
 
-#~ msgid "Error adding update medium"
-#~ msgstr "Gwall wrth ychwanegu cyfrwng diweddaru"
-
 #~ msgid "Please wait, contacting mirror to initialize updates packages."
 #~ msgstr "Arhoswch, yn cysylltu â'r drych i gychwyn pecynnau diweddaru."
 
diff --git a/po/da.po b/po/da.po
index 1f9edfb4..03a120ca 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: 2003-05-16 03:28+0200\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -17,16 +17,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"Er det O.k. at fortsætte?"
+msgid "Enabled?"
+msgstr "Aktiveret?"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "sti eller monteringspunkt:"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Portugal"
+msgstr "Portugal"
 
 #: ../rpmdrake:1
 #, c-format
@@ -46,146 +50,182 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"Velkommen til MandrakeUpdate!\n"
-"\n"
-"Dette værktøj hjælper dig med at vælge opdateringerne du vil\n"
-"installere på maskinen."
+msgid "by group"
+msgstr "efter gruppe"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
-msgstr ""
-"Velkommen til værktøjet til fjernelse af pakker!\n"
-"\n"
-"Dette værktøj hjælper dig med at vælge hvilke programmer du vil fjerne fra\n"
-"maskinen."
+msgid "Name:"
+msgstr "Navn:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Der opstod et problem under fjernelsen af pakker:\n"
-"\n"
-"%s"
+msgid "Italy"
+msgstr "Italien"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Problem during removal"
-msgstr "Problem ved fjernelse"
+msgid "How to choose manually your mirror"
+msgstr "Hvordan du manuelt vælger dit spejl"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "Vent venligst, fjerner pakker..."
+msgid "Some packages need to be removed"
+msgstr "Visse pakker skal fjernes"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Vent venligst, læser pakkedatabase..."
+msgid "More information on package..."
+msgstr "Mere information om pakken..."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Ja"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"There was a problem during the installation:\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"%s"
 msgstr ""
-"Der opstod et problem under installationen:\n"
+"På grund af deres afhængigheder skal følgende pakker\n"
+"afmarkeres nu:\n"
 "\n"
-"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation failed"
-msgstr "Installationen mislykkedes"
+msgid "everything was installed correctly"
+msgstr "alting blev installeret korrekt"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Alvorlig fejl: ingen pakke fundet til installation. Beklager."
+msgid "%s KB"
+msgstr "%s KB"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "No package found for installation."
-msgstr "Ingen pakke fundet til installation."
+#, fuzzy, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"Du kan også vælge dit ønskede spejl manuelt; for at gøre dette skal du "
+"starte Administrationen af programmelkilder, og dernæst tilføje en kilde til "
+"'Sikkerhedsopdateringer'.\n"
+"Derefter skal MandrakeUpdate genstartes."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Alle ønskede pakker blev installeret uden problemer."
+msgid ""
+"Welcome to the software removal tool!\n"
+"\n"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
+msgstr ""
+"Velkommen til værktøjet til fjernelse af pakker!\n"
+"\n"
+"Dette værktøj hjælper dig med at vælge hvilke programmer du vil fjerne fra\n"
+"maskinen."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Alting installeret uden problemer"
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "For at gemme ændringerne skal du indsætte mediet i drevet."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Gem og afslut"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"There was a problem during the removal of packages:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"%s"
 msgstr ""
-"Installationen er færdig; %s.\n"
+"Der opstod et problem under fjernelsen af pakker:\n"
 "\n"
-"Nogen konfigurationsfiler blev oprette som '.rpmnew' eller '.rpmsave',\n"
-"du kan nu kigge på nogen for at tage aktion:"
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "everything was installed correctly"
-msgstr "alting blev installeret korrekt"
+msgid "Size: "
+msgstr "Størrelse: "
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Problem during installation"
-msgstr "Problem ved installationen"
+msgid "Security updates"
+msgstr "Sikkerhedsopdateringer"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Already existing update medias"
+msgstr "Allerede eksisterende opdateringskilder"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Installerer pakke `%s' (%s/%s)..."
+msgid "Maximum information"
+msgstr "Mest information"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy..."
+msgstr "Proxy..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
+msgstr ""
+"Installationen mislykkedes, visse filer mangler.\n"
+"Du skal måske opdatere din kildedatabase."
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Preparing packages installation..."
-msgstr "Forbereder installation af pakker"
+msgid "United Kingdom"
+msgstr "Storbritannien"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "in names"
+msgstr "i navne"
+
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
+"I can't find any suitable mirror.\n"
 "\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
+"Kan ikke finde noget passende spejl.\n"
 "\n"
-"\n"
-"Fejl rapporteret:\n"
-"%s"
+"Det kan være mange årsager til dette problem; det mest almindelige er\n"
+"når arkitekturen på din processor ikke understøttes af\n"
+"Mandrake Linux' officielle opdateringer."
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"Installationen mislykkedes, visse filer mangler.\n"
-"Du skal måske opdatere din kildedatabase."
+msgid "Remove .%s"
+msgstr "Fjern .%s"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "Finland"
 
 #: ../rpmdrake:1
 #, c-format
@@ -202,360 +242,339 @@ msgstr ""
 "\n"
 "Ønsker du at fortsætte installeringen?"
 
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Examining distant file of media `%s'..."
+msgstr "Undersøger fjern fil fra kilde '%s'..."
+
 #: ../rpmdrake:1
 #, c-format
 msgid "Verifying packages signatures..."
 msgstr "Efterprøver pakkeunderskrifter..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Henter pakke `%s' (%s/%s)..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Cancel"
-msgstr "Annullér"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "O.k."
+msgid "France"
+msgstr "Frankrig"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Indsæt venligst media med navn \"%s\" i enhed [%s]"
+msgid "More info"
+msgstr "Mere info"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Change medium"
-msgstr "Skift media"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Er det O.k. at fortsætte?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "Initialiserer..."
+msgid "Reload the packages list"
+msgstr "Genindlæs pakkelisten"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Package installation..."
-msgstr "Installation af pakker"
+msgid "Choose a mirror..."
+msgstr "Vælg et spejl..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Desværre, kunne ikke hente kildepakker. %s"
+msgid "Some packages can't be installed"
+msgstr "Visse pakker kan ikke installeres"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Unable to get source packages."
-msgstr "Kunne ikke hente kildepakker."
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "Alvorlig fejl: ingen pakke fundet til installation. Beklager."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "Undersøg..."
+msgid "All packages,"
+msgstr "Alle pakker,"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Installation finished"
-msgstr "Installationen færdig"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Type of media:"
+msgstr "Kildetype:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Gør ingenting"
+msgid "in files"
+msgstr "i filer"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Brug .%s som hovedfil"
+msgid "All requested packages were installed successfully."
+msgstr "Alle ønskede pakker blev installeret uden problemer."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Fjern .%s"
+msgid "Proxy hostname:"
+msgstr "Værtsnavn for proxy:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "changes:"
-msgstr "ændringer:"
+msgid "Local files"
+msgstr "Lokale filer"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspecting %s"
 msgstr "Undersøger %s"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Vent venligst, finder tilgængelige pakker..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "Vent venligst, tilføjer medie..."
+msgid "Israel"
+msgstr "Israel"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
-"\n"
-"Then, restart MandrakeUpdate."
-msgstr ""
-"Du kan også vælge dit ønskede spejl manuelt; for at gøre dette skal du "
-"starte Administrationen af programmelkilder, og dernæst tilføje en kilde til "
-"'Sikkerhedsopdateringer'.\n"
-"Derefter skal MandrakeUpdate genstartes."
+msgid "Help"
+msgstr "Hjælp"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "Hvordan du manuelt vælger dit spejl"
+msgid "HTTP server"
+msgstr "HTTP-server"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
-msgstr ""
-"Du har allerede mindst én opdateringskilde konfigureret, men de\n"
-"er alle deaktiveret i øjeblikket. Du bør køre Administrationen\n"
-"for programmelkilder for at aktivere mindst én. (Markér det i Aktiveret?-"
-"kolonnen\n"
-"\n"
-"Derefter skal MandrakeUpdate genstartes."
+msgid "Installation failed"
+msgstr "Installationen mislykkedes"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Already existing update sources"
-msgstr "Allerede eksisterende opdateringskilder"
+msgid "Use .%s as main file"
+msgstr "Brug .%s som hovedfil"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Må kontakte spejlet for at hente de seneste opdateringspakker.\n"
-"Kontrollér venligst at dit netværk er startet.\n"
-"\n"
-"Er det O.k. at fortsætte?"
+msgid "Search results"
+msgstr "Søgeresultater"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr "En fatal fejl skete: %s."
+msgid " failed!"
+msgstr " mislykkedes!"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Fatal error"
-msgstr "fatal fejl"
+msgid "Brazil"
+msgstr "Brasilien"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Software Packages Installation"
-msgstr "Installation af programpakker"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"Der er allerede et medie med dette navn, ønsker du\n"
+"virkelig at erstatte dette?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Mandrake Opdatér"
+msgid "Find:"
+msgstr "Find:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Fjernelse af programpakker"
+msgid "All packages, alphabetical"
+msgstr "Alle pakker, alfabetisk"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Quit"
-msgstr "Afslut"
+msgid "Please wait, searching..."
+msgstr "Vent venligst, søger..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Installér"
+msgid "Please wait, reading packages database..."
+msgstr "Vent venligst, læser pakkedatabase..."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "Fjern"
+msgid "unknown package "
+msgstr "Ukendt pakke "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Help"
-msgstr "Hjælp"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Indsæt venligst media med navn \"%s\" i enhed [%s]"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search"
-msgstr "Søg"
+msgid "Reset the selection"
+msgstr "Nulstil det valgte"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Find:"
-msgstr "Find:"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"Hvis du har brug for en proxy, skal du indtaste værtsnavnet og eventuelt en "
+"port (syntaks: <proxyvært[:port]>):"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
 "\n"
-"Is it ok to continue?"
 msgstr ""
-"Følgende pakker skal fjernes for at andre skal kunne opdateres:\n"
-"\n"
-"%s\n"
+"På grund af deres afhængigheder vil disse pakker også blive fjernet:\n"
 "\n"
-"Er det O.k. at fortsætte?"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Visse pakker skal fjernes"
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
+"There was a problem during the installation:\n"
 "\n"
-"Do you really want to install all the selected packages?"
+"%s"
 msgstr ""
-"Advarsel: det ser ud til at du prøver på at tilføje så mange pakker at dit "
-"filsystem kan løbe tør for fri diskplads, under eller efter "
-"pakkeinstallationen; dette er særlig farligt og bør overvejes omhyggeligt.\n"
+"Der opstod et problem under installationen:\n"
 "\n"
-"Ønsker du virkeligt at installere alle de valgte pakker?"
+"%s"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "For mange pakker er valgt"
+msgid "Please wait, removing medium..."
+msgstr "Vent venligst, fjerner medie..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Maximum information"
-msgstr "Mest information"
+msgid "Password:"
+msgstr "Adgangskode:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Normal information"
-msgstr "Normal information"
+msgid "Taiwan"
+msgstr "Taiwan"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update source(s)"
-msgstr "Opdatér kilder"
+msgid "User:"
+msgstr "Bruger:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Genindlæs pakkelisten"
+msgid "Please wait, updating medium..."
+msgstr "Vent venligst, opdaterer medie..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "Nulstil det valgte"
+msgid "Please wait, listing packages..."
+msgstr "Vent venligst, lister pakker..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "i filer"
+msgid "Information on packages"
+msgstr "Information om pakker"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "in descriptions"
-msgstr "i beskrivelser"
+msgid "Cancel"
+msgstr "Annullér"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "i navne"
+msgid "Everything installed successfully"
+msgstr "Alting installeret uden problemer"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "by update availability"
-msgstr "efter opdateringstilgængelighed"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Select the media(s) you wish to update:"
+msgstr "Venligst vælg de kilder du ønsker at opdatere:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by source repository"
-msgstr "efter kildelagringsplads"
+msgid "Please wait, updating media..."
+msgstr "Vent venligst, opdaterer medie..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by selection state"
-msgstr "efter valgstatus"
+msgid "A fatal error occurred: %s."
+msgstr "En fatal fejl skete: %s."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by size"
-msgstr "efter størrelse"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Følgende pakker skal fjernes for at andre skal kunne opdateres:\n"
+"\n"
+"%s\n"
+"\n"
+"Er det O.k. at fortsætte?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-msgstr "efter gruppe"
+msgid "in descriptions"
+msgstr "i beskrivelser"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "All packages,"
-msgstr "Alle pakker,"
+msgid "Configure proxies"
+msgstr "Konfigurér proxyer"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Alle pakker, alfabetisk"
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Må kontakte MandrakeSofts websted for at hente spejllisten.\n"
+"Kontrollér venligst at dit netværk er startet.\n"
+"\n"
+"Er det O.k. at fortsætte?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Mandrake-valg"
+msgid "Please choose"
+msgstr "Vælg"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Normal updates"
-msgstr "Normale opdateringer"
+msgid "Selected size: %d MB"
+msgstr "Valgt størrelse: %d MB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Fejlretningsopdateringer"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Security updates"
-msgstr "Sikkerhedsopdateringer"
+msgid "Initializing..."
+msgstr "Initialiserer..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Description: "
-msgstr "Beskrivelse: "
+msgid "Save changes"
+msgstr "Gem ændringer"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Årsag til opdatering: "
+msgid "Error during download"
+msgstr "Fejl under hentning"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Summary: "
-msgstr "Resumé: "
+msgid "Package installation..."
+msgstr "Installation af pakker"
 
 #: ../rpmdrake:1
 #, c-format
@@ -564,560 +583,469 @@ msgstr "Vigtighed: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid ""
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
+msgstr ""
+"For at opfylde afhængigheder skal følgende pakker også installeres:\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Size: "
-msgstr "Størrelse: "
+msgid "Add..."
+msgstr "Tilføj..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Version: "
-msgstr "Version: "
+msgid "Unable to create medium."
+msgstr "Kan ikke lave medie."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "Navn: "
+msgid ""
+"The installation is finished; %s.\n"
+"\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
+msgstr ""
+"Installationen er færdig; %s.\n"
+"\n"
+"Nogen konfigurationsfiler blev oprette som '.rpmnew' eller '.rpmsave',\n"
+"du kan nu kigge på nogen for at tage aktion:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Nuværende installeret version: "
+msgid "Browse..."
+msgstr "Gennemse..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Source: "
-msgstr "Kilde: "
+msgid "Some packages can't be removed"
+msgstr "Visse pakker kan ikke fjernes"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
-msgstr "(Ingen tilgængelig)"
+msgid "Info..."
+msgstr "Info..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Ændringslog:\n"
+msgid "You need to insert the medium to continue"
+msgstr "Du skal indsætte mediet for at fortsætte"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Files:\n"
-msgstr "Filer:\n"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Copying file for media `%s'..."
+msgstr "Kopierer fil for kilde `%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "Valgt størrelse: %d MB"
+msgid "Remove"
+msgstr "Fjern"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Valgt: %d MB / Fri diskplads: %d MB"
+msgid "Preparing packages installation..."
+msgstr "Forbereder installation af pakker"
 
 #: ../rpmdrake:1
-#, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
-msgstr ""
-"På grund af deres afhængigheder skal følgende pakker\n"
-"afmarkeres nu:\n"
-"\n"
+#, fuzzy, c-format
+msgid "by media repository"
+msgstr "efter kildelagringsplads"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr ""
-"Desværre, følgende pakker kan ikke vælges:\n"
-"\n"
-"%s\n"
-"\n"
-"Årsager følger:\n"
-"\n"
-"%s"
+msgid "No mirror"
+msgstr "Intet spejl"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "%s conflicts with %s"
-msgstr "%s er i konflikt med %s"
+msgid "You need to fill up at least the two first entries."
+msgstr "Du skal udfylde i det mindste de to første indgange."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages can't be installed"
-msgstr "Visse pakker kan ikke installeres"
+msgid "Install"
+msgstr "Installér"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
-msgstr ""
-"For at opfylde afhængigheder skal følgende pakker også installeres:\n"
-"\n"
+msgid "Japan"
+msgstr "Japan"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "Yderligere pakker behøves"
+msgid "Do nothing"
+msgstr "Gør ingenting"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages can't be removed"
-msgstr "Visse pakker kan ikke fjernes"
+msgid "No update"
+msgstr "Ingen opdatering"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
-"Desværre, fjernelse af disse pakker ville ødelægge systemet:\n"
-"\n"
+msgid "Description: "
+msgstr "Beskrivelse: "
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
 "\n"
+"Do you really want to install all the selected packages?"
 msgstr ""
-"På grund af deres afhængigheder vil disse pakker også blive fjernet:\n"
+"Advarsel: det ser ud til at du prøver på at tilføje så mange pakker at dit "
+"filsystem kan løbe tør for fri diskplads, under eller efter "
+"pakkeinstallationen; dette er særlig farligt og bør overvejes omhyggeligt.\n"
 "\n"
+"Ønsker du virkeligt at installere alle de valgte pakker?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Nogle yderligere pakker skal fjernes"
+msgid "Name: "
+msgstr "Navn: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "More information on package..."
-msgstr "Mere information om pakken..."
+msgid "Inspect..."
+msgstr "Undersøg..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Information on packages"
-msgstr "Information om pakker"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing media \"%s\":"
+msgstr "Redigerer kilde '%s':"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "More info"
-msgstr "Mere info"
+msgid "No package found for installation."
+msgstr "Ingen pakke fundet til installation."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "Kan tilføjes"
+msgid "Australia"
+msgstr "Australien"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Upgradable"
-msgstr "Kan opdateres"
+msgid "Installation finished"
+msgstr "Installationen færdig"
 
 #: ../rpmdrake:1
 #, c-format
-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 ""
-"Listen over opdateringer er tom. Dette betyder at der ikke\n"
-"findes nogen tilgængelige opdateringer for programmerne installeret\n"
-"på maskinen eller at du allerede har installeret dem alle."
+msgid "by update availability"
+msgstr "efter opdateringstilgængelighed"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "No update"
-msgstr "Ingen opdatering"
+msgid "Poland"
+msgstr "Polen"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "(none)"
-msgstr "(ingen)"
+msgid "Version: "
+msgstr "Version: "
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Vent venligst, lister pakker..."
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+"Du kan angive en bruger og en adgangskode for autentifikation af proxy:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "unknown package "
-msgstr "Ukendt pakke "
+msgid "Upgradable"
+msgstr "Kan opdateres"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "En af følgende pakker behøves:"
+msgid " done."
+msgstr " færdig."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Vælg"
+msgid "Software Packages Installation"
+msgstr "Installation af programpakker"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Additional packages needed"
+msgstr "Yderligere pakker behøves"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Not selected"
-msgstr "Ikke valgt"
+msgid "Bugfixes updates"
+msgstr "Fejlretningsopdateringer"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Selected"
-msgstr "Valgt"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "Hentning af `%s', resterende tid:%s, hastighed:%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results"
-msgstr "Søgeresultater"
+msgid "Germany"
+msgstr "Tyskland"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Stop"
-msgstr "Stop"
+msgid "Russia"
+msgstr "Rusland"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Vent venligst, søger..."
+msgid "Norway"
+msgstr "Norge"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Søgeresultater (ingen)"
+msgid "Problem during installation"
+msgstr "Problem ved installationen"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Other"
-msgstr "Andet"
+msgid "Search"
+msgstr "Søg"
 
 #: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Edit a media"
+msgstr "Redigér en kilde"
+
+#: ../rpmdrake.pm:1
 #, c-format
+msgid "Czech Republic"
+msgstr "Tjekkiet"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
 msgid ""
-"Welcome to the packages source editor!\n"
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
 "\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
+"Then, restart MandrakeUpdate."
 msgstr ""
-"Velkommen til redigering af kildepakker!\n"
+"Du har allerede mindst én opdateringskilde konfigureret, men de\n"
+"er alle deaktiveret i øjeblikket. Du bør køre Administrationen\n"
+"for programmelkilder for at aktivere mindst én. (Markér det i Aktiveret?-"
+"kolonnen\n"
 "\n"
-"Dette værktøj hjælper dig med at konfigurere pakkekilderne du vil bruge\n"
-"på maskinen. De vil derefter være tilgængelige så du kan installere nye\n"
-"programmer eller udføre opdateringer."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Save and quit"
-msgstr "Gem og afslut"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Proxy..."
-msgstr "Proxy..."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Update..."
-msgstr "Opdatér..."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add..."
-msgstr "Tilføj..."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Edit"
-msgstr "Redigér"
+"Derefter skal MandrakeUpdate genstartes."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Source"
-msgstr "Kilde"
+msgid "Stop"
+msgstr "Stop"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Enabled?"
-msgstr "Aktiveret?"
+msgid "Update"
+msgstr "Opdatér"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure sources"
-msgstr "Konfigurér kilder"
+msgid "Please wait, removing packages..."
+msgstr "Vent venligst, fjerner pakker..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "Adgangskode:"
+msgid "Normal information"
+msgstr "Normal information"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "User:"
-msgstr "Bruger:"
+msgid "Media: "
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "Du kan angive en bruger og en adgangskode for autentifikation af proxy:"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "Henter pakke `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "Værtsnavn for proxy:"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Valgt: %d MB / Fri diskplads: %d MB"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+msgid "Media"
 msgstr ""
-"Hvis du har brug for en proxy, skal du indtaste værtsnavnet og eventuelt en "
-"port (syntaks: <proxyvært[:port]>):"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure proxies"
-msgstr "Konfigurér proxyer"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Vent venligst, opdaterer medie..."
+msgid "Spain"
+msgstr "Spanien"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "In order to save the changes, you need to insert the medium in the drive."
-msgstr "For at gemme ændringerne skal du indsætte mediet i drevet."
+msgid "Normal updates"
+msgstr "Normale opdateringer"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "Du skal indsætte mediet for at fortsætte"
+msgid "by selection state"
+msgstr "efter valgstatus"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Save changes"
-msgstr "Gem ændringer"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "Vent venligst, henter spejladresser fra MandrakeSofts websted."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Relativ sti til syntese eller hdlist:"
+msgid "Login:"
+msgstr "Login:"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "URL:"
-msgstr "URL: "
+#, fuzzy, c-format
+msgid "Adding a media:"
+msgstr "Tilføjer en kilde:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Editing source \"%s\":"
-msgstr "Redigerer kilde '%s':"
+msgid "Austria"
+msgstr "Østrig"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Edit a source"
-msgstr "Redigér en kilde"
+msgid "Fatal error"
+msgstr "fatal fejl"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Vent venligst, fjerner medie..."
+msgid "Update..."
+msgstr "Opdatér..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "Kildetype:"
+msgid "Starting download of `%s'..."
+msgstr "Starter hentning af `%s'..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Tilføjer en kilde:"
+msgid "(none)"
+msgstr "(ingen)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
+"Removing these packages would break your system, sorry:\n"
+"\n"
 msgstr ""
-"Der er allerede et medie med dette navn, ønsker du\n"
-"virkelig at erstatte dette?"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Du skal udfylde i det mindste de to første indgange."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Name:"
-msgstr "Navn:"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Login:"
-msgstr "Login:"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Choose a mirror..."
-msgstr "Vælg et spejl..."
+"Desværre, fjernelse af disse pakker ville ødelægge systemet:\n"
+"\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
-msgstr "Gennemse..."
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Installerer pakke `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Path or mount point:"
-msgstr "sti eller monteringspunkt:"
+msgid "Currently installed version: "
+msgstr "Nuværende installeret version: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Removable device"
-msgstr "Udskiftelig enhed"
+msgid "Other"
+msgstr "Andet"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "HTTP-server"
+msgid "Reason for update: "
+msgstr "Årsag til opdatering: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "FTP-server"
+msgid "Please choose the desired mirror."
+msgstr "Vælg ønsket spejl."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Path:"
-msgstr "Sti:"
+msgid "Edit"
+msgstr "Redigér"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "Lokale filer"
+msgid "Please wait, finding available packages..."
+msgstr "Vent venligst, finder tilgængelige pakker..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Add a source"
-msgstr "Tilføj en kilde"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr ""
-"Kan ikke opdatere medie; det vil automatisk være deaktiveret.\n"
-"\n"
-"Fejl:\n"
-"%s"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Unable to create medium."
-msgstr "Kan ikke lave medie."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Update"
-msgstr "Opdatér"
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Relativ sti til syntese eller hdlist:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Venligst vælg de kilder du ønsker at opdatere:"
+msgid "Search results (none)"
+msgstr "Søgeresultater (ingen)"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Vent venligst, opdaterer medie..."
+msgid "Danmark"
+msgstr "Danmark"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid " failed!"
-msgstr " mislykkedes!"
+msgid "China"
+msgstr "Kina"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid " done."
-msgstr " færdig."
+msgid "United States"
+msgstr "U.S.A."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "Hentning af `%s', hastighed:%s"
+msgid "changes:"
+msgstr "ændringer:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "Hentning af `%s', resterende tid:%s, hastighed:%s"
+msgid "Some additional packages need to be removed"
+msgstr "Nogle yderligere pakker skal fjernes"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Starting download of `%s'..."
-msgstr "Starter hentning af `%s'..."
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "Undersøger fjern fil fra kilde '%s'..."
+msgid "No"
+msgstr "Nej"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Examining file of source `%s'..."
-msgstr "Undersøger fil fra kilde '%s'..."
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure medias"
+msgstr "Konfigurér kilder"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Copying file for source `%s'..."
-msgstr "Kopierer fil for kilde `%s'..."
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a media"
+msgstr "Tilføj en kilde"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please choose the desired mirror."
-msgstr "Vælg ønsket spejl."
+msgid "Summary: "
+msgstr "Resumé: "
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
-msgstr ""
-"Kan ikke finde noget passende spejl.\n"
-"\n"
-"Det kan være mange årsager til dette problem; det mest almindelige er\n"
-"når arkitekturen på din processor ikke understøttes af\n"
-"Mandrake Linux' officielle opdateringer."
+msgid "Canada"
+msgstr "Canada"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No mirror"
-msgstr "Intet spejl"
+msgid "Greece"
+msgstr "Grækenland"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1134,178 +1062,252 @@ msgstr ""
 "Netværket eller MandrakeSofts websted kan være utilgængelige.\n"
 "Forsøg igen senere."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
-msgstr "Fejl under hentning"
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Desværre, kunne ikke hente kildepakker. %s"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr "Vent venligst, henter spejladresser fra MandrakeSofts websted."
+msgid "Path:"
+msgstr "Sti:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Må kontakte MandrakeSofts websted for at hente spejllisten.\n"
-"Kontrollér venligst at dit netværk er startet.\n"
-"\n"
-"Er det O.k. at fortsætte?"
+msgid "Problem during removal"
+msgstr "Problem ved fjernelse"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United States"
-msgstr "U.S.A."
+msgid "Selected"
+msgstr "Valgt"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "Kina"
+msgid "Netherlands"
+msgstr "Holland"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Storbritannien"
+msgid "Addable"
+msgstr "Kan tilføjes"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Taiwan"
+msgid "(Not available)"
+msgstr "(Ingen tilgængelig)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Sweden"
-msgstr "Sverige"
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
+msgstr ""
+"Desværre, følgende pakker kan ikke vælges:\n"
+"\n"
+"%s\n"
+"\n"
+"Årsager følger:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Russia"
-msgstr "Rusland"
+msgid "Not selected"
+msgstr "Ikke valgt"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Portugal"
-msgstr "Portugal"
+msgid "Software Packages Removal"
+msgstr "Fjernelse af programpakker"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Poland"
-msgstr "Polen"
+msgid "Sweden"
+msgstr "Sverige"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Norway"
-msgstr "Norge"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
+msgstr ""
+"\n"
+"\n"
+"Fejl rapporteret:\n"
+"%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Netherlands"
-msgstr "Holland"
+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 ""
+"Listen over opdateringer er tom. Dette betyder at der ikke\n"
+"findes nogen tilgængelige opdateringer for programmerne installeret\n"
+"på maskinen eller at du allerede har installeret dem alle."
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Korea"
-msgstr "Korea"
+#, fuzzy, c-format
+msgid "Examining file of media `%s'..."
+msgstr "Undersøger fil fra kilde '%s'..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Japan"
-msgstr "Japan"
+msgid "Download of `%s', speed:%s"
+msgstr "Hentning af `%s', hastighed:%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Italy"
-msgstr "Italien"
+msgid "One of the following packages is needed:"
+msgstr "En af følgende pakker behøves:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Israel"
-msgstr "Israel"
+msgid "Quit"
+msgstr "Afslut"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Greece"
-msgstr "Grækenland"
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Må kontakte spejlet for at hente de seneste opdateringspakker.\n"
+"Kontrollér venligst at dit netværk er startet.\n"
+"\n"
+"Er det O.k. at fortsætte?"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update media(s)"
+msgstr "Opdatér kilder"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "France"
-msgstr "Frankrig"
+msgid "Ok"
+msgstr "O.k."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Finland"
-msgstr "Finland"
+msgid "Please wait, adding medium..."
+msgstr "Vent venligst, tilføjer medie..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Spain"
-msgstr "Spanien"
+msgid "Unable to get source packages."
+msgstr "Kunne ikke hente kildepakker."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Danmark"
-msgstr "Danmark"
+msgid "Too many packages are selected"
+msgstr "For mange pakker er valgt"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"Velkommen til redigering af kildepakker!\n"
+"\n"
+"Dette værktøj hjælper dig med at konfigurere pakkekilderne du vil bruge\n"
+"på maskinen. De vil derefter være tilgængelige så du kan installere nye\n"
+"programmer eller udføre opdateringer."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "Tyskland"
+msgid "%s conflicts with %s"
+msgstr "%s er i konflikt med %s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Tjekkiet"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Velkommen til MandrakeUpdate!\n"
+"\n"
+"Dette værktøj hjælper dig med at vælge opdateringerne du vil\n"
+"installere på maskinen."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Costa Rica"
+msgid "Mandrake choices"
+msgstr "Mandrake-valg"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Canada"
-msgstr "Canada"
+msgid "Changelog:\n"
+msgstr "Ændringslog:\n"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Brazil"
-msgstr "Brasilien"
+msgid "Korea"
+msgstr "Korea"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Removable device"
+msgstr "Udskiftelig enhed"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Belgien"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Australien"
+msgid "Change medium"
+msgstr "Skift media"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "Østrig"
+msgid "Mandrake Update"
+msgstr "Mandrake Opdatér"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
-msgstr "Info..."
+msgid "by size"
+msgstr "efter størrelse"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "Nej"
+msgid "FTP server"
+msgstr "FTP-server"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "Filer:\n"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Yes"
-msgstr "Ja"
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr ""
+"Kan ikke opdatere medie; det vil automatisk være deaktiveret.\n"
+"\n"
+"Fejl:\n"
+"%s"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -1577,6 +1579,12 @@ msgstr "Fjern programmel"
 msgid "Software Sources Manager"
 msgstr "Administration af programmelkilder"
 
+#~ msgid "Source: "
+#~ msgstr "Kilde: "
+
+#~ msgid "Source"
+#~ msgstr "Kilde"
+
 #~ msgid ""
 #~ "some packages failed to install\n"
 #~ "correctly"
@@ -1592,4 +1600,3 @@ msgstr "Administration af programmelkilder"
 
 #~ msgid "Program missing"
 #~ msgstr "Program mangler"
-
diff --git a/po/da.pom b/po/da.pom
index f9cd6308..c861124e 100644
--- a/po/da.pom
+++ b/po/da.pom
@@ -3,6 +3,10 @@ msgid "Server"
 msgstr "Server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+msgid "Development"
+msgstr "Udvikling"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Office Workstation"
 msgstr "Kontor-arbejdsstation"
@@ -18,11 +22,6 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Arbejdsstation"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
 msgid "Game station"
 msgstr "Spillemaskine"
 
@@ -111,11 +110,6 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Grafisk miljø"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
 msgid "Gnome Workstation"
 msgstr "Gnome-arbejdsstation"
 
@@ -138,12 +132,6 @@ msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-msgid "Development"
-msgstr "Udvikling"
-
-# 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 og C++ udviklingsbiblioteker, programmer, og include-filer."
 
@@ -229,36 +217,6 @@ msgstr "NFS-vært, SMB-vært, mellemvært (proxy), SSH-vært"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Audio station"
-msgstr "Lyd-station"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Sound playing/editing programs"
-msgstr "Lyd-afspillere og -redigeringsværktøjer"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Video station"
-msgstr "Video-maskine"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Video playing programs"
-msgstr "Video-afspilningsprogrammer"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Graphic station"
-msgstr "Grafisk maskine"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Graphics programs"
-msgstr "Grafiske programmer"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
 msgid "Set of tools to read and send mail and news and to browse the Web"
 msgstr ""
 "Værktøjssæt til at læse samt sende post og nyheder, og til at browse på "
diff --git a/po/de.po b/po/de.po
index f014836e..f33aed16 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: 2003-02-14 00:18+0100\n"
 "Last-Translator: Stefan Siegel <siegel@linux-mandrake.com>\n"
 "Language-Team: German <cooker-i18n@linux-mandrake.com>\n"
@@ -14,16 +14,20 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"Wollen Sie fortfahren?"
+msgid "Enabled?"
+msgstr "Aktiviert?"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Pfad oder Einhängpunkt:"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Portugal"
+msgstr "Port:"
 
 #: ../rpmdrake:1
 #, c-format
@@ -42,16 +46,78 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "by group"
+msgstr "nach Gruppen"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Name:"
+msgstr "Name"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Italy"
+msgstr "Installieren"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Wie Sie Ihren Paketserver selbst auswählen"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "Einige Pakete müssen entfernt werden"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
+msgstr "Mehr Paketinformationen ..."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Ja"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Welcome to MandrakeUpdate!\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
 msgstr ""
-"Willkommen zu MandrakeUpdate!\n"
+"Um die Abhängigkeiten zu berücksichtigen, muss die Auswahl folgender\n"
+"Pakete zurüchgesetzt werden:\n"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "Alles korrekt installiert"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "%s KB"
+msgstr "%.1f KB"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
 "\n"
-"Dieses Werkzeug möchte Ihnen ber der Entscheidung helfen, welche \n"
-"aktualisierten Pakete Sie installieren wollen."
+"Then, restart MandrakeUpdate."
+msgstr ""
+"Sie kön Ihren bevorzugten Paketserver auch selbst angeben:\n"
+"Starten Sie den Paketquellen-Manager, und fügen Sie eine \n"
+"„Sicherheitsaktualisierungen“ Quelle hinzu.\n"
+"\n"
+"Starten Sie anschließend erneut MandrakeUpdate."
 
 #: ../rpmdrake:1
 #, c-format
@@ -66,40 +132,22 @@ msgstr ""
 "Dieses Programm wird Ihnen helfen, die Softwarepakete auszuwählen,\n"
 "die Sie von Ihrem Rechner entfernen wollen.."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:1
+#, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
+"In order to save the changes, you need to insert the medium in the drive."
 msgstr ""
-"Während der Paketinstallation trat ein Fehler auf:\n"
-"\n"
-"%s"
+"Un die Änderungen zu speichern, müssen Sie das Medium ins Laufwerk legen"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Problem during removal"
-msgstr "Fehler beim Entfernen"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, removing packages..."
-msgstr ""
-"Bitte warten\n"
-"Ich sortiere die Pakete"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, reading packages database..."
-msgstr ""
-"Bitte warten\n"
-"Ich sortiere die Pakete"
+msgid "Save and quit"
+msgstr "Speichern und beenden"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"There was a problem during the installation:\n"
+"There was a problem during the removal of packages:\n"
 "\n"
 "%s"
 msgstr ""
@@ -109,80 +157,72 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Alle Installieren"
+msgid "Size: "
+msgstr "Größe"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Paketinstallation vorbereiten ..."
+msgid "Security updates"
+msgstr "Zeige Sicherheits-Aktualisierungen"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Paketinstallation vorbereiten ..."
+msgid "Already existing update medias"
+msgstr "Fehler beim Erstellen eines Aktualisierungsmediums"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Alle gewählten Pakete wurden erfolgreich installiert."
+msgid "Maximum information"
+msgstr "Maximale Infonformationen"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Everything installed successfully"
-msgstr "Alles erfolgreich installiert"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Proxy..."
+msgstr "Fehler ..."
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The installation is finished; %s.\n"
-"\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
 msgstr ""
-"Die Installation ist abgeschlossen; %s.\n"
-"\n"
-"Einige Konfigurationsdateien wurden als „.rpmnew“ bzw. „.rpmsave“ angelegt. "
-"Sie kön diese nun genauer betrachten, um möglicherweise notwendige Aktionen "
-"vorzunehmen:"
+"Die Installation schlug fehl, da einige Pakete fehlen.\n"
+"Sie sollten Ihre Paketliste aktualisieren."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "everything was installed correctly"
-msgstr "Alles korrekt installiert"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Währen der Installation sind Fehler aufgetreten."
+msgid "United Kingdom"
+msgstr "Großbritannien"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Installiere Paket „%s“ (%s/%s) ..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Paketinstallation vorbereiten ..."
+msgid "in names"
+msgstr "in Namen"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
+"I can't find any suitable mirror.\n"
 "\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
+"Ich kan keinen passenden Paketserver finden.\n"
+"\n"
+"Es gibt zahlreiche mögliche Fehlerquellen. Der häufigste Fehler\n"
+"ist, dass es für Ihre Prozessorarchitektur keine regulären Mandrake\n"
+"Linux Aktualisierungen gibt."
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"Die Installation schlug fehl, da einige Pakete fehlen.\n"
-"Sie sollten Ihre Paketliste aktualisieren."
+msgid "Remove .%s"
+msgstr "Entferne .%s"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "Finland"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -199,206 +239,276 @@ msgstr ""
 "\n"
 "Soll ich fortfahren?"
 
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Examining distant file of media `%s'..."
+msgstr ""
+
 #: ../rpmdrake:1
 #, c-format
 msgid "Verifying packages signatures..."
 msgstr ""
 
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "France"
+msgstr "Forciert"
+
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "More info"
+msgstr "Weitere Infos"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Besorge Paket „%s“ (%s/%s) ..."
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Wollen Sie fortfahren?"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "Abbruch"
+msgid "Reload the packages list"
+msgstr "Paketliste neu laden"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Ok"
-msgstr "OK"
+msgid "Choose a mirror..."
+msgstr "Wählen Sie einen Mirror ..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Bitte legen Sie das Medium „%s“ in Laufwerk [%s]."
+msgid "Some packages can't be installed"
+msgstr "Das Paket „%s“ kann nicht installiert werden\n"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "Paketinstallation vorbereiten ..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Change medium"
-msgstr "Medienwechsel"
+msgid "All packages,"
+msgstr "Alle Pakete,"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Type of media:"
+msgstr "Typ der Quelle:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "Installierung ..."
+msgid "in files"
+msgstr "in Dateien"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "Alle gewählten Pakete wurden erfolgreich installiert."
+
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Paketinstallation vorbereiten ..."
+msgid "Proxy hostname:"
+msgstr "Proxy Kennzeichen:"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "Lokale Dateien"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr "Untersuche %s"
+
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Nur das privileg. Kennzeichen „root“ darf Pakete installieren."
+msgid "Israel"
+msgstr "Installieren"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unable to get source packages."
-msgstr "Wählen Sie Ihre Pakete"
+msgid "Help"
+msgstr "/_Hilfe"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Inspect..."
-msgstr "Untersuche ..."
+msgid "HTTP server"
+msgstr "HTTP-Server"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Installation finished"
-msgstr "Installiert"
+msgid "Installation failed"
+msgstr "Alle Installieren"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Tue nichts"
+msgid "Use .%s as main file"
+msgstr "Verwende .%s als Hauptdatei"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Verwende .%s als Hauptdatei"
+msgid "Search results"
+msgstr "Suchergebnisse"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid " failed!"
+msgstr "in Dateien"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
+msgstr "Brasilien"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"Es existiert bereits ein Medium mit diesem Namen,\n"
+"wollen Sie es ersetzen?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Entferne .%s"
+msgid "Find:"
+msgstr "Finden:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "changes:"
-msgstr "Änderungen:"
+msgid "All packages, alphabetical"
+msgstr "Alle Pakete, alphabetisch sortiert"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Untersuche %s"
+msgid "Please wait, searching..."
+msgstr "Bitte warten, ich suche ..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, finding available packages..."
+msgid "Please wait, reading packages database..."
 msgstr ""
 "Bitte warten\n"
 "Ich sortiere die Pakete"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Please wait, adding medium..."
-msgstr "Hinzufügen der Quelle, bitte warten ..."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "unbekannt"
 
 #: ../rpmdrake:1
-#, c-format
-msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
-"\n"
-"Then, restart MandrakeUpdate."
-msgstr ""
-"Sie kön Ihren bevorzugten Paketserver auch selbst angeben:\n"
-"Starten Sie den Paketquellen-Manager, und fügen Sie eine \n"
-"„Sicherheitsaktualisierungen“ Quelle hinzu.\n"
-"\n"
-"Starten Sie anschließend erneut MandrakeUpdate."
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Bitte legen Sie das Medium „%s“ in Laufwerk [%s]."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "Wie Sie Ihren Paketserver selbst auswählen"
+msgid "Reset the selection"
+msgstr "Auswahl zurücksetzen"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
 msgstr ""
+"Falls Sie einen Proxy verwenden müssen, geben Sie dessen Rechnernamen/IP und "
+"- falls nötig auch den Port - an (Syntax: <Proxyrechner[:Port]>):"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Already existing update sources"
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
 msgstr ""
+"Um alle Abhängigkeiten gewährleisten zu können\n"
+"werden folgende Pakete gelöscht:\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
+msgid "Costa Rica"
+msgstr "Costa Rica"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
+"There was a problem during the installation:\n"
 "\n"
-"Is it ok to continue?"
+"%s"
 msgstr ""
-"Ich muss Kontakt mit dem Paketserver aufnehmen, um die neuen Pakete\n"
-"zu besorgen. Stelen Sie sicher, dass Ihre Netzwerkverbindung besteht.\n"
+"Während der Paketinstallation trat ein Fehler auf:\n"
 "\n"
-"Soll ich fortfahren?"
+"%s"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Please wait, removing medium..."
+msgstr "Entfernen der Quelle, bitte warten ..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Dateifehler"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "Passwort:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "Taiwan"
+
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Paketinstallation vorbereiten ..."
+msgid "User:"
+msgstr "Kennzeichen:"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr "Aktualisieren der Quelle, bitte warten ..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Mandrake Update"
-msgstr "Mandrake Update Voreinstellungen"
+msgid "Please wait, listing packages..."
+msgstr ""
+"Bitte warten\n"
+"Ich sortiere die Pakete"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Software Packages Removal"
-msgstr "Softwarepakete-Entferner"
+#, fuzzy, c-format
+msgid "Information on packages"
+msgstr "Wählen Sie Ihre Pakete"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "Beenden"
+msgid "Cancel"
+msgstr "Abbruch"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Installieren"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Remove"
-msgstr "Entfernen"
+msgid "Everything installed successfully"
+msgstr "Alles erfolgreich installiert"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Help"
-msgstr "/_Hilfe"
+msgid "Select the media(s) you wish to update:"
+msgstr "Bitte wählen Sie die zu aktualisierenden Quelle(n):"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search"
-msgstr "Suche"
+msgid "Please wait, updating media..."
+msgstr "Quellen aktualisieren, bitte warten ..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Finden:"
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -416,161 +526,189 @@ msgstr ""
 "Soll ich fortfahren?"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "in descriptions"
+msgstr "Beschreibung"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Einige Pakete müssen entfernt werden"
+msgid "Configure proxies"
+msgstr "Proxy einrichten"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
 "\n"
-"Do you really want to install all the selected packages?"
+"Is it ok to continue?"
 msgstr ""
-"WARNUNG: Es scheint, dass Sie mehr Pakete installieren wollen\n"
-"als Plattenplatz auf Ihren Dateisystemen vorhanden ist.\n"
-"Dies kann im ungünstigstem Fall zu einem inkonsistenten und\n"
-"daher unbrauchbarem System führen.\n"
+"Ich muss die Liste der Paketserver von der MandrakeSoft Web-Seite\n"
+"laden. Stelen Sie sicher, dass Ihre Netzwerkverbindung besteht.\n"
 "\n"
-"Wollen Sie wirklich alle markierten Pakete installieren?"
+"Soll ich fortfahren?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Zu viele Pakete ausgewählt"
+msgid "Please choose"
+msgstr "Bitte Wählen Sie"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Maximum information"
-msgstr "Maximale Infonformationen"
+#, fuzzy, c-format
+msgid "Selected size: %d MB"
+msgstr "%d gewählte Pakete: %.1f MB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Normal information"
-msgstr "Normale Informationen"
+msgid "Initializing..."
+msgstr "Installierung ..."
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update source(s)"
-msgstr "Quelle(n) aktualisieren"
+msgid "Save changes"
+msgstr "Änderungen speichern"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Paketliste neu laden"
+msgid "Error during download"
+msgstr "Fehler beim Besorgen"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reset the selection"
-msgstr "Auswahl zurücksetzen"
+#, fuzzy, c-format
+msgid "Package installation..."
+msgstr "Paketinstallation vorbereiten ..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "in Dateien"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "in descriptions"
-msgstr "Beschreibung"
+msgid "Importance: "
+msgstr "Wichtigkeit: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "in Namen"
+msgid ""
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
+msgstr ""
+"Um die Abhängigkeiten zu berücksichtigen, müssen die folgenden\n"
+"Pakete ebenfalls installiert werden:\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by update availability"
-msgstr "nach Verfügbarkeit"
+msgid "Add..."
+msgstr "Hinzufügen ..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by source repository"
-msgstr "nach Quellen"
+msgid "Unable to create medium."
+msgstr "Ich kann das Medium nicht anlegen."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by selection state"
-msgstr "nach Auswahlstadium"
+msgid ""
+"The installation is finished; %s.\n"
+"\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
+msgstr ""
+"Die Installation ist abgeschlossen; %s.\n"
+"\n"
+"Einige Konfigurationsdateien wurden als „.rpmnew“ bzw. „.rpmsave“ angelegt. "
+"Sie kön diese nun genauer betrachten, um möglicherweise notwendige Aktionen "
+"vorzunehmen:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by size"
-msgstr "nach Größe"
+msgid "Browse..."
+msgstr "Durchstöbern ..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "Das Paket „%s“ kann nicht installiert werden\n"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by group"
-msgstr "nach Gruppen"
+msgid "Info..."
+msgstr "Info ..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "All packages,"
-msgstr "Alle Pakete,"
+msgid "You need to insert the medium to continue"
+msgstr "Sie müssen das Medium einlegen, um fortfahren zu können"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Alle Pakete, alphabetisch sortiert"
+msgid "Copying file for media `%s'..."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Mandrake Auswahl"
+msgid "Remove"
+msgstr "Entfernen"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Normal updates"
-msgstr "Normale Aktualisierungen"
+msgid "Preparing packages installation..."
+msgstr "Paketinstallation vorbereiten ..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Bugfixes updates"
-msgstr "Zeige Fehlerkorrekturen"
+msgid "by media repository"
+msgstr "nach Quellen"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Security updates"
-msgstr "Zeige Sicherheits-Aktualisierungen"
+msgid "No mirror"
+msgstr "Mirror:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Description: "
-msgstr "Beschreibung"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to fill up at least the two first entries."
+msgstr "Sie müssen zumindest die ersten beiden Felder ausfüllen."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Aktualisierungsgründe:"
+msgid "Install"
+msgstr "Installieren"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Summary: "
-msgstr "Zusammenfassung"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Japan"
+msgstr "Japan"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Importance: "
-msgstr "Wichtigkeit: "
+msgid "Do nothing"
+msgstr "Tue nichts"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "%s KB"
-msgstr "%.1f KB"
+msgid "No update"
+msgstr "Aktualisieren"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Size: "
-msgstr "Größe"
+msgid "Description: "
+msgstr "Beschreibung"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Version: "
-msgstr "Version:"
+#, c-format
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr ""
+"WARNUNG: Es scheint, dass Sie mehr Pakete installieren wollen\n"
+"als Plattenplatz auf Ihren Dateisystemen vorhanden ist.\n"
+"Dies kann im ungünstigstem Fall zu einem inkonsistenten und\n"
+"daher unbrauchbarem System führen.\n"
+"\n"
+"Wollen Sie wirklich alle markierten Pakete installieren?"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -579,83 +717,65 @@ msgstr "Name: %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Momentan installierte Version:"
+msgid "Inspect..."
+msgstr "Untersuche ..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Source: "
-msgstr "Quelle"
+msgid "Editing media \"%s\":"
+msgstr "Quelle „%s“ bearbeiten:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "(Not available)"
-msgstr "(Nicht vorhanden)"
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "Paketinstallation vorbereiten ..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "ChangeLog:\n"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Files:\n"
-msgstr "/_Datei"
+msgid "Australia"
+msgstr "Australien"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Selected size: %d MB"
-msgstr "%d gewählte Pakete: %.1f MB"
+msgid "Installation finished"
+msgstr "Installiert"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Ausgewählt: %d MB / Freier Plattenplatz: %d MB"
+msgid "by update availability"
+msgstr "nach Verfügbarkeit"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
-msgstr ""
-"Um die Abhängigkeiten zu berücksichtigen, muss die Auswahl folgender\n"
-"Pakete zurüchgesetzt werden:\n"
+msgid "Poland"
+msgstr "Polen"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr ""
-"Die folgenden Pakete können nicht ausgewählt werden:\n"
-"\n"
+msgid "Version: "
+msgstr "Version:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "wirft Konflikte auf mit"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+"Sie können auch ein Benutzerkennzeichen und Passwort für die "
+"Proxyauthentifizierung angeben:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Das Paket „%s“ kann nicht installiert werden\n"
+msgid "Upgradable"
+msgstr "Neue Version"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
+msgid " done."
 msgstr ""
-"Um die Abhängigkeiten zu berücksichtigen, müssen die folgenden\n"
-"Pakete ebenfalls installiert werden:\n"
-"\n"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Software Packages Installation"
+msgstr "Paketinstallation vorbereiten ..."
 
 #: ../rpmdrake:1
 #, c-format
@@ -664,644 +784,524 @@ msgstr "Es werden zusätzliche Pakete benötigt"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "Das Paket „%s“ kann nicht installiert werden\n"
+msgid "Bugfixes updates"
+msgstr "Zeige Fehlerkorrekturen"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
+msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
-"Entfernen dieser Pakete würde Ihr System unbrauchbar machen:\n"
-"\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"Um alle Abhängigkeiten gewährleisten zu können\n"
-"werden folgende Pakete gelöscht:\n"
-"\n"
+msgid "Germany"
+msgstr "Deutschland"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Einige weitere Pakete müssen ebenfalls entfernt werden."
+msgid "Russia"
+msgstr "Russland"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "More information on package..."
-msgstr "Mehr Paketinformationen ..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Information on packages"
-msgstr "Wählen Sie Ihre Pakete"
+msgid "Norway"
+msgstr "Norwegen"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "More info"
-msgstr "Weitere Infos"
+msgid "Problem during installation"
+msgstr "Währen der Installation sind Fehler aufgetreten."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Addable"
-msgstr "Verfügbar"
+msgid "Search"
+msgstr "Suche"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Upgradable"
-msgstr "Neue Version"
+msgid "Edit a media"
+msgstr "Quelle bearbeiten"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
+msgstr "Tschechei"
 
 #: ../rpmdrake:1
 #, c-format
 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."
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"Die Aktualisierungsliste ist leer. Das bedeutet entwerder, das es\n"
-"(noch) keine Aktualisierungen für Ihr System gibt oder das Sie\n"
-"breits alle Aktualisierungen auf Ihren Rechner aufgespielt haben."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "No update"
-msgstr "Aktualisieren"
+#, c-format
+msgid "Stop"
+msgstr "Stopp"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(none)"
-msgstr "(keine)"
+msgid "Update"
+msgstr "Neue Version"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, listing packages..."
+msgid "Please wait, removing packages..."
 msgstr ""
 "Bitte warten\n"
 "Ich sortiere die Pakete"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "unbekannt"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Sie benötigen eines der folgenden Pakete:"
+msgid "Normal information"
+msgstr "Normale Informationen"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Bitte Wählen Sie"
+msgid "Media: "
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "RpmDrake"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr "Konflikte gefunden"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "Besorge Paket „%s“ (%s/%s) ..."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Selected"
-msgstr ""
-"Alle\n"
-"auswählen"
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Ausgewählt: %d MB / Freier Plattenplatz: %d MB"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search results"
-msgstr "Suchergebnisse"
+msgid "Media"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Stop"
-msgstr "Stopp"
+msgid "Spain"
+msgstr "Spanien"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Please wait, searching..."
-msgstr "Bitte warten, ich suche ..."
+#, fuzzy, c-format
+msgid "Normal updates"
+msgstr "Normale Aktualisierungen"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Suchergebnisse (keine)"
+msgid "by selection state"
+msgstr "nach Auswahlstadium"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Other"
-msgstr "Sonstige"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "Bitte Waten: Besorgen der Serverliste vom MandrakeSoft-Server ..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the packages source editor!\n"
-"\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
-msgstr ""
-"Willkommen zum Paketquellen-Editor!\n"
-"\n"
-"Mit diesem Programm können Sie einstellen, welche Paketquellen Sie für\n"
-"Ihren Rechner verwenden wollen. Sie stehen dann zur Verfgung, um\n"
-"Softwarepakete von dort zu installieren bzw. zu aktualisieren."
+msgid "Login:"
+msgstr "Login:"
 
 #: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Adding a media:"
+msgstr "Hinzufügen einer Quelle:"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Save and quit"
-msgstr "Speichern und beenden"
+msgid "Austria"
+msgstr "Östereich"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Fehler ..."
+msgid "Fatal error"
+msgstr "Dateifehler"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Update..."
 msgstr "Neue Version"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add..."
-msgstr "Hinzufügen ..."
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "Signatur von „%s“ überprüfen ..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Edit"
-msgstr "Bearbeiten"
+msgid "(none)"
+msgstr "(keine)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Source"
-msgstr "Quelle"
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
+"Entfernen dieser Pakete würde Ihr System unbrauchbar machen:\n"
+"\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Enabled?"
-msgstr "Aktiviert?"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Installiere Paket „%s“ (%s/%s) ..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure sources"
-msgstr "Quellen einrichten"
+msgid "Currently installed version: "
+msgstr "Momentan installierte Version:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "Passwort:"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "User:"
-msgstr "Kennzeichen:"
+msgid "Other"
+msgstr "Sonstige"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr ""
-"Sie können auch ein Benutzerkennzeichen und Passwort für die "
-"Proxyauthentifizierung angeben:"
+msgid "Reason for update: "
+msgstr "Aktualisierungsgründe:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Proxy hostname:"
-msgstr "Proxy Kennzeichen:"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+msgid "Please choose the desired mirror."
 msgstr ""
-"Falls Sie einen Proxy verwenden müssen, geben Sie dessen Rechnernamen/IP und "
-"- falls nötig auch den Port - an (Syntax: <Proxyrechner[:Port]>):"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure proxies"
-msgstr "Proxy einrichten"
+"Bitte warten\n"
+"Ich besorge die Mirror Liste ..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Aktualisieren der Quelle, bitte warten ..."
+msgid "Edit"
+msgstr "Bearbeiten"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, finding available packages..."
 msgstr ""
-"Un die Änderungen zu speichern, müssen Sie das Medium ins Laufwerk legen"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to insert the medium to continue"
-msgstr "Sie müssen das Medium einlegen, um fortfahren zu können"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Save changes"
-msgstr "Änderungen speichern"
+"Bitte warten\n"
+"Ich sortiere die Pakete"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Relativer Pfad zur Synthesis- oder HD-Liste: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "Search results (none)"
+msgstr "Suchergebnisse (keine)"
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "Quelle „%s“ bearbeiten:"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
+msgstr "Dänemark"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit a source"
-msgstr "Quelle bearbeiten"
+msgid "China"
+msgstr "China"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Entfernen der Quelle, bitte warten ..."
+msgid "United States"
+msgstr "Vereinigte Staaten"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Type of source:"
-msgstr "Typ der Quelle:"
+msgid "changes:"
+msgstr "Änderungen:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Hinzufügen einer Quelle:"
+msgid "Some additional packages need to be removed"
+msgstr "Einige weitere Pakete müssen ebenfalls entfernt werden."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
-msgstr ""
-"Es existiert bereits ein Medium mit diesem Namen,\n"
-"wollen Sie es ersetzen?"
+msgid "rpmdrake"
+msgstr "RpmDrake"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Sie müssen zumindest die ersten beiden Felder ausfüllen."
+msgid "No"
+msgstr "Nein"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Name:"
-msgstr "Name"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Login:"
-msgstr "Login:"
+msgid "Configure medias"
+msgstr "Quellen einrichten"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Choose a mirror..."
-msgstr "Wählen Sie einen Mirror ..."
+#, fuzzy, c-format
+msgid "Add a media"
+msgstr "Hinzufügen einer Quelle"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Browse..."
-msgstr "Durchstöbern ..."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Summary: "
+msgstr "Zusammenfassung"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Path or mount point:"
-msgstr "Pfad oder Einhängpunkt:"
+msgid "Canada"
+msgstr "Kanada"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "Wechselmedium"
+msgid "Greece"
+msgstr "Griechenland"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "HTTP server"
-msgstr "HTTP-Server"
+msgid ""
+"There was an error downloading the mirrors list:\n"
+"\n"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
+msgstr ""
+"Es trat ein Fehler beim Besorgen der Serverliste auf:\n"
+"\n"
+"%s\n"
+"Bitte versuchen Sie es später erneut."
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "FTP server"
-msgstr "FTP-Server"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Nur das privileg. Kennzeichen „root“ darf Pakete installieren."
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Path:"
 msgstr "Port:"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Local files"
-msgstr "Lokale Dateien"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add a source"
-msgstr "Hinzufügen einer Quelle"
+msgid "Problem during removal"
+msgstr "Fehler beim Entfernen"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr "Da ich das Medium nicht aktualisieren kann, wird es deaktiviert."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Unable to create medium."
-msgstr "Ich kann das Medium nicht anlegen."
+msgid "Selected"
+msgstr ""
+"Alle\n"
+"auswählen"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Update"
-msgstr "Neue Version"
+msgid "Netherlands"
+msgstr "Niederlande"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Bitte wählen Sie die zu aktualisierenden Quelle(n):"
+msgid "Addable"
+msgstr "Verfügbar"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Quellen aktualisieren, bitte warten ..."
+msgid "(Not available)"
+msgstr "(Nicht vorhanden)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid " failed!"
-msgstr "in Dateien"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid " done."
-msgstr ""
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Download of `%s', speed:%s"
-msgstr ""
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
 msgstr ""
+"Die folgenden Pakete können nicht ausgewählt werden:\n"
+"\n"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "Signatur von „%s“ überprüfen ..."
+msgid "Not selected"
+msgstr "Konflikte gefunden"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr ""
+msgid "Software Packages Removal"
+msgstr "Softwarepakete-Entferner"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr ""
+msgid "Sweden"
+msgstr "Schweden"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr ""
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Please choose the desired mirror."
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
 msgstr ""
-"Bitte warten\n"
-"Ich besorge die Mirror Liste ..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
+"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 ""
-"Ich kan keinen passenden Paketserver finden.\n"
-"\n"
-"Es gibt zahlreiche mögliche Fehlerquellen. Der häufigste Fehler\n"
-"ist, dass es für Ihre Prozessorarchitektur keine regulären Mandrake\n"
-"Linux Aktualisierungen gibt."
+"Die Aktualisierungsliste ist leer. Das bedeutet entwerder, das es\n"
+"(noch) keine Aktualisierungen für Ihr System gibt oder das Sie\n"
+"breits alle Aktualisierungen auf Ihren Rechner aufgespielt haben."
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "No mirror"
-msgstr "Mirror:"
+#, c-format
+msgid "Examining file of media `%s'..."
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was an error downloading the mirrors list:\n"
-"\n"
-"%s\n"
-"The network, or MandrakeSoft website, are maybe unavailable.\n"
-"Please try again later."
+msgid "Download of `%s', speed:%s"
 msgstr ""
-"Es trat ein Fehler beim Besorgen der Serverliste auf:\n"
-"\n"
-"%s\n"
-"Bitte versuchen Sie es später erneut."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
-msgstr "Fehler beim Besorgen"
+msgid "One of the following packages is needed:"
+msgstr "Sie benötigen eines der folgenden Pakete:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr "Bitte Waten: Besorgen der Serverliste vom MandrakeSoft-Server ..."
+msgid "Quit"
+msgstr "Beenden"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
 "\n"
 "Is it ok to continue?"
 msgstr ""
-"Ich muss die Liste der Paketserver von der MandrakeSoft Web-Seite\n"
-"laden. Stelen Sie sicher, dass Ihre Netzwerkverbindung besteht.\n"
+"Ich muss Kontakt mit dem Paketserver aufnehmen, um die neuen Pakete\n"
+"zu besorgen. Stelen Sie sicher, dass Ihre Netzwerkverbindung besteht.\n"
 "\n"
 "Soll ich fortfahren?"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "United States"
-msgstr "Vereinigte Staaten"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "China"
-msgstr "China"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "United Kingdom"
-msgstr "Großbritannien"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Taiwan"
-msgstr "Taiwan"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Sweden"
-msgstr "Schweden"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Russia"
-msgstr "Russland"
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Portugal"
-msgstr "Port:"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Poland"
-msgstr "Polen"
+msgid "Update media(s)"
+msgstr "Quelle(n) aktualisieren"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Norway"
-msgstr "Norwegen"
+msgid "Ok"
+msgstr "OK"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Netherlands"
-msgstr "Niederlande"
+msgid "Please wait, adding medium..."
+msgstr "Hinzufügen der Quelle, bitte warten ..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Korea"
-msgstr "Forciert"
+msgid "Unable to get source packages."
+msgstr "Wählen Sie Ihre Pakete"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "Japan"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Italy"
-msgstr "Installieren"
+msgid "Too many packages are selected"
+msgstr "Zu viele Pakete ausgewählt"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Israel"
-msgstr "Installieren"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Greece"
-msgstr "Griechenland"
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"Willkommen zum Paketquellen-Editor!\n"
+"\n"
+"Mit diesem Programm können Sie einstellen, welche Paketquellen Sie für\n"
+"Ihren Rechner verwenden wollen. Sie stehen dann zur Verfgung, um\n"
+"Softwarepakete von dort zu installieren bzw. zu aktualisieren."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "France"
-msgstr "Forciert"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Finland"
-msgstr "Finland"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Spain"
-msgstr "Spanien"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Danmark"
-msgstr "Dänemark"
+msgid "%s conflicts with %s"
+msgstr "wirft Konflikte auf mit"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "Deutschland"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Willkommen zu MandrakeUpdate!\n"
+"\n"
+"Dieses Werkzeug möchte Ihnen ber der Entscheidung helfen, welche \n"
+"aktualisierten Pakete Sie installieren wollen."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Tschechei"
+msgid "Mandrake choices"
+msgstr "Mandrake Auswahl"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Costa Rica"
+msgid "Changelog:\n"
+msgstr "ChangeLog:\n"
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Canada"
-msgstr "Kanada"
+#, fuzzy, c-format
+msgid "Korea"
+msgstr "Forciert"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Brazil"
-msgstr "Brasilien"
+msgid "Removable device"
+msgstr "Wechselmedium"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Belgien"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Australien"
+msgid "Change medium"
+msgstr "Medienwechsel"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Austria"
-msgstr "Östereich"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mandrake Update"
+msgstr "Mandrake Update Voreinstellungen"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
-msgstr "Info ..."
+msgid "by size"
+msgstr "nach Größe"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "Nein"
+msgid "FTP server"
+msgstr "FTP-Server"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Files:\n"
+msgstr "/_Datei"
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Yes"
-msgstr "Ja"
+#, fuzzy, c-format
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr "Da ich das Medium nicht aktualisieren kann, wird es deaktiviert."
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -1575,6 +1575,13 @@ msgstr "Software entfernen"
 msgid "Software Sources Manager"
 msgstr "Paketquellen verwalten"
 
+#, fuzzy
+#~ msgid "Source: "
+#~ msgstr "Quelle"
+
+#~ msgid "Source"
+#~ msgstr "Quelle"
+
 #~ msgid ""
 #~ "some packages failed to install\n"
 #~ "correctly"
@@ -1615,9 +1622,6 @@ msgstr "Paketquellen verwalten"
 #~ "\n"
 #~ "Wollen Sie einen anderen Server versuchen?"
 
-#~ msgid "Error adding update medium"
-#~ msgstr "Fehler beim Erstellen eines Aktualisierungsmediums"
-
 #~ msgid "Please wait, contacting mirror to initialize updates packages."
 #~ msgstr ""
 #~ "Besorge Liste der zu aktualisierenden Pakete vom Server, bitte warten ..."
diff --git a/po/el.po b/po/el.po
index 9c0ab3cb..92bb60e0 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: 2002-08-30 16:19+0300\n"
 "Last-Translator: Íßêïò Íýêôáñçò (Nick Niktaris) <niktaris@yahoo.com>\n"
 "Language-Team: Greek <nls@hellug.gr>\n"
@@ -15,16 +15,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"Íá óõíå÷éóôåß;"
+msgid "Enabled?"
+msgstr "Åíåñãïðïßçóç;"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "ÈÝóç Þ óçìåßï ðñïóÜñôçóçò: "
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Portugal"
+msgstr "Ðïñôïãáëßá"
 
 #: ../rpmdrake:1
 #, c-format
@@ -43,16 +47,79 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "by group"
+msgstr "âÜóç ïìÜäáò"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "¼íïìá:"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Italy"
+msgstr "ÅãêáôÜóôáóç"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Ðùò íá äéáëÝîåôå ìüíïé óáò ôçí åíáëëáêôéêÞ óáò"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "ÏñéóìÝíá ðáêÝôá ðñÝðåé íá áöáéñåèïýí"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
+msgstr "Ðåñéóóüôåñåò ðëçñïöïñßåò ãéá ôï ðáêÝôï..."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Íáé"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Welcome to MandrakeUpdate!\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
 msgstr ""
-"Êáëþò ïñßóáôå óôï MandrakeUpdate!\n"
+"Ãéá íá éêáíïðïéçèïýí ïé åîáñôÞóåéò ôïõò ôá ðáñáêÜôù ðáêÝôá ðñÝðåé\n"
+"íá áðïåðéëåãïýí:\n"
 "\n"
-"Áõôü ôï åñãáëåßï èá óáò âïçèÞóåé íá åðéëÝîåôå ôéò áíáâáèìßóåéò ðïõ èÝëåôå\n"
-"íá åãêáôáóôÞóåôå óôïí õðïëïãéóôÞ óáò."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "üëá åãêáôáóôÜèçêáí óùóôÜ"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"Ìðïñåßôå ìüíïé óáò íá äéáëÝîåôå ôçí åðéèõìçôÞ óå åóÜò åíáëëáêôéêÞ\n"
+"äéåýèõíóç: ãéá íá ôï êÜíåôå åêêéíÞóôå ôï Äéá÷åéñéóôÞò Ðçãáßùí ÐáêÝôùí\n"
+"êáé ðñïóèÝóôå ìéá  ðçãÞ `ÁíáâÜèìéóç áóöáëåßáò' \n"
+"\n"
+"ÌåôÜ, îåêéíÞóôå îáíÜ ôï MandrakeUpdate."
 
 #: ../rpmdrake:1
 #, c-format
@@ -67,36 +134,22 @@ msgstr ""
 "Áõôü ôï åñãáëåßï èá óáò âïçèÞóåé íá åðéëÝîåôå ôï ðñüãñáììá ðïõ èÝëåôå\n"
 "íá áöáéñÝóåôå áðü ôïí õðïëïãéóôÞ óáò."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:1
+#, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
+"In order to save the changes, you need to insert the medium in the drive."
 msgstr ""
-"ÓõíÝâç Ýíá óöÜëìá êáôÜ ôçí åãêáôÜóôáóç ôùí ðáêÝôùí:\n"
-"\n"
-"%s"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during removal"
-msgstr "ÕðÞñîáí ðñïâëÞìáôá êáôÜ ôçí åãêáôÜóôáóç"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Please wait, removing packages..."
-msgstr "Ðáñáêáëþ ðåñéìÝíåôå, áöáéñïýíôáé ôá ðáêÝôá..."
+"Ãéá íá áðïèçêåõôïýí ïé áëëáãÝò, èá ðñÝðåé íá åéóÜãåôå ôï ìÝóï óôïí ïäçãü."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Ðáñáêáëþ ðåñéìÝíåôå, äéáâÜæåôáé ç âÜóç äåäïìÝíùí ôùí ðáêÝôùí..."
+msgid "Save and quit"
+msgstr "ÁðïèÞêåõóç êáé Ýîïäïò"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"There was a problem during the installation:\n"
+"There was a problem during the removal of packages:\n"
 "\n"
 "%s"
 msgstr ""
@@ -105,80 +158,74 @@ msgstr ""
 "%s"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "ÅãêáôÜóôáóç üëùí"
+#, c-format
+msgid "Size: "
+msgstr "ÌÝãåèïò: "
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Ðñïåôïéìáóßá ðáêÝôùí ãéá åãêáôÜóôáóç..."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
+msgstr "Áíáíåþóåéò Áóöáëåßáò"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Ðñïåôïéìáóßá ðáêÝôùí ãéá åãêáôÜóôáóç..."
+msgid "Already existing update medias"
+msgstr "ÓöÜëìá êáôÜ ôçí ðñïóèÞêç ôïõ ìÝóïõ áíáâáèìßóåùí"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "¼ëá ôá æçôçèÝíôá ðáêÝôá åãêáôáóôÜèçêáí åðéôõ÷þò."
+msgid "Maximum information"
+msgstr "ÌÝãéóôåò ðëçñïöïñßåò"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Everything installed successfully"
-msgstr "¼ëá åãêáôáóôÜèçêáí åðéôõ÷þò"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Proxy..."
+msgstr "ÓöÜëìá..."
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The installation is finished; %s.\n"
-"\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
 msgstr ""
-"Ç åãêáôÜóôáóç ôåëåßùóå %s.\n"
-"\n"
-"ÏñéóìÝíá áñ÷åßá ñýèìéóåùí äçìéïõñãÞèçêáí ùò `.rpmnew' Þ`.rpmsave',\n"
-"ßóùò íá ðñÝðåé íá ôá åëÝãîåôå ãéá íá åêôåëÝóåôå ïñéóìÝíåò åíÝñãåéåò:"
+"Ç åãêáôÜóôáóç áðÝôõ÷å, ïñéóìÝíá áñ÷åßá äåí õðÜñ÷ïõí.\n"
+"ºóùò íá ðñÝðåé íá áíáâáèìßóåôå ôçí âÜóç äåäïìÝíùí ôùí ðçãþí."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "everything was installed correctly"
-msgstr "üëá åãêáôáóôÜèçêáí óùóôÜ"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "ÕðÞñîáí ðñïâëÞìáôá êáôÜ ôçí åãêáôÜóôáóç"
+msgid "United Kingdom"
+msgstr "ÇíùìÝíï Âáóßëåéï"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "ÅãêáôÜóôáóç ðáêÝôïõ `%s' (%s/%s)..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Ðñïåôïéìáóßá ðáêÝôùí ãéá åãêáôÜóôáóç..."
+msgid "in names"
+msgstr "óôá ïíüìáôá"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
+"I can't find any suitable mirror.\n"
 "\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
+"Äåí ìðïñþ íá âñù êáôÜëëçëç åíáëëáêôéêÞ.\n"
+"\n"
+"Ïé ëüãïé ìðïñåß íá åßíáé ðïëëïß, ï óõíçèÝóôåñïò åßíáé üôáí äåí "
+"õðïóôçñßæåôáé\n"
+"ç áñ÷éôåêôïíéêÞ ôïõ åðåîåñãáóôÞ óáò áðü ôéò åðßóçìåò áíáâáèìßóåéò áðü ôï \n"
+"Mandrake Linux"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"Ç åãêáôÜóôáóç áðÝôõ÷å, ïñéóìÝíá áñ÷åßá äåí õðÜñ÷ïõí.\n"
-"ºóùò íá ðñÝðåé íá áíáâáèìßóåôå ôçí âÜóç äåäïìÝíùí ôùí ðçãþí."
+msgid "Remove .%s"
+msgstr "Áöáßñåóç.%s"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "Öéíëáíäßá"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -195,70 +242,112 @@ msgstr ""
 "\n"
 "Íá óõíå÷éóôåß;"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Verifying packages signatures..."
+msgid "Examining distant file of media `%s'..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Ãßíåôáé ç ëÞøç ôïõ ðáêÝôïõ `%s' (%s/%s)..."
+msgid "Verifying packages signatures..."
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "France"
+msgstr "Åîáíáãêáóìüò"
+
+#. -PO: Keep it short, this is gonna be on a button
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "Áêýñùóç"
+msgid "More info"
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Ok"
-msgstr "OK"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Íá óõíå÷éóôåß;"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Ðáñáêáëþ åéóÜãåôå ôï ìÝóï ìå üíïìá \"%s\" óôç óõóêåõÞ [%s]"
+msgid "Reload the packages list"
+msgstr "Ôï ðáêÝôï %s äåí Ý÷åé õðïãñáöÞ"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Change medium"
-msgstr "ÁëëáãÞ ìÝóïõ"
+msgid "Choose a mirror..."
+msgstr "ÅðéëÝîôå ìéá åíáëëáêôéêÞ..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Initializing..."
-msgstr "Áñ÷éêïðïßçóç..."
+#, fuzzy, c-format
+msgid "Some packages can't be installed"
+msgstr "Ôï ðáêÝôï `%s' äåí ìðïñåß íá åãêáôáóôáèåß\n"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Package installation..."
+msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Ðñïåôïéìáóßá ðáêÝôùí ãéá åãêáôÜóôáóç..."
 
 #: ../rpmdrake:1
+#, c-format
+msgid "All packages,"
+msgstr "¼ëá ôá ðáêÝôá,"
+
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "ÐñÝðåé íá åßóôå root ãéá íá åãêáôáóôÞóåôå ðáêÝôá, óõãíþìç."
+msgid "Type of media:"
+msgstr "Ôýðïò ðçãÞò:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Unable to get source packages."
-msgstr "Áäýíáôç ç ëÞøç ôùí ðçãáßùí ðáêÝôùí."
+msgid "in files"
+msgstr "óôá áñ÷åßá"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "¸ëåã÷ïò..."
+msgid "All requested packages were installed successfully."
+msgstr "¼ëá ôá æçôçèÝíôá ðáêÝôá åãêáôáóôÜèçêáí åðéôõ÷þò."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "ÔïðéêÜ áñ÷åßá"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation finished"
-msgstr "Ç åãêáôÜóôáóç ôåëåßùóå"
+msgid "Inspecting %s"
+msgstr "ÅëÝã÷åôáé ôï %s"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Israel"
+msgstr "ÅãêáôÜóôáóç"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Íá ìç ãßíåé ôßðïôá"
+msgid "Help"
+msgstr "ÂïÞèåéá"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "HTTP server"
+msgstr "ÄéáêïìéóôÞò HTTP"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Installation failed"
+msgstr "ÅãêáôÜóôáóç üëùí"
 
 #: ../rpmdrake:1
 #, c-format
@@ -267,133 +356,156 @@ msgstr "×ñÞóç ôïõ .%s ùò êýñéï áñ÷åßï"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Áöáßñåóç.%s"
+msgid "Search results"
+msgstr "ÁðïôÝëåóìá ÁíáæÞôçóçò"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "changes:"
-msgstr "ÁðïèÞêåõóç áëëáãþí"
+msgid " failed!"
+msgstr "óôá áñ÷åßá"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "ÅëÝã÷åôáé ôï %s"
+msgid "Brazil"
+msgstr "Âñáæéëßá"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"ÕðÜñ÷åé Þäç Ýíá ìÝóï ìå áõôü ôï üíïìá, åßóôå âÝâáéïé\n"
+"ãéá ôçí áíôéêáôÜóôáóÞ ôïõ;"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Ðáñáêáëþ ðåñéìÝíåôå, áíáæçôïýíôáé ôá äéáèÝóéìá ðáêÝôá..."
+msgid "Find:"
+msgstr "Åýñåóç:"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "Ðáñáêáëþ ðåñéìÝíåôå, ðñïóôßèåôáé ôï ìÝóï..."
+msgid "All packages, alphabetical"
+msgstr "¼ëá ôá ðáêÝôá, áëöáâçôéêÜ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
-"\n"
-"Then, restart MandrakeUpdate."
-msgstr ""
-"Ìðïñåßôå ìüíïé óáò íá äéáëÝîåôå ôçí åðéèõìçôÞ óå åóÜò åíáëëáêôéêÞ\n"
-"äéåýèõíóç: ãéá íá ôï êÜíåôå åêêéíÞóôå ôï Äéá÷åéñéóôÞò Ðçãáßùí ÐáêÝôùí\n"
-"êáé ðñïóèÝóôå ìéá  ðçãÞ `ÁíáâÜèìéóç áóöáëåßáò' \n"
-"\n"
-"ÌåôÜ, îåêéíÞóôå îáíÜ ôï MandrakeUpdate."
+msgid "Please wait, searching..."
+msgstr "Ðáñáêáëþ ðåñéìÝíåôå, ãßíåôáé áíáæÞôçóç..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "Ðùò íá äéáëÝîåôå ìüíïé óáò ôçí åíáëëáêôéêÞ óáò"
+msgid "Please wait, reading packages database..."
+msgstr "Ðáñáêáëþ ðåñéìÝíåôå, äéáâÜæåôáé ç âÜóç äåäïìÝíùí ôùí ðáêÝôùí..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "Áäõíáìßá áíïßãìáôïò ôïõ ðáêÝôïõ`%s'\n"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Ðáñáêáëþ åéóÜãåôå ôï ìÝóï ìå üíïìá \"%s\" óôç óõóêåõÞ [%s]"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
+msgid "Reset the selection"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Already existing update sources"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
 "\n"
-"Is it ok to continue?"
 msgstr ""
-"ÐñÝðåé íá åðéêïéíùíÞóù ìå ôçí åíáëëáêôéêÞ ãéá íá ðÜñù ôéò \n"
-"ôåëåõôáßåò áíáâáèìßóåéò ðáêÝôùí. Ðáñáêáëþ åëÝãîôå üôé äßêôõï\n"
-"åßíáé åíåñãü\n"
+"Ãéá íá éêáíïðïéçèïýí ïé åîáñôÞóåéò ôïõò ôá ðáñáêÜôù ðáêÝôá ðñÝðåé åðßóçò\n"
+"íá áöáéñåèïýí:\n"
 "\n"
-"Íá óõíå÷ßóù;"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Costa Rica"
+msgstr "Êüóôá Ñßêá"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Fatal error"
-msgstr "ÓöÜëìá áñ÷åßïõ"
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"ÓõíÝâç Ýíá óöÜëìá êáôÜ ôçí åãêáôÜóôáóç ôùí ðáêÝôùí:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Ðñïåôïéìáóßá ðáêÝôùí ãéá åãêáôÜóôáóç..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr "Ðáñáêáëþ ðåñéìÝíåôå, áöáéñåßôáé ôï ìÝóï..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Mandrake Update"
+msgid "Password:"
+msgstr "Êùäéêüò ðñüóâáóçò:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Áöáßñåóç ÐáêÝôùí Ëïãéóìéêïý"
+msgid "Taiwan"
+msgstr "ÔáúâÜí"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Quit"
-msgstr "¸îïäïò"
+msgid "User:"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Install"
-msgstr "ÅãêáôÜóôáóç"
+msgid "Please wait, updating medium..."
+msgstr "Ðáñáêáëþ ðåñéìÝíåôå, áíáíåþíåôáé ôï ìÝóï..."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "Áöáßñåóç"
+msgid "Please wait, listing packages..."
+msgstr "Ðáñáêáëþ ðåñéìÝíåôå, ôáîéíïìïýíôáé ôá ðáêÝôá"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Information on packages"
+msgstr "Ðåñéóóüôåñåò ðëçñïöïñßåò ãéá ôï ðáêÝôï..."
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Help"
-msgstr "ÂïÞèåéá"
+msgid "Cancel"
+msgstr "Áêýñùóç"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search"
-msgstr "ÁíáæÞôçóç"
+msgid "Everything installed successfully"
+msgstr "¼ëá åãêáôáóôÜèçêáí åðéôõ÷þò"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Select the media(s) you wish to update:"
+msgstr "ÅðéëÝîôå ôéò ðçãÝò ðïõ èÝëåôå íá áíáíåþóåôå:"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, updating media..."
+msgstr "Ðáñáêáëþ ðåñéìÝíåôå, áíáíåþíåôáé ôï ìÝóï..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Åýñåóç:"
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -412,154 +524,182 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "ÏñéóìÝíá ðáêÝôá ðñÝðåé íá áöáéñåèïýí"
+msgid "in descriptions"
+msgstr "óôéò ðåñéãñáöÝò"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure proxies"
+msgstr "Ñýèìéóç ðçãþí"
+
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
 "\n"
-"Do you really want to install all the selected packages?"
+"Is it ok to continue?"
 msgstr ""
+"ÐñÝðåé íá åðéêïéíùíÞóù ìå ôçí éóôïóåëßäá ôçò MandrakeSoft  ãéá íá ðÜñù\n"
+"ôçí ëßóôá ìå ôéò åíáëëáêôéêÝò äéåõèýíóåéò\n"
+"Ðáñáêáëþ åëÝãîôå üôé ôï äßêôõü óáò åßíáé åíåñãü\n"
+"\n"
+"Íá óõíå÷éóôåß;"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Too many packages are selected"
-msgstr "ÏñéóìÝíá ðáêÝôá äåí ìðïñïýí íá åãêáôáóôáèïýí"
+#, c-format
+msgid "Please choose"
+msgstr "Ðáñáêáëþ åðéëÝîôå"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "ÌÝãéóôåò ðëçñïöïñßåò"
+msgid "Selected size: %d MB"
+msgstr "ÅðéëåãìÝíï ìÝãåèïò: %d MB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Normal information"
-msgstr "ÊáíïíéêÝò ðëçñïöïñßåò"
+msgid "Initializing..."
+msgstr "Áñ÷éêïðïßçóç..."
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update source(s)"
-msgstr "ÁíáíÝùóç ðçãÞò(þí)"
+msgid "Save changes"
+msgstr "ÁðïèÞêåõóç áëëáãþí"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "ÓöÜëìá êáôÜ ôç ëÞøç"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Reload the packages list"
-msgstr "Ôï ðáêÝôï %s äåí Ý÷åé õðïãñáöÞ"
+msgid "Package installation..."
+msgstr "Ðñïåôïéìáóßá ðáêÝôùí ãéá åãêáôÜóôáóç..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr ""
+msgid "Importance: "
+msgstr "Óðïõäáéüôçôá: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "óôá áñ÷åßá"
+msgid ""
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
+msgstr ""
+"Ãéá íá éêáíïðïéçèïýí ïé åîáñôÞóåéò, ðñÝðåé íá åãêáôáóôáèïýí êáé\n"
+" ôá ðáñáêÜôù ðáêÝôá:\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "in descriptions"
-msgstr "óôéò ðåñéãñáöÝò"
+msgid "Add..."
+msgstr "ÐñïóèÞêç..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "in names"
-msgstr "óôá ïíüìáôá"
+msgid "Unable to create medium."
+msgstr "Áäõíáìßá äçìéïõñãßáò ìÝóïõ."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
-msgstr "âÜóç äéáèåóéìüôçôáò áíáâÜèìéóçò"
+msgid ""
+"The installation is finished; %s.\n"
+"\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
+msgstr ""
+"Ç åãêáôÜóôáóç ôåëåßùóå %s.\n"
+"\n"
+"ÏñéóìÝíá áñ÷åßá ñýèìéóåùí äçìéïõñãÞèçêáí ùò `.rpmnew' Þ`.rpmsave',\n"
+"ßóùò íá ðñÝðåé íá ôá åëÝãîåôå ãéá íá åêôåëÝóåôå ïñéóìÝíåò åíÝñãåéåò:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by source repository"
-msgstr "âÜóç áðïèçêåõìÝíùí ðçãþí"
+msgid "Browse..."
+msgstr "ÁíáæÞôçóç..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by selection state"
-msgstr "âÜóç êáôÜóôáóçò åðéëïãÞò"
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "Ôï ðáêÝôï `%s' äåí ìðïñåß íá åãêáôáóôáèåß\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by size"
-msgstr "âÜóç ìåãÝèïõò"
+msgid "Info..."
+msgstr "Ðëçñïöïñßåò..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by group"
-msgstr "âÜóç ïìÜäáò"
+msgid "You need to insert the medium to continue"
+msgstr "ÐñÝðåé íá åéóÜãåôå ôï ìÝóï ãéá íá óõíå÷ßóåôå"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "All packages,"
-msgstr "¼ëá ôá ðáêÝôá,"
+msgid "Copying file for media `%s'..."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "¼ëá ôá ðáêÝôá, áëöáâçôéêÜ"
+msgid "Remove"
+msgstr "Áöáßñåóç"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Mandrake choices"
-msgstr "ÅðéëïãÝò Mandrake"
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Ðñïåôïéìáóßá ðáêÝôùí ãéá åãêáôÜóôáóç..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Normal updates"
-msgstr "ÊáíïíéêÝò áíáâáèìßóåéò"
+#, fuzzy, c-format
+msgid "by media repository"
+msgstr "âÜóç áðïèçêåõìÝíùí ðçãþí"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Áíáâáèìßóåéò äéïñèþóåùí"
+msgid "No mirror"
+msgstr "×ùñßò åíáëëáêôéêÝò"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Security updates"
-msgstr "Áíáíåþóåéò Áóöáëåßáò"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Description: "
-msgstr "ÐåñéãñáöÞ"
+msgid "You need to fill up at least the two first entries."
+msgstr "ÐñÝðåé íá óõìðëçñþóåôå ôïõëÜ÷éóôïí ôá äýï ðñþôá ðåäßá."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reason for update: "
-msgstr ""
+msgid "Install"
+msgstr "ÅãêáôÜóôáóç"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Summary: "
-msgstr "Óýíïøç: "
+msgid "Japan"
+msgstr "Éáðùíßá"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Importance: "
-msgstr "Óðïõäáéüôçôá: "
+msgid "Do nothing"
+msgstr "Íá ìç ãßíåé ôßðïôá"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "No update"
+msgstr "×ùñßò áíáâáèìßóåéò"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Size: "
-msgstr "ÌÝãåèïò: "
+#, fuzzy, c-format
+msgid "Description: "
+msgstr "ÐåñéãñáöÞ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Version: "
-msgstr "¸êäïóç: "
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -568,84 +708,63 @@ msgstr "¼íïìá: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Currently installed version: "
-msgstr ""
+msgid "Inspect..."
+msgstr "¸ëåã÷ïò..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Source: "
-msgstr "Åîáíáãêáóìüò"
+msgid "Editing media \"%s\":"
+msgstr "Åðåîåñãáóßá ðçãÞò \"%s\":"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "Ðñïåôïéìáóßá ðáêÝôùí ãéá åãêáôÜóôáóç..."
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
-msgstr "(Äåí åßíáé äéáèÝóéìï/ç)"
+msgid "Australia"
+msgstr "Áõóôñáëßá"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "ÁëëáãÝò:\n"
+msgid "Installation finished"
+msgstr "Ç åãêáôÜóôáóç ôåëåßùóå"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Files:\n"
-msgstr "¶ñ÷åßá:\n"
+msgid "by update availability"
+msgstr "âÜóç äéáèåóéìüôçôáò áíáâÜèìéóçò"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "ÅðéëåãìÝíï ìÝãåèïò: %d MB"
+msgid "Poland"
+msgstr "Ðïëùíßá"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "ÅðéëåãìÝíï: %d MB/ Åëåýèåñïò ÷þñïò óôïí äßóêï: %d MB"
+msgid "Version: "
+msgstr "¸êäïóç: "
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
+msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
-"Ãéá íá éêáíïðïéçèïýí ïé åîáñôÞóåéò ôïõò ôá ðáñáêÜôù ðáêÝôá ðñÝðåé\n"
-"íá áðïåðéëåãïýí:\n"
-"\n"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr ""
-"Óõãíþìç, ôá ðáñáêÜôù ðáêÝôá äåí ìðïñïýí íá åðéëåãïýí:\n"
-"\n"
+#, c-format
+msgid "Upgradable"
+msgstr "Áíáâáèìßóéìá"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr " óõãêñïýåôáé ìå"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid " done."
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Ôï ðáêÝôï `%s' äåí ìðïñåß íá åãêáôáóôáèåß\n"
-
-#: ../rpmdrake:1
-#, c-format
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
-msgstr ""
-"Ãéá íá éêáíïðïéçèïýí ïé åîáñôÞóåéò, ðñÝðåé íá åãêáôáóôáèïýí êáé\n"
-" ôá ðáñáêÜôù ðáêÝôá:\n"
-"\n"
+msgid "Software Packages Installation"
+msgstr "Ðñïåôïéìáóßá ðáêÝôùí ãéá åãêáôÜóôáóç..."
 
 #: ../rpmdrake:1
 #, c-format
@@ -653,640 +772,521 @@ msgid "Additional packages needed"
 msgstr "Áðáéôïýíôáé åðéðëÝïí ðáêÝôá"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "Ôï ðáêÝôï `%s' äåí ìðïñåß íá åãêáôáóôáèåß\n"
+#, c-format
+msgid "Bugfixes updates"
+msgstr "Áíáâáèìßóåéò äéïñèþóåùí"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
-"Óõãíþìç, ç áöáßñåóç áõôþí ôùí ðáêÝôùí èá êáôáóôñÝøåé ôï óýóôçìÜ óáò:\n"
-"\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"Ãéá íá éêáíïðïéçèïýí ïé åîáñôÞóåéò ôïõò ôá ðáñáêÜôù ðáêÝôá ðñÝðåé åðßóçò\n"
-"íá áöáéñåèïýí:\n"
-"\n"
+msgid "Germany"
+msgstr "Ãåñìáíßá"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "ÏñéóìÝíá åðéðëÝïí ðáêÝôá ðñÝðåé íá áöáéñåèïýí"
+msgid "Russia"
+msgstr "Ñùóßá"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "More information on package..."
-msgstr "Ðåñéóóüôåñåò ðëçñïöïñßåò ãéá ôï ðáêÝôï..."
+msgid "Norway"
+msgstr "Íïñâçãßá"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Information on packages"
-msgstr "Ðåñéóóüôåñåò ðëçñïöïñßåò ãéá ôï ðáêÝôï..."
+msgid "Problem during installation"
+msgstr "ÕðÞñîáí ðñïâëÞìáôá êáôÜ ôçí åãêáôÜóôáóç"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "More info"
-msgstr ""
+msgid "Search"
+msgstr "ÁíáæÞôçóç"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Addable"
-msgstr "ÐñïóôéèÝìåíá"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Edit a media"
+msgstr "Åðåîåñãáóßá ðçãÞò"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Upgradable"
-msgstr "Áíáâáèìßóéìá"
+msgid "Czech Republic"
+msgstr "Ôóå÷ßá"
 
 #: ../rpmdrake:1
 #, c-format
 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."
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"Ç ëßóôá ìå ôéò áíáâáèìßóåéò åßíáé êåíÞ. Áõôü óçìáßíåé üôé Þ äåí \n"
-"õðÜñ÷ïõí äéáèÝóéìá ðáêÝôá ãéá áíáâÜèìéóç ãéá ôá åãêáôåóôçìÝíá\n"
-"ðáêÝôá ôïõ õðïëïãéóôÞ óáò Þ ôá Ý÷åôå Þäç áíáâáèìßóåé."
-
-#: ../rpmdrake:1
-#, c-format
-msgid "No update"
-msgstr "×ùñßò áíáâáèìßóåéò"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "(none)"
-msgstr "(êáíÝíá)"
+msgid "Stop"
+msgstr "Ôåñìáôéóìüò"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Ðáñáêáëþ ðåñéìÝíåôå, ôáîéíïìïýíôáé ôá ðáêÝôá"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "Áäõíáìßá áíïßãìáôïò ôïõ ðáêÝôïõ`%s'\n"
+msgid "Update"
+msgstr "ÁíáíÝùóç"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "¸íá áðü ôá ðáñáêÜôù ðáêÝôá áðáéôïýíôáé:"
+msgid "Please wait, removing packages..."
+msgstr "Ðáñáêáëþ ðåñéìÝíåôå, áöáéñïýíôáé ôá ðáêÝôá..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Ðáñáêáëþ åðéëÝîôå"
+msgid "Normal information"
+msgstr "ÊáíïíéêÝò ðëçñïöïñßåò"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr "ÂñÝèçêáí óõãêñïýóåéò"
+msgid "Media: "
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected"
-msgstr "ÅðéëåãìÝíá"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "Ãßíåôáé ç ëÞøç ôïõ ðáêÝôïõ `%s' (%s/%s)..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results"
-msgstr "ÁðïôÝëåóìá ÁíáæÞôçóçò"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "ÅðéëåãìÝíï: %d MB/ Åëåýèåñïò ÷þñïò óôïí äßóêï: %d MB"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Stop"
-msgstr "Ôåñìáôéóìüò"
+msgid "Media"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Ðáñáêáëþ ðåñéìÝíåôå, ãßíåôáé áíáæÞôçóç..."
+msgid "Spain"
+msgstr "Éóðáíßá"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results (none)"
-msgstr "ÁðïôÝëåóìá ÁíáæÞôçóçò (êáíÝíá)"
+msgid "Normal updates"
+msgstr "ÊáíïíéêÝò áíáâáèìßóåéò"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Other"
-msgstr "¶ëëá"
+msgid "by selection state"
+msgstr "âÜóç êáôÜóôáóçò åðéëïãÞò"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Welcome to the packages source editor!\n"
-"\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
-"Êáëþò ïñßóáôå óôïí åðåîåñãáóôÞ ôùí ðçãáßùí ðáêÝôùí!\n"
-"\n"
-"Áõôü ôï åñãáëåßï èá óáò âïçèÞóåé íá ñõèìßóåôå ôá ðçãáßá ðáêÝôá ðïõ èÝëåôå\n"
-"íá ÷ñçóéìïðïéÞóåôå óå áõôüí ôïí õðïëïãéóôÞ. '¸ðåéôá èá åßíáé äéáèÝóéìá íá \n"
-"åãêáôáóôáèïýí óáí íÝá ðáêÝôá Þ íá áíáâáèìßóåôå õðÜñ÷ïíôá ðáêÝôá."
+"Ðáñáêáëþ ðåñéìÝíåôå ãßíåôáé ç ëÞøç ôùí äéåõèýíóåùí ôùí åíáëëáêôéêþí èÝóåùí "
+"áðü ôçí MandrakeSoft."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Save and quit"
-msgstr "ÁðïèÞêåõóç êáé Ýîïäïò"
+msgid "Login:"
+msgstr "ÐñïóðÝëáóç:"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "ÓöÜëìá..."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Update..."
-msgstr "ÁíáíÝùóç..."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add..."
-msgstr "ÐñïóèÞêç..."
+msgid "Adding a media:"
+msgstr "ÐñïóèÞêç ðçãÞò:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "Åðåîåñãáóßá"
+msgid "Austria"
+msgstr "Áõóôñßá"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Source"
-msgstr "Åîáíáãêáóìüò"
+msgid "Fatal error"
+msgstr "ÓöÜëìá áñ÷åßïõ"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Enabled?"
-msgstr "Åíåñãïðïßçóç;"
+msgid "Update..."
+msgstr "ÁíáíÝùóç..."
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure sources"
-msgstr "Ñýèìéóç ðçãþí"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "ÅðáëÞèåõóç õðïãñáöÞò ôïõ `%s'..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "Êùäéêüò ðñüóâáóçò:"
+msgid "(none)"
+msgstr "(êáíÝíá)"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "User:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
 msgstr ""
+"Óõãíþìç, ç áöáßñåóç áõôþí ôùí ðáêÝôùí èá êáôáóôñÝøåé ôï óýóôçìÜ óáò:\n"
+"\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr ""
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "ÅãêáôÜóôáóç ðáêÝôïõ `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
+msgid "Currently installed version: "
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
-msgstr ""
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Configure proxies"
-msgstr "Ñýèìéóç ðçãþí"
+msgid "Other"
+msgstr "¶ëëá"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Ðáñáêáëþ ðåñéìÝíåôå, áíáíåþíåôáé ôï ìÝóï..."
+msgid "Reason for update: "
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr ""
-"Ãéá íá áðïèçêåõôïýí ïé áëëáãÝò, èá ðñÝðåé íá åéóÜãåôå ôï ìÝóï óôïí ïäçãü."
+msgid "Please choose the desired mirror."
+msgstr "Ðáñáêáëþ åðéëÝîôå ôçí åðéèõìçôÞ åíáëëáêôéêÞ."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "ÐñÝðåé íá åéóÜãåôå ôï ìÝóï ãéá íá óõíå÷ßóåôå"
+msgid "Edit"
+msgstr "Åðåîåñãáóßá"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "ÁðïèÞêåõóç áëëáãþí"
+msgid "Please wait, finding available packages..."
+msgstr "Ðáñáêáëþ ðåñéìÝíåôå, áíáæçôïýíôáé ôá äéáèÝóéìá ðáêÝôá..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Ó÷åôéêÞ èÝóç ôùí synthesis/hdlist: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "Åðåîåñãáóßá ðçãÞò \"%s\":"
+msgid "Search results (none)"
+msgstr "ÁðïôÝëåóìá ÁíáæÞôçóçò (êáíÝíá)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit a source"
-msgstr "Åðåîåñãáóßá ðçãÞò"
+msgid "Danmark"
+msgstr "Äáíßá"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Ðáñáêáëþ ðåñéìÝíåôå, áöáéñåßôáé ôï ìÝóï..."
+msgid "China"
+msgstr "Êßíá"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "Ôýðïò ðçãÞò:"
+msgid "United States"
+msgstr "ÇíùìÝíåò Ðïëéôåßåò ÁìåñéêÞò"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Adding a source:"
-msgstr "ÐñïóèÞêç ðçãÞò:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "changes:"
+msgstr "ÁðïèÞêåõóç áëëáãþí"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
-msgstr ""
-"ÕðÜñ÷åé Þäç Ýíá ìÝóï ìå áõôü ôï üíïìá, åßóôå âÝâáéïé\n"
-"ãéá ôçí áíôéêáôÜóôáóÞ ôïõ;"
+msgid "Some additional packages need to be removed"
+msgstr "ÏñéóìÝíá åðéðëÝïí ðáêÝôá ðñÝðåé íá áöáéñåèïýí"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "ÐñÝðåé íá óõìðëçñþóåôå ôïõëÜ÷éóôïí ôá äýï ðñþôá ðåäßá."
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Name:"
-msgstr "¼íïìá:"
+msgid "No"
+msgstr "¼÷é"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Login:"
-msgstr "ÐñïóðÝëáóç:"
+#, fuzzy, c-format
+msgid "Configure medias"
+msgstr "Ñýèìéóç ðçãþí"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Choose a mirror..."
-msgstr "ÅðéëÝîôå ìéá åíáëëáêôéêÞ..."
+#, fuzzy, c-format
+msgid "Add a media"
+msgstr "ÐñïóèÞêç ðçãÞò:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
-msgstr "ÁíáæÞôçóç..."
+msgid "Summary: "
+msgstr "Óýíïøç: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Path or mount point:"
-msgstr "ÈÝóç Þ óçìåßï ðñïóÜñôçóçò: "
+msgid "Canada"
+msgstr "ÊáíáäÜò"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "Áöáéñïýìåíç óõóêåõÞ"
+msgid "Greece"
+msgstr "ÅëëÜäá"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "HTTP server"
-msgstr "ÄéáêïìéóôÞò HTTP"
+msgid ""
+"There was an error downloading the mirrors list:\n"
+"\n"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
+msgstr ""
+"ÓöÜëìá êáôÜ ôç ëÞøç ôçò ëßóôáò ôùí åíáëëáêôéêþí äéåõèýíóåùí:\n"
+"\n"
+"%s\n"
+"Ôï äßêôõï Þ ç éóôïóåëßäá ôçò MandrakeSoft ìðïñåß íá ìçí åßíáé äéáèÝóéìç.\n"
+"Ðáñáêáëþ ðñïóðáèÞóôå îáíÜ áñãüôåñá."
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "FTP server"
-msgstr "ÄéáêïìéóôÞò FTP"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr "ÐñÝðåé íá åßóôå root ãéá íá åãêáôáóôÞóåôå ðáêÝôá, óõãíþìç."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Path:"
 msgstr "ÈÝóç:"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Local files"
-msgstr "ÔïðéêÜ áñ÷åßá"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Add a source"
-msgstr "ÐñïóèÞêç ðçãÞò:"
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr "Áäõíáìßá áíáâÜèìéóçò ôïõ ìÝóïõ, èá áðåíåñãïðïéçèåß áõôüìáôá."
+msgid "Problem during removal"
+msgstr "ÕðÞñîáí ðñïâëÞìáôá êáôÜ ôçí åãêáôÜóôáóç"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Unable to create medium."
-msgstr "Áäõíáìßá äçìéïõñãßáò ìÝóïõ."
+msgid "Selected"
+msgstr "ÅðéëåãìÝíá"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Update"
-msgstr "ÁíáíÝùóç"
+msgid "Netherlands"
+msgstr "Ïëëáíäßá"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "ÅðéëÝîôå ôéò ðçãÝò ðïõ èÝëåôå íá áíáíåþóåôå:"
+msgid "Addable"
+msgstr "ÐñïóôéèÝìåíá"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Ðáñáêáëþ ðåñéìÝíåôå, áíáíåþíåôáé ôï ìÝóï..."
+msgid "(Not available)"
+msgstr "(Äåí åßíáé äéáèÝóéìï/ç)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid " failed!"
-msgstr "óôá áñ÷åßá"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid " done."
-msgstr ""
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Download of `%s', speed:%s"
-msgstr ""
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
 msgstr ""
+"Óõãíþìç, ôá ðáñáêÜôù ðáêÝôá äåí ìðïñïýí íá åðéëåãïýí:\n"
+"\n"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "ÅðáëÞèåõóç õðïãñáöÞò ôïõ `%s'..."
+msgid "Not selected"
+msgstr "ÂñÝèçêáí óõãêñïýóåéò"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr ""
+msgid "Software Packages Removal"
+msgstr "Áöáßñåóç ÐáêÝôùí Ëïãéóìéêïý"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr ""
+msgid "Sweden"
+msgstr "Óïõçäßá"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Copying file for source `%s'..."
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Please choose the desired mirror."
-msgstr "Ðáñáêáëþ åðéëÝîôå ôçí åðéèõìçôÞ åíáëëáêôéêÞ."
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
+"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 ""
-"Äåí ìðïñþ íá âñù êáôÜëëçëç åíáëëáêôéêÞ.\n"
-"\n"
-"Ïé ëüãïé ìðïñåß íá åßíáé ðïëëïß, ï óõíçèÝóôåñïò åßíáé üôáí äåí "
-"õðïóôçñßæåôáé\n"
-"ç áñ÷éôåêôïíéêÞ ôïõ åðåîåñãáóôÞ óáò áðü ôéò åðßóçìåò áíáâáèìßóåéò áðü ôï \n"
-"Mandrake Linux"
+"Ç ëßóôá ìå ôéò áíáâáèìßóåéò åßíáé êåíÞ. Áõôü óçìáßíåé üôé Þ äåí \n"
+"õðÜñ÷ïõí äéáèÝóéìá ðáêÝôá ãéá áíáâÜèìéóç ãéá ôá åãêáôåóôçìÝíá\n"
+"ðáêÝôá ôïõ õðïëïãéóôÞ óáò Þ ôá Ý÷åôå Þäç áíáâáèìßóåé."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No mirror"
-msgstr "×ùñßò åíáëëáêôéêÝò"
+msgid "Examining file of media `%s'..."
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was an error downloading the mirrors list:\n"
-"\n"
-"%s\n"
-"The network, or MandrakeSoft website, are maybe unavailable.\n"
-"Please try again later."
+msgid "Download of `%s', speed:%s"
 msgstr ""
-"ÓöÜëìá êáôÜ ôç ëÞøç ôçò ëßóôáò ôùí åíáëëáêôéêþí äéåõèýíóåùí:\n"
-"\n"
-"%s\n"
-"Ôï äßêôõï Þ ç éóôïóåëßäá ôçò MandrakeSoft ìðïñåß íá ìçí åßíáé äéáèÝóéìç.\n"
-"Ðáñáêáëþ ðñïóðáèÞóôå îáíÜ áñãüôåñá."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
-msgstr "ÓöÜëìá êáôÜ ôç ëÞøç"
+msgid "One of the following packages is needed:"
+msgstr "¸íá áðü ôá ðáñáêÜôù ðáêÝôá áðáéôïýíôáé:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
-"Ðáñáêáëþ ðåñéìÝíåôå ãßíåôáé ç ëÞøç ôùí äéåõèýíóåùí ôùí åíáëëáêôéêþí èÝóåùí "
-"áðü ôçí MandrakeSoft."
+msgid "Quit"
+msgstr "¸îïäïò"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
 "\n"
 "Is it ok to continue?"
 msgstr ""
-"ÐñÝðåé íá åðéêïéíùíÞóù ìå ôçí éóôïóåëßäá ôçò MandrakeSoft  ãéá íá ðÜñù\n"
-"ôçí ëßóôá ìå ôéò åíáëëáêôéêÝò äéåõèýíóåéò\n"
-"Ðáñáêáëþ åëÝãîôå üôé ôï äßêôõü óáò åßíáé åíåñãü\n"
+"ÐñÝðåé íá åðéêïéíùíÞóù ìå ôçí åíáëëáêôéêÞ ãéá íá ðÜñù ôéò \n"
+"ôåëåõôáßåò áíáâáèìßóåéò ðáêÝôùí. Ðáñáêáëþ åëÝãîôå üôé äßêôõï\n"
+"åßíáé åíåñãü\n"
 "\n"
-"Íá óõíå÷éóôåß;"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "United States"
-msgstr "ÇíùìÝíåò Ðïëéôåßåò ÁìåñéêÞò"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "China"
-msgstr "Êßíá"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "United Kingdom"
-msgstr "ÇíùìÝíï Âáóßëåéï"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Taiwan"
-msgstr "ÔáúâÜí"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Sweden"
-msgstr "Óïõçäßá"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Russia"
-msgstr "Ñùóßá"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Portugal"
-msgstr "Ðïñôïãáëßá"
+"Íá óõíå÷ßóù;"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Poland"
-msgstr "Ðïëùíßá"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update media(s)"
+msgstr "ÁíáíÝùóç ðçãÞò(þí)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Norway"
-msgstr "Íïñâçãßá"
+msgid "Ok"
+msgstr "OK"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Netherlands"
-msgstr "Ïëëáíäßá"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Korea"
-msgstr "Åîáíáãêáóìüò"
+msgid "Please wait, adding medium..."
+msgstr "Ðáñáêáëþ ðåñéìÝíåôå, ðñïóôßèåôáé ôï ìÝóï..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "Éáðùíßá"
+msgid "Unable to get source packages."
+msgstr "Áäýíáôç ç ëÞøç ôùí ðçãáßùí ðáêÝôùí."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Italy"
-msgstr "ÅãêáôÜóôáóç"
+msgid "Too many packages are selected"
+msgstr "ÏñéóìÝíá ðáêÝôá äåí ìðïñïýí íá åãêáôáóôáèïýí"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Israel"
-msgstr "ÅãêáôÜóôáóç"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Greece"
-msgstr "ÅëëÜäá"
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"Êáëþò ïñßóáôå óôïí åðåîåñãáóôÞ ôùí ðçãáßùí ðáêÝôùí!\n"
+"\n"
+"Áõôü ôï åñãáëåßï èá óáò âïçèÞóåé íá ñõèìßóåôå ôá ðçãáßá ðáêÝôá ðïõ èÝëåôå\n"
+"íá ÷ñçóéìïðïéÞóåôå óå áõôüí ôïí õðïëïãéóôÞ. '¸ðåéôá èá åßíáé äéáèÝóéìá íá \n"
+"åãêáôáóôáèïýí óáí íÝá ðáêÝôá Þ íá áíáâáèìßóåôå õðÜñ÷ïíôá ðáêÝôá."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "France"
-msgstr "Åîáíáãêáóìüò"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Finland"
-msgstr "Öéíëáíäßá"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Spain"
-msgstr "Éóðáíßá"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Danmark"
-msgstr "Äáíßá"
+msgid "%s conflicts with %s"
+msgstr " óõãêñïýåôáé ìå"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "Ãåñìáíßá"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Êáëþò ïñßóáôå óôï MandrakeUpdate!\n"
+"\n"
+"Áõôü ôï åñãáëåßï èá óáò âïçèÞóåé íá åðéëÝîåôå ôéò áíáâáèìßóåéò ðïõ èÝëåôå\n"
+"íá åãêáôáóôÞóåôå óôïí õðïëïãéóôÞ óáò."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Ôóå÷ßá"
+msgid "Mandrake choices"
+msgstr "ÅðéëïãÝò Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Êüóôá Ñßêá"
+msgid "Changelog:\n"
+msgstr "ÁëëáãÝò:\n"
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Canada"
-msgstr "ÊáíáäÜò"
+#, fuzzy, c-format
+msgid "Korea"
+msgstr "Åîáíáãêáóìüò"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Brazil"
-msgstr "Âñáæéëßá"
+msgid "Removable device"
+msgstr "Áöáéñïýìåíç óõóêåõÞ"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "ÂÝëãéï"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Áõóôñáëßá"
+msgid "Change medium"
+msgstr "ÁëëáãÞ ìÝóïõ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "Áõóôñßá"
+msgid "Mandrake Update"
+msgstr "Mandrake Update"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
-msgstr "Ðëçñïöïñßåò..."
+msgid "by size"
+msgstr "âÜóç ìåãÝèïõò"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "¼÷é"
+msgid "FTP server"
+msgstr "ÄéáêïìéóôÞò FTP"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "Íáé"
+msgid "Files:\n"
+msgstr "¶ñ÷åßá:\n"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr "Áäõíáìßá áíáâÜèìéóçò ôïõ ìÝóïõ, èá áðåíåñãïðïéçèåß áõôüìáôá."
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -1562,6 +1562,14 @@ msgstr "Áöáßñåóç Ëïãéóìéêïý"
 msgid "Software Sources Manager"
 msgstr "Äéá÷åéñéóôÞò Ðçãáßïõ Ëïãéóìéêïý"
 
+#, fuzzy
+#~ msgid "Source: "
+#~ msgstr "Åîáíáãêáóìüò"
+
+#, fuzzy
+#~ msgid "Source"
+#~ msgstr "Åîáíáãêáóìüò"
+
 #~ msgid ""
 #~ "some packages failed to install\n"
 #~ "correctly"
@@ -1601,9 +1609,6 @@ msgstr "Äéá÷åéñéóôÞò Ðçãáßïõ Ëïãéóìéêïý"
 #~ "\n"
 #~ "ÈÝëåôå íá äïêéìÜóåôå Üëëç åíáëëáêôéêÞ;"
 
-#~ msgid "Error adding update medium"
-#~ msgstr "ÓöÜëìá êáôÜ ôçí ðñïóèÞêç ôïõ ìÝóïõ áíáâáèìßóåùí"
-
 #~ msgid "Please wait, contacting mirror to initialize updates packages."
 #~ msgstr ""
 #~ "Ðáñáêáëþ ðåñéìÝíåôå, ãßíåôáé óýíäåóç ìå ôçí åíáëëáêôéêÞ äéåýèõíóç ãéá ôçí "
diff --git a/po/eo.po b/po/eo.po
index ef17b20e..f9101be0 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: 2003-03-11 21:40-0400\n"
 "Last-Translator: Vilhelmo Lutermano <vlutermano@free.fr>\n"
 "Language-Team: esperanto <eo@li.org>\n"
@@ -14,14 +14,21 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
+msgid "Enabled?"
 msgstr ""
 
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Path or mount point:"
+msgstr "surmetingo:"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Portugal"
+msgstr "Pordo:"
+
 #: ../rpmdrake:1
 #, c-format
 msgid ""
@@ -34,56 +41,96 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
+msgid "by group"
 msgstr ""
 
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Name:"
+msgstr "Nomo"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Italy"
+msgstr "Instalu"
+
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
+msgid "How to choose manually your mirror"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
+msgid "More information on package..."
+msgstr ""
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Jes"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"%s"
 msgstr ""
-"Okazis eraro dum instalado de pakaĵoj:\n"
-"\n"
-"`%s'"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Problem during removal"
-msgstr "Problemo okazis dum instalado"
+msgid "everything was installed correctly"
+msgstr "Pakaĵo estas jam instalata"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, removing packages..."
+msgid "%s KB"
+msgstr "%.1f KB"
+
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"Bonvole Atendu\n"
-"Mi ordigas la pakaĵojn"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, reading packages database..."
+#, c-format
+msgid ""
+"Welcome to the software removal tool!\n"
+"\n"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
+msgstr ""
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr ""
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
 msgstr ""
-"Bonvole Atendu\n"
-"Mi ordigas la pakaĵojn"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"There was a problem during the installation:\n"
+"There was a problem during the removal of packages:\n"
 "\n"
 "%s"
 msgstr ""
@@ -93,73 +140,65 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Instalu ĉio"
+msgid "Size: "
+msgstr "Grandeco"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Preparas pakaĵojn por instalado..."
+msgid "Security updates"
+msgstr "Montru sekurecajn �isdatigojn"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Preparas pakaĵojn por instalado..."
+msgid "Already existing update medias"
+msgstr "Kontrolas dependaĵojn..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
+msgid "Maximum information"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Everything installed successfully"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Proxy..."
+msgstr "Eraro..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
-"\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "everything was installed correctly"
-msgstr "Pakaĵo estas jam instalata"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Problemo okazis dum instalado"
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Instalante pakaĵon `%s' (%s/%s)..."
+msgid "United Kingdom"
+msgstr "Unui�inta Regno"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Preparas pakaĵojn por instalado..."
+#, c-format
+msgid "in names"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
+"I can't find any suitable mirror.\n"
 "\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
+#, fuzzy, c-format
+msgid "Remove .%s"
+msgstr "Deprenebla"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Finland"
+msgstr "Trovu:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -176,878 +215,790 @@ msgstr ""
 "\n"
 "Ĉu vi deziras tamen daŭrigi (saltante tiun pakaĵon)?"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Verifying packages signatures..."
+msgid "Examining distant file of media `%s'..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "De�utante pakaĵon '%s' (%s/%s)..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Cancel"
-msgstr "Forigu"
+msgid "Verifying packages signatures..."
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Ok"
-msgstr "Jes"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "France"
+msgstr "Devigu"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+msgid "More info"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Change medium"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Initializing..."
-msgstr "Inicanta..."
+#, fuzzy, c-format
+msgid "Reload the packages list"
+msgstr "La pakaĵo %s ne estas subskribita"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Preparas pakaĵojn por instalado..."
+msgid "Choose a mirror..."
+msgstr "Elektu vian spegulon:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Vi devas esti root por instali pakaĵojn, bedaŭrinde."
+msgid "Some packages can't be installed"
+msgstr "Pakaĵo  `%s'ne povas esti instalata\n"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unable to get source packages."
-msgstr "Elektu viajn pakaĵojn"
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "Preparas pakaĵojn por instalado..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Inspect..."
-msgstr ""
+#, fuzzy, c-format
+msgid "All packages,"
+msgstr "0 pakaĵoj, 0 bitokoj"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Installation finished"
-msgstr "Instalitaj"
+msgid "Type of media:"
+msgstr "Speco de fonto:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Do nothing"
-msgstr "sed ne konformanta(j)"
+msgid "in files"
+msgstr "Loka"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
+msgid "All requested packages were installed successfully."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Remove .%s"
-msgstr "Deprenebla"
+msgid "Proxy hostname:"
+msgstr "Salutnomo por prokura servilo:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "changes:"
-msgstr "Pakaĵoj"
+msgid "Local files"
+msgstr "Loka"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspecting %s"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Please wait, finding available packages..."
-msgstr ""
-"Bonvole Atendu\n"
-"Mi ordigas la pakaĵojn"
+msgid "Israel"
+msgstr "Instalu"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, adding medium..."
-msgstr "Kontrolas dependaĵojn..."
+msgid "Help"
+msgstr "/_Helpo"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
-"\n"
-"Then, restart MandrakeUpdate."
+msgid "HTTP server"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "How to choose manually your mirror"
-msgstr ""
+#, fuzzy, c-format
+msgid "Installation failed"
+msgstr "Instalu ĉio"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
+msgid "Use .%s as main file"
 msgstr ""
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Search results"
+msgstr "Serĉrezulto"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid " failed!"
+msgstr "Loka"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Already existing update sources"
-msgstr ""
+msgid "Brazil"
+msgstr "Brazilo"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Find:"
+msgstr "Trovu:"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Fatal error"
-msgstr "dosiera eraro"
+#, c-format
+msgid "All packages, alphabetical"
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Preparas pakaĵojn por instalado..."
+msgid "Please wait, searching..."
+msgstr "Bonvole atendu dum rpm-o malinstalas ĉi tiujn pakaĵojn:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Mandrake Update"
-msgstr "MandrakeUpdate Preferoj"
+msgid "Please wait, reading packages database..."
+msgstr ""
+"Bonvole Atendu\n"
+"Mi ordigas la pakaĵojn"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Software Packages Removal"
-msgstr " ProgramarAdministrilo "
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Quit"
-msgstr "Forlasu"
+msgid "unknown package "
+msgstr "nekonata"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Instalu"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Remove"
-msgstr "Malproksima printilo"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Help"
-msgstr "/_Helpo"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Search"
-msgstr "serĉu"
+#, c-format
+msgid "Reset the selection"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Find:"
-msgstr "Trovu:"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
 "\n"
-"Is it ok to continue?"
 msgstr ""
+"Por plenumi ĉiujn el la dependaĵoj,\n"
+"ĉi tiuj pakaĵoj estos malinstalataj:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr ""
+msgid "Costa Rica"
+msgstr "Kostariko"
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
+"There was a problem during the installation:\n"
 "\n"
-"Do you really want to install all the selected packages?"
+"%s"
 msgstr ""
+"Okazis eraro dum instalado de pakaĵoj:\n"
+"\n"
+"`%s'"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Too many packages are selected"
-msgstr "Pakaĵoj jam estas instalataj"
+msgid "Please wait, removing medium..."
+msgstr "Kontrolas dependaĵojn..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Maximum information"
-msgstr ""
+msgid "Password:"
+msgstr "Passvorto:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Normal information"
-msgstr "normaj �isdatigoj"
+msgid "Taiwan"
+msgstr "Tajlando"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Update source(s)"
-msgstr "Redaktu Fontojn"
+msgid "User:"
+msgstr "Salutnomo:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Reload the packages list"
-msgstr "La pakaĵo %s ne estas subskribita"
+msgid "Please wait, updating medium..."
+msgstr "Kontrolas dependaĵojn..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reset the selection"
+#, fuzzy, c-format
+msgid "Please wait, listing packages..."
 msgstr ""
+"Bonvole Atendu\n"
+"Mi ordigas la pakaĵojn"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "in files"
-msgstr "Loka"
+msgid "Information on packages"
+msgstr "Elektu viajn pakaĵojn"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "in descriptions"
-msgstr "Priskriboj"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
+msgstr "Forigu"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
+msgid "Everything installed successfully"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "by update availability"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Select the media(s) you wish to update:"
 msgstr ""
+"Bonvole elektu la fontojn\n"
+"vi deziras �isdatigi:"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Please wait, updating media..."
+msgstr "Kontrolas dependaĵojn..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by source repository"
+msgid "A fatal error occurred: %s."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by selection state"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "by size"
-msgstr "Profunda grandeca"
+msgid "in descriptions"
+msgstr "Priskriboj"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure proxies"
+msgstr "Ĉu konfiguri fonton?"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by group"
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "All packages,"
-msgstr "0 pakaĵoj, 0 bitokoj"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
+msgid "Please choose"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Mandrake choices"
-msgstr "MandrakeÄœisdatigilo"
+msgid "Selected size: %d MB"
+msgstr "%d elektitaj pakaĵoj: %.1f MB"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Normal updates"
-msgstr "Normalaj Äœisdatigoj"
+#, c-format
+msgid "Initializing..."
+msgstr "Inicanta..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Bugfixes updates"
-msgstr "Montru cimo-riparajn �isdatigojn"
+msgid "Save changes"
+msgstr "Pakaĵoj"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Security updates"
-msgstr "Montru sekurecajn �isdatigojn"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "Eraro dum de�utado"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Description: "
-msgstr "Priskriboj"
+msgid "Package installation..."
+msgstr "Preparas pakaĵojn por instalado..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reason for update: "
+msgid "Importance: "
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Summary: "
-msgstr "Resumo"
+#, c-format
+msgid ""
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Importance: "
+msgid "Add..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "%s KB"
-msgstr "%.1f KB"
+msgid "Unable to create medium."
+msgstr "Ne povis krei raportdosieron, ĉesigas.\n"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Size: "
-msgstr "Grandeco"
+#, c-format
+msgid ""
+"The installation is finished; %s.\n"
+"\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
+msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Version: "
-msgstr "Versio:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Browse..."
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Name: "
-msgstr "Nomo: %s"
+msgid "Some packages can't be removed"
+msgstr "Pakaĵo  `%s'ne povas esti instalata\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Currently installed version: "
+msgid "Info..."
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Source: "
-msgstr "Fonto"
-
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(Not available)"
+msgid "You need to insert the medium to continue"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
+msgid "Copying file for media `%s'..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Files:\n"
-msgstr "/_Dosiero"
+msgid "Remove"
+msgstr "Malproksima printilo"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Selected size: %d MB"
-msgstr "%d elektitaj pakaĵoj: %.1f MB"
+msgid "Preparing packages installation..."
+msgstr "Preparas pakaĵojn por instalado..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
+msgid "by media repository"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "No mirror"
+msgstr "spegulo:"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
+msgid "You need to fill up at least the two first entries."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr ""
+msgid "Install"
+msgstr "Instalu"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Japan"
+msgstr "Japanio"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "konfliktas kun"
+msgid "Do nothing"
+msgstr "sed ne konformanta(j)"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Pakaĵo  `%s'ne povas esti instalata\n"
+msgid "No update"
+msgstr "Faru Äœisdatigojn"
 
 #: ../rpmdrake:1
-#, c-format
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "Description: "
+msgstr "Priskriboj"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Additional packages needed"
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "Pakaĵo  `%s'ne povas esti instalata\n"
+msgid "Name: "
+msgstr "Nomo: %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
+msgid "Inspect..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"Por plenumi ĉiujn el la dependaĵoj,\n"
-"ĉi tiuj pakaĵoj estos malinstalataj:"
+msgid "Editing media \"%s\":"
+msgstr "Redaktu Fontojn"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Vi devas instali ĉi tiujn pakaĵojn por ĉiuj bone funkcias:"
+msgid "No package found for installation."
+msgstr "Preparas pakaĵojn por instalado..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "More information on package..."
-msgstr ""
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Australia"
+msgstr "seria"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Information on packages"
-msgstr "Elektu viajn pakaĵojn"
+msgid "Installation finished"
+msgstr "Instalitaj"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "More info"
+msgid "by update availability"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr ""
+msgid "Poland"
+msgstr "Pollando"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Upgradable"
-msgstr "Äœisdatigu"
+msgid "Version: "
+msgstr "Versio:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-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."
+msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No update"
-msgstr "Faru Äœisdatigojn"
+msgid "Upgradable"
+msgstr "Äœisdatigu"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(none)"
-msgstr "(nenio)"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, listing packages..."
+msgid " done."
 msgstr ""
-"Bonvole Atendu\n"
-"Mi ordigas la pakaĵojn"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "unknown package "
-msgstr "nekonata"
+msgid "Software Packages Installation"
+msgstr "Preparas pakaĵojn por instalado..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "One of the following packages is needed:"
+msgid "Additional packages needed"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Please choose"
-msgstr ""
+#, fuzzy, c-format
+msgid "Bugfixes updates"
+msgstr "Montru cimo-riparajn �isdatigojn"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Not selected"
-msgstr "Konfliktoj detektitaj"
+msgid "Germany"
+msgstr "Germana"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Selected"
-msgstr ""
-"Elektu\n"
-"ĉiujn"
+msgid "Russia"
+msgstr "Rusa"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Search results"
-msgstr "Serĉrezulto"
+msgid "Norway"
+msgstr "Norvega"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Stop"
-msgstr "Sektoro"
+msgid "Problem during installation"
+msgstr "Problemo okazis dum instalado"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, searching..."
-msgstr "Bonvole atendu dum rpm-o malinstalas ĉi tiujn pakaĵojn:"
+msgid "Search"
+msgstr "serĉu"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Search results (none)"
-msgstr "Serĉrezulto"
+msgid "Edit a media"
+msgstr "Redaktu Fontojn"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Other"
-msgstr "Alia"
+msgid "Czech Republic"
+msgstr "la Ĉeĥa Respubliko"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"Welcome to the packages source editor!\n"
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
 "\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
+"Then, restart MandrakeUpdate."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Stop"
+msgstr "Sektoro"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Save and quit"
-msgstr ""
+msgid "Update"
+msgstr "Äœisdatigu"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Eraro..."
+msgid "Please wait, removing packages..."
+msgstr ""
+"Bonvole Atendu\n"
+"Mi ordigas la pakaĵojn"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Update..."
-msgstr "Äœisdatigu"
+msgid "Normal information"
+msgstr "normaj �isdatigoj"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
+msgid "Media: "
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Edit"
-msgstr "Redaktu"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "De�utante pakaĵon '%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Source"
-msgstr "Fonto"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Enabled?"
+msgid "Media"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Configure sources"
-msgstr "Ĉu konfiguri fonton?"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Password:"
-msgstr "Passvorto:"
+msgid "Spain"
+msgstr "Hispanujo"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "User:"
-msgstr "Salutnomo:"
+msgid "Normal updates"
+msgstr "Normalaj Äœisdatigoj"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
+msgid "by selection state"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Proxy hostname:"
-msgstr "Salutnomo por prokura servilo:"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Configure proxies"
-msgstr "Ĉu konfiguri fonton?"
+msgid "Login:"
+msgstr "salutnomo:"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Please wait, updating medium..."
-msgstr "Kontrolas dependaĵojn..."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr ""
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to insert the medium to continue"
+msgid "Adding a media:"
 msgstr ""
+"Bonvole Atendu\n"
+"Aldonas fonton"
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Save changes"
-msgstr "Pakaĵoj"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "relativa vojo al hdlist: "
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "Austria"
+msgstr "seria"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "Redaktu Fontojn"
+msgid "Fatal error"
+msgstr "dosiera eraro"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Edit a source"
-msgstr "Redaktu Fontojn"
+msgid "Update..."
+msgstr "Äœisdatigu"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Please wait, removing medium..."
-msgstr "Kontrolas dependaĵojn..."
+msgid "Starting download of `%s'..."
+msgstr "Kontrolante la subskribon de '%s'..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Type of source:"
-msgstr "Speco de fonto:"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Adding a source:"
-msgstr ""
-"Bonvole Atendu\n"
-"Aldonas fonton"
+msgid "(none)"
+msgstr "(nenio)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
-msgstr ""
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
+"Removing these packages would break your system, sorry:\n"
+"\n"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Name:"
-msgstr "Nomo"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Login:"
-msgstr "salutnomo:"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Choose a mirror..."
-msgstr "Elektu vian spegulon:"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
-msgstr ""
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Path or mount point:"
-msgstr "surmetingo:"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Instalante pakaĵon `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Removable device"
+msgid "Currently installed version: "
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr ""
+msgid "Other"
+msgstr "Alia"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "FTP server"
+msgid "Reason for update: "
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Path:"
-msgstr "Pordo:"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Local files"
-msgstr "Loka"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Add a source"
+msgid "Please choose the desired mirror."
 msgstr ""
 "Bonvole Atendu\n"
-"Aldonas fonton"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr ""
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Unable to create medium."
-msgstr "Ne povis krei raportdosieron, ĉesigas.\n"
+"Mi prenas la liston de speguloj"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "Äœisdatigu"
+msgid "Edit"
+msgstr "Redaktu"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Select the source(s) you wish to update:"
+msgid "Please wait, finding available packages..."
 msgstr ""
-"Bonvole elektu la fontojn\n"
-"vi deziras �isdatigi:"
+"Bonvole Atendu\n"
+"Mi ordigas la pakaĵojn"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Please wait, updating media..."
-msgstr "Kontrolas dependaĵojn..."
+msgid "Relative path to synthesis/hdlist:"
+msgstr "relativa vojo al hdlist: "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid " failed!"
-msgstr "Loka"
+msgid "Search results (none)"
+msgstr "Serĉrezulto"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid " done."
+msgid "Danmark"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr ""
+msgid "China"
+msgstr "Ĉinio"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr ""
+msgid "United States"
+msgstr "Usono"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "Kontrolante la subskribon de '%s'..."
+msgid "changes:"
+msgstr "Pakaĵoj"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some additional packages need to be removed"
+msgstr "Vi devas instali ĉi tiujn pakaĵojn por ĉiuj bone funkcias:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr ""
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr ""
+msgid "No"
+msgstr "Ne"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Please choose the desired mirror."
+msgid "Configure medias"
+msgstr "Ĉu konfiguri fonton?"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a media"
 msgstr ""
 "Bonvole Atendu\n"
-"Mi prenas la liston de speguloj"
+"Aldonas fonton"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Summary: "
+msgstr "Resumo"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
-msgstr ""
+msgid "Canada"
+msgstr "Kanado"
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "No mirror"
-msgstr "spegulo:"
+msgid "Greece"
+msgstr "Greka"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1059,174 +1010,223 @@ msgid ""
 "Please try again later."
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Error during download"
-msgstr "Eraro dum de�utado"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Vi devas esti root por instali pakaĵojn, bedaŭrinde."
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Path:"
+msgstr "Pordo:"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during removal"
+msgstr "Problemo okazis dum instalado"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Selected"
 msgstr ""
+"Elektu\n"
+"ĉiujn"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
+msgid "Netherlands"
+msgstr "Nederlando"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United States"
-msgstr "Usono"
+msgid "Addable"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "China"
-msgstr "Ĉinio"
+msgid "(Not available)"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Unui�inta Regno"
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Taiwan"
-msgstr "Tajlando"
+msgid "Not selected"
+msgstr "Konfliktoj detektitaj"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Software Packages Removal"
+msgstr " ProgramarAdministrilo "
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Sweden"
 msgstr "Sveda"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Russia"
-msgstr "Rusa"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
+msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Portugal"
-msgstr "Pordo:"
+#: ../rpmdrake:1
+#, c-format
+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.pm:1
 #, c-format
-msgid "Poland"
-msgstr "Pollando"
+msgid "Examining file of media `%s'..."
+msgstr ""
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Norway"
-msgstr "Norvega"
+#, c-format
+msgid "Download of `%s', speed:%s"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Netherlands"
-msgstr "Nederlando"
+msgid "One of the following packages is needed:"
+msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Korea"
-msgstr "Devigu"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Forlasu"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "Japanio"
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Italy"
-msgstr "Instalu"
+msgid "Update media(s)"
+msgstr "Redaktu Fontojn"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Israel"
-msgstr "Instalu"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "Jes"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Greece"
-msgstr "Greka"
+msgid "Please wait, adding medium..."
+msgstr "Kontrolas dependaĵojn..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "France"
-msgstr "Devigu"
+msgid "Unable to get source packages."
+msgstr "Elektu viajn pakaĵojn"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Finland"
-msgstr "Trovu:"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Spain"
-msgstr "Hispanujo"
+msgid "Too many packages are selected"
+msgstr "Pakaĵoj jam estas instalataj"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Danmark"
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Germany"
-msgstr "Germana"
+msgid "%s conflicts with %s"
+msgstr "konfliktas kun"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
-msgstr "la Ĉeĥa Respubliko"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Costa Rica"
-msgstr "Kostariko"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mandrake choices"
+msgstr "MandrakeÄœisdatigilo"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Canada"
-msgstr "Kanado"
+msgid "Changelog:\n"
+msgstr ""
 
 #: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Korea"
+msgstr "Devigu"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Brazil"
-msgstr "Brazilo"
+msgid "Removable device"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Belgium"
 msgstr "Belga"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Australia"
-msgstr "seria"
+msgid "Mandrake Update"
+msgstr "MandrakeUpdate Preferoj"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Austria"
-msgstr "seria"
+msgid "by size"
+msgstr "Profunda grandeca"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Info..."
+msgid "FTP server"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "No"
-msgstr "Ne"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Files:\n"
+msgstr "/_Dosiero"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Yes"
-msgstr "Jes"
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -1501,6 +1501,13 @@ msgid "Software Sources Manager"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Source: "
+#~ msgstr "Fonto"
+
+#~ msgid "Source"
+#~ msgstr "Fonto"
+
+#, fuzzy
 #~ msgid ""
 #~ "some packages failed to install\n"
 #~ "correctly"
diff --git a/po/es.po b/po/es.po
index d701eafe..b9485c56 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: 2003-02-13 14:33-0300\n"
 "Last-Translator: Fabian Mandelbaum <fabman@mandrakesoft.com>\n"
 "Language-Team: Spanish <cooker-i18n@linux-mandrake.com>\n"
@@ -17,16 +17,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"¿Desea continuar? "
+msgid "Enabled?"
+msgstr "¿Habilitada?"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Ruta o punto de montaje:"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Portugal"
+msgstr "Portugal"
 
 #: ../rpmdrake:1
 #, c-format
@@ -45,104 +49,54 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"¡Bienvenido a MandrakeUpdate!\n"
-"\n"
-"Esta herramienta lo ayudará a elegir las actualizaciones que desea instalar "
-"en su computadora."
+msgid "by group"
+msgstr "por grupo"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
-msgstr ""
-"¡Bienvenido a la herramienta para quitar software!\n"
-"\n"
-"Esta herramienta lo ayudará a elegir el software que desea quitar de su "
-"computadora."
+msgid "Name:"
+msgstr "Nombre:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Hubo un error durante la instalación de los paquetes:\n"
-"\n"
-"%s"
+msgid "Italy"
+msgstr "Instalar"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Problem during removal"
-msgstr "Problema durante la eliminación"
+msgid "How to choose manually your mirror"
+msgstr "Cómo elegir manualmente su sitio de réplica"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "Por favor espere, quitando paquetes..."
+msgid "URL:"
+msgstr "URL:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Por favor espere, leyendo la base de datos de paquetes..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Hubo un error durante la instalación de los paquetes:\n"
-"\n"
-"%s"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Instalar todo"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Preparando paquetes para la instalación..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Preparando paquetes para la instalación..."
+msgid "Some packages need to be removed"
+msgstr "Se necesita quitar algunos paquetes"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Se instalaron satisfactoriamente todos los paquetes pedidos."
+msgid "More information on package..."
+msgstr "Más información sobre el paquete..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Se instaló todo satisfactoriamente"
+msgid "Yes"
+msgstr "Sí"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
 msgstr ""
-"Finalizó la instalación; %s.\n"
+"Debido a sus dependencias, ahora se debe deseleccionar el o los\n"
+"paquetes siguientes:\n"
 "\n"
-"Algunos archivos de configuración se crearon como `.rpmnew' o `.rpmsave',\n"
-"ahora puede inspeccionar algunos para poder tomar acción:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -150,460 +104,453 @@ msgid "everything was installed correctly"
 msgstr "Se instaló todo satisfactoriamente"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Ocurrió un problema durante la instalación"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Instalando el paquete «%s» (%s/%s)..."
+msgid "%s KB"
+msgstr "%s KB"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Preparando paquetes para la instalación..."
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"También puede elegir manualmente su sitio de réplica: para esto,\n"
+"lance el Administrador de fuentes de software, y luego añada una\n"
+"fuente de 'Actualizaciones de seguridad'.\n"
+"\n"
+"Luego, vuelva a iniciar MandrakeUpdate."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
+"Welcome to the software removal tool!\n"
 "\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
 msgstr ""
+"¡Bienvenido a la herramienta para quitar software!\n"
 "\n"
-"\n"
-"Error(es) reportados:\n"
-"%s"
+"Esta herramienta lo ayudará a elegir el software que desea quitar de su "
+"computadora."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"Falló la instalación, faltan algunos archivos.\n"
-"Puede que desee actualizar la base de datos de sus fuentes."
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "Para guardar los cambios, necesita insertar el soporte en la unidad."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Guardar y salir"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
+"There was a problem during the removal of packages:\n"
 "\n"
-"Do you want to continue installation?"
+"%s"
 msgstr ""
-"Se tienen que quitar los paquetes siguientes para poder actualizar otros:\n"
-"\n"
-"%s\n"
+"Hubo un error durante la instalación de los paquetes:\n"
 "\n"
-"¿Desea continuar?"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Descargando el paquete «%s» (%s/%s)..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Cancel"
-msgstr "Cancelar"
+msgid "Size: "
+msgstr "Tamaño: "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Ok"
-msgstr "Aceptar"
+msgid "Security updates"
+msgstr "Actualizaciones de seguridad"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Por favor inserte el soporte denominado \"%s\" en el dispositivo [%s]"
+msgid "Already existing update medias"
+msgstr "Error agregando soporte de actualizaciones"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Change medium"
-msgstr "Cambiar el soporte"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Initializing..."
-msgstr "Inicializando..."
+msgid "Maximum information"
+msgstr "Información máxima"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Preparando paquetes para la instalación..."
+msgid "Proxy..."
+msgstr "Error..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Necesita ser root para instalar paquetes. Lo siento."
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Unable to get source packages."
-msgstr "No se pueden obtener los paquetes de la fuente."
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspect..."
-msgstr "Inspeccionar..."
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
+msgstr ""
+"Falló la instalación, faltan algunos archivos.\n"
+"Puede que desee actualizar la base de datos de sus fuentes."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Installation finished"
-msgstr "Finalizó la instalación"
+msgid "United Kingdom"
+msgstr "Reino Unido"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Hacer nada"
+msgid "in names"
+msgstr "en nombres"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Usar .%s como archivo principal"
+msgid ""
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
+msgstr ""
+"No puedo encontrar un sitio de réplica adecuado.\n"
+"\n"
+"Pueden haber muchas razones para este problema; la más común es cuando la\n"
+"arquitectura de su procesador no está soportada por las Actualizaciones\n"
+"Oficiales de Mandrake Linux."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Remove .%s"
 msgstr "Quitar .%s"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "changes:"
-msgstr "cambios:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspecting %s"
-msgstr "Inspeccionando %s"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Por favor espere, encontrando los paquetes disponibles..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "Por favor espere, agregando soporte..."
+msgid "Finland"
+msgstr "Finlandia"
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
+"The following packages have bad signatures:\n"
 "\n"
-"Then, restart MandrakeUpdate."
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"También puede elegir manualmente su sitio de réplica: para esto,\n"
-"lance el Administrador de fuentes de software, y luego añada una\n"
-"fuente de 'Actualizaciones de seguridad'.\n"
+"Se tienen que quitar los paquetes siguientes para poder actualizar otros:\n"
 "\n"
-"Luego, vuelva a iniciar MandrakeUpdate."
+"%s\n"
+"\n"
+"¿Desea continuar?"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "How to choose manually your mirror"
-msgstr "Cómo elegir manualmente su sitio de réplica"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Examining distant file of media `%s'..."
+msgstr "Examinando archivo distante de fuente `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
+msgid "Verifying packages signatures..."
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Already existing update sources"
-msgstr ""
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "France"
+msgstr "Forzar"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "More info"
+msgstr "Más información"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
+"%s\n"
 "\n"
 "Is it ok to continue?"
 msgstr ""
-"Necesito contactar al sitio de réplica para obtener los últimos paquetes "
-"actualizados.\n"
-"Por favor, verifique que su conexión de red está activa.\n"
+"%s\n"
 "\n"
-"¿Desea continuar?"
+"¿Desea continuar? "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Reload the packages list"
+msgstr "Recargar la lista de paquetes"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Elija un sitio de réplica..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Error de archivo"
+msgid "Some packages can't be installed"
+msgstr "El paquete «%s» no se puede instalar\n"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
+msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Preparando paquetes para la instalación..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Actualización de Mandrake"
+msgid "All packages,"
+msgstr "Todos los paquetes,"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Software Packages Removal"
-msgstr "Quitar paquetes de software"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Type of media:"
+msgstr "Tipo de fuente:"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Quit"
-msgstr "Salir"
+msgid "in files"
+msgstr "en archivos"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Instalar"
+msgid "All requested packages were installed successfully."
+msgstr "Se instalaron satisfactoriamente todos los paquetes pedidos."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove"
-msgstr "Quitar"
+msgid "Proxy hostname:"
+msgstr "Nombre de host del proxy:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Help"
-msgstr "Ayuda"
+msgid "Local files"
+msgstr "Archivos locales"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search"
-msgstr "Buscar"
+msgid "Inspecting %s"
+msgstr "Inspeccionando %s"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Find:"
-msgstr "Encontrar:"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Israel"
+msgstr "Instalar"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Se tienen que quitar los paquetes siguientes para poder actualizar otros:\n"
-"\n"
-"%s\n"
-"\n"
-"¿Desea continuar?"
+msgid "Help"
+msgstr "Ayuda"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Se necesita quitar algunos paquetes"
+msgid "HTTP server"
+msgstr "Servidor HTTP"
 
 #: ../rpmdrake:1
-#, c-format
-msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
-"\n"
-"Do you really want to install all the selected packages?"
-msgstr ""
-"Atención: parece que está intentando añadir tantos\n"
-"paquetes que su sistema de archivos puede quedarse sin espacio libre en el "
-"disco duro,\n"
-"durante o despues de la instalación de los paquetes; esto es "
-"particularmente\n"
-"peligroso y debería ser considerado con cuidado.\n"
-"\n"
-"¿Realmente quiere instalar los paquetes seleccionados?"
+#, fuzzy, c-format
+msgid "Installation failed"
+msgstr "Instalar todo"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Se han seleccionado demasiados paquetes."
+msgid "Use .%s as main file"
+msgstr "Usar .%s como archivo principal"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "Información máxima"
+msgid "Search results"
+msgstr "Resultados de la búsqueda"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Normal information"
-msgstr "Información normal"
+msgid " failed!"
+msgstr "¡falló!"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Update source(s)"
-msgstr "Actualizar fuente(s)"
+msgid "Brazil"
+msgstr "Brasil"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Recargar la lista de paquetes"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"Ya hay un soporte con ese nombre, ¿realmente\n"
+"desea reemplazarlo?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "Reiniciar la selección"
+msgid "Find:"
+msgstr "Encontrar:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "en archivos"
+msgid "All packages, alphabetical"
+msgstr "Todos los paquetes, alfabético"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "en descripciones"
+msgid "Please wait, searching..."
+msgstr "Por favor espere, buscando ..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "en nombres"
+msgid "Please wait, reading packages database..."
+msgstr "Por favor espere, leyendo la base de datos de paquetes..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by update availability"
-msgstr "por disponibilidad de actualización"
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "No se puede abrir el paquete «%s»\n"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by source repository"
-msgstr "por repositorio fuente"
+#, fuzzy, 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:1
 #, c-format
-msgid "by selection state"
-msgstr "por estado de la selección"
+msgid "Reset the selection"
+msgstr "Reiniciar la selección"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by size"
-msgstr "por tamaño"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"Si necesita un proxy, ingrese el nombre del host y un puerto opcional "
+"(sintaxis: <host_proxy[:puerto]>):"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-msgstr "por grupo"
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
+"Debido a sus dependencias, también se debe quitar el o los paquetes\n"
+"siguientes:\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "All packages,"
-msgstr "Todos los paquetes,"
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "All packages, alphabetical"
-msgstr "Todos los paquetes, alfabético"
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Hubo un error durante la instalación de los paquetes:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Selecciones de Mandrake"
+msgid "Please wait, removing medium..."
+msgstr "Por favor espere, quitando soporte..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
-msgstr "Actualizaciones normales"
+msgid "Password:"
+msgstr "Contraseña:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Actualizaciones que corrigen bugs"
+msgid "Taiwan"
+msgstr "Taiwan"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Security updates"
-msgstr "Actualizaciones de seguridad"
+msgid "User:"
+msgstr "Usuario:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Description: "
-msgstr "Descripción: "
+msgid "Please wait, updating medium..."
+msgstr "Por favor espere, actualizando soporte..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Razón para actualizar: "
+msgid "Please wait, listing packages..."
+msgstr "Por favor espere, listando paquetes..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Summary: "
-msgstr "Resumen: "
+msgid "Information on packages"
+msgstr "Información sobre paquetes"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Importance: "
-msgstr "Importancia: "
+msgid "Cancel"
+msgstr "Cancelar"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Everything installed successfully"
+msgstr "Se instaló todo satisfactoriamente"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Size: "
-msgstr "Tamaño: "
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Select the media(s) you wish to update:"
+msgstr "Seleccione la(s) fuente(s) que desea actualizar:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Version: "
-msgstr "Versión: "
+msgid "Please wait, updating media..."
+msgstr "Por favor espere, actualizando soportes..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "Nombre: "
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Versión actualmente instalada: "
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Se tienen que quitar los paquetes siguientes para poder actualizar otros:\n"
+"\n"
+"%s\n"
+"\n"
+"¿Desea continuar?"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Source: "
-msgstr "Forzar"
+#, c-format
+msgid "in descriptions"
+msgstr "en descripciones"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(Not available)"
-msgstr "(No disponible)"
+msgid "Configure proxies"
+msgstr "Configurar proxies"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Cambios:\n"
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Necesito contactar al sitio web de MandrakeSoft para obtener la lista de\n"
+"sitios de réplica. Por favor, verifique que su conexión de red está activa.\n"
+"\n"
+"¿Desea continuar?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Files:\n"
-msgstr "Archivos:\n"
+msgid "Please choose"
+msgstr "Por favor, elija"
 
 #: ../rpmdrake:1
 #, c-format
@@ -612,43 +559,28 @@ msgstr "Tamaño seleccionado: %d MB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Seleccionado: %d MB / Disponible en disco: %d MB"
+msgid "Initializing..."
+msgstr "Inicializando..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
-msgstr ""
-"Debido a sus dependencias, ahora se debe deseleccionar el o los\n"
-"paquetes siguientes:\n"
-"\n"
+msgid "Save changes"
+msgstr "Guardar cambios"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr ""
-"Lo siento, no se puede seleccionar el o los paquetes siguientes:\n"
-"\n"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "Error durante la descarga"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "entra en conflicto con"
+msgid "Package installation..."
+msgstr "Preparando paquetes para la instalación..."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "El paquete «%s» no se puede instalar\n"
+#, c-format
+msgid "Importance: "
+msgstr "Importancia: "
 
 #: ../rpmdrake:1
 #, c-format
@@ -661,312 +593,311 @@ msgstr ""
 "paquetes siguientes:\n"
 "\n"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "Se necesitan paquetes adicionales"
+msgid "Add..."
+msgstr "Agregar..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "El paquete «%s» no se puede instalar\n"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "No se puede crear el soporte."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Removing these packages would break your system, sorry:\n"
+"The installation is finished; %s.\n"
 "\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
 msgstr ""
-"Eliminando estos paquetes podria estropear su sistema, lo siento:\n"
+"Finalizó la instalación; %s.\n"
 "\n"
+"Algunos archivos de configuración se crearon como `.rpmnew' o `.rpmsave',\n"
+"ahora puede inspeccionar algunos para poder tomar acción:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"Debido a sus dependencias, también se debe quitar el o los paquetes\n"
-"siguientes:\n"
-"\n"
+msgid "Browse..."
+msgstr "Examinar..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "El paquete «%s» no se puede instalar\n"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Se necesitan quitar algunos paquetes adicionales"
+msgid "Info..."
+msgstr "Info..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "More information on package..."
-msgstr "Más información sobre el paquete..."
+msgid "You need to insert the medium to continue"
+msgstr "Necesita insertar el soporte para continuar"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Copying file for media `%s'..."
+msgstr "Copiando archivo para fuente `%s'..."
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Information on packages"
-msgstr "Información sobre paquetes"
+msgid "Remove"
+msgstr "Quitar"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "More info"
-msgstr "Más información"
+msgid "Preparing packages installation..."
+msgstr "Preparando paquetes para la instalación..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "by media repository"
+msgstr "por repositorio fuente"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "Agregable"
+msgid "No mirror"
+msgstr "Sin sitio de réplica"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Upgradable"
-msgstr "Actualizable"
+msgid "You need to fill up at least the two first entries."
+msgstr "Debe completar al menos las dos primeras entradas."
 
 #: ../rpmdrake:1
 #, c-format
-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 ""
-"La lista de actualizaciones está vacía. Esto significa que, o bien no hay\n"
-"actualizaciones disponibles para los paquetes instalados en su computadora,\n"
-"o bien ya los instaló a todos."
+msgid "Install"
+msgstr "Instalar"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "No update"
-msgstr "Sin actualizaciones"
+msgid "Japan"
+msgstr "Japón"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "(none)"
-msgstr "(ninguno)"
+msgid "Do nothing"
+msgstr "Hacer nada"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Por favor espere, listando paquetes..."
+msgid "No update"
+msgstr "Sin actualizaciones"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "No se puede abrir el paquete «%s»\n"
+#, c-format
+msgid "Description: "
+msgstr "Descripción: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Se necesita uno de los paquetes siguientes:"
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr ""
+"Atención: parece que está intentando añadir tantos\n"
+"paquetes que su sistema de archivos puede quedarse sin espacio libre en el "
+"disco duro,\n"
+"durante o despues de la instalación de los paquetes; esto es "
+"particularmente\n"
+"peligroso y debería ser considerado con cuidado.\n"
+"\n"
+"¿Realmente quiere instalar los paquetes seleccionados?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Por favor, elija"
+msgid "Name: "
+msgstr "Nombre: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Inspect..."
+msgstr "Inspeccionar..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Not selected"
-msgstr "Conflictos detectados"
+msgid "Editing media \"%s\":"
+msgstr "Editando fuente \"%s\":"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Selected"
-msgstr "Seleccionado"
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "Preparando paquetes para la instalación..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results"
-msgstr "Resultados de la búsqueda"
+msgid "Australia"
+msgstr "Australia"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Stop"
-msgstr "Detener"
+msgid "Installation finished"
+msgstr "Finalizó la instalación"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Por favor espere, buscando ..."
+msgid "by update availability"
+msgstr "por disponibilidad de actualización"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Resultados de la búsqueda (ninguno)"
+msgid "Poland"
+msgstr "Polonia"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Other"
-msgstr "Otro"
+msgid "Version: "
+msgstr "Versión: "
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the packages source editor!\n"
-"\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
+msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
-"¡Bienvenido al editor de fuentes de paquetes!\n"
-"\n"
-"Esta herramienta lo ayudará a configurar las fuentes de paquetes que desea\n"
-"utilizar en su computadora. Luego, las mismas estarán disponibles para\n"
-"instalar paquetes de software nuevos o realizar actualizaciones."
+"Puede especificar un usuario/contraseña para la autenticación del proxy:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
-msgstr "Guardar y salir"
+msgid "Upgradable"
+msgstr "Actualizable"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid " done."
+msgstr "hecho."
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Error..."
+msgid "Software Packages Installation"
+msgstr "Preparando paquetes para la instalación..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Update..."
-msgstr "Actualizar..."
+msgid "Additional packages needed"
+msgstr "Se necesitan paquetes adicionales"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "Agregar..."
+msgid "Bugfixes updates"
+msgstr "Actualizaciones que corrigen bugs"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "Editar"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Source"
-msgstr "Forzar"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "Descarga de `%s', faltan:%s, velocidad:%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Enabled?"
-msgstr "¿Habilitada?"
+msgid "Germany"
+msgstr "Alemania"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Configure sources"
-msgstr "Configurar fuentes"
+msgid "Russia"
+msgstr "Rusia"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Password:"
-msgstr "Contraseña:"
+msgid "Norway"
+msgstr "Noruega"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "User:"
-msgstr "Usuario:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during installation"
+msgstr "Ocurrió un problema durante la instalación"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr ""
-"Puede especificar un usuario/contraseña para la autenticación del proxy:"
+msgid "Search"
+msgstr "Buscar"
 
 #: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Edit a media"
+msgstr "Editar una fuente"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "Nombre de host del proxy:"
+msgid "Czech Republic"
+msgstr "República Checa"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"Si necesita un proxy, ingrese el nombre del host y un puerto opcional "
-"(sintaxis: <host_proxy[:puerto]>):"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Configurar proxies"
+msgid "Stop"
+msgstr "Detener"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Por favor espere, actualizando soporte..."
+msgid "Update"
+msgstr "Actualizar"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "Para guardar los cambios, necesita insertar el soporte en la unidad."
+msgid "Please wait, removing packages..."
+msgstr "Por favor espere, quitando paquetes..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "Necesita insertar el soporte para continuar"
+msgid "Normal information"
+msgstr "Información normal"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "Guardar cambios"
+msgid "Media: "
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Ruta relativa de synthesis/hdlist:"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "Descargando el paquete «%s» (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "Editando fuente \"%s\":"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Seleccionado: %d MB / Disponible en disco: %d MB"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit a source"
-msgstr "Editar una fuente"
+msgid "Media"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Por favor espere, quitando soporte..."
+msgid "Spain"
+msgstr "España"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Type of source:"
-msgstr "Tipo de fuente:"
+msgid "Normal updates"
+msgstr "Actualizaciones normales"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Agregando una fuente:"
+msgid "by selection state"
+msgstr "por estado de la selección"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
-"Ya hay un soporte con ese nombre, ¿realmente\n"
-"desea reemplazarlo?"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Debe completar al menos las dos primeras entradas."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Name:"
-msgstr "Nombre:"
+"Por favor espere, descargando las direcciones de los sitios de réplica desde "
+"el sitio web de MandrakeSoft."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -974,143 +905,148 @@ msgid "Login:"
 msgstr "Cuenta:"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Choose a mirror..."
-msgstr "Elija un sitio de réplica..."
+#, fuzzy, c-format
+msgid "Adding a media:"
+msgstr "Agregando una fuente:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Browse..."
-msgstr "Examinar..."
+msgid "Austria"
+msgstr "Austria"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Path or mount point:"
-msgstr "Ruta o punto de montaje:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Fatal error"
+msgstr "Error de archivo"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Removable device"
-msgstr "Dispositivo removible"
+msgid "Update..."
+msgstr "Actualizar..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "Verificando la firma de «%s»..."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "Servidor HTTP"
+msgid "(none)"
+msgstr "(ninguno)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "FTP server"
-msgstr "Servidor FTP"
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
+"Eliminando estos paquetes podria estropear su sistema, lo siento:\n"
+"\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Path:"
-msgstr "Ruta:"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Instalando el paquete «%s» (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "Archivos locales"
+msgid "Currently installed version: "
+msgstr "Versión actualmente instalada: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add a source"
-msgstr "Agregar una fuente"
+msgid "Other"
+msgstr "Otro"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr "No se puede actualizar el soporte; se deshabilitará automáticamente."
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "Razón para actualizar: "
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to create medium."
-msgstr "No se puede crear el soporte."
+msgid "Please choose the desired mirror."
+msgstr "Por favor, elija el sitio de réplica deseado."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "Actualizar"
+msgid "Edit"
+msgstr "Editar"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Seleccione la(s) fuente(s) que desea actualizar:"
+msgid "Please wait, finding available packages..."
+msgstr "Por favor espere, encontrando los paquetes disponibles..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Por favor espere, actualizando soportes..."
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Ruta relativa de synthesis/hdlist:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " failed!"
-msgstr "¡falló!"
+msgid "Search results (none)"
+msgstr "Resultados de la búsqueda (ninguno)"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid " done."
-msgstr "hecho."
+msgid "Danmark"
+msgstr "Dinamarca"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "Descarga de `%s', velocidad:%s"
+msgid "China"
+msgstr "China"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "Descarga de `%s', faltan:%s, velocidad:%s"
+msgid "United States"
+msgstr "Estados Unidos"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "Verificando la firma de «%s»..."
+#: ../rpmdrake:1
+#, c-format
+msgid "changes:"
+msgstr "cambios:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "Examinando archivo distante de fuente `%s'..."
+msgid "Some additional packages need to be removed"
+msgstr "Se necesitan quitar algunos paquetes adicionales"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "Examinando archivo de fuente `%s'..."
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "Copiando archivo para fuente `%s'..."
+msgid "No"
+msgstr "No"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure medias"
+msgstr "Configurar fuentes"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a media"
+msgstr "Agregar una fuente"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Please choose the desired mirror."
-msgstr "Por favor, elija el sitio de réplica deseado."
+msgid "Summary: "
+msgstr "Resumen: "
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
-msgstr ""
-"No puedo encontrar un sitio de réplica adecuado.\n"
-"\n"
-"Pueden haber muchas razones para este problema; la más común es cuando la\n"
-"arquitectura de su procesador no está soportada por las Actualizaciones\n"
-"Oficiales de Mandrake Linux."
+msgid "Canada"
+msgstr "Canadá"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No mirror"
-msgstr "Sin sitio de réplica"
+msgid "Greece"
+msgstr "Grecia"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1127,180 +1063,244 @@ msgstr ""
 "Tal vez no está disponible la red, o el sitio web de MandrakeSoft.\n"
 "Por favor, intente nuevamente más tarde."
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Error during download"
-msgstr "Error durante la descarga"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Necesita ser root para instalar paquetes. Lo siento."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-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."
+msgid "Path:"
+msgstr "Ruta:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Necesito contactar al sitio web de MandrakeSoft para obtener la lista de\n"
-"sitios de réplica. Por favor, verifique que su conexión de red está activa.\n"
-"\n"
-"¿Desea continuar?"
+msgid "Problem during removal"
+msgstr "Problema durante la eliminación"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United States"
-msgstr "Estados Unidos"
+msgid "Selected"
+msgstr "Seleccionado"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "China"
+msgid "Netherlands"
+msgstr "Países Bajos"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Reino Unido"
+msgid "Addable"
+msgstr "Agregable"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Taiwan"
+msgid "(Not available)"
+msgstr "(No disponible)"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Sweden"
-msgstr "Suecia"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
+msgstr ""
+"Lo siento, no se puede seleccionar el o los paquetes siguientes:\n"
+"\n"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Russia"
-msgstr "Rusia"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Not selected"
+msgstr "Conflictos detectados"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Portugal"
-msgstr "Portugal"
+msgid "Software Packages Removal"
+msgstr "Quitar paquetes de software"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Poland"
-msgstr "Polonia"
+msgid "Sweden"
+msgstr "Suecia"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Norway"
-msgstr "Noruega"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
+msgstr ""
+"\n"
+"\n"
+"Error(es) reportados:\n"
+"%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Netherlands"
-msgstr "Países Bajos"
+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 ""
+"La lista de actualizaciones está vacía. Esto significa que, o bien no hay\n"
+"actualizaciones disponibles para los paquetes instalados en su computadora,\n"
+"o bien ya los instaló a todos."
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Korea"
-msgstr "Forzar"
+msgid "Examining file of media `%s'..."
+msgstr "Examinando archivo de fuente `%s'..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Japan"
-msgstr "Japón"
+msgid "Download of `%s', speed:%s"
+msgstr "Descarga de `%s', velocidad:%s"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Italy"
-msgstr "Instalar"
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Se necesita uno de los paquetes siguientes:"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Israel"
-msgstr "Instalar"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Salir"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Greece"
-msgstr "Grecia"
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Necesito contactar al sitio de réplica para obtener los últimos paquetes "
+"actualizados.\n"
+"Por favor, verifique que su conexión de red está activa.\n"
+"\n"
+"¿Desea continuar?"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "France"
-msgstr "Forzar"
+msgid "Update media(s)"
+msgstr "Actualizar fuente(s)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Finland"
-msgstr "Finlandia"
+msgid "Ok"
+msgstr "Aceptar"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Spain"
-msgstr "España"
+msgid "Please wait, adding medium..."
+msgstr "Por favor espere, agregando soporte..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Danmark"
-msgstr "Dinamarca"
+msgid "Unable to get source packages."
+msgstr "No se pueden obtener los paquetes de la fuente."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "Alemania"
+msgid "Too many packages are selected"
+msgstr "Se han seleccionado demasiados paquetes."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"¡Bienvenido al editor de fuentes de paquetes!\n"
+"\n"
+"Esta herramienta lo ayudará a configurar las fuentes de paquetes que desea\n"
+"utilizar en su computadora. Luego, las mismas estarán disponibles para\n"
+"instalar paquetes de software nuevos o realizar actualizaciones."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
+msgstr "entra en conflicto con"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
-msgstr "República Checa"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"¡Bienvenido a MandrakeUpdate!\n"
+"\n"
+"Esta herramienta lo ayudará a elegir las actualizaciones que desea instalar "
+"en su computadora."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Costa Rica"
+msgid "Mandrake choices"
+msgstr "Selecciones de Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Canada"
-msgstr "Canadá"
+msgid "Changelog:\n"
+msgstr "Cambios:\n"
 
 #: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Korea"
+msgstr "Forzar"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Brazil"
-msgstr "Brasil"
+msgid "Removable device"
+msgstr "Dispositivo removible"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Bélgica"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Australia"
+msgid "Change medium"
+msgstr "Cambiar el soporte"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "Austria"
+msgid "Mandrake Update"
+msgstr "Actualización de Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
-msgstr "Info..."
+msgid "by size"
+msgstr "por tamaño"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "No"
+msgid "FTP server"
+msgstr "Servidor FTP"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "Sí"
+msgid "Files:\n"
+msgstr "Archivos:\n"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr "No se puede actualizar el soporte; se deshabilitará automáticamente."
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -1574,6 +1574,14 @@ msgstr "Quitar software"
 msgid "Software Sources Manager"
 msgstr "Administrador de las fuentes de software"
 
+#, fuzzy
+#~ msgid "Source: "
+#~ msgstr "Forzar"
+
+#, fuzzy
+#~ msgid "Source"
+#~ msgstr "Forzar"
+
 #~ msgid ""
 #~ "some packages failed to install\n"
 #~ "correctly"
@@ -1613,9 +1621,6 @@ msgstr "Administrador de las fuentes de software"
 #~ "\n"
 #~ "¿Desea intentar con otro sitio de réplica?"
 
-#~ msgid "Error adding update medium"
-#~ msgstr "Error agregando soporte de actualizaciones"
-
 #~ msgid "Please wait, contacting mirror to initialize updates packages."
 #~ msgstr ""
 #~ "Por favor espere, contactando al sitio de réplica para inicializar los "
diff --git a/po/et.po b/po/et.po
index 92f7b211..1b347ec1 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: 2003-05-13 15:54+0200\n"
 "Last-Translator: Marek Laane <bald@online.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -16,16 +16,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"Kas jätkata?"
+msgid "Enabled?"
+msgstr "Kas lubada?"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Otsingutee või haakepunkt:"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Portugal"
+msgstr "Portugal"
 
 #: ../rpmdrake:1
 #, c-format
@@ -43,144 +47,180 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"Mandrake uuendused\n"
-"\n"
-"Selle tööriista abil saate oma Mandrake Linuxit uuendada."
+msgid "by group"
+msgstr "grupi järgi"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
-msgstr ""
-"Tarkvara eemaldamine\n"
-"\n"
-"Selle tööriista abil saate valida eemaldatava tarkvara."
+msgid "Name:"
+msgstr "Nimi:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Pakettide eemaldamisel juhtus järgmine viga:\n"
-"\n"
-"%s"
+msgid "Italy"
+msgstr "Itaalia"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Problem during removal"
-msgstr "Probleem eemaldamisel"
+msgid "How to choose manually your mirror"
+msgstr "Kuidas valida peeglit käsitsi"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "Palun oodake, eemaldan pakette..."
+msgid "Some packages need to be removed"
+msgstr "Mõned paketid tuleb eemaldada"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Palun oodake, loen pakettide andmebaasi..."
+msgid "More information on package..."
+msgstr "Rohkem infot paketi kohta..."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Jah"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"There was a problem during the installation:\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"%s"
 msgstr ""
-"Paigaldamisel juhtus järgmine viga:\n"
+"Sõltuvuste tõttu ei saa järgmisi pakette valida:\n"
 "\n"
-"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation failed"
-msgstr "Paigaldamine ebaõnnestus"
+msgid "everything was installed correctly"
+msgstr "kõik paigaldati edukalt"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Parandamatu viga: kahjuks ei leitud paigaldamiseks ühtegi paketti."
+msgid "%s KB"
+msgstr "%s KB"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "No package found for installation."
-msgstr "Paigaldamiseks ei leitud ühtegi paketti."
+#, fuzzy, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"Te võite meelepärase peegli ka käsitsi valida. Selleks\n"
+"käivitage tarkvara allikate haldur ja lisage 'turvauuenduste'\n"
+"allikas.\n"
+"\n"
+"Seejärel taaskäivitage Mandrake uuendused."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Kõik soovitud paketid said edukalt paigaldatud."
+msgid ""
+"Welcome to the software removal tool!\n"
+"\n"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
+msgstr ""
+"Tarkvara eemaldamine\n"
+"\n"
+"Selle tööriista abil saate valida eemaldatava tarkvara."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Kõik paigaldati edukalt"
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "Muutuste salvestamiseks tuleb andmekandja seadmesse sisestada."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Salvesta ja välju"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"There was a problem during the removal of packages:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"%s"
 msgstr ""
-"Paigaldus on lõpetatud; %s\n"
+"Pakettide eemaldamisel juhtus järgmine viga:\n"
 "\n"
-"Mõned seadistusfailid loodi kui '.rpmnew' või '.rpmsave'. Te\n"
-"võiksite mõnda neist nüüd uurida, et võtta ette järgmisi samme:"
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "everything was installed correctly"
-msgstr "kõik paigaldati edukalt"
+msgid "Size: "
+msgstr "Suurus: "
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Problem during installation"
-msgstr "Paigaldusel tekkis probleem"
+msgid "Security updates"
+msgstr "Turvaparandused"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Already existing update medias"
+msgstr "Olemasolevad uuenduste allikad"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Paigaldan paketti '%s' (%s/%s)..."
+msgid "Maximum information"
+msgstr "Täielik info"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy..."
+msgstr "Vahendaja..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
+msgstr ""
+"Paigaldus ebaõnnestus, osa faile on puudu.\n"
+"Võimalik, et peate allikate andmebaasi uuendama."
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Preparing packages installation..."
-msgstr "Paigaldamiseks valmistumine..."
+msgid "United Kingdom"
+msgstr "Suurbritannia"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "in names"
+msgstr "nimedes"
+
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
+"I can't find any suitable mirror.\n"
 "\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
+"Kõlbulikku peeglit ei õnnestunud leida.\n"
 "\n"
-"\n"
-"Anti teada viga(dest):\n"
-"%s"
+"Sellel võib olla mitu põhjust. Kõige tavalisem on see, et Mandrake\n"
+"Linuxi ametlikud uuendused ei toeta Teie protsessori arhitektuuri."
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"Paigaldus ebaõnnestus, osa faile on puudu.\n"
-"Võimalik, et peate allikate andmebaasi uuendama."
+msgid "Remove .%s"
+msgstr "Eemalda .%s"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "Soome"
 
 #: ../rpmdrake:1
 #, c-format
@@ -197,361 +237,339 @@ msgstr ""
 "\n"
 "Kas jätkata?"
 
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Examining distant file of media `%s'..."
+msgstr "Kaugallikafaili `%s' uurimine..."
+
 #: ../rpmdrake:1
 #, c-format
 msgid "Verifying packages signatures..."
 msgstr "Signatuuride kontrollimine..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Laadin võrgust paketti '%s' (%s/%s)..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Cancel"
-msgstr "Katkesta"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "Olgu"
+msgid "France"
+msgstr "Prantsusmaa"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Palun sisestage andmekandja nimega \"%s\" seadmesse [%s]"
+msgid "More info"
+msgstr "Rohkem infot"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Change medium"
-msgstr "Muuda andmekandjat"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Kas jätkata?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "Initsialiseerin.."
+msgid "Reload the packages list"
+msgstr "Pakettide nimekirja taaslaadimine"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Package installation..."
-msgstr "Paigaldan..."
+msgid "Choose a mirror..."
+msgstr "Valige peegel..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Vabandust, pakette ei õnnetunud kätte saada. %s"
+msgid "Some packages can't be installed"
+msgstr "Mõnda paketti ei saa paigaldada"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Unable to get source packages."
-msgstr "Ei saa pakette kätte."
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "Parandamatu viga: kahjuks ei leitud paigaldamiseks ühtegi paketti."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "Uuri..."
+msgid "All packages,"
+msgstr "Kõik paketid,"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Installation finished"
-msgstr "Paigaldus lõpetatud"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Type of media:"
+msgstr "Andmekandja tüüp:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Ära tee midagi"
+msgid "in files"
+msgstr "failides"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr ".%s kasutamine põhifailina"
+msgid "All requested packages were installed successfully."
+msgstr "Kõik soovitud paketid said edukalt paigaldatud."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Eemalda .%s"
+msgid "Proxy hostname:"
+msgstr "Vahendaja masinanimi:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "changes:"
-msgstr "muutused:"
+msgid "Local files"
+msgstr "Kohalikud failid"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspecting %s"
 msgstr "%s uurimine"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Palun oodake, otsin kättesaadavaid pakette..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "Palun oodake, lisan andmekandja..."
+msgid "Israel"
+msgstr "Iisrael"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
-"\n"
-"Then, restart MandrakeUpdate."
-msgstr ""
-"Te võite meelepärase peegli ka käsitsi valida. Selleks\n"
-"käivitage tarkvara allikate haldur ja lisage 'turvauuenduste'\n"
-"allikas.\n"
-"\n"
-"Seejärel taaskäivitage Mandrake uuendused."
+msgid "Help"
+msgstr "Abi"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "Kuidas valida peeglit käsitsi"
+msgid "HTTP server"
+msgstr "HTTP server"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
-msgstr ""
-"Vähemalt üks uuenduste allikas peab olema seadistatud, kuid\n"
-"praegu on kõik keelatud. Teil tuleks käivitada tarkvara allikate\n"
-"haldur, et vähemalt üks lubada (klõpsake selleks veerul Kas lubada?)\n"
-"\n"
-"Seejärel käivitage Mandrake uuendused uuesti."
+msgid "Installation failed"
+msgstr "Paigaldamine ebaõnnestus"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Already existing update sources"
-msgstr "Olemasolevad uuenduste allikad"
+msgid "Use .%s as main file"
+msgstr ".%s kasutamine põhifailina"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Viimaste uuenduste hankimiseks tuleb võtta ühendus peegelsaidiga.\n"
-"Kontrollige palun, et Internetiühendus töötaks.\n"
-"\n"
-"Kas jätkata?"
+msgid "Search results"
+msgstr "Otsingu tulemused"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr "Tekkis saatuslik viga: %s."
+msgid " failed!"
+msgstr " ebaõnnestus!"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Fatal error"
-msgstr "Saatuslik viga"
+msgid "Brazil"
+msgstr "Brasiilia"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Software Packages Installation"
-msgstr "Pakettide paigaldamine"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"Sellise nimega andmekandja on juba olemas, kas\n"
+"soovite tõesti selle asendada?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Mandrake uuendused"
+msgid "Find:"
+msgstr "Leia:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Pakettide eemaldamine"
+msgid "All packages, alphabetical"
+msgstr "Kõik paketid, tähestikuliselt"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Quit"
-msgstr "Välju"
+msgid "Please wait, searching..."
+msgstr "Palun oodake, otsin..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Paigalda"
+msgid "Please wait, reading packages database..."
+msgstr "Palun oodake, loen pakettide andmebaasi..."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "Eemalda"
+msgid "unknown package "
+msgstr "tundmatu pakett "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Help"
-msgstr "Abi"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Palun sisestage andmekandja nimega \"%s\" seadmesse [%s]"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search"
-msgstr "Otsi"
+msgid "Reset the selection"
+msgstr "Valiku lähtestamine"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Find:"
-msgstr "Leia:"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"Kui vajate vahendajat, sisestage masina nimi ja võimalusel port (süntaks: "
+"<vahendajamasin[:port]>):"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
 "\n"
-"Is it ok to continue?"
 msgstr ""
-"Järgmised paketid tuleb eemaldada, et saaks teisi uuendada:\n"
-"\n"
-"%s\n"
+"Kõigi sõltuvuste rahuldamiseks eemaldatakse ka järgmised paketid:\n"
 "\n"
-"Kas jätkata?"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Mõned paketid tuleb eemaldada"
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
+"There was a problem during the installation:\n"
 "\n"
-"Do you really want to install all the selected packages?"
+"%s"
 msgstr ""
-"Hoiatus: paistab, et püüate lisada nii palju pakette, et\n"
-"Teil võib kettaruumist puudu tulla kas nende paigaldamise\n"
-"ajal või pärast seda. See kujutab endast väga suurt ohtu\n"
-"ning kasulik oleks siinkohal natuke mõelda.\n"
+"Paigaldamisel juhtus järgmine viga:\n"
 "\n"
-"Kas soovite tõesti paigaldada kõik valitud paketid?"
+"%s"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Valitud on liiga palju pakette"
+msgid "Please wait, removing medium..."
+msgstr "Palun oodake, eemaldan andmekandja..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Maximum information"
-msgstr "Täielik info"
+msgid "Password:"
+msgstr "Parool:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Normal information"
-msgstr "Tavainfo"
+msgid "Taiwan"
+msgstr "Taiwan"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update source(s)"
-msgstr "Allika(te) uuendamine"
+msgid "User:"
+msgstr "Kasutajanimi:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Pakettide nimekirja taaslaadimine"
+msgid "Please wait, updating medium..."
+msgstr "Palun oodake, uuendan andmekandjat..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "Valiku lähtestamine"
+msgid "Please wait, listing packages..."
+msgstr "Palun oodake, koostan nimekirja..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "failides"
+msgid "Information on packages"
+msgstr "Info pakettide kohta"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "in descriptions"
-msgstr "kirjeldustes"
+msgid "Cancel"
+msgstr "Katkesta"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "nimedes"
+msgid "Everything installed successfully"
+msgstr "Kõik paigaldati edukalt"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "by update availability"
-msgstr "uuendamisstaatuse järgi"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Select the media(s) you wish to update:"
+msgstr "Valige allikas (allikad), mida soovite uuendada:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by source repository"
-msgstr "andmekandja asukoha järgi"
+msgid "Please wait, updating media..."
+msgstr "Palun oodake, uuendan andmekandjat..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by selection state"
-msgstr "valikustaatuse järgi"
+msgid "A fatal error occurred: %s."
+msgstr "Tekkis saatuslik viga: %s."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by size"
-msgstr "suuruse järgi"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Järgmised paketid tuleb eemaldada, et saaks teisi uuendada:\n"
+"\n"
+"%s\n"
+"\n"
+"Kas jätkata?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-msgstr "grupi järgi"
+msgid "in descriptions"
+msgstr "kirjeldustes"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "All packages,"
-msgstr "Kõik paketid,"
+msgid "Configure proxies"
+msgstr "Vahendajate seadistamine"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Kõik paketid, tähestikuliselt"
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Peeglite nimekirja hankimiseks tuleb ühendust võtta MandrakeSofti\n"
+"veebileheküljega. Kontrollige, et Internetiühendus töötab.\n"
+"\n"
+"Kas jätkata?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Mandrake valikud"
+msgid "Please choose"
+msgstr "Palun valige"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Normal updates"
-msgstr "Uuendused"
+msgid "Selected size: %d MB"
+msgstr "Valitud pakettide maht: %d MB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Turvaparandused/uuendused"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Security updates"
-msgstr "Turvaparandused"
+msgid "Initializing..."
+msgstr "Initsialiseerin.."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Description: "
-msgstr "Kirjeldus: "
+msgid "Save changes"
+msgstr "Salvesta muutused"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Uuendamise põhjus: "
+msgid "Error during download"
+msgstr "Viga allalaadimisel"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Summary: "
-msgstr "Kokkuvõte: "
+msgid "Package installation..."
+msgstr "Paigaldan..."
 
 #: ../rpmdrake:1
 #, c-format
@@ -560,559 +578,468 @@ msgstr "Tähtsus: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid ""
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
+msgstr ""
+"Sõltuvuste rahuldamiseks tuleb paigaldada ka järgmised paketid:\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Size: "
-msgstr "Suurus: "
+msgid "Add..."
+msgstr "Lisa..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Version: "
-msgstr "Versioon: "
+msgid "Unable to create medium."
+msgstr "Andmekandja loomine ebaõnnestus."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "Nimi: "
+msgid ""
+"The installation is finished; %s.\n"
+"\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
+msgstr ""
+"Paigaldus on lõpetatud; %s\n"
+"\n"
+"Mõned seadistusfailid loodi kui '.rpmnew' või '.rpmsave'. Te\n"
+"võiksite mõnda neist nüüd uurida, et võtta ette järgmisi samme:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Praegu paigaldatud versioon: "
+msgid "Browse..."
+msgstr "Sirvi..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Source: "
-msgstr "Allikas: "
+msgid "Some packages can't be removed"
+msgstr "Mõnda paketti ei saa eemaldada"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
-msgstr "(kättesaamatu)"
+msgid "Info..."
+msgstr "Info..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Muutuste logi:\n"
+msgid "You need to insert the medium to continue"
+msgstr "Jätkamiseks tuleb sisestada andmekandja"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Files:\n"
-msgstr "Failid:\n"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Copying file for media `%s'..."
+msgstr "Faili kopeerimine allikale `%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "Valitud pakettide maht: %d MB"
+msgid "Remove"
+msgstr "Eemalda"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Valitud: %d MB / Vaba kettapinda %d MB"
+msgid "Preparing packages installation..."
+msgstr "Paigaldamiseks valmistumine..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
-msgstr ""
-"Sõltuvuste tõttu ei saa järgmisi pakette valida:\n"
-"\n"
+#, fuzzy, c-format
+msgid "by media repository"
+msgstr "andmekandja asukoha järgi"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr ""
-"Kahjuks ei saa järgmisi pakette valida:\n"
-"\n"
-"%s\n"
-"\n"
-"Põhjused:\n"
-"\n"
-"%s"
+msgid "No mirror"
+msgstr "Peeglit ei leitud"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "%s conflicts with %s"
-msgstr "%s ja %s on konfliktis"
+msgid "You need to fill up at least the two first entries."
+msgstr "Täitke vähemalt 2 esimest välja."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages can't be installed"
-msgstr "Mõnda paketti ei saa paigaldada"
+msgid "Install"
+msgstr "Paigalda"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
-msgstr ""
-"Sõltuvuste rahuldamiseks tuleb paigaldada ka järgmised paketid:\n"
-"\n"
+msgid "Japan"
+msgstr "Jaapan"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "Vajalikud lisapaketid"
+msgid "Do nothing"
+msgstr "Ära tee midagi"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages can't be removed"
-msgstr "Mõnda paketti ei saa eemaldada"
+msgid "No update"
+msgstr "Uuendusi ei ole"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
-"Vabandan, aga nende pakettide eemaldamine võib halvata Teie süsteemi:\n"
-"\n"
+msgid "Description: "
+msgstr "Kirjeldus: "
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
 "\n"
+"Do you really want to install all the selected packages?"
 msgstr ""
-"Kõigi sõltuvuste rahuldamiseks eemaldatakse ka järgmised paketid:\n"
+"Hoiatus: paistab, et püüate lisada nii palju pakette, et\n"
+"Teil võib kettaruumist puudu tulla kas nende paigaldamise\n"
+"ajal või pärast seda. See kujutab endast väga suurt ohtu\n"
+"ning kasulik oleks siinkohal natuke mõelda.\n"
 "\n"
+"Kas soovite tõesti paigaldada kõik valitud paketid?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Et kõik töötaks, on vaja lisaks eemaldada mõned paketid"
+msgid "Name: "
+msgstr "Nimi: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "More information on package..."
-msgstr "Rohkem infot paketi kohta..."
+msgid "Inspect..."
+msgstr "Uuri..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Information on packages"
-msgstr "Info pakettide kohta"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing media \"%s\":"
+msgstr "Allika \"%s\" muutmine:"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "More info"
-msgstr "Rohkem infot"
+msgid "No package found for installation."
+msgstr "Paigaldamiseks ei leitud ühtegi paketti."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "Lisatavad"
+msgid "Australia"
+msgstr "Austraalia"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Upgradable"
-msgstr "Uuendatavad"
+msgid "Installation finished"
+msgstr "Paigaldus lõpetatud"
 
 #: ../rpmdrake:1
 #, c-format
-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 ""
-"Uuenduste nimekiri on tühi. See tähendab, et Teie süsteemi\n"
-"paigaldatud pakettidele ei ole parajasti mingeid uuendusi või\n"
-"Te olete need juba kõik paigaldanud."
+msgid "by update availability"
+msgstr "uuendamisstaatuse järgi"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "No update"
-msgstr "Uuendusi ei ole"
+msgid "Poland"
+msgstr "Poola"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "(none)"
-msgstr "(puudub)"
+msgid "Version: "
+msgstr "Versioon: "
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Palun oodake, koostan nimekirja..."
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Vahendaja autentimiseks oleks tulus määrata kasutajanimi ja parool:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "unknown package "
-msgstr "tundmatu pakett "
+msgid "Upgradable"
+msgstr "Uuendatavad"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Vajalik on üks järgmistest pakettidest:"
+msgid " done."
+msgstr " tehtud."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Palun valige"
+msgid "Software Packages Installation"
+msgstr "Pakettide paigaldamine"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Additional packages needed"
+msgstr "Vajalikud lisapaketid"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Not selected"
-msgstr "Valimata"
+msgid "Bugfixes updates"
+msgstr "Turvaparandused/uuendused"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Selected"
-msgstr "Valitud"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "`%s' allalaadimine, aega jäänud:%s, kiirus:%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results"
-msgstr "Otsingu tulemused"
+msgid "Germany"
+msgstr "Saksamaa"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Stop"
-msgstr "Peata"
+msgid "Russia"
+msgstr "Venemaa"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Palun oodake, otsin..."
+msgid "Norway"
+msgstr "Norra"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Otsingu tulemus (ei leitud)"
+msgid "Problem during installation"
+msgstr "Paigaldusel tekkis probleem"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Other"
-msgstr "Muu"
+msgid "Search"
+msgstr "Otsi"
 
 #: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Edit a media"
+msgstr "Allika muutmine"
+
+#: ../rpmdrake.pm:1
 #, c-format
+msgid "Czech Republic"
+msgstr "TÅ¡ehhi Vabariik"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
 msgid ""
-"Welcome to the packages source editor!\n"
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
 "\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
+"Then, restart MandrakeUpdate."
 msgstr ""
-"Tarkvara allikad\n"
+"Vähemalt üks uuenduste allikas peab olema seadistatud, kuid\n"
+"praegu on kõik keelatud. Teil tuleks käivitada tarkvara allikate\n"
+"haldur, et vähemalt üks lubada (klõpsake selleks veerul Kas lubada?)\n"
 "\n"
-"See abivahend aitab määrata pakettide allikaid, mida soovite kasutada oma\n"
-"süsteemi uuendamisel. Kui olete allikad määranud, saate nende abil\n"
-"paigaldada uusi tarkvarapakette või uuendada vanu pakette."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Save and quit"
-msgstr "Salvesta ja välju"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Proxy..."
-msgstr "Vahendaja..."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Update..."
-msgstr "Uuenda..."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add..."
-msgstr "Lisa..."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Edit"
-msgstr "Muuda"
+"Seejärel käivitage Mandrake uuendused uuesti."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Source"
-msgstr "Allikas"
+msgid "Stop"
+msgstr "Peata"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Enabled?"
-msgstr "Kas lubada?"
+msgid "Update"
+msgstr "Uuenda"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure sources"
-msgstr "Allikate seadistamine"
+msgid "Please wait, removing packages..."
+msgstr "Palun oodake, eemaldan pakette..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "Parool:"
+msgid "Normal information"
+msgstr "Tavainfo"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "User:"
-msgstr "Kasutajanimi:"
+msgid "Media: "
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "Vahendaja autentimiseks oleks tulus määrata kasutajanimi ja parool:"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "Laadin võrgust paketti '%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "Vahendaja masinanimi:"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Valitud: %d MB / Vaba kettapinda %d MB"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+msgid "Media"
 msgstr ""
-"Kui vajate vahendajat, sisestage masina nimi ja võimalusel port (süntaks: "
-"<vahendajamasin[:port]>):"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure proxies"
-msgstr "Vahendajate seadistamine"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Palun oodake, uuendan andmekandjat..."
+msgid "Spain"
+msgstr "Hispaania"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "Muutuste salvestamiseks tuleb andmekandja seadmesse sisestada."
+msgid "Normal updates"
+msgstr "Uuendused"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "Jätkamiseks tuleb sisestada andmekandja"
+msgid "by selection state"
+msgstr "valikustaatuse järgi"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Save changes"
-msgstr "Salvesta muutused"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "Palun oodake, peeglite aadresse laetakse..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Suhteline tee synthesis/hdlist juurde:"
+msgid "Login:"
+msgstr "Kasutajanimi:"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "URL:"
-msgstr "URL:"
+#, fuzzy, c-format
+msgid "Adding a media:"
+msgstr "Allika lisamine:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Editing source \"%s\":"
-msgstr "Allika \"%s\" muutmine:"
+msgid "Austria"
+msgstr "Austria"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Edit a source"
-msgstr "Allika muutmine"
+msgid "Fatal error"
+msgstr "Saatuslik viga"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Palun oodake, eemaldan andmekandja..."
+msgid "Update..."
+msgstr "Uuenda..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "Andmekandja tüüp:"
+msgid "Starting download of `%s'..."
+msgstr "'%s' allalaadimise alustamine..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Allika lisamine:"
+msgid "(none)"
+msgstr "(puudub)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
+"Removing these packages would break your system, sorry:\n"
+"\n"
 msgstr ""
-"Sellise nimega andmekandja on juba olemas, kas\n"
-"soovite tõesti selle asendada?"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Täitke vähemalt 2 esimest välja."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Name:"
-msgstr "Nimi:"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Login:"
-msgstr "Kasutajanimi:"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Choose a mirror..."
-msgstr "Valige peegel..."
+"Vabandan, aga nende pakettide eemaldamine võib halvata Teie süsteemi:\n"
+"\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
-msgstr "Sirvi..."
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Paigaldan paketti '%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Path or mount point:"
-msgstr "Otsingutee või haakepunkt:"
+msgid "Currently installed version: "
+msgstr "Praegu paigaldatud versioon: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Removable device"
-msgstr "Eemaldatav seade"
+msgid "Other"
+msgstr "Muu"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "HTTP server"
+msgid "Reason for update: "
+msgstr "Uuendamise põhjus: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "FTP server"
+msgid "Please choose the desired mirror."
+msgstr "Palun valige peegel."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Path:"
-msgstr "Otsingutee:"
+msgid "Edit"
+msgstr "Muuda"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "Kohalikud failid"
+msgid "Please wait, finding available packages..."
+msgstr "Palun oodake, otsin kättesaadavaid pakette..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Add a source"
-msgstr "Lisa allikas"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr ""
-"Andmekandja uuendamine ebaõnnestus; sellest loobutakse automaatselt.\n"
-"\n"
-"Vead:\n"
-"%s"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Unable to create medium."
-msgstr "Andmekandja loomine ebaõnnestus."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Update"
-msgstr "Uuenda"
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Suhteline tee synthesis/hdlist juurde:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Valige allikas (allikad), mida soovite uuendada:"
+msgid "Search results (none)"
+msgstr "Otsingu tulemus (ei leitud)"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Palun oodake, uuendan andmekandjat..."
+msgid "Danmark"
+msgstr "Taani"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid " failed!"
-msgstr " ebaõnnestus!"
+msgid "China"
+msgstr "Hiina"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid " done."
-msgstr " tehtud."
+msgid "United States"
+msgstr "USA"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "`%s' allalaadimine, kiirus:%s"
+msgid "changes:"
+msgstr "muutused:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "`%s' allalaadimine, aega jäänud:%s, kiirus:%s"
+msgid "Some additional packages need to be removed"
+msgstr "Et kõik töötaks, on vaja lisaks eemaldada mõned paketid"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Starting download of `%s'..."
-msgstr "'%s' allalaadimise alustamine..."
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "Kaugallikafaili `%s' uurimine..."
+msgid "No"
+msgstr "Ei"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Examining file of source `%s'..."
-msgstr "Allikafaili `%s' uurimine..."
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure medias"
+msgstr "Allikate seadistamine"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Copying file for source `%s'..."
-msgstr "Faili kopeerimine allikale `%s'..."
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a media"
+msgstr "Lisa allikas"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please choose the desired mirror."
-msgstr "Palun valige peegel."
+msgid "Summary: "
+msgstr "Kokkuvõte: "
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
-msgstr ""
-"Kõlbulikku peeglit ei õnnestunud leida.\n"
-"\n"
-"Sellel võib olla mitu põhjust. Kõige tavalisem on see, et Mandrake\n"
-"Linuxi ametlikud uuendused ei toeta Teie protsessori arhitektuuri."
+msgid "Canada"
+msgstr "Kanada"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No mirror"
-msgstr "Peeglit ei leitud"
+msgid "Greece"
+msgstr "Kreeka"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1129,178 +1056,251 @@ msgstr ""
 "Võrk või MandrakeSofti veebilehekülg ei pruugi olla kättesaadav.\n"
 "Palun proovige varsti uuesti."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
-msgstr "Viga allalaadimisel"
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Vabandust, pakette ei õnnetunud kätte saada. %s"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr "Palun oodake, peeglite aadresse laetakse..."
+msgid "Path:"
+msgstr "Otsingutee:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Peeglite nimekirja hankimiseks tuleb ühendust võtta MandrakeSofti\n"
-"veebileheküljega. Kontrollige, et Internetiühendus töötab.\n"
-"\n"
-"Kas jätkata?"
+msgid "Problem during removal"
+msgstr "Probleem eemaldamisel"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United States"
-msgstr "USA"
+msgid "Selected"
+msgstr "Valitud"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "Hiina"
+msgid "Netherlands"
+msgstr "Holland"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Suurbritannia"
+msgid "Addable"
+msgstr "Lisatavad"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Taiwan"
+msgid "(Not available)"
+msgstr "(kättesaamatu)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Sweden"
-msgstr "Rootsi"
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
+msgstr ""
+"Kahjuks ei saa järgmisi pakette valida:\n"
+"\n"
+"%s\n"
+"\n"
+"Põhjused:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Russia"
-msgstr "Venemaa"
+msgid "Not selected"
+msgstr "Valimata"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Portugal"
-msgstr "Portugal"
+msgid "Software Packages Removal"
+msgstr "Pakettide eemaldamine"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Poland"
-msgstr "Poola"
+msgid "Sweden"
+msgstr "Rootsi"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Norway"
-msgstr "Norra"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
+msgstr ""
+"\n"
+"\n"
+"Anti teada viga(dest):\n"
+"%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Netherlands"
-msgstr "Holland"
+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 ""
+"Uuenduste nimekiri on tühi. See tähendab, et Teie süsteemi\n"
+"paigaldatud pakettidele ei ole parajasti mingeid uuendusi või\n"
+"Te olete need juba kõik paigaldanud."
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Korea"
-msgstr "Korea"
+#, fuzzy, c-format
+msgid "Examining file of media `%s'..."
+msgstr "Allikafaili `%s' uurimine..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Japan"
-msgstr "Jaapan"
+msgid "Download of `%s', speed:%s"
+msgstr "`%s' allalaadimine, kiirus:%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Italy"
-msgstr "Itaalia"
+msgid "One of the following packages is needed:"
+msgstr "Vajalik on üks järgmistest pakettidest:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Israel"
-msgstr "Iisrael"
+msgid "Quit"
+msgstr "Välju"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Greece"
-msgstr "Kreeka"
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Viimaste uuenduste hankimiseks tuleb võtta ühendus peegelsaidiga.\n"
+"Kontrollige palun, et Internetiühendus töötaks.\n"
+"\n"
+"Kas jätkata?"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update media(s)"
+msgstr "Allika(te) uuendamine"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "France"
-msgstr "Prantsusmaa"
+msgid "Ok"
+msgstr "Olgu"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Finland"
-msgstr "Soome"
+msgid "Please wait, adding medium..."
+msgstr "Palun oodake, lisan andmekandja..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Spain"
-msgstr "Hispaania"
+msgid "Unable to get source packages."
+msgstr "Ei saa pakette kätte."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Danmark"
-msgstr "Taani"
+msgid "Too many packages are selected"
+msgstr "Valitud on liiga palju pakette"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"Tarkvara allikad\n"
+"\n"
+"See abivahend aitab määrata pakettide allikaid, mida soovite kasutada oma\n"
+"süsteemi uuendamisel. Kui olete allikad määranud, saate nende abil\n"
+"paigaldada uusi tarkvarapakette või uuendada vanu pakette."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "Saksamaa"
+msgid "%s conflicts with %s"
+msgstr "%s ja %s on konfliktis"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
-msgstr "TÅ¡ehhi Vabariik"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Mandrake uuendused\n"
+"\n"
+"Selle tööriista abil saate oma Mandrake Linuxit uuendada."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Costa Rica"
+msgid "Mandrake choices"
+msgstr "Mandrake valikud"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Canada"
-msgstr "Kanada"
+msgid "Changelog:\n"
+msgstr "Muutuste logi:\n"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Brazil"
-msgstr "Brasiilia"
+msgid "Korea"
+msgstr "Korea"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Removable device"
+msgstr "Eemaldatav seade"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Belgia"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Austraalia"
+msgid "Change medium"
+msgstr "Muuda andmekandjat"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "Austria"
+msgid "Mandrake Update"
+msgstr "Mandrake uuendused"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
-msgstr "Info..."
+msgid "by size"
+msgstr "suuruse järgi"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "Ei"
+msgid "FTP server"
+msgstr "FTP server"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "Failid:\n"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Yes"
-msgstr "Jah"
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr ""
+"Andmekandja uuendamine ebaõnnestus; sellest loobutakse automaatselt.\n"
+"\n"
+"Vead:\n"
+"%s"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -1571,3 +1571,9 @@ msgstr "Tarkvara eemaldamine"
 #: data/rpmdrake-sources.desktop.in.h:1
 msgid "Software Sources Manager"
 msgstr "Tarkvaraallikate haldur"
+
+#~ msgid "Source: "
+#~ msgstr "Allikas: "
+
+#~ msgid "Source"
+#~ msgstr "Allikas"
diff --git a/po/eu.po b/po/eu.po
index 750481f7..426f7482 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: 2002-08-27 19:47+0200\n"
 "Last-Translator: Iñigo Salvador Azurmendi <xalba@euskalnet.net>\n"
 "Language-Team: Euskara <linux-eu@chanae.alphanet.ch>\n"
@@ -15,16 +15,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"Jarraitu nahi dezaket?"
+msgid "Enabled?"
+msgstr "Gaitu?"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "bidea edo muntatze-puntua:"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Portugal"
+msgstr "Portugal"
 
 #: ../rpmdrake:1
 #, c-format
@@ -44,17 +48,79 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "by group"
+msgstr "talde arabera"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "Izena:"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Italy"
+msgstr "Instalatu"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Nola hautatu eskuz zure ispilua"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URLa:"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "Zenbait pakete ezabatu egin behar dira"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
+msgstr "Paketeari buruzko informazio gehiago..."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Bai"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Welcome to MandrakeUpdate!\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
 msgstr ""
-"Ongi etorri MandrakeUpdatera!\n"
+"Dituzten menpekotasunengatik, ondorengo paketeak aukeratik kendu\n"
+"behar dira:\n"
 "\n"
-"Tresna honek zure konputagailuan instalatu nahi dituzun eguneratzeak "
-"aukeratzen\n"
-"lagunduko dizu."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "guztia ondo instalatu da"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"Erabili nahi duzun ispilua eskuz aukeratu dezakezu: horretarako,\n"
+"jaurti Software Sorburu Kudeatzailea, eta gehitu 'Segurtasun eguneratze'\n"
+"sorburu bat.\n"
+"\n"
+"Gero, berrabiarazi MandrakeUpdate"
 
 #: ../rpmdrake:1
 #, c-format
@@ -69,6 +135,17 @@ msgstr ""
 "Tresna honek zure konputagailutik ezabatu nahi duzun softwarea aukeratzen\n"
 "lagunduko dizu."
 
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "Aldaketak gorde daitezen, euskarria unitatean sartu behar duzu."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Gorde eta irten"
+
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
@@ -81,106 +158,73 @@ msgstr ""
 "%s"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during removal"
-msgstr "Arazoa instalatzerakoan"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "Itxaoin mesedez, paketeak ezabatzen..."
+msgid "Size: "
+msgstr "Neurria: "
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Itxoin mesedez, paketeen datubasea irakurtzen..."
+msgid "Security updates"
+msgstr "Segurtasunaren eguneratzeak"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Okerra jazo da paketeak instalatzerakoan:\n"
-"\n"
-"%s"
+msgid "Already existing update medias"
+msgstr "Okerra eguneratze euskarria gehitzerakoan"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Instalatu dena"
+#, c-format
+msgid "Maximum information"
+msgstr "Informazio zabalenak"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Paketeak instalaziorako prestatzen..."
+msgid "Proxy..."
+msgstr "Errorea..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Paketeak instalaziorako prestatzen..."
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
+msgstr ""
+"Instalazioak hutsegin du, zenbait fitxategi falta dira.\n"
+"Zure sorburuen datubasea eguneratu nahia izan dezakezu."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Eskatutako pakete guztiak ondo instalatu dira."
+msgid "United Kingdom"
+msgstr "Erresuma Batua"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Guztia ondo instalatu da."
+msgid "in names"
+msgstr "izenetan"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"I can't find any suitable mirror.\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
-"Instalazioa amaitu da; %s.\n"
+"Ezin dut ispilu egokirik aurkitu.\n"
 "\n"
-"Zenbait konfigurazio fitxategi `.rpmnew' edo `.rpmsave' bezala\n"
-"gorde dira, orain aztertu ditzakezu behar diren ekintzak burutzeko:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "everything was installed correctly"
-msgstr "guztia ondo instalatu da"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Arazoak izan dira instalazioan zehar"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "'%s' (%s/%s) paketea instalatzen..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Paketeak instalaziorako prestatzen..."
+"Arazo honek arrazoi ugarik sortu dezakete, ohikoena da zure\n"
+"prozesagailuaren arkitekturak Mandrake Linux Eguneratze Ofizialen\n"
+"euskarririk ez izatea."
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
-msgstr ""
+msgid "Remove .%s"
+msgstr "Ezabatu .%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"Instalazioak hutsegin du, zenbait fitxategi falta dira.\n"
-"Zure sorburuen datubasea eguneratu nahia izan dezakezu."
+msgid "Finland"
+msgstr "Finlandia"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -196,205 +240,272 @@ msgstr ""
 "%s\n"
 "Jarraitu dezaket?"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Verifying packages signatures..."
+msgid "Examining distant file of media `%s'..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "`%s' (%s/%s) paketea jaisten ..."
+msgid "Verifying packages signatures..."
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "France"
+msgstr "Behartu"
+
+#. -PO: Keep it short, this is gonna be on a button
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "Utzi"
+msgid "More info"
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Ok"
-msgstr "Ados"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Jarraitu nahi dezaket?"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Mesedez sartu \"%s\" izeneko euskarria [%s] gailuan"
+#, c-format
+msgid "Reload the packages list"
+msgstr "Birzamatu paketeen zerrenda"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Change medium"
-msgstr "Aldatu euskarria"
+msgid "Choose a mirror..."
+msgstr "Aukeratu ispilua..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Initializing..."
-msgstr "Hasieratzen..."
+#, fuzzy, c-format
+msgid "Some packages can't be installed"
+msgstr "Ezin da paketea instalatu"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Package installation..."
+msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Paketeak instalaziorako prestatzen..."
 
 #: ../rpmdrake:1
+#, c-format
+msgid "All packages,"
+msgstr "Pakete guztiak,"
+
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Barkatu, root izan behar duzu paketeak instalatzeko."
+msgid "Type of media:"
+msgstr "Sorburu-mota:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Unable to get source packages."
-msgstr "Ezin dira sorburuko paketeak jaso."
+msgid "in files"
+msgstr "fitxategitan"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "Ikertu..."
+msgid "All requested packages were installed successfully."
+msgstr "Eskatutako pakete guztiak ondo instalatu dira."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Installation finished"
-msgstr "Instalazioa amaitu da"
+msgid "Proxy hostname:"
+msgstr "Proxy ostalari-izena:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Do nothing"
-msgstr "Ez egin ezer"
+msgid "Local files"
+msgstr "Bertako fitxategiak"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Erabili %s fitxategi nagusi gisa"
+msgid "Inspecting %s"
+msgstr "%s ikertzen"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Israel"
+msgstr "Instalatu"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Ezabatu .%s"
+msgid "Help"
+msgstr "Laguntza"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "HTTP server"
+msgstr "HTTP zerbitzaria"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "changes:"
-msgstr "Aldaketak gorde"
+msgid "Installation failed"
+msgstr "Instalatu dena"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "%s ikertzen"
+msgid "Use .%s as main file"
+msgstr "Erabili %s fitxategi nagusi gisa"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Itxoin mesedez, eskuratu daitezkeen paketeak bilatzen..."
+msgid "Search results"
+msgstr "Bilaketaren emaitzak"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid " failed!"
+msgstr "fitxategitan"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "Itxoin mesedez, euskarria gehitzen..."
+msgid "Brazil"
+msgstr "Brasil"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
-"\n"
-"Then, restart MandrakeUpdate."
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 msgstr ""
-"Erabili nahi duzun ispilua eskuz aukeratu dezakezu: horretarako,\n"
-"jaurti Software Sorburu Kudeatzailea, eta gehitu 'Segurtasun eguneratze'\n"
-"sorburu bat.\n"
-"\n"
-"Gero, berrabiarazi MandrakeUpdate"
+"Izen hori duen euskarri bat dago, ziur zaude\n"
+"ordezkatu nahi duzula?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "Nola hautatu eskuz zure ispilua"
+msgid "Find:"
+msgstr "Aurkitu:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
-msgstr ""
+msgid "All packages, alphabetical"
+msgstr "Pakete guztiak, alfabetikoki"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, searching..."
+msgstr "Itxoin mesedez, bilatzen..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Already existing update sources"
+msgid "Please wait, reading packages database..."
+msgstr "Itxoin mesedez, paketeen datubasea irakurtzen..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "Ezin da paketea ireki"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Mesedez sartu \"%s\" izeneko euskarria [%s] gailuan"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
+msgstr "Hautua berrezarri"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
 msgstr ""
+"Proxy bat behar baduzu, sartu ostalari-izena eta, behar bazenu, portua "
+"(sintaksia <proxyostalaria[:portua]>):"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
 "\n"
-"Is it ok to continue?"
 msgstr ""
-"MandrakeSoft webgunearekin arremanetan jarri behar dut eguneratze pakete "
-"berrienak jasotzeko.\n"
-"Mesedez ziurtatu zure sarea martxan dagoen.\n"
+"Dituzten menpekotasunengatik, ondorengo paketeak ere kendu behar\n"
+"dira:\n"
 "\n"
-"Jarraitu dezaket?"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Fitxategi okerra"
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Okerra jazo da paketeak instalatzerakoan:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Paketeak instalaziorako prestatzen..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr "Itxoin mesedez, euskarria ezabatzen..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Mandrake Eguneratu"
+msgid "Password:"
+msgstr "Pasahitza:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Software Paketeen Ezabaketa"
+msgid "Taiwan"
+msgstr "Taiwan"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Quit"
-msgstr "Irten"
+msgid "User:"
+msgstr "Erabiltzailea:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Install"
-msgstr "Instalatu"
+msgid "Please wait, updating medium..."
+msgstr "Itxoin mesedez, euskarria eguneratzen..."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "Ezabatu"
+msgid "Please wait, listing packages..."
+msgstr "Itxoin, paketeak zerrendatzen..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Information on packages"
+msgstr "Ezin da paketea ireki"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Help"
-msgstr "Laguntza"
+msgid "Cancel"
+msgstr "Utzi"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search"
-msgstr "Bilatu"
+msgid "Everything installed successfully"
+msgstr "Guztia ondo instalatu da."
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Select the media(s) you wish to update:"
+msgstr "Hautatu eguneratu nahi dituzun sorburuak:"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, updating media..."
+msgstr "Itxoin mesedez, euskarria eguneratzen..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Aurkitu:"
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -412,160 +523,188 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Zenbait pakete ezabatu egin behar dira"
+msgid "in descriptions"
+msgstr "deskribapenetan"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "Proxyak konfiguratu"
+
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
 "\n"
-"Do you really want to install all the selected packages?"
+"Is it ok to continue?"
 msgstr ""
-"Adi: dirudienez hainbeste pakete gehitu nahian zabiltza,\n"
-"zure fitxategi-sistema leku hutsik gabe gelditu daitekeela,\n"
-"paketeak instalatzerakoan edo instalatu ondoren; egoera hau nahiko\n"
-"larria da eta kontuz hausnartu beharko litzateke.\n"
+"MandrakeSoft webgunearekin arremanetan jarri behar dut ispilu zerrenda "
+"jasotzeko.\n"
+"Mesedez ziurtatu zure sarea martxan dagoen.\n"
 "\n"
-"Hautatutako pakete guztiak instalatu nahi dituzu?"
+"Jarraitu dezaket?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Pakete gehiegi dago hautatuta"
+msgid "Please choose"
+msgstr "Hautatu mesedez"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "Informazio zabalenak"
+msgid "Selected size: %d MB"
+msgstr "Aukeratutakoen neurria: %d MB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Normal information"
-msgstr "Informazio arruntak"
+msgid "Initializing..."
+msgstr "Hasieratzen..."
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update source(s)"
-msgstr "Eguneratu sorburua(k)"
+msgid "Save changes"
+msgstr "Aldaketak gorde"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Birzamatu paketeen zerrenda"
+msgid "Error during download"
+msgstr "Okerra jaisterakoan"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reset the selection"
-msgstr "Hautua berrezarri"
+#, fuzzy, c-format
+msgid "Package installation..."
+msgstr "Paketeak instalaziorako prestatzen..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "fitxategitan"
+msgid "Importance: "
+msgstr "Garrantzia: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "deskribapenetan"
+msgid ""
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
+msgstr ""
+"Menpekotasunak asetzeko, ondorengo paketeak ere instalatu\n"
+"behar dira:\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "in names"
-msgstr "izenetan"
+msgid "Add..."
+msgstr "Gehitu..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by update availability"
-msgstr "eguneratze eskuragarritasun arabera"
+msgid "Unable to create medium."
+msgstr "Ezin da euskarria sortu."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by source repository"
-msgstr "sorburu gordailuaren arabera"
+msgid ""
+"The installation is finished; %s.\n"
+"\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
+msgstr ""
+"Instalazioa amaitu da; %s.\n"
+"\n"
+"Zenbait konfigurazio fitxategi `.rpmnew' edo `.rpmsave' bezala\n"
+"gorde dira, orain aztertu ditzakezu behar diren ekintzak burutzeko:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by selection state"
-msgstr "hautapenaren arabera"
+msgid "Browse..."
+msgstr "Aztertu..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by size"
-msgstr "neurri arabera"
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "Ezin da paketea instalatu"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by group"
-msgstr "talde arabera"
+msgid "Info..."
+msgstr "Info..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "All packages,"
-msgstr "Pakete guztiak,"
+msgid "You need to insert the medium to continue"
+msgstr "Jarraitzeko euskarria sartu behar duzu"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Pakete guztiak, alfabetikoki"
+msgid "Copying file for media `%s'..."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Mandrake aukerak"
+msgid "Remove"
+msgstr "Ezabatu"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Normal updates"
-msgstr "Eguneratze arruntak"
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Paketeak instalaziorako prestatzen..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Bugfixes updates"
-msgstr "Akatsak konpontzeko eguneratzeak"
+#, fuzzy, c-format
+msgid "by media repository"
+msgstr "sorburu gordailuaren arabera"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Security updates"
-msgstr "Segurtasunaren eguneratzeak"
+msgid "No mirror"
+msgstr "Ispilurik ez"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Description: "
-msgstr "Deskribapena: "
+msgid "You need to fill up at least the two first entries."
+msgstr "Gutxienez lehenengo bi sarrerak bete behar dituzu."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Eguneratzeko arrazoia: "
+msgid "Install"
+msgstr "Instalatu"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Summary: "
-msgstr "Laburpena: "
+msgid "Japan"
+msgstr "Japonia"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Importance: "
-msgstr "Garrantzia: "
+msgid "Do nothing"
+msgstr "Ez egin ezer"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "No update"
+msgstr "Eguneratzerik ez"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Size: "
-msgstr "Neurria: "
+msgid "Description: "
+msgstr "Deskribapena: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Version: "
-msgstr "Bertsioa: "
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr ""
+"Adi: dirudienez hainbeste pakete gehitu nahian zabiltza,\n"
+"zure fitxategi-sistema leku hutsik gabe gelditu daitekeela,\n"
+"paketeak instalatzerakoan edo instalatu ondoren; egoera hau nahiko\n"
+"larria da eta kontuz hausnartu beharko litzateke.\n"
+"\n"
+"Hautatutako pakete guztiak instalatu nahi dituzu?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -574,84 +713,63 @@ msgstr "Izena: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Orain instalatutako bertsioa: "
+msgid "Inspect..."
+msgstr "Ikertu..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Source: "
-msgstr "Behartu"
+msgid "Editing media \"%s\":"
+msgstr "\"%s\" sorburua editatzen:"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "Paketeak instalaziorako prestatzen..."
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
-msgstr "(Ez dago eskuragarri)"
+msgid "Australia"
+msgstr "Australia"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Aldakketa-Erregistroa:\n"
+msgid "Installation finished"
+msgstr "Instalazioa amaitu da"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Files:\n"
-msgstr "Fitxategiak:\n"
+msgid "by update availability"
+msgstr "eguneratze eskuragarritasun arabera"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "Aukeratutakoen neurria: %d MB"
+msgid "Poland"
+msgstr "Polonia"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Aukeratutakoak: %d MB / Diskoan leku askea: %d MB"
+msgid "Version: "
+msgstr "Bertsioa: "
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
-msgstr ""
-"Dituzten menpekotasunengatik, ondorengo paketeak aukeratik kendu\n"
-"behar dira:\n"
-"\n"
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "erabiltzaile/pasahitza zehaztu dezakezu proxy autentifikaziorako:"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr ""
-"Barkatu, ondorengo paketeak ezin dira hautatu:\n"
-"\n"
+#, c-format
+msgid "Upgradable"
+msgstr "Eguneragarria"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "honekin gatazka dauka"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid " done."
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Ezin da paketea instalatu"
-
-#: ../rpmdrake:1
-#, c-format
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
-msgstr ""
-"Menpekotasunak asetzeko, ondorengo paketeak ere instalatu\n"
-"behar dira:\n"
-"\n"
+msgid "Software Packages Installation"
+msgstr "Paketeak instalaziorako prestatzen..."
 
 #: ../rpmdrake:1
 #, c-format
@@ -659,637 +777,519 @@ msgid "Additional packages needed"
 msgstr "Pakete osagarriak behar dira"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "Ezin da paketea instalatu"
+#, c-format
+msgid "Bugfixes updates"
+msgstr "Akatsak konpontzeko eguneratzeak"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
+msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"Dituzten menpekotasunengatik, ondorengo paketeak ere kendu behar\n"
-"dira:\n"
-"\n"
+msgid "Germany"
+msgstr "Alemania"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Pakete osagarri batzu kendu behar dira"
+msgid "Russia"
+msgstr "Errusia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "More information on package..."
-msgstr "Paketeari buruzko informazio gehiago..."
+msgid "Norway"
+msgstr "Norvegia"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Information on packages"
-msgstr "Ezin da paketea ireki"
+msgid "Problem during installation"
+msgstr "Arazoak izan dira instalazioan zehar"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "More info"
-msgstr ""
+msgid "Search"
+msgstr "Bilatu"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Addable"
-msgstr "Gehigarria"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Edit a media"
+msgstr "Editatu sorburua"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Upgradable"
-msgstr "Eguneragarria"
+msgid "Czech Republic"
+msgstr "Txekiar Errepublika"
 
 #: ../rpmdrake:1
 #, c-format
 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."
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"Eguneratze zerrenda hutsik dago. Honek esan nahi du ez dagoela\n"
-"zure konputagailuan instalatutako paketeentzako eguneratzerik, edo\n"
-"guztiak instalatuta dauzkazula dagoeneko."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "No update"
-msgstr "Eguneratzerik ez"
+msgid "Stop"
+msgstr "Gelditu"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(none)"
-msgstr "(bat ere ez)"
+msgid "Update"
+msgstr "Eguneratu"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Itxoin, paketeak zerrendatzen..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "Ezin da paketea ireki"
+msgid "Please wait, removing packages..."
+msgstr "Itxaoin mesedez, paketeak ezabatzen..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Ondorengo paketeetako bat behar da:"
+msgid "Normal information"
+msgstr "Informazio arruntak"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Hautatu mesedez"
+msgid "Media: "
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr "Gatazkak aurkitu dira"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "`%s' (%s/%s) paketea jaisten ..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected"
-msgstr "Hautatuta"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Aukeratutakoak: %d MB / Diskoan leku askea: %d MB"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search results"
-msgstr "Bilaketaren emaitzak"
+msgid "Media"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Stop"
-msgstr "Gelditu"
+msgid "Spain"
+msgstr "Espainia"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Itxoin mesedez, bilatzen..."
+msgid "Normal updates"
+msgstr "Eguneratze arruntak"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Bilaketaren emaitzak (batere ez)"
+msgid "by selection state"
+msgstr "hautapenaren arabera"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Other"
-msgstr "Beste bat"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "Itxoin mesedez, ispiluen helbideak eskuratzen MandrakeSoft webgunetik."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the packages source editor!\n"
-"\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
-msgstr ""
-"Ongi etorri paketeen sorburu editorera!\n"
-"\n"
-"Tresna honek, zure konputagailuan erabili nahi dituzun paketeen sorburuak\n"
-"konfiguratzen lagunduko dizu. Gero haiek erabili ahal izango dituzu "
-"software\n"
-"berria instalatzeko edo eguneratzeak gauzatzeko.."
+msgid "Login:"
+msgstr "Sarrera:"
 
 #: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Adding a media:"
+msgstr "Sorburua gehitzen:"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Save and quit"
-msgstr "Gorde eta irten"
+msgid "Austria"
+msgstr "Austria"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Errorea..."
+msgid "Fatal error"
+msgstr "Fitxategi okerra"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Update..."
 msgstr "Eguneratu..."
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add..."
-msgstr "Gehitu..."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Edit"
-msgstr "Editatu"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Source"
-msgstr "Behartu"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "Gaitu?"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure sources"
-msgstr "Sorburuak konfiguratu"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Password:"
-msgstr "Pasahitza:"
+msgid "Starting download of `%s'..."
+msgstr "'%s'-ren sinadura egiaztatzen..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "User:"
-msgstr "Erabiltzailea:"
+msgid "(none)"
+msgstr "(bat ere ez)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "erabiltzaile/pasahitza zehaztu dezakezu proxy autentifikaziorako:"
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "Proxy ostalari-izena:"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "'%s' (%s/%s) paketea instalatzen..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
-msgstr ""
-"Proxy bat behar baduzu, sartu ostalari-izena eta, behar bazenu, portua "
-"(sintaksia <proxyostalaria[:portua]>):"
+msgid "Currently installed version: "
+msgstr "Orain instalatutako bertsioa: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Proxyak konfiguratu"
+msgid "Other"
+msgstr "Beste bat"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Itxoin mesedez, euskarria eguneratzen..."
+msgid "Reason for update: "
+msgstr "Eguneratzeko arrazoia: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "Aldaketak gorde daitezen, euskarria unitatean sartu behar duzu."
+msgid "Please choose the desired mirror."
+msgstr "Mesedez hautatu nahi duzun ispilua."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "Jarraitzeko euskarria sartu behar duzu"
+msgid "Edit"
+msgstr "Editatu"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "Aldaketak gorde"
+msgid "Please wait, finding available packages..."
+msgstr "Itxoin mesedez, eskuratu daitezkeen paketeak bilatzen..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Bide erlatiboa synthesis/hdlist-ekiko:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URLa:"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "\"%s\" sorburua editatzen:"
+msgid "Search results (none)"
+msgstr "Bilaketaren emaitzak (batere ez)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit a source"
-msgstr "Editatu sorburua"
+msgid "Danmark"
+msgstr "Danimarka"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Itxoin mesedez, euskarria ezabatzen..."
+msgid "China"
+msgstr "Txina"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "Sorburu-mota:"
+msgid "United States"
+msgstr "Estatu Batuak"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Adding a source:"
-msgstr "Sorburua gehitzen:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "changes:"
+msgstr "Aldaketak gorde"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
-msgstr ""
-"Izen hori duen euskarri bat dago, ziur zaude\n"
-"ordezkatu nahi duzula?"
+msgid "Some additional packages need to be removed"
+msgstr "Pakete osagarri batzu kendu behar dira"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Gutxienez lehenengo bi sarrerak bete behar dituzu."
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Name:"
-msgstr "Izena:"
+msgid "No"
+msgstr "Ez"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Login:"
-msgstr "Sarrera:"
+#, fuzzy, c-format
+msgid "Configure medias"
+msgstr "Sorburuak konfiguratu"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Choose a mirror..."
-msgstr "Aukeratu ispilua..."
+#, fuzzy, c-format
+msgid "Add a media"
+msgstr "Sorburua gehitzen:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
-msgstr "Aztertu..."
+msgid "Summary: "
+msgstr "Laburpena: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Path or mount point:"
-msgstr "bidea edo muntatze-puntua:"
+msgid "Canada"
+msgstr "Kanada"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "Gailu aldagarriak"
+msgid "Greece"
+msgstr "Grezia"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "HTTP server"
-msgstr "HTTP zerbitzaria"
+msgid ""
+"There was an error downloading the mirrors list:\n"
+"\n"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
+msgstr ""
+"Okerra jazo da ispilu zerrenda jaisterakoan:\n"
+"\n"
+"%s\n"
+"Sarea, edo MandrakeSoft webgunea ez daude eskuragarri seguraski.\n"
+"Mesedez saiatu berriro beranduago."
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "FTP server"
-msgstr "FTP zerbitzaria"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Barkatu, root izan behar duzu paketeak instalatzeko."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Path:"
 msgstr "bidea:"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Local files"
-msgstr "Bertako fitxategiak"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Add a source"
-msgstr "Sorburua gehitzen:"
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr "Ezin da euskarria eguneratu, automatikoki ezgaituko da."
+msgid "Problem during removal"
+msgstr "Arazoa instalatzerakoan"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Unable to create medium."
-msgstr "Ezin da euskarria sortu."
+msgid "Selected"
+msgstr "Hautatuta"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Update"
-msgstr "Eguneratu"
+msgid "Netherlands"
+msgstr "Herbeherak"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Hautatu eguneratu nahi dituzun sorburuak:"
+msgid "Addable"
+msgstr "Gehigarria"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Itxoin mesedez, euskarria eguneratzen..."
+msgid "(Not available)"
+msgstr "(Ez dago eskuragarri)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid " failed!"
-msgstr "fitxategitan"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid " done."
-msgstr ""
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Download of `%s', speed:%s"
-msgstr ""
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
 msgstr ""
+"Barkatu, ondorengo paketeak ezin dira hautatu:\n"
+"\n"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "'%s'-ren sinadura egiaztatzen..."
+msgid "Not selected"
+msgstr "Gatazkak aurkitu dira"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr ""
+msgid "Software Packages Removal"
+msgstr "Software Paketeen Ezabaketa"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr ""
+msgid "Sweden"
+msgstr "Suedia"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Copying file for source `%s'..."
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Please choose the desired mirror."
-msgstr "Mesedez hautatu nahi duzun ispilua."
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
+"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 ""
-"Ezin dut ispilu egokirik aurkitu.\n"
-"\n"
-"Arazo honek arrazoi ugarik sortu dezakete, ohikoena da zure\n"
-"prozesagailuaren arkitekturak Mandrake Linux Eguneratze Ofizialen\n"
-"euskarririk ez izatea."
+"Eguneratze zerrenda hutsik dago. Honek esan nahi du ez dagoela\n"
+"zure konputagailuan instalatutako paketeentzako eguneratzerik, edo\n"
+"guztiak instalatuta dauzkazula dagoeneko."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No mirror"
-msgstr "Ispilurik ez"
+msgid "Examining file of media `%s'..."
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was an error downloading the mirrors list:\n"
-"\n"
-"%s\n"
-"The network, or MandrakeSoft website, are maybe unavailable.\n"
-"Please try again later."
+msgid "Download of `%s', speed:%s"
 msgstr ""
-"Okerra jazo da ispilu zerrenda jaisterakoan:\n"
-"\n"
-"%s\n"
-"Sarea, edo MandrakeSoft webgunea ez daude eskuragarri seguraski.\n"
-"Mesedez saiatu berriro beranduago."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
-msgstr "Okerra jaisterakoan"
+msgid "One of the following packages is needed:"
+msgstr "Ondorengo paketeetako bat behar da:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr "Itxoin mesedez, ispiluen helbideak eskuratzen MandrakeSoft webgunetik."
+msgid "Quit"
+msgstr "Irten"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
 "\n"
 "Is it ok to continue?"
 msgstr ""
-"MandrakeSoft webgunearekin arremanetan jarri behar dut ispilu zerrenda "
-"jasotzeko.\n"
+"MandrakeSoft webgunearekin arremanetan jarri behar dut eguneratze pakete "
+"berrienak jasotzeko.\n"
 "Mesedez ziurtatu zure sarea martxan dagoen.\n"
 "\n"
 "Jarraitu dezaket?"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "United States"
-msgstr "Estatu Batuak"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update media(s)"
+msgstr "Eguneratu sorburua(k)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "Txina"
+msgid "Ok"
+msgstr "Ados"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Erresuma Batua"
+msgid "Please wait, adding medium..."
+msgstr "Itxoin mesedez, euskarria gehitzen..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Taiwan"
+msgid "Unable to get source packages."
+msgstr "Ezin dira sorburuko paketeak jaso."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Sweden"
-msgstr "Suedia"
+msgid "Too many packages are selected"
+msgstr "Pakete gehiegi dago hautatuta"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Russia"
-msgstr "Errusia"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"Ongi etorri paketeen sorburu editorera!\n"
+"\n"
+"Tresna honek, zure konputagailuan erabili nahi dituzun paketeen sorburuak\n"
+"konfiguratzen lagunduko dizu. Gero haiek erabili ahal izango dituzu "
+"software\n"
+"berria instalatzeko edo eguneratzeak gauzatzeko.."
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Portugal"
-msgstr "Portugal"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
+msgstr "honekin gatazka dauka"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
-msgstr "Polonia"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Ongi etorri MandrakeUpdatera!\n"
+"\n"
+"Tresna honek zure konputagailuan instalatu nahi dituzun eguneratzeak "
+"aukeratzen\n"
+"lagunduko dizu."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Norway"
-msgstr "Norvegia"
+msgid "Mandrake choices"
+msgstr "Mandrake aukerak"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Netherlands"
-msgstr "Herbeherak"
+msgid "Changelog:\n"
+msgstr "Aldakketa-Erregistroa:\n"
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Korea"
 msgstr "Behartu"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Japan"
-msgstr "Japonia"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Italy"
-msgstr "Instalatu"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Israel"
-msgstr "Instalatu"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Greece"
-msgstr "Grezia"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "France"
-msgstr "Behartu"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Finland"
-msgstr "Finlandia"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Spain"
-msgstr "Espainia"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Danmark"
-msgstr "Danimarka"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Germany"
-msgstr "Alemania"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Czech Republic"
-msgstr "Txekiar Errepublika"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Costa Rica"
-msgstr "Costa Rica"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Canada"
-msgstr "Kanada"
-
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Brazil"
-msgstr "Brasil"
+msgid "Removable device"
+msgstr "Gailu aldagarriak"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Belgika"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Australia"
+msgid "Change medium"
+msgstr "Aldatu euskarria"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "Austria"
+msgid "Mandrake Update"
+msgstr "Mandrake Eguneratu"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
-msgstr "Info..."
+msgid "by size"
+msgstr "neurri arabera"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "Ez"
+msgid "FTP server"
+msgstr "FTP zerbitzaria"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "Bai"
+msgid "Files:\n"
+msgstr "Fitxategiak:\n"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr "Ezin da euskarria eguneratu, automatikoki ezgaituko da."
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -1564,6 +1564,14 @@ msgstr "Softwarea Ezabatu"
 msgid "Software Sources Manager"
 msgstr "Software Sorburu Kudeatzailea"
 
+#, fuzzy
+#~ msgid "Source: "
+#~ msgstr "Behartu"
+
+#, fuzzy
+#~ msgid "Source"
+#~ msgstr "Behartu"
+
 #~ msgid ""
 #~ "some packages failed to install\n"
 #~ "correctly"
@@ -1603,9 +1611,6 @@ msgstr "Software Sorburu Kudeatzailea"
 #~ "\n"
 #~ "Beste ispilu batekin froga egin nahi duzu?"
 
-#~ msgid "Error adding update medium"
-#~ msgstr "Okerra eguneratze euskarria gehitzerakoan"
-
 #~ msgid "Please wait, contacting mirror to initialize updates packages."
 #~ msgstr ""
 #~ "Itxoin mesedez, ispiluarekin kontaktatzen eguneratze paketeak "
diff --git a/po/fi.po b/po/fi.po
index 5fa3b1a2..310e7ff6 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-fi - MDK Release 9.1\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: 2003-05-07 00:36--200\n"
 "Last-Translator: Taisto Kuikka <69319@batman.jypoly.fi>\n"
 "Language-Team: Finnish <cooker-i18n@linux-mandrake.com>\n"
@@ -21,16 +21,20 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"Sopiiko että jatketaan?"
+msgid "Enabled?"
+msgstr "Käytössä?"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Polku tai liitoskohta: "
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Portugal"
+msgstr "Portugali"
 
 #: ../rpmdrake:1
 #, c-format
@@ -49,146 +53,183 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"Tervetuloa Mandrake päivitys ohjelmaan!\n"
-"\n"
-"Tämä ohjelma auttaa sinua valitsemaan päivityksiä joita haluat\n"
-"asentaa tietokoneeseesi."
+msgid "by group"
+msgstr "ryhmän mukaan"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
-msgstr ""
-"Tervetuloa ohjelmiston poistamisohjelmaan!\n"
-"\n"
-"Tämä ohjelma auttaa sinua valitsemaan ohjelmia joita haluat\n"
-"poistaa tietokoneestasi."
+msgid "Name:"
+msgstr "Nimi:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Pakettien poistamisen aikana ilmeni ongelma:\n"
-"\n"
-"%s"
+msgid "Italy"
+msgstr "Italia"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Problem during removal"
-msgstr "Ongelma poistamisen aikana"
+msgid "How to choose manually your mirror"
+msgstr "Miten manuaalisesti valitset peilipalvelimen"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "Odota, paketteja poistetaan..."
+msgid "Some packages need to be removed"
+msgstr "Joitakin paketteja pitää poistaa "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Odota, pakettitietokantaa luetaan..."
+msgid "More information on package..."
+msgstr "Lisätietoa paketista..."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Kyllä"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"There was a problem during the installation:\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"%s"
 msgstr ""
-"Pakettien asennuksen aikana ilmeni ongelma:\n"
+"Riippuvuuksien vuoksi seuraavat paketit joudutaan\n"
+"nyt poistamaan valinnasta:\n"
 "\n"
-"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation failed"
-msgstr "Asennus epäonnistui"
+msgid "everything was installed correctly"
+msgstr "Kaikki asennettiin oikein"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Ohittamaton virhe: pakettia ei löytynyt asennettavaksi, valitan."
+msgid "%s KB"
+msgstr "%s kt"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "No package found for installation."
-msgstr "Pakettia ei löytynyt asennettavaksi."
+#, fuzzy, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"Voit myös lisätä haluamasi peilipalvelimen manuaalisesti:\n"
+"tehdäksesi tämän, käynnistä 'Ohjelmistolähteiden hallinta'\n"
+"ja lisää 'Tietoturvapäivitykset' lähde.\n"
+"\n"
+"Käynnistä Mandrake päivitys tämän jälkeen uudelleen.."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Kaikki haluamasi paketit asennettiin onnistuneesti."
+msgid ""
+"Welcome to the software removal tool!\n"
+"\n"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
+msgstr ""
+"Tervetuloa ohjelmiston poistamisohjelmaan!\n"
+"\n"
+"Tämä ohjelma auttaa sinua valitsemaan ohjelmia joita haluat\n"
+"poistaa tietokoneestasi."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Kaikki asennettiin onnistuneesti"
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "Tallentaaksesi muutokset sinun pitää asettaa media asemaan."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Tallenna ja lopeta"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"There was a problem during the removal of packages:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"%s"
 msgstr ""
-"Asennus on valmis; %s.\n"
+"Pakettien poistamisen aikana ilmeni ongelma:\n"
 "\n"
-"Jotkut asetustiedostot tallennettiin päätteellä '.rpmnew' tai '.rpmsave',\n"
-"voit tarkistaa ne ja tehdä tarvittavat muutokset:"
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "everything was installed correctly"
-msgstr "Kaikki asennettiin oikein"
+msgid "Size: "
+msgstr "Koko: "
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Problem during installation"
-msgstr "Ongelma asennuksen aikana"
+msgid "Security updates"
+msgstr "Tietoturvapäivitykset"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Already existing update medias"
+msgstr "Olemassaolevat päivityslähteet"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr ""
+msgid "Maximum information"
+msgstr "Mahdollisimman paljon tietoa"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy..."
+msgstr "Välityspalvelin..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Ohjelmistopakettien asentaminen"
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
+msgstr ""
+"Asennus epäonnistui, joitakin tiedostoja puuttuu.\n"
+"Sinun kannattaisi päivittää lähdetietokantasi."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr "Iso-Britannia"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "in names"
+msgstr "nimissä"
+
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
+"I can't find any suitable mirror.\n"
 "\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
+"Yhtäkään sopivaa peilipalvelinta ei löytynyt.\n"
 "\n"
-"\n"
-"Raportoidut virheet:\n"
-"%s"
+"Tähän voi olla monta syytä, mutta yleisin syy on\n"
+"että käyttämäsi suoritin-arkkitehtuuri ei ole tuettu\n"
+"virallisissa Mandrake Linux päivityksissä."
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"Asennus epäonnistui, joitakin tiedostoja puuttuu.\n"
-"Sinun kannattaisi päivittää lähdetietokantasi."
+msgid "Remove .%s"
+msgstr "Poista .%s"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "Suomi"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -205,70 +246,112 @@ msgstr ""
 "\n"
 "Sopiiko että jatkan?"
 
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Examining distant file of media `%s'..."
+msgstr "Tarkistan etätiedostoa lähteestä `%s'..."
+
 #: ../rpmdrake:1
 #, c-format
 msgid "Verifying packages signatures..."
 msgstr ""
 
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "France"
+msgstr "Ranska"
+
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
+msgid "More info"
+msgstr "Lisää tietoa"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
+"%s\n"
+"\n"
+"Sopiiko että jatketaan?"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "Peruuta"
+msgid "Reload the packages list"
+msgstr "Lataa listan paketeista uudelleen"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Ok"
-msgstr "OK"
+msgid "Choose a mirror..."
+msgstr "Valitse peilipalvelin..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Ole hyvä ja aseta media nimeltä \"%s\" laitteeseen [%s]"
+msgid "Some packages can't be installed"
+msgstr "Joitakin paketteja ei voida asentaa"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Change medium"
-msgstr "Vaihda mediaa"
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "Ohittamaton virhe: pakettia ei löytynyt asennettavaksi, valitan."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr ""
+msgid "All packages,"
+msgstr "Kaikki paketit,"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Ohjelmistopakettien asentaminen"
+msgid "Type of media:"
+msgstr "Lähteen tyyppi:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Lähdepakettien hakeminen epäonnistui, valitan. %s"
+msgid "in files"
+msgstr "tiedostoissa"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Unable to get source packages."
-msgstr "Lähdepakettien hakeminen epäonnistui."
+msgid "All requested packages were installed successfully."
+msgstr "Kaikki haluamasi paketit asennettiin onnistuneesti."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "Välityspalvelimen nimi:"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "Paikalliset tiedostot"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "Tarkista..."
+msgid "Inspecting %s"
+msgstr "Tarkistan %s"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Israel"
+msgstr "Israel"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation finished"
-msgstr "Asennus on valmis"
+msgid "Help"
+msgstr "Apua"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "HTTP server"
+msgstr "HTTP palvelin"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Jätä tekemättä"
+msgid "Installation failed"
+msgstr "Asennus epäonnistui"
 
 #: ../rpmdrake:1
 #, c-format
@@ -277,138 +360,157 @@ msgstr "Käytä .%s päätiedostona"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Poista .%s"
+msgid "Search results"
+msgstr "Haun tulokset"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid " failed!"
+msgstr " epäonnistui!"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
+msgstr "Brasilia"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"Tämän niminen media on jo olemassa,\n"
+"Oletko varma että haluat korvata sen?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "changes:"
-msgstr "muutokset:"
+msgid "Find:"
+msgstr "Hae:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Tarkistan %s"
+msgid "All packages, alphabetical"
+msgstr "Kaikki paketit, aakkosjärjestyksessä"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Odota, etsitään saatavilla olevia paketteja"
+msgid "Please wait, searching..."
+msgstr "Odota, etsitään..."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "Odota, mediaa lisätään..."
+msgid "Please wait, reading packages database..."
+msgstr "Odota, pakettitietokantaa luetaan..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
-"\n"
-"Then, restart MandrakeUpdate."
-msgstr ""
-"Voit myös lisätä haluamasi peilipalvelimen manuaalisesti:\n"
-"tehdäksesi tämän, käynnistä 'Ohjelmistolähteiden hallinta'\n"
-"ja lisää 'Tietoturvapäivitykset' lähde.\n"
-"\n"
-"Käynnistä Mandrake päivitys tämän jälkeen uudelleen.."
+msgid "unknown package "
+msgstr "tuntematon paketti "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "Miten manuaalisesti valitset peilipalvelimen"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Ole hyvä ja aseta media nimeltä \"%s\" laitteeseen [%s]"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Reset the selection"
+msgstr "Palauta valinnat"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
 msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"Jos tarvitset välityspalvelinta, anna palvelimen nimi ja mahdollisesti "
+"portti (muodossa: <palvelinnimi[:portti]>):"
+
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
 "\n"
-"Then, restart MandrakeUpdate."
 msgstr ""
-"Olet jo määrittänyt ainakin yhden päivityslähteen, mutta\n"
-"kaikki ovat tällä hetkellä pois käytöstä. Sinun pitäisi ottaa\n"
-"käyttöön ainakin yksi lähteistä Ohjelmistolähteiden hallinnassa\n"
-"(valitse sen Käytössä?-valinta)\n"
+"Riippuvuuksien vuoksi myös seuraavat paketit joudutaan poistamaan:\n"
 "\n"
-"Käynnistä tämän jälkeen Mandrake päivitys uudelleen."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Already existing update sources"
-msgstr "Olemassaolevat päivityslähteet"
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
+"There was a problem during the installation:\n"
 "\n"
-"Is it ok to continue?"
+"%s"
 msgstr ""
-"Viimeisimpien päivityspakettien saamiseksi tarvitaan ottaa\n"
-"yhteys peilipalvelimelle. Varmista että verkkoyhteytesi on avattu.\n"
+"Pakettien asennuksen aikana ilmeni ongelma:\n"
 "\n"
-"Sopiiko että jatkan?"
+"%s"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr "Tapahtui ohittamaton virhe: %s."
+msgid "Please wait, removing medium..."
+msgstr "Odota, mediaa poistetaan..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Fatal error"
-msgstr "Ohittamaton virhe"
+msgid "Password:"
+msgstr "Salasana:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Installation"
-msgstr "Ohjelmistopakettien asentaminen"
+msgid "Taiwan"
+msgstr "Taiwan"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Mandrake päivitys"
+msgid "User:"
+msgstr "Käyttäjä:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Ohjelmistopakettien poistaminen"
+msgid "Please wait, updating medium..."
+msgstr "Odota, päivitetään mediaa..."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Quit"
-msgstr "Poistu"
+msgid "Please wait, listing packages..."
+msgstr "Odota, listaan paketteja..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Asenna"
+msgid "Information on packages"
+msgstr "Lisätietoa paketista"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Remove"
-msgstr "Poista"
+msgid "Cancel"
+msgstr "Peruuta"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Help"
-msgstr "Apua"
+msgid "Everything installed successfully"
+msgstr "Kaikki asennettiin onnistuneesti"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Select the media(s) you wish to update:"
+msgstr "Valitse lähteet, joita haluat päivittää:"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search"
-msgstr "Etsi"
+msgid "Please wait, updating media..."
+msgstr "Odota, päivitetään media(t)..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Hae:"
+msgid "A fatal error occurred: %s."
+msgstr "Tapahtui ohittamaton virhe: %s."
 
 #: ../rpmdrake:1
 #, c-format
@@ -427,160 +529,187 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Joitakin paketteja pitää poistaa "
+msgid "in descriptions"
+msgstr "kuvauksissa"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "Määrittele välityspalvelin"
+
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
 "\n"
-"Do you really want to install all the selected packages?"
+"Is it ok to continue?"
 msgstr ""
-"Varoitus: näyttää siltä että yrität asentaa niin paljon\n"
-"paketteja että tiedostojärjestelmäsi tila voi loppua kesken,\n"
-"joko asennuksen aikana tai sen jälkeen; tämä on vaarallista\n"
-"ja asiaa pitäisi harkita kunnolla.\n"
+"Peilipalvelinlistan saamiseksi tarvitaan ottaa yhteys MandrakeSoft:n\n"
+"webbisivustoon. Varmista että verkkoyhteytesi on avattu.\n"
 "\n"
-"Oletko varma että haluat asentaa kaikki valitsemasi paketit?"
+"Sopiiko että jatkan?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Liian paljon paketteja valittu"
+msgid "Please choose"
+msgstr "Ole hyvä ja valitse"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "Mahdollisimman paljon tietoa"
+msgid "Selected size: %d MB"
+msgstr "Valittujen koko: %d Mt"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Normal information"
-msgstr "Tavallista tietoa"
+msgid "Initializing..."
+msgstr ""
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update source(s)"
-msgstr "Päivitä lähteet"
+msgid "Save changes"
+msgstr "Tallenna muutokset"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Lataa listan paketeista uudelleen"
+msgid "Error during download"
+msgstr "Virhe latauksen aikana"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reset the selection"
-msgstr "Palauta valinnat"
+#, fuzzy, c-format
+msgid "Package installation..."
+msgstr "Ohjelmistopakettien asentaminen"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "tiedostoissa"
+msgid "Importance: "
+msgstr "Tärkeys: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "kuvauksissa"
+msgid ""
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
+msgstr ""
+"Riippuvuuksien täyttämiseksi myös seuraavat paketit\n"
+"pitää asentaa:\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "in names"
-msgstr "nimissä"
+msgid "Add..."
+msgstr "Lisää..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by update availability"
-msgstr "päivityksien mukaan"
+msgid "Unable to create medium."
+msgstr "Median luominen epäonnistui."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by source repository"
-msgstr "lähteiden mukaan"
+msgid ""
+"The installation is finished; %s.\n"
+"\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
+msgstr ""
+"Asennus on valmis; %s.\n"
+"\n"
+"Jotkut asetustiedostot tallennettiin päätteellä '.rpmnew' tai '.rpmsave',\n"
+"voit tarkistaa ne ja tehdä tarvittavat muutokset:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by selection state"
-msgstr "valinnan mukaan"
+msgid "Browse..."
+msgstr "Selaa..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by size"
-msgstr "koon mukaan"
+msgid "Some packages can't be removed"
+msgstr "Joitakin paketteja ei voida poistaa"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by group"
-msgstr "ryhmän mukaan"
+msgid "Info..."
+msgstr "Tietoja..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "All packages,"
-msgstr "Kaikki paketit,"
+msgid "You need to insert the medium to continue"
+msgstr "Sinun pitää asettaa media jatkaaksesi"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "All packages, alphabetical"
-msgstr "Kaikki paketit, aakkosjärjestyksessä"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Copying file for media `%s'..."
+msgstr "Kopioin tiedostoa lähteelle `%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Mandrake valinnat"
+msgid "Remove"
+msgstr "Poista"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Normal updates"
-msgstr "Tavalliset päivitykset"
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Ohjelmistopakettien asentaminen"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Bugfixes updates"
-msgstr "Virhekorjaukset"
+#, fuzzy, c-format
+msgid "by media repository"
+msgstr "lähteiden mukaan"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Security updates"
-msgstr "Tietoturvapäivitykset"
+msgid "No mirror"
+msgstr "Ei peilipalvelinta"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Description: "
-msgstr "Kuvaus: "
+msgid "You need to fill up at least the two first entries."
+msgstr "Sinun pitää täyttää ainakin kaksi ensimmäistä kohtaa."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Syy päivitykseen: "
+msgid "Install"
+msgstr "Asenna"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Summary: "
-msgstr "Yhteenveto: "
+msgid "Japan"
+msgstr "Japani"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Importance: "
-msgstr "Tärkeys: "
+msgid "Do nothing"
+msgstr "Jätä tekemättä"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s kt"
+msgid "No update"
+msgstr "Ei päivitystä"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Size: "
-msgstr "Koko: "
+msgid "Description: "
+msgstr "Kuvaus: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Version: "
-msgstr "Versio: "
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr ""
+"Varoitus: näyttää siltä että yrität asentaa niin paljon\n"
+"paketteja että tiedostojärjestelmäsi tila voi loppua kesken,\n"
+"joko asennuksen aikana tai sen jälkeen; tämä on vaarallista\n"
+"ja asiaa pitäisi harkita kunnolla.\n"
+"\n"
+"Oletko varma että haluat asentaa kaikki valitsemasi paketit?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -589,89 +718,64 @@ msgstr "Nimi: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Asennettu versio: "
+msgid "Inspect..."
+msgstr "Tarkista..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Source: "
-msgstr "Lähde: "
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing media \"%s\":"
+msgstr "Muokataan lähdettä \"%s\":"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "(Not available)"
-msgstr "(Ei käytettävissä)"
+msgid "No package found for installation."
+msgstr "Pakettia ei löytynyt asennettavaksi."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Muutosloki:\n"
+msgid "Australia"
+msgstr "Australia"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Files:\n"
-msgstr "Tiedostot:\n"
+msgid "Installation finished"
+msgstr "Asennus on valmis"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "Valittujen koko: %d Mt"
+msgid "by update availability"
+msgstr "päivityksien mukaan"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Valitut: %d Mt / Vapaata levytilaa: %d Mt"
+msgid "Poland"
+msgstr "Puola"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
-msgstr ""
-"Riippuvuuksien vuoksi seuraavat paketit joudutaan\n"
-"nyt poistamaan valinnasta:\n"
-"\n"
+msgid "Version: "
+msgstr "Versio: "
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
+msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
-"Valitan, seuraavia paketteja ei voida valita:\n"
-"\n"
-"%s\n"
-"\n"
-"Syy:\n"
-"\n"
-"%s"
+"Voit halutessasi antaa tunnuksen/salasanan välityspalvelimen tunnistukseen:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "%s conflicts with %s"
-msgstr "%s on ristiriidassa paketin %s kanssa"
+msgid "Upgradable"
+msgstr "Päivitettävissä"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some packages can't be installed"
-msgstr "Joitakin paketteja ei voida asentaa"
+msgid " done."
+msgstr " valmis."
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
-msgstr ""
-"Riippuvuuksien täyttämiseksi myös seuraavat paketit\n"
-"pitää asentaa:\n"
-"\n"
+msgid "Software Packages Installation"
+msgstr "Ohjelmistopakettien asentaminen"
 
 #: ../rpmdrake:1
 #, c-format
@@ -680,639 +784,535 @@ msgstr "Lisäpaketteja vaaditaan"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages can't be removed"
-msgstr "Joitakin paketteja ei voida poistaa"
+msgid "Bugfixes updates"
+msgstr "Virhekorjaukset"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
-"Näiden pakettien poistaminen rikkoisi järjestelmäsi, valitan:\n"
-"\n"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "Lataan `%s', aikaa jäljellä:%s, nopeus:%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"Riippuvuuksien vuoksi myös seuraavat paketit joudutaan poistamaan:\n"
-"\n"
+msgid "Germany"
+msgstr "Saksa"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Joitakin paketteja pitää poistaa tämän lisäksi"
+msgid "Russia"
+msgstr "Venäjä"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "More information on package..."
-msgstr "Lisätietoa paketista..."
+msgid "Norway"
+msgstr "Norja"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Information on packages"
-msgstr "Lisätietoa paketista"
+msgid "Problem during installation"
+msgstr "Ongelma asennuksen aikana"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "More info"
-msgstr "Lisää tietoa"
+msgid "Search"
+msgstr "Etsi"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Addable"
-msgstr "Lisättävissä"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Edit a media"
+msgstr "Muokkaa lähdettä"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Upgradable"
-msgstr "Päivitettävissä"
+msgid "Czech Republic"
+msgstr "Tsekki"
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 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."
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"Päivityslista on tyhjä. Tämä tarkoittaa joko ettei\n"
-"päivityksiä löydy, tai olet jo asentanut kaikki."
-
-#: ../rpmdrake:1
-#, c-format
-msgid "No update"
-msgstr "Ei päivitystä"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "(none)"
-msgstr "(tyhjä)"
+"Olet jo määrittänyt ainakin yhden päivityslähteen, mutta\n"
+"kaikki ovat tällä hetkellä pois käytöstä. Sinun pitäisi ottaa\n"
+"käyttöön ainakin yksi lähteistä Ohjelmistolähteiden hallinnassa\n"
+"(valitse sen Käytössä?-valinta)\n"
+"\n"
+"Käynnistä tämän jälkeen Mandrake päivitys uudelleen."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Odota, listaan paketteja..."
+msgid "Stop"
+msgstr "Pysäytä"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "unknown package "
-msgstr "tuntematon paketti "
+msgid "Update"
+msgstr "Päivitä"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Yksi seuraavista paketista tarvitaan:"
+msgid "Please wait, removing packages..."
+msgstr "Odota, paketteja poistetaan..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Ole hyvä ja valitse"
+msgid "Normal information"
+msgstr "Tavallista tietoa"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Media: "
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Not selected"
-msgstr "Ei valittu"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected"
-msgstr "Valittu"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Valitut: %d Mt / Vapaata levytilaa: %d Mt"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search results"
-msgstr "Haun tulokset"
+msgid "Media"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Stop"
-msgstr "Pysäytä"
+msgid "Spain"
+msgstr "Espanja"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Odota, etsitään..."
+msgid "Normal updates"
+msgstr "Tavalliset päivitykset"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Haun tulokset (ei mitään)"
+msgid "by selection state"
+msgstr "valinnan mukaan"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Other"
-msgstr "Muu"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "Odota, haetaan lista peilipalvelimista MandrakeSoft:n webbisivustosta."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the packages source editor!\n"
-"\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
-msgstr ""
-"Tervetuloa pakettien lähteiden hallintaan!\n"
-"\n"
-"Tämä työkalu auttaa sinua asettamaan pakettien lähteet joita haluat\n"
-"käyttää tietokoneessasi. Sen jälkeen ne ovat käytettävissä jos haluat\n"
-"asentaa uusia paketteja tai päivittää jo asennettuja."
+msgid "Login:"
+msgstr "Käyttäjätunnus:"
 
 #: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Adding a media:"
+msgstr "Lisätään lähdettä:"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Save and quit"
-msgstr "Tallenna ja lopeta"
+msgid "Austria"
+msgstr "Itävalta"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy..."
-msgstr "Välityspalvelin..."
+msgid "Fatal error"
+msgstr "Ohittamaton virhe"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Update..."
 msgstr "Päivitä..."
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add..."
-msgstr "Lisää..."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Edit"
-msgstr "Muokkaa"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Source"
-msgstr "Lähde"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "Käytössä?"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure sources"
-msgstr "Määrittele lähteet"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Password:"
-msgstr "Salasana:"
+msgid "Starting download of `%s'..."
+msgstr "Aloitan `%s' lataamisen..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "User:"
-msgstr "Käyttäjä:"
+msgid "(none)"
+msgstr "(tyhjä)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
 msgstr ""
-"Voit halutessasi antaa tunnuksen/salasanan välityspalvelimen tunnistukseen:"
+"Näiden pakettien poistaminen rikkoisi järjestelmäsi, valitan:\n"
+"\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "Välityspalvelimen nimi:"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
-msgstr ""
-"Jos tarvitset välityspalvelinta, anna palvelimen nimi ja mahdollisesti "
-"portti (muodossa: <palvelinnimi[:portti]>):"
+msgid "Currently installed version: "
+msgstr "Asennettu versio: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Määrittele välityspalvelin"
+msgid "Other"
+msgstr "Muu"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Odota, päivitetään mediaa..."
+msgid "Reason for update: "
+msgstr "Syy päivitykseen: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "Tallentaaksesi muutokset sinun pitää asettaa media asemaan."
+msgid "Please choose the desired mirror."
+msgstr "Ole hyvä ja valitse haluttu peilipalvelin."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "Sinun pitää asettaa media jatkaaksesi"
+msgid "Edit"
+msgstr "Muokkaa"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "Tallenna muutokset"
+msgid "Please wait, finding available packages..."
+msgstr "Odota, etsitään saatavilla olevia paketteja"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Suhteellinen polku tiedostoon synthesis tai hdlist:"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "URL:"
-msgstr "URL: "
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Editing source \"%s\":"
-msgstr "Muokataan lähdettä \"%s\":"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Edit a source"
-msgstr "Muokkaa lähdettä"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Please wait, removing medium..."
-msgstr "Odota, mediaa poistetaan..."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Type of source:"
-msgstr "Lähteen tyyppi:"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Adding a source:"
-msgstr "Lisätään lähdettä:"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
-msgstr ""
-"Tämän niminen media on jo olemassa,\n"
-"Oletko varma että haluat korvata sen?"
+msgid "Search results (none)"
+msgstr "Haun tulokset (ei mitään)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Sinun pitää täyttää ainakin kaksi ensimmäistä kohtaa."
+msgid "Danmark"
+msgstr "Tanska"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Name:"
-msgstr "Nimi:"
+msgid "China"
+msgstr "Kiina"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Login:"
-msgstr "Käyttäjätunnus:"
+msgid "United States"
+msgstr "Yhdysvallat"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr "Valitse peilipalvelin..."
+msgid "changes:"
+msgstr "muutokset:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
-msgstr "Selaa..."
+msgid "Some additional packages need to be removed"
+msgstr "Joitakin paketteja pitää poistaa tämän lisäksi"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Path or mount point:"
-msgstr "Polku tai liitoskohta: "
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "Siirrettävä laite"
+msgid "No"
+msgstr "Ei"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "HTTP server"
-msgstr "HTTP palvelin"
+#, fuzzy, c-format
+msgid "Configure medias"
+msgstr "Määrittele lähteet"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "FTP server"
-msgstr "FTP palvelin"
+#, fuzzy, c-format
+msgid "Add a media"
+msgstr "Lisätään lähde"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Path:"
-msgstr "Polku: "
+msgid "Summary: "
+msgstr "Yhteenveto: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Local files"
-msgstr "Paikalliset tiedostot"
+msgid "Canada"
+msgstr "Kanada"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Add a source"
-msgstr "Lisätään lähde"
+msgid "Greece"
+msgstr "Kreikka"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
+"There was an error downloading the mirrors list:\n"
 "\n"
-"Errors:\n"
-"%s"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
-"Median päivittäminen epäonnistui, poistetaan käytöstä automaattisesti.\n"
+"Haettaessa listaa peilipalvelimista ilmeni virhe:\n"
 "\n"
-"Virheet:\n"
-"%s"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Unable to create medium."
-msgstr "Median luominen epäonnistui."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Update"
-msgstr "Päivitä"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Valitse lähteet, joita haluat päivittää:"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Please wait, updating media..."
-msgstr "Odota, päivitetään media(t)..."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid " failed!"
-msgstr " epäonnistui!"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid " done."
-msgstr " valmis."
+"%s\n"
+"Verkkoyhteytesi tai MandrakeSoft:n webbisivusto ei ole saatavilla.\n"
+"Yritä myöhemmin uudelleen."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "Lataan `%s', nopeus:%s"
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Lähdepakettien hakeminen epäonnistui, valitan. %s"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "Lataan `%s', aikaa jäljellä:%s, nopeus:%s"
+msgid "Path:"
+msgstr "Polku: "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Starting download of `%s'..."
-msgstr "Aloitan `%s' lataamisen..."
+msgid "Problem during removal"
+msgstr "Ongelma poistamisen aikana"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "Tarkistan etätiedostoa lähteestä `%s'..."
+msgid "Selected"
+msgstr "Valittu"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "Tarkistan tiedostoa lähteestä `%s'..."
+msgid "Netherlands"
+msgstr "Alankomaat"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "Kopioin tiedostoa lähteelle `%s'..."
+msgid "Addable"
+msgstr "Lisättävissä"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please choose the desired mirror."
-msgstr "Ole hyvä ja valitse haluttu peilipalvelin."
+msgid "(Not available)"
+msgstr "(Ei käytettävissä)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"I can't find any suitable mirror.\n"
+"Sorry, the following package(s) can't be selected:\n"
 "\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
-msgstr ""
-"Yhtäkään sopivaa peilipalvelinta ei löytynyt.\n"
+"%s\n"
 "\n"
-"Tähän voi olla monta syytä, mutta yleisin syy on\n"
-"että käyttämäsi suoritin-arkkitehtuuri ei ole tuettu\n"
-"virallisissa Mandrake Linux päivityksissä."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "No mirror"
-msgstr "Ei peilipalvelinta"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid ""
-"There was an error downloading the mirrors list:\n"
+"Reasons follow:\n"
 "\n"
-"%s\n"
-"The network, or MandrakeSoft website, are maybe unavailable.\n"
-"Please try again later."
+"%s"
 msgstr ""
-"Haettaessa listaa peilipalvelimista ilmeni virhe:\n"
+"Valitan, seuraavia paketteja ei voida valita:\n"
 "\n"
 "%s\n"
-"Verkkoyhteytesi tai MandrakeSoft:n webbisivusto ei ole saatavilla.\n"
-"Yritä myöhemmin uudelleen."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Error during download"
-msgstr "Virhe latauksen aikana"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr "Odota, haetaan lista peilipalvelimista MandrakeSoft:n webbisivustosta."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
 "\n"
-"Is it ok to continue?"
-msgstr ""
-"Peilipalvelinlistan saamiseksi tarvitaan ottaa yhteys MandrakeSoft:n\n"
-"webbisivustoon. Varmista että verkkoyhteytesi on avattu.\n"
+"Syy:\n"
 "\n"
-"Sopiiko että jatkan?"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "United States"
-msgstr "Yhdysvallat"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "China"
-msgstr "Kiina"
+"%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Iso-Britannia"
+msgid "Not selected"
+msgstr "Ei valittu"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Taiwan"
+msgid "Software Packages Removal"
+msgstr "Ohjelmistopakettien poistaminen"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Sweden"
 msgstr "Ruotsi"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Russia"
-msgstr "Venäjä"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
+msgstr ""
+"\n"
+"\n"
+"Raportoidut virheet:\n"
+"%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Portugal"
-msgstr "Portugali"
+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 ""
+"Päivityslista on tyhjä. Tämä tarkoittaa joko ettei\n"
+"päivityksiä löydy, tai olet jo asentanut kaikki."
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Poland"
-msgstr "Puola"
+#, fuzzy, c-format
+msgid "Examining file of media `%s'..."
+msgstr "Tarkistan tiedostoa lähteestä `%s'..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Norway"
-msgstr "Norja"
+msgid "Download of `%s', speed:%s"
+msgstr "Lataan `%s', nopeus:%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Netherlands"
-msgstr "Alankomaat"
+msgid "One of the following packages is needed:"
+msgstr "Yksi seuraavista paketista tarvitaan:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Korea"
-msgstr "Korea"
+msgid "Quit"
+msgstr "Poistu"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "Japani"
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Viimeisimpien päivityspakettien saamiseksi tarvitaan ottaa\n"
+"yhteys peilipalvelimelle. Varmista että verkkoyhteytesi on avattu.\n"
+"\n"
+"Sopiiko että jatkan?"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Italy"
-msgstr "Italia"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update media(s)"
+msgstr "Päivitä lähteet"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Israel"
-msgstr "Israel"
+msgid "Ok"
+msgstr "OK"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Greece"
-msgstr "Kreikka"
+msgid "Please wait, adding medium..."
+msgstr "Odota, mediaa lisätään..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "France"
-msgstr "Ranska"
+msgid "Unable to get source packages."
+msgstr "Lähdepakettien hakeminen epäonnistui."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "Suomi"
+msgid "Too many packages are selected"
+msgstr "Liian paljon paketteja valittu"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Spain"
-msgstr "Espanja"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"Tervetuloa pakettien lähteiden hallintaan!\n"
+"\n"
+"Tämä työkalu auttaa sinua asettamaan pakettien lähteet joita haluat\n"
+"käyttää tietokoneessasi. Sen jälkeen ne ovat käytettävissä jos haluat\n"
+"asentaa uusia paketteja tai päivittää jo asennettuja."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Danmark"
-msgstr "Tanska"
+msgid "%s conflicts with %s"
+msgstr "%s on ristiriidassa paketin %s kanssa"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "Saksa"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Tervetuloa Mandrake päivitys ohjelmaan!\n"
+"\n"
+"Tämä ohjelma auttaa sinua valitsemaan päivityksiä joita haluat\n"
+"asentaa tietokoneeseesi."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Tsekki"
+msgid "Mandrake choices"
+msgstr "Mandrake valinnat"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Costa Rica"
+msgid "Changelog:\n"
+msgstr "Muutosloki:\n"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "Kanada"
+msgid "Korea"
+msgstr "Korea"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Brazil"
-msgstr "Brasilia"
+msgid "Removable device"
+msgstr "Siirrettävä laite"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Belgia"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Australia"
+msgid "Change medium"
+msgstr "Vaihda mediaa"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "Itävalta"
+msgid "Mandrake Update"
+msgstr "Mandrake päivitys"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
-msgstr "Tietoja..."
+msgid "by size"
+msgstr "koon mukaan"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "Ei"
+msgid "FTP server"
+msgstr "FTP palvelin"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "Tiedostot:\n"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Yes"
-msgstr "Kyllä"
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr ""
+"Median päivittäminen epäonnistui, poistetaan käytöstä automaattisesti.\n"
+"\n"
+"Virheet:\n"
+"%s"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -1587,6 +1587,12 @@ msgstr "Poista ohjelmia"
 msgid "Software Sources Manager"
 msgstr "Ohjelmistolähteiden hallinta"
 
+#~ msgid "Source: "
+#~ msgstr "Lähde: "
+
+#~ msgid "Source"
+#~ msgstr "Lähde"
+
 #~ msgid ""
 #~ "some packages failed to install\n"
 #~ "correctly"
diff --git a/po/fr.po b/po/fr.po
index c5a794a8..1a920b68 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,8 +10,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
-"PO-Revision-Date: 2003-05-16 18:28+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
+"PO-Revision-Date: 2003-05-16 19:08+0200\n"
 "Last-Translator: Christophe Combelles <ccomb@free.fr>\n"
 "Language-Team: french <cooker-i18n@linux-mandrake.com>\n"
 "MIME-Version: 1.0\n"
@@ -19,16 +19,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"Êtes-vous d'accord pour continuer ?"
+msgid "Enabled?"
+msgstr "Activée ?"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Chemin ou point de montage :"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Portugal"
+msgstr "Portugal"
 
 #: ../rpmdrake:1
 #, c-format
@@ -48,16 +52,79 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "by group"
+msgstr "par groupe"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "Nom :"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Italy"
+msgstr "Italie"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Comment choisir manuellement votre mirroir"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL :"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "Certains paquetages doivent être enlevés"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
+msgstr "Plus d'informations sur le paquetage..."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Oui"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Welcome to MandrakeUpdate!\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
 msgstr ""
-"Bienvenue dans MandrakeUpdate !\n"
+"Pour satisfaire les dépendances, le(s) paquetage(s) suivant(s)\n"
+"doivent être déselectionnés :\n"
 "\n"
-"Cet outil va vous aider à choisir les mises à jour que vous\n"
-"souhaiter installer sur votre ordinateur."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "tout a été installé correctement"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s Ko"
+
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"Vous pouvez aussi choisir votre mirroir manuellement : pour ce\n"
+"faire, lancez le Gestionnaire de Médias Logiciels, puis\n"
+"ajoutez une « Mise à jour de sécurité ».\n"
+"\n"
+"Puis, redémarrez MandrakeUpdate."
 
 #: ../rpmdrake:1
 #, c-format
@@ -72,124 +139,98 @@ msgstr ""
 "Cet outil va vous aider à choisir quel(s) logiciel(s) vous\n"
 "souhaitez supprimer de votre ordinateur."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
+"In order to save the changes, you need to insert the medium in the drive."
 msgstr ""
-"Une erreur est survenue pendant la suppression des paquetages :\n"
-"\n"
-"%s"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Problem during removal"
-msgstr "Un problème est survenu pendant la désinstallation"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Please wait, removing packages..."
-msgstr "Veuillez patienter, suppression des paquetages..."
+"Afin de sauvegarder les changements, vous devez insérer le médium dans le "
+"lecteur."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Veuillez patienter, lecture de la base de donnée des paquetages..."
+msgid "Save and quit"
+msgstr "Sauver et quitter"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"There was a problem during the installation:\n"
+"There was a problem during the removal of packages:\n"
 "\n"
 "%s"
 msgstr ""
-"Une erreur est survenue pendant l'installation des paquetages :\n"
+"Une erreur est survenue pendant la suppression des paquetages :\n"
 "\n"
 "%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation failed"
-msgstr "Echec de l'installation"
+msgid "Size: "
+msgstr "Taille : "
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr ""
-"Erreur irrécupérable : aucune paquetage trouvé pour l'installation, désolé."
+msgid "Security updates"
+msgstr "Mises à jour de sécurité"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "No package found for installation."
-msgstr "Aucun paquetage trouvé pour l'installation."
+msgid "Already existing update medias"
+msgstr "Des médias de mise-à-jour existent déjà"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Tous les paquetages demandés ont été installés correctement."
+msgid "Maximum information"
+msgstr "Informations maximales"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Tout a été installé correctement"
+msgid "Proxy..."
+msgstr "Mandataire..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
-"\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
 msgstr ""
-"L'installation est terminée ; %s.\n"
-"\n"
-"Certains fichiers de configuration ont été créés en tant que\n"
-"`.rpmnew' ou `.rpmsave', vous pouvez maintenant les examiner\n"
-"afin de décider ce que vous souhaitez en faire :"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "everything was installed correctly"
-msgstr "tout a été installé correctement"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Problem during installation"
-msgstr "Des problèmes sont survenus durant l'installation"
+"L'installation a échoué, certains fichiers sont introuvables.\n"
+"Vous devriez probablement mettre à jour vos médias."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Installation du paquetage `%s' (%s/%s)..."
+msgid "United Kingdom"
+msgstr "Royaume-Uni"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Preparing packages installation..."
-msgstr "Préparation de l'installation des paquetages..."
+msgid "in names"
+msgstr "parmi les noms"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
+"I can't find any suitable mirror.\n"
 "\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
+"Impossible de trouver un miroir.\n"
 "\n"
-"\n"
-"Erreur(s) rencontrées :\n"
-"%s"
+"Il peut y avoir plusieurs raisons à cela ; la plus fréquente\n"
+"d'entre elles est que l'architecture de votre processeur n'est\n"
+"pas supportée par les Mises à jour Officielle Mandrake Linux."
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"L'installation a échoué, certains fichiers sont introuvables.\n"
-"Vous pouvez mettre à jour vos sources."
+msgid "Remove .%s"
+msgstr "Supprimer le .%s"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "Finlande"
 
 #: ../rpmdrake:1
 #, c-format
@@ -206,70 +247,113 @@ msgstr ""
 "\n"
 "Voulez-vous continuer l'installation ?"
 
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Examining distant file of media `%s'..."
+msgstr "Examen du fichier distant du média `%s'..."
+
 #: ../rpmdrake:1
 #, c-format
 msgid "Verifying packages signatures..."
 msgstr "Vérification de la signature des paquetages..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Téléchargement du paquetage `%s' (%s/%s)..."
+msgid "France"
+msgstr "France"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#. -PO: Keep it short, this is gonna be on a button
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "Annuler"
+msgid "More info"
+msgstr "Plus d'infos"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Êtes-vous d'accord pour continuer ?"
 
 #: ../rpmdrake:1
 #, 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]"
+msgid "Reload the packages list"
+msgstr "Rafraîchir la liste des paquetages"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Choisissez votre miroir..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Change medium"
-msgstr "Changement de médium"
+msgid "Some packages can't be installed"
+msgstr "Certains paquetages ne peuvent pas être installés"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "Initialisation..."
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr ""
+"Erreur irrécupérable : aucune paquetage trouvé pour l'installation, désolé."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Package installation..."
-msgstr "Installation des paquetages..."
+msgid "All packages,"
+msgstr "Tous les paquetages,"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of media:"
+msgstr "Type de média :"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Impossible d'obtenir les paquetages sources, désolé. %s"
+msgid "in files"
+msgstr "parmi les fichiers"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Unable to get source packages."
-msgstr "Impossible d'obtenir les paquetages sources."
+msgid "All requested packages were installed successfully."
+msgstr "Tous les paquetages demandés ont été installés correctement."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "Nom du serveur mandataire"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "Fichiers locaux"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "Examiner..."
+msgid "Inspecting %s"
+msgstr "Examen de %s"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Israel"
+msgstr "Israël"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation finished"
-msgstr "L'installation est terminée"
+msgid "Help"
+msgstr "Aide"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "HTTP server"
+msgstr "Serveur HTTP"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Ne rien faire"
+msgid "Installation failed"
+msgstr "Echec de l'installation"
 
 #: ../rpmdrake:1
 #, c-format
@@ -278,139 +362,160 @@ msgstr "Utiliser le .%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Supprimer le .%s"
+msgid "Search results"
+msgstr "Résultats de la recherche"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid " failed!"
+msgstr " échec !"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
+msgstr "Brésil"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"Il existe déjà un médium du même nom,\n"
+"voulez-vous vraiment le remplacer ?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "changes:"
-msgstr "changements :"
+msgid "Find:"
+msgstr "Rechercher :"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Examen de %s"
+msgid "All packages, alphabetical"
+msgstr "Tous les paquetages, classement alphabétique"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Veuillez patienter, recherche des paquetages disponibles..."
+msgid "Please wait, searching..."
+msgstr "Veuillez patienter, recherche en cours..."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "Veuillez patienter, ajout du médium..."
+msgid "Please wait, reading packages database..."
+msgstr "Veuillez patienter, lecture de la base de donnée des paquetages..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
-"\n"
-"Then, restart MandrakeUpdate."
-msgstr ""
-"Vous pouvez aussi choisir votre mirroir manuellement : pour ce\n"
-"faire, lancez le Gestionnaire de Sources Logicielles, puis\n"
-"ajoutez une « Mise à jour de sécurité ».\n"
-"\n"
-"Puis, redémarrez MandrakeUpdate."
+msgid "unknown package "
+msgstr "paquetage inconnu "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "Comment choisir manuellement votre mirroir"
+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:1
 #, c-format
+msgid "Reset the selection"
+msgstr "Remettre à zéro la sélection"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
 msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
+"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), veuillez "
+"entrer le nom\n"
+"de la machine et un port optionnel (la syntaxe est : <nommachine[:port]>) :"
+
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
 "\n"
-"Then, restart MandrakeUpdate."
 msgstr ""
-"Vous possédez déjà au moins une source de mise-à-jour configurée, mais\n"
-"elles sont toutes désactivées actuellement. Vous devriez lancer le\n"
-"Gestionnaire de Sources Logicielles pour en activer au moins une\n"
-"(cochez-la dans la colonne « Activée ? »)\n"
+"Pour satisfaire les dépendances, le(s) paquetage(s) supplémentaire(s) suivant"
+"(s)\n"
+"doivent aussi être supprimés :\n"
 "\n"
-"Ensuite, redémarrez MandrakeUpdate."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Already existing update sources"
-msgstr "Des sources de mise-à-jour existent déjà"
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
+"There was a problem during the installation:\n"
 "\n"
-"Is it ok to continue?"
+"%s"
 msgstr ""
-"J'ai besoin de contacter le miroir afin d'obtenir les dernières mises à "
-"jour.\n"
-"Veuillez vérifier que le réseau est en fonctionnement.\n"
+"Une erreur est survenue pendant l'installation des paquetages :\n"
 "\n"
-"Êtes-vous d'accord pour continuer ?"
+"%s"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr "Une erreur fatale est survenue : %s."
+msgid "Please wait, removing medium..."
+msgstr "Veuillez patienter, suppression du médium..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Fatal error"
-msgstr "Erreur fatale"
+msgid "Password:"
+msgstr "Mot de passe :"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Installation"
-msgstr "Installation de paquetages logiciels"
+msgid "Taiwan"
+msgstr "Taïwan"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Mandrake Update"
+msgid "User:"
+msgstr "Nom d'utilisateur :"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Suppression de Paquetages Logiciels"
+msgid "Please wait, updating medium..."
+msgstr "Veuillez patienter, mise à jour du médium..."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Quit"
-msgstr "Quitter"
+msgid "Please wait, listing packages..."
+msgstr "Veuillez patienter, énumération des paquetages..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Installer"
+msgid "Information on packages"
+msgstr "Informations sur les paquetages"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Remove"
-msgstr "Supprimer"
+msgid "Cancel"
+msgstr "Annuler"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Help"
-msgstr "Aide"
+msgid "Everything installed successfully"
+msgstr "Tout a été installé correctement"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search"
-msgstr "Chercher"
+msgid "Select the media(s) you wish to update:"
+msgstr "Veuillez choisir le(s) média(s) que vous voulez mettre à jour :"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, updating media..."
+msgstr "Veuillez patienter, mise à jour des média..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Rechercher :"
+msgid "A fatal error occurred: %s."
+msgstr "Une erreur fatale est survenue : %s."
 
 #: ../rpmdrake:1
 #, c-format
@@ -430,161 +535,190 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Certains paquetages doivent être enlevés"
+msgid "in descriptions"
+msgstr "parmi les descriptions"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "Configurer les serveurs mandataires (proxy)"
+
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
 "\n"
-"Do you really want to install all the selected packages?"
+"Is it ok to continue?"
 msgstr ""
-"Attention : il semble que vous essayez d'installer tellement de\n"
-"paquetages, qu'il est possible que votre disque dur n'ait plus\n"
-"d'espace libre après ou pendant l'installation ; ceci est\n"
-"particulièrement dangereux, et devrait être examiné\n"
-"soigneusement.\n"
+"J'ai besoin de contacter le site web de MandrakeSoft, afin d'obtenir la "
+"liste des miroirs.\n"
+"Veuillez vérifier que le réseau est en fonctionnement.\n"
 "\n"
-"Voulez-vous vraiment installer tous les paquetages sélectionnés ?"
+"Êtes-vous d'accord pour continuer ?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Trop de paquetages sont sélectionnés"
+msgid "Please choose"
+msgstr "Veuillez choisir"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "Informations maximales"
+msgid "Selected size: %d MB"
+msgstr "Taille sélectionnée : %d Mo"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Normal information"
-msgstr "Informations normales"
+msgid "Initializing..."
+msgstr "Initialisation..."
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update source(s)"
-msgstr "Mise à jour de source(s)"
+msgid "Save changes"
+msgstr "Sauvegarder"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Rafraîchir la liste des paquetages"
+msgid "Error during download"
+msgstr "Erreur pendant le téléchargement"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "Remettre à zéro la sélection"
+msgid "Package installation..."
+msgstr "Installation des paquetages..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "parmi les fichiers"
+msgid "Importance: "
+msgstr "Importance : "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "parmi les descriptions"
+msgid ""
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
+msgstr ""
+"Pour satisfaire les dépendances, le(s) paquetage(s) suivant(s)\n"
+"doivent aussi être installés :\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "in names"
-msgstr "parmi les noms"
+msgid "Add..."
+msgstr "Ajouter..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by update availability"
-msgstr "nouveaux ou mis à jour"
+msgid "Unable to create medium."
+msgstr "Impossible de créer le médium."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by source repository"
-msgstr "par source"
+msgid ""
+"The installation is finished; %s.\n"
+"\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
+msgstr ""
+"L'installation est terminée ; %s.\n"
+"\n"
+"Certains fichiers de configuration ont été créés en tant que\n"
+"`.rpmnew' ou `.rpmsave', vous pouvez maintenant les examiner\n"
+"afin de décider ce que vous souhaitez en faire :"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by selection state"
-msgstr "sélectionnés ou non"
+msgid "Browse..."
+msgstr "Parcourir..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by size"
-msgstr "par taille"
+msgid "Some packages can't be removed"
+msgstr "Des paquetages ne peuvent pas être supprimés"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by group"
-msgstr "par groupe"
+msgid "Info..."
+msgstr "Info..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "All packages,"
-msgstr "Tous les paquetages,"
+msgid "You need to insert the medium to continue"
+msgstr "Vous devez insérer le médium pour continuer"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Tous les paquetages, classement alphabétique"
+msgid "Copying file for media `%s'..."
+msgstr "Copie du fichier pour le média `%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Choix Mandrake"
+msgid "Remove"
+msgstr "Supprimer"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Normal updates"
-msgstr "Mises à jour normales"
+msgid "Preparing packages installation..."
+msgstr "Préparation de l'installation des paquetages..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Corrections de bogues"
+msgid "by media repository"
+msgstr "par média"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Security updates"
-msgstr "Mises à jour de sécurité"
+msgid "No mirror"
+msgstr "Pas de miroir"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Description: "
-msgstr "Description : "
+msgid "You need to fill up at least the two first entries."
+msgstr "Vous devez remplir au moins les deux premiers champs."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Raison de la mise à jour : "
+msgid "Install"
+msgstr "Installer"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Summary: "
-msgstr "Intitulé : "
+msgid "Japan"
+msgstr "Japon"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Importance: "
-msgstr "Importance : "
+msgid "Do nothing"
+msgstr "Ne rien faire"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s Ko"
+msgid "No update"
+msgstr "Pas de mise à jour"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Size: "
-msgstr "Taille : "
+msgid "Description: "
+msgstr "Description : "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Version: "
-msgstr "Version : "
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr ""
+"Attention : il semble que vous essayez d'installer tellement de\n"
+"paquetages, qu'il est possible que votre disque dur n'ait plus\n"
+"d'espace libre après ou pendant l'installation ; ceci est\n"
+"particulièrement dangereux, et devrait être examiné\n"
+"soigneusement.\n"
+"\n"
+"Voulez-vous vraiment installer tous les paquetages sélectionnés ?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -593,89 +727,66 @@ msgstr "Nom : "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Version actuellement installée : "
+msgid "Inspect..."
+msgstr "Examiner..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Source: "
-msgstr "Source : "
+msgid "Editing media \"%s\":"
+msgstr "Édition du média \"%s\" :"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "(Not available)"
-msgstr "(Non disponible)"
+msgid "No package found for installation."
+msgstr "Aucun paquetage trouvé pour l'installation."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Changelog :\n"
+msgid "Australia"
+msgstr "Australie"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Files:\n"
-msgstr "Fichiers :\n"
+msgid "Installation finished"
+msgstr "L'installation est terminée"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "Taille sélectionnée : %d Mo"
+msgid "by update availability"
+msgstr "nouveaux ou mis à jour"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Sélectionnés : %d Mo / Place libre sur disque : %d Mo"
+msgid "Poland"
+msgstr "Pologne"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
-msgstr ""
-"Pour satisfaire les dépendances, le(s) paquetage(s) suivant(s)\n"
-"doivent être déselectionnés :\n"
-"\n"
+msgid "Version: "
+msgstr "Version : "
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
+msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
-"Désolé, le(s) paquetage(s) suivant(s) ne peuvent pas être sélectionnés :\n"
-"\n"
-"%s\n"
-"\n"
-"Les raisons sont :\n"
-"\n"
-"%s"
+"Vous pouvez aussi utiliser un nom d'utilisateur/mot de passe pour la "
+"connexion\n"
+"au serveur mandataire :"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "%s conflicts with %s"
-msgstr "%s est en conflit avec %s"
+msgid "Upgradable"
+msgstr "Mises à jour"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some packages can't be installed"
-msgstr "Certains paquetages ne peuvent pas être installés"
+msgid " done."
+msgstr " fini."
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
-msgstr ""
-"Pour satisfaire les dépendances, le(s) paquetage(s) suivant(s)\n"
-"doivent aussi être installés :\n"
-"\n"
+msgid "Software Packages Installation"
+msgstr "Installation de paquetages logiciels"
 
 #: ../rpmdrake:1
 #, c-format
@@ -684,652 +795,541 @@ msgstr "Des paquetages supplémentaires sont nécessaires"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages can't be removed"
-msgstr "Des paquetages ne peuvent pas être supprimés"
+msgid "Bugfixes updates"
+msgstr "Corrections de bogues"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
-"Le fait d'enlever ce paquetage rendrait instable votre système, désolé:\n"
-"\n"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "Téléchargement de `%s', temps : %s, vitesse : %s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"Pour satisfaire les dépendances, le(s) paquetage(s) supplémentaire(s) suivant"
-"(s)\n"
-"doivent aussi être supprimés :\n"
-"\n"
+msgid "Germany"
+msgstr "Allemagne"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Des paquetages supplémentaires doivent être supprimés"
+msgid "Russia"
+msgstr "Russie"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "More information on package..."
-msgstr "Plus d'informations sur le paquetage..."
+msgid "Norway"
+msgstr "Norvège"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Information on packages"
-msgstr "Informations sur les paquetages"
+msgid "Problem during installation"
+msgstr "Des problèmes sont survenus durant l'installation"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "More info"
-msgstr "Plus d'infos"
+msgid "Search"
+msgstr "Chercher"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Addable"
-msgstr "Nouveaux"
+msgid "Edit a media"
+msgstr "Éditer un média"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Upgradable"
-msgstr "Mises à jour"
+msgid "Czech Republic"
+msgstr "République Tchèque"
 
 #: ../rpmdrake:1
 #, c-format
 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."
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"La liste des mises à jour est vide. Cela veut dire qu'il n'y a\n"
-"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:1
-#, c-format
-msgid "No update"
-msgstr "Pas de mise à jour"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "(none)"
-msgstr "(aucun)"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Please wait, listing packages..."
-msgstr "Veuillez patienter, énumération des paquetages..."
+"Vous possédez déjà au moins un média de mise-à-jour configuré, mais\n"
+"ils sont tous désactivés actuellement. Vous devriez lancer le\n"
+"Gestionnaire de Médias Logiciels pour en activer au moins un\n"
+"(cochez-le dans la colonne « Activé ? »)\n"
+"\n"
+"Ensuite, redémarrez MandrakeUpdate."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "unknown package "
-msgstr "paquetage inconnu "
+msgid "Stop"
+msgstr "Arrêter"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "L'un des paquetages suivants est nécessaire :"
+msgid "Update"
+msgstr "Mettre à jour"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Veuillez choisir"
+msgid "Please wait, removing packages..."
+msgstr "Veuillez patienter, suppression des paquetages..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Normal information"
+msgstr "Informations normales"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Not selected"
-msgstr "Non sélectionnés"
+msgid "Media: "
+msgstr "Média :"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected"
-msgstr "Sélectionnés"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "Téléchargement du paquetage `%s' (%s/%s)..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results"
-msgstr "Résultats de la recherche"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Sélectionnés : %d Mo / Place libre sur disque : %d Mo"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Stop"
-msgstr "Arrêter"
+msgid "Media"
+msgstr "Média"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Veuillez patienter, recherche en cours..."
+msgid "Spain"
+msgstr "Espagne"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Résultats de la recherche (aucun)"
+msgid "Normal updates"
+msgstr "Mises à jour normales"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Other"
-msgstr "Autre"
+msgid "by selection state"
+msgstr "sélectionnés ou non"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Welcome to the packages source editor!\n"
-"\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
-"Bienvenue dans l'éditeur de sources de paquetages !\n"
-"\n"
-"Cet outil vous aidera à configurer les sources de paquetages que\n"
-"vous souhaitez utiliser sur votre ordinateur. Elles seront\n"
-"disponibles par la suite pour installer de nouveaux paquetages\n"
-"logiciels ou pour réaliser des mises à jour."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Save and quit"
-msgstr "Sauver et quitter"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Proxy..."
-msgstr "Mandataire..."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Update..."
-msgstr "Mettre à jour..."
+"Veuillez patienter, téléchargement de la liste des miroirs à partir du site "
+"web de MandrakeSoft."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Add..."
-msgstr "Ajouter..."
+msgid "Login:"
+msgstr "Login :"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit"
-msgstr "Éditer"
+msgid "Adding a media:"
+msgstr "Ajout d'un média :"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Source"
-msgstr "Source"
+msgid "Austria"
+msgstr "Autriche"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Enabled?"
-msgstr "Activée ?"
+msgid "Fatal error"
+msgstr "Erreur fatale"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Configure sources"
-msgstr "Configurer les sources"
+msgid "Update..."
+msgstr "Mettre à jour..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Password:"
-msgstr "Mot de passe :"
+msgid "Starting download of `%s'..."
+msgstr "Démarrage du téléchargement de `%s'..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "User:"
-msgstr "Nom d'utilisateur :"
+msgid "(none)"
+msgstr "(aucun)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
 msgstr ""
-"Vous pouvez aussi utiliser un nom d'utilisateur/mot de passe pour la "
-"connexion\n"
-"au serveur mandataire :"
+"Le fait d'enlever ce paquetage rendrait instable votre système, désolé:\n"
+"\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "Nom du serveur mandataire"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Installation du paquetage `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-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), veuillez "
-"entrer le nom\n"
-"de la machine et un port optionnel (la syntaxe est : <nommachine[:port]>) :"
+msgid "Currently installed version: "
+msgstr "Version actuellement installée : "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Configurer les serveurs mandataires (proxy)"
+msgid "Other"
+msgstr "Autre"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Veuillez patienter, mise à jour du médium..."
+msgid "Reason for update: "
+msgstr "Raison de la mise à jour : "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr ""
-"Afin de sauvegarder les changements, vous devez insérer le médium dans le "
-"lecteur."
+msgid "Please choose the desired mirror."
+msgstr "Veuillez choisir le miroir."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "Vous devez insérer le médium pour continuer"
+msgid "Edit"
+msgstr "Éditer"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "Sauvegarder"
+msgid "Please wait, finding available packages..."
+msgstr "Veuillez patienter, recherche des paquetages disponibles..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Chemin relatif vers hdlist/synthesis :"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "URL:"
-msgstr "URL :"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Editing source \"%s\":"
-msgstr "Édition de la source \"%s\" :"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Edit a source"
-msgstr "Éditer une source"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Please wait, removing medium..."
-msgstr "Veuillez patienter, suppression du médium..."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Type of source:"
-msgstr "Type de source :"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Adding a source:"
-msgstr "Ajout d'une source :"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
-msgstr ""
-"Il existe déjà un médium du même nom,\n"
-"voulez-vous vraiment le remplacer ?"
+msgid "Search results (none)"
+msgstr "Résultats de la recherche (aucun)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Vous devez remplir au moins les deux premiers champs."
+msgid "Danmark"
+msgstr "Danemark"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Name:"
-msgstr "Nom :"
+msgid "China"
+msgstr "Chine"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Login:"
-msgstr "Login :"
+msgid "United States"
+msgstr "États-Unis"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr "Choisissez votre miroir..."
+msgid "changes:"
+msgstr "changements :"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
-msgstr "Parcourir..."
+msgid "Some additional packages need to be removed"
+msgstr "Des paquetages supplémentaires doivent être supprimés"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Path or mount point:"
-msgstr "Chemin ou point de montage :"
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "Périphérique amovible"
+msgid "No"
+msgstr "Non"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "HTTP server"
-msgstr "Serveur HTTP"
+msgid "Configure medias"
+msgstr "Configurer les médias"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "FTP server"
-msgstr "Serveur FTP"
+msgid "Add a media"
+msgstr "Ajout d'un média"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Path:"
-msgstr "Chemin : "
+msgid "Summary: "
+msgstr "Intitulé : "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Local files"
-msgstr "Fichiers locaux"
+msgid "Canada"
+msgstr "Canada"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Add a source"
-msgstr "Ajout d'une source :"
+msgid "Greece"
+msgstr "Grèce"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
+"There was an error downloading the mirrors list:\n"
 "\n"
-"Errors:\n"
-"%s"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
-"Impossible de mettre à jour le médium ; il sera ignoré.\n"
+"Une erreur est survenue pendant le téléchargement de la liste des miroirs :\n"
 "\n"
-"Erreurs :\n"
-"%s"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Unable to create medium."
-msgstr "Impossible de créer le médium."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Update"
-msgstr "Mettre à jour"
+"%s\n"
+"Le réseau, ou bien le site web de MandrakeSoft, sont peut-être "
+"indisponibles.\n"
+"Veuillez réessayer ultérieurement."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Veuillez choisir les sources que vous voulez mettre à jour :"
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Impossible d'obtenir les paquetages sources, désolé. %s"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Veuillez patienter, mise à jour des média..."
+msgid "Path:"
+msgstr "Chemin : "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " failed!"
-msgstr " échec !"
+msgid "Problem during removal"
+msgstr "Un problème est survenu pendant la désinstallation"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " done."
-msgstr " fini."
+msgid "Selected"
+msgstr "Sélectionnés"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "Téléchargement de `%s', vitesse : %s"
+msgid "Netherlands"
+msgstr "Pays-Bas"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "Téléchargement de `%s', temps : %s, vitesse : %s"
+msgid "Addable"
+msgstr "Nouveaux"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Starting download of `%s'..."
-msgstr "Démarrage du téléchargement de `%s'..."
+msgid "(Not available)"
+msgstr "(Non disponible)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "Examen du fichier distant de la source `%s'..."
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
+msgstr ""
+"Désolé, le(s) paquetage(s) suivant(s) ne peuvent pas être sélectionnés :\n"
+"\n"
+"%s\n"
+"\n"
+"Les raisons sont :\n"
+"\n"
+"%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "Examen du fichier de la source `%s'..."
+msgid "Not selected"
+msgstr "Non sélectionnés"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "Copie du fichier pour la source `%s'..."
+msgid "Software Packages Removal"
+msgstr "Suppression de Paquetages Logiciels"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Please choose the desired mirror."
-msgstr "Veuillez choisir le miroir."
+msgid "Sweden"
+msgstr "Suède"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"I can't find any suitable mirror.\n"
 "\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
+"\n"
+"Error(s) reported:\n"
+"%s"
 msgstr ""
-"Impossible de trouver un miroir.\n"
 "\n"
-"Il peut y avoir plusieurs raisons à cela ; la plus fréquente\n"
-"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:1
-#, c-format
-msgid "No mirror"
-msgstr "Pas de miroir"
+"\n"
+"Erreur(s) rencontrées :\n"
+"%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"There was an error downloading the mirrors list:\n"
-"\n"
-"%s\n"
-"The network, or MandrakeSoft website, are maybe unavailable.\n"
-"Please try again later."
+"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 ""
-"Une erreur est survenue pendant le téléchargement de la liste des miroirs :\n"
-"\n"
-"%s\n"
-"Le réseau, ou bien le site web de MandrakeSoft, sont peut-être "
-"indisponibles.\n"
-"Veuillez réessayer ultérieurement."
+"La liste des mises à jour est vide. Cela veut dire qu'il n'y a\n"
+"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.pm:1
 #, c-format
-msgid "Error during download"
-msgstr "Erreur pendant le téléchargement"
+msgid "Examining file of media `%s'..."
+msgstr "Examen du fichier du média `%s'..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-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."
+msgid "Download of `%s', speed:%s"
+msgstr "Téléchargement de `%s', vitesse : %s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "L'un des paquetages suivants est nécessaire :"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Quitter"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
 "\n"
 "Is it ok to continue?"
 msgstr ""
-"J'ai besoin de contacter le site web de MandrakeSoft, afin d'obtenir la "
-"liste des miroirs.\n"
+"J'ai besoin de contacter le miroir afin d'obtenir les dernières mises à "
+"jour.\n"
 "Veuillez vérifier que le réseau est en fonctionnement.\n"
 "\n"
 "Êtes-vous d'accord pour continuer ?"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, c-format
-msgid "United States"
-msgstr "États-Unis"
+msgid "Update media(s)"
+msgstr "Mise à jour de média(s)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "Chine"
+msgid "Ok"
+msgstr "Ok"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Royaume-Uni"
+msgid "Please wait, adding medium..."
+msgstr "Veuillez patienter, ajout du médium..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Taïwan"
+msgid "Unable to get source packages."
+msgstr "Impossible d'obtenir les paquetages sources."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Sweden"
-msgstr "Suède"
+msgid "Too many packages are selected"
+msgstr "Trop de paquetages sont sélectionnés"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Russia"
-msgstr "Russie"
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"Bienvenue dans le Gestionnaire de Médias Logiciels !\n"
+"\n"
+"Cet outil vous aidera à configurer les médias logiciels que\n"
+"vous souhaitez utiliser sur votre ordinateur. Ils seront\n"
+"disponibles par la suite pour installer de nouveaux paquetages\n"
+"logiciels ou pour réaliser des mises à jour."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Portugal"
-msgstr "Portugal"
+msgid "%s conflicts with %s"
+msgstr "%s est en conflit avec %s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
-msgstr "Pologne"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Bienvenue dans MandrakeUpdate !\n"
+"\n"
+"Cet outil va vous aider à choisir les mises à jour que vous\n"
+"souhaiter installer sur votre ordinateur."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Norway"
-msgstr "Norvège"
+msgid "Mandrake choices"
+msgstr "Choix Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Netherlands"
-msgstr "Pays-Bas"
+msgid "Changelog:\n"
+msgstr "Changelog :\n"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Korea"
 msgstr "Corée"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Japan"
-msgstr "Japon"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Italy"
-msgstr "Italie"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Israel"
-msgstr "Israël"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Greece"
-msgstr "Grèce"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "France"
-msgstr "France"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Finland"
-msgstr "Finlande"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Spain"
-msgstr "Espagne"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Danmark"
-msgstr "Danemark"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Germany"
-msgstr "Allemagne"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Czech Republic"
-msgstr "République Tchèque"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Costa Rica"
-msgstr "Costa Rica"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Canada"
-msgstr "Canada"
-
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Brazil"
-msgstr "Brésil"
+msgid "Removable device"
+msgstr "Périphérique amovible"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Belgique"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Australie"
+msgid "Change medium"
+msgstr "Changement de médium"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "Autriche"
+msgid "Mandrake Update"
+msgstr "Mandrake Update"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
-msgstr "Info..."
+msgid "by size"
+msgstr "par taille"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "Non"
+msgid "FTP server"
+msgstr "Serveur FTP"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "Fichiers :\n"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Yes"
-msgstr "Oui"
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr ""
+"Impossible de mettre à jour le médium ; il sera ignoré.\n"
+"\n"
+"Erreurs :\n"
+"%s"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -1601,6 +1601,12 @@ msgstr "Supprimer des Logiciels"
 msgid "Software Sources Manager"
 msgstr "Gestionnaire de Sources Logicielles"
 
+#~ msgid "Source: "
+#~ msgstr "Source : "
+
+#~ msgid "Source"
+#~ msgstr "Source"
+
 #~ msgid ""
 #~ "some packages failed to install\n"
 #~ "correctly"
diff --git a/po/ga.po b/po/ga.po
index 3ae1a62b..04ad3e92 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+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"
@@ -13,14 +13,21 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
+msgid "Enabled?"
 msgstr ""
 
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr ""
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Portugal"
+msgstr "Poirt:"
+
 #: ../rpmdrake:1
 #, c-format
 msgid ""
@@ -33,127 +40,164 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
+msgid "by group"
 msgstr ""
 
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Name:"
+msgstr "Ainm"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Italy"
+msgstr "Ag Feistiú:"
+
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
+msgid "How to choose manually your mirror"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
+msgid "URL:"
+msgstr "URL:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Problem during removal"
+msgid "Some packages need to be removed"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, removing packages..."
+#, c-format
+msgid "More information on package..."
 msgstr ""
-"Fan tamall\n"
-"Ag scrios pacáistí"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, reading packages database..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
 msgstr ""
-"Fan tamall\n"
-"Ag scrios pacáistí"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"There was a problem during the installation:\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"%s"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Feist gach rud"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
+msgid "everything was installed correctly"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Bainisteoir Bog-Earraí"
+msgid "%s KB"
+msgstr "%.1f KB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
+msgid ""
+"Welcome to the software removal tool!\n"
+"\n"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
+msgstr ""
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr ""
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"There was a problem during the removal of packages:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"%s"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "everything was installed correctly"
+#, fuzzy, c-format
+msgid "Size: "
+msgstr "Meid"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Security updates"
+msgstr "Slándáil"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Already existing update medias"
 msgstr ""
+"Fan tamall\n"
+"Checking dependencies"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Problem during installation"
+msgid "Maximum information"
 msgstr ""
 
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Proxy..."
+msgstr "Earraidh..."
+
 #: ../rpmdrake:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Bainisteoir Bog-Earraí"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "in names"
+msgstr ""
+
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
+"I can't find any suitable mirror.\n"
 "\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+msgid "Remove .%s"
 msgstr ""
 
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Finland"
+msgstr "Faigh:"
+
 #: ../rpmdrake:1
 #, c-format
 msgid ""
@@ -164,70 +208,109 @@ msgid ""
 "Do you want to continue installation?"
 msgstr ""
 
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Examining distant file of media `%s'..."
+msgstr ""
+
 #: ../rpmdrake:1
 #, c-format
 msgid "Verifying packages signatures..."
 msgstr ""
 
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "France"
+msgstr "Fórsáil"
+
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
+msgid "More info"
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Cancel"
-msgstr "Cealaigh"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Ok"
-msgstr "Ceart go Leor"
+msgid "Reload the packages list"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+msgid "Some packages can't be installed"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Change medium"
+msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Initializing..."
-msgstr "Ag Feistiú:"
+msgid "All packages,"
+msgstr "%d pacáistí"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of media:"
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Bainisteoir Bog-Earraí"
+msgid "in files"
+msgstr "Áit"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Unable to get source packages, sorry. %s"
+msgid "All requested packages were installed successfully."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Unable to get source packages."
+msgid "Proxy hostname:"
 msgstr ""
 
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "Comhaid Áitiúl"
+
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
+msgid "Inspecting %s"
 msgstr ""
 
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Israel"
+msgstr "Ag Feistiú:"
+
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Installation finished"
-msgstr "Ag Feistiú"
+msgid "Help"
+msgstr "/_Cúnamh"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "HTTP server"
+msgstr "Freastalaí HTTP:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Do nothing"
-msgstr "Ag Tosnaigh CUPS"
+msgid "Installation failed"
+msgstr "Feist gach rud"
 
 #: ../rpmdrake:1
 #, c-format
@@ -235,128 +318,161 @@ msgid "Use .%s as main file"
 msgstr ""
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Search results"
+msgstr "Cuardaigh"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid " failed!"
+msgstr "Áit"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Remove .%s"
+msgid "Brazil"
+msgstr "An Bhrasail"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "changes:"
-msgstr "Pacáistí"
+#, c-format
+msgid "Find:"
+msgstr "Faigh:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
+msgid "All packages, alphabetical"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, finding available packages..."
+msgid "Please wait, searching..."
 msgstr ""
 "Fan tamall\n"
 "Ag scrios pacáistí"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, adding medium..."
+msgid "Please wait, reading packages database..."
 msgstr ""
 "Fan tamall\n"
-"Checking dependencies"
+"Ag scrios pacáistí"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "Teip ag oscailt pacáiste"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
-"\n"
-"Then, restart MandrakeUpdate."
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
+msgid "Reset the selection"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
 "\n"
-"Then, restart MandrakeUpdate."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Already existing update sources"
+msgid "Costa Rica"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
+"There was a problem during the installation:\n"
 "\n"
-"Is it ok to continue?"
+"%s"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "A fatal error occurred: %s."
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, removing medium..."
 msgstr ""
+"Fan tamall\n"
+"Checking dependencies"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "Pasfhocal:"
+
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Earraidh scríobhta\n"
+msgid "Taiwan"
+msgstr "Áit"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Bainisteoir Bog-Earraí"
+msgid "Please wait, updating medium..."
+msgstr ""
+"Fan tamall\n"
+"Checking dependencies"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Mandrake Update"
+#, fuzzy, c-format
+msgid "Please wait, listing packages..."
 msgstr ""
+"Fan tamall\n"
+"Ag scrios pacáistí"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Software Packages Removal"
-msgstr "Bainisteoir Bog-Earraí"
+msgid "Information on packages"
+msgstr "Teip ag oscailt pacáiste"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "Éirigh"
+msgid "Cancel"
+msgstr "Cealaigh"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Ag Feistiú:"
+msgid "Everything installed successfully"
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Remove"
-msgstr "Scríos Printéir"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Select the media(s) you wish to update:"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Help"
-msgstr "/_Cúnamh"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Search"
-msgstr "Cuardaigh"
+msgid "Please wait, updating media..."
+msgstr ""
+"Fan tamall\n"
+"Checking dependencies"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Faigh:"
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -369,857 +485,743 @@ msgid ""
 msgstr ""
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "in descriptions"
+msgstr "Cuntasaí"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Some packages need to be removed"
+msgid "Configure proxies"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
 "\n"
-"Do you really want to install all the selected packages?"
+"Is it ok to continue?"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Too many packages are selected"
-msgstr ""
+#, fuzzy, c-format
+msgid "Please choose"
+msgstr "Cinntigh, le do thoil"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
+msgid "Selected size: %d MB"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Normal information"
-msgstr ""
-
-#: ../rpmdrake:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Update source(s)"
-msgstr ""
+#, fuzzy, c-format
+msgid "Initializing..."
+msgstr "Ag Feistiú:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Reload the packages list"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Save changes"
+msgstr "Pacáistí"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Reset the selection"
+msgid "Error during download"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "in files"
-msgstr "Áit"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "in descriptions"
-msgstr "Cuntasaí"
+msgid "Package installation..."
+msgstr "Bainisteoir Bog-Earraí"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
+msgid "Importance: "
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
+msgid ""
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by source repository"
+msgid "Add..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by selection state"
+msgid "Unable to create medium."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by size"
+msgid ""
+"The installation is finished; %s.\n"
+"\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by group"
+msgid "Browse..."
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "All packages,"
-msgstr "%d pacáistí"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
+msgid "Some packages can't be removed"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
+msgid "Info..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
+msgid "You need to insert the medium to continue"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Bugfixes updates"
+msgid "Copying file for media `%s'..."
 msgstr ""
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Security updates"
-msgstr "Slándáil"
+msgid "Remove"
+msgstr "Scríos Printéir"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Description: "
-msgstr "Cuntasaí"
+msgid "Preparing packages installation..."
+msgstr "Bainisteoir Bog-Earraí"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reason for update: "
+msgid "by media repository"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Summary: "
-msgstr "Coimriú"
+msgid "No mirror"
+msgstr "Gan earraidh"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Importance: "
+msgid "You need to fill up at least the two first entries."
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s KB"
-msgstr "%.1f KB"
+#, c-format
+msgid "Install"
+msgstr "Ag Feistiú:"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Japan"
+msgstr "An tSeapáin"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Size: "
-msgstr "Meid"
+msgid "Do nothing"
+msgstr "Ag Tosnaigh CUPS"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Version: "
-msgstr "Leagan:"
+msgid "No update"
+msgstr "slí"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Name: "
-msgstr "Ainm: %s"
+msgid "Description: "
+msgstr "Cuntasaí"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Currently installed version: "
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Source: "
-msgstr "Bún"
+msgid "Name: "
+msgstr "Ainm: %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "(Not available)"
+msgid "Inspect..."
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Changelog:\n"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing media \"%s\":"
 msgstr ""
+"Fan tamall\n"
+"Ag scrios pacáistí"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Files:\n"
-msgstr "/_Comhad"
+msgid "No package found for installation."
+msgstr "Bainisteoir Bog-Earraí"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Selected size: %d MB"
-msgstr ""
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Australia"
+msgstr "srathach"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr ""
+#, fuzzy, c-format
+msgid "Installation finished"
+msgstr "Ag Feistiú"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
+msgid "by update availability"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr ""
+msgid "Poland"
+msgstr "An Pholainn"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "%s conflicts with %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Version: "
+msgstr "Leagan:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Some packages can't be installed"
+msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
+msgid "Upgradable"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Additional packages needed"
+msgid " done."
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Some packages can't be removed"
-msgstr ""
+#, fuzzy, c-format
+msgid "Software Packages Installation"
+msgstr "Bainisteoir Bog-Earraí"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
+msgid "Additional packages needed"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
+msgid "Bugfixes updates"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
+msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "More information on package..."
-msgstr ""
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Germany"
+msgstr "Gearmáinis"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Information on packages"
-msgstr "Teip ag oscailt pacáiste"
+msgid "Russia"
+msgstr "Ruislís"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Norway"
+msgstr "Ioruais"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "More info"
+msgid "Problem during installation"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Addable"
-msgstr "Ag Feistiú"
+#, c-format
+msgid "Search"
+msgstr "Cuardaigh"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Upgradable"
+msgid "Edit a media"
 msgstr ""
 
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
+msgstr "An Phoblacht nc tSeic"
+
 #: ../rpmdrake:1
 #, c-format
 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."
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No update"
-msgstr "slí"
+msgid "Stop"
+msgstr "Teascán"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "(none)"
-msgstr "(ar bith)"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update"
+msgstr "slí"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, listing packages..."
+msgid "Please wait, removing packages..."
 msgstr ""
 "Fan tamall\n"
 "Ag scrios pacáistí"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "Teip ag oscailt pacáiste"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "One of the following packages is needed:"
+msgid "Normal information"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please choose"
-msgstr "Cinntigh, le do thoil"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr "Tóg gach rud"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Selected"
+msgid "Media: "
 msgstr ""
-"Tóg\n"
-"gach rud"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Search results"
-msgstr "Cuardaigh"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Stop"
-msgstr "Teascán"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, searching..."
+#, c-format
+msgid "Downloading package `%s' (%s/%s)..."
 msgstr ""
-"Fan tamall\n"
-"Ag scrios pacáistí"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Search results (none)"
-msgstr "Cuardaigh"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Other"
-msgstr "Eile"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the packages source editor!\n"
-"\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
+msgid "Media"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Save and quit"
+msgid "Spain"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Earraidh..."
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Update..."
+msgid "Normal updates"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
+msgid "by selection state"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "Eagar"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Source"
-msgstr "Bún"
+msgid "Login:"
+msgstr "Logann:"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
+#, fuzzy, c-format
+msgid "Adding a media:"
 msgstr ""
+"Fan tamall\n"
+"Ag scrios pacáistí"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure sources"
-msgstr ""
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Austria"
+msgstr "srathach"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Password:"
-msgstr "Pasfhocal:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Fatal error"
+msgstr "Earraidh scríobhta\n"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "User:"
+msgid "Update..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
+msgid "Starting download of `%s'..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr ""
+msgid "(none)"
+msgstr "(ar bith)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+"Removing these packages would break your system, sorry:\n"
+"\n"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
+msgid "Installing package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Please wait, updating medium..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
 msgstr ""
-"Fan tamall\n"
-"Checking dependencies"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr ""
+msgid "Other"
+msgstr "Eile"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
+msgid "Reason for update: "
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Save changes"
-msgstr "Pacáistí"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
+msgid "Please choose the desired mirror."
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "Edit"
+msgstr "Eagar"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Editing source \"%s\":"
+msgid "Please wait, finding available packages..."
 msgstr ""
 "Fan tamall\n"
 "Ag scrios pacáistí"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit a source"
+msgid "Relative path to synthesis/hdlist:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, removing medium..."
-msgstr ""
-"Fan tamall\n"
-"Checking dependencies"
+msgid "Search results (none)"
+msgstr "Cuardaigh"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr ""
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Adding a source:"
+msgid "Danmark"
 msgstr ""
-"Fan tamall\n"
-"Ag scrios pacáistí"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
-msgstr ""
+msgid "China"
+msgstr "An tSín"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr ""
+msgid "United States"
+msgstr "Stáit Aontaithe Mheiriceá"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Name:"
-msgstr "Ainm"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Login:"
-msgstr "Logann:"
+msgid "changes:"
+msgstr "Pacáistí"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
+msgid "Some additional packages need to be removed"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
-msgstr ""
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Path or mount point:"
+msgid "No"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Removable device"
+msgid "Configure medias"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "HTTP server"
-msgstr "Freastalaí HTTP:"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "FTP server"
-msgstr "Freastalaí FTP:"
+#, fuzzy, c-format
+msgid "Add a media"
+msgstr ""
+"Fan tamall\n"
+"Ag scrios pacáistí"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Path:"
-msgstr "Poirt:"
+msgid "Summary: "
+msgstr "Coimriú"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Local files"
-msgstr "Comhaid Áitiúl"
+msgid "Canada"
+msgstr "Ceanada"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Add a source"
-msgstr ""
-"Fan tamall\n"
-"Ag scrios pacáistí"
+msgid "Greece"
+msgstr "Greicís"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
+"There was an error downloading the mirrors list:\n"
 "\n"
-"Errors:\n"
-"%s"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Unable to create medium."
+msgid "Unable to get source packages, sorry. %s"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Update"
-msgstr "slí"
+msgid "Path:"
+msgstr "Poirt:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
+msgid "Problem during removal"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, updating media..."
+msgid "Selected"
 msgstr ""
-"Fan tamall\n"
-"Checking dependencies"
+"Tóg\n"
+"gach rud"
 
 #: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
+msgstr "An Isiltír"
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid " failed!"
-msgstr "Áit"
+msgid "Addable"
+msgstr "Ag Feistiú"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " done."
+msgid "(Not available)"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Download of `%s', speed:%s"
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Not selected"
+msgstr "Tóg gach rud"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Software Packages Removal"
+msgstr "Bainisteoir Bog-Earraí"
+
 #: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Sweden"
+msgstr "Amharc"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Starting download of `%s'..."
+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.pm:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
+msgid "Examining file of media `%s'..."
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Examining file of source `%s'..."
+msgid "Download of `%s', speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Copying file for source `%s'..."
+msgid "One of the following packages is needed:"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please choose the desired mirror."
-msgstr ""
+msgid "Quit"
+msgstr "Éirigh"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"I can't find any suitable mirror.\n"
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
 "\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
+"Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "No mirror"
-msgstr "Gan earraidh"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update media(s)"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was an error downloading the mirrors list:\n"
-"\n"
-"%s\n"
-"The network, or MandrakeSoft website, are maybe unavailable.\n"
-"Please try again later."
+msgid "Ok"
+msgstr "Ceart go Leor"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, adding medium..."
 msgstr ""
+"Fan tamall\n"
+"Checking dependencies"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
+msgid "Unable to get source packages."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgid "Too many packages are selected"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
+"Welcome to the Software Medias Manager!\n"
 "\n"
-"Is it ok to continue?"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "United States"
-msgstr "Stáit Aontaithe Mheiriceá"
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "China"
-msgstr "An tSín"
+msgid "%s conflicts with %s"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Taiwan"
-msgstr "Áit"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Sweden"
-msgstr "Amharc"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Russia"
-msgstr "Ruislís"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Portugal"
-msgstr "Poirt:"
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
-msgstr "An Pholainn"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Norway"
-msgstr "Ioruais"
+msgid "Mandrake choices"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Netherlands"
-msgstr "An Isiltír"
+msgid "Changelog:\n"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Korea"
 msgstr "Fórsáil"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Japan"
-msgstr "An tSeapáin"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Italy"
-msgstr "Ag Feistiú:"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Israel"
-msgstr "Ag Feistiú:"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Greece"
-msgstr "Greicís"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "France"
-msgstr "Fórsáil"
+msgid "Removable device"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Finland"
-msgstr "Faigh:"
+msgid "Belgium"
+msgstr "Belgáiris"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Spain"
+msgid "Change medium"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Danmark"
+msgid "Mandrake Update"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Germany"
-msgstr "Gearmáinis"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Czech Republic"
-msgstr "An Phoblacht nc tSeic"
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
+msgid "by size"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Canada"
-msgstr "Ceanada"
-
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Brazil"
-msgstr "An Bhrasail"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Belgium"
-msgstr "Belgáiris"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Australia"
-msgstr "srathach"
+msgid "FTP server"
+msgstr "Freastalaí FTP:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Austria"
-msgstr "srathach"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Info..."
-msgstr ""
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "No"
-msgstr ""
+msgid "Files:\n"
+msgstr "/_Comhad"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Yes"
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
 msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:86
@@ -1498,6 +1500,13 @@ msgid "Software Sources Manager"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Source: "
+#~ msgstr "Bún"
+
+#~ msgid "Source"
+#~ msgstr "Bún"
+
+#, fuzzy
 #~ msgid "Please wait, removing packages to allow others to be upgraded..."
 #~ msgstr ""
 #~ "Fan tamall\n"
diff --git a/po/gl.po b/po/gl.po
index 702ac32d..0af74f19 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+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"
@@ -13,14 +13,21 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
+msgid "Enabled?"
 msgstr ""
 
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr ""
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Portugal"
+msgstr "Porto:"
+
 #: ../rpmdrake:1
 #, c-format
 msgid ""
@@ -33,85 +40,50 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
+msgid "by group"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr "Preparando para a instalación"
-
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Problem during removal"
-msgstr "Preparando para a instalación"
+msgid "Name:"
+msgstr "Nome"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Please wait, removing packages..."
-msgstr "Agarde, por favor"
+msgid "Italy"
+msgstr "Instalar"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, reading packages database..."
+msgid "How to choose manually your mirror"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr "Preparando para a instalación"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Instalar"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Preparando para a instalación"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Preparando para a instalación"
+#, c-format
+msgid "Some packages need to be removed"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
+msgid "More information on package..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Everything installed successfully"
+msgid "Yes"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -120,114 +92,98 @@ msgid "everything was installed correctly"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Preparando para a instalación"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
+msgid "%s KB"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Preparando para a instalación"
-
-#: ../rpmdrake:1
 #, c-format
 msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
 "\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"Then, restart MandrakeUpdate."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"Welcome to the software removal tool!\n"
+"\n"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you want to continue installation?"
+"In order to save the changes, you need to insert the medium in the drive."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Verifying packages signatures..."
+msgid "Save and quit"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr ""
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Ok"
-msgstr "Aceptar"
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr "Preparando para a instalación"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr ""
+#, fuzzy, c-format
+msgid "Size: "
+msgstr "Tamaño"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Change medium"
+msgid "Security updates"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Initializing..."
-msgstr "Instalando:"
+msgid "Already existing update medias"
+msgstr "Agarde, por favor"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Preparando para a instalación"
+msgid "Proxy..."
+msgstr "Erro..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Unable to get source packages, sorry. %s"
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to get source packages."
+msgid "United Kingdom"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
+msgid "in names"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation finished"
-msgstr "Instalar"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Do nothing"
-msgstr "Máquina:"
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Use .%s as main file"
+msgid ""
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
 
 #: ../rpmdrake:1
@@ -235,170 +191,180 @@ msgstr ""
 msgid "Remove .%s"
 msgstr "Quitar"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "changes:"
-msgstr "Paquetes"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspecting %s"
-msgstr ""
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, finding available packages..."
+msgid "Finland"
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Please wait, adding medium..."
-msgstr "Agarde, por favor"
-
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
+"The following packages have bad signatures:\n"
 "\n"
-"Then, restart MandrakeUpdate."
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "How to choose manually your mirror"
+msgid "Examining distant file of media `%s'..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
+msgid "Verifying packages signatures..."
 msgstr ""
 
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "France"
+msgstr "Forzar"
+
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "Already existing update sources"
+msgid "More info"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
+"%s\n"
 "\n"
 "Is it ok to continue?"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
+msgid "Reload the packages list"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Fatal error"
+msgid "Choose a mirror..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
+msgid "Some packages can't be installed"
+msgstr "O paquete non se pode instalar"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Preparando para a instalación"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Mandrake Update"
-msgstr "Actualización de Linux-Mandrake"
+msgid "All packages,"
+msgstr "Desinstalando"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of media:"
+msgstr ""
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "in files"
+msgstr "Etiqueta"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Software Packages Removal"
+msgid "All requested packages were installed successfully."
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Quit"
-msgstr "Saír"
+msgid "Proxy hostname:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Local files"
+msgstr "Etiqueta"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Instalar"
+msgid "Inspecting %s"
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Remove"
-msgstr "Impresora remota"
+msgid "Israel"
+msgstr "Instalar"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Help"
 msgstr "Axuda"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search"
-msgstr "Buscar"
+msgid "HTTP server"
+msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Find:"
-msgstr ""
+#, fuzzy, c-format
+msgid "Installation failed"
+msgstr "Instalar"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
-"\n"
-"Is it ok to continue?"
+msgid "Use .%s as main file"
 msgstr ""
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Search results"
+msgstr "Buscar"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid " failed!"
+msgstr "Etiqueta"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some packages need to be removed"
+msgid "Brazil"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
-"\n"
-"Do you really want to install all the selected packages?"
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
+msgid "Find:"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
+msgid "All packages, alphabetical"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Normal information"
-msgstr "Actualización de Linux-Mandrake"
+msgid "Please wait, searching..."
+msgstr "Agarde, por favor"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Update source(s)"
-msgstr "Medio"
+msgid "unknown package "
+msgstr "Non se pode abri-lo paquete"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reload the packages list"
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -406,766 +372,791 @@ msgstr ""
 msgid "Reset the selection"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "in files"
-msgstr "Etiqueta"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "in descriptions"
-msgstr "Descripcións"
-
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "in names"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by source repository"
+msgid "Costa Rica"
 msgstr ""
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr "Preparando para a instalación"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by selection state"
+msgid "Please wait, removing medium..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by size"
+msgid "Password:"
+msgstr "Contrasinal:"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Taiwan"
+msgstr "Localización"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
 msgstr ""
 
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, updating medium..."
+msgstr "Agarde, por favor"
+
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
+msgid "Please wait, listing packages..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "All packages,"
-msgstr "Desinstalando"
+msgid "Information on packages"
+msgstr "Non se pode abri-lo paquete"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
+msgstr "Cancelar"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
+msgid "Everything installed successfully"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
+msgid "Select the media(s) you wish to update:"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Normal updates"
-msgstr "Actualización de Linux-Mandrake"
+msgid "Please wait, updating media..."
+msgstr "Agarde, por favor"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Bugfixes updates"
+msgid "A fatal error occurred: %s."
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Security updates"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Description: "
+msgid "in descriptions"
 msgstr "Descripcións"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure proxies"
+msgstr "Engadir usuario"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Reason for update: "
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Summary: "
-msgstr "Resume"
+msgid "Please choose"
+msgstr "Agarde, por favor"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Importance: "
+msgid "Selected size: %d MB"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "%s KB"
-msgstr ""
+#, fuzzy, c-format
+msgid "Initializing..."
+msgstr "Instalando:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Size: "
-msgstr "Tamaño"
+msgid "Save changes"
+msgstr "Paquetes"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Version: "
+msgid "Error during download"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Name: "
-msgstr "Nome: %s"
+msgid "Package installation..."
+msgstr "Preparando para a instalación"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Currently installed version: "
+msgid "Importance: "
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Source: "
-msgstr "Forzar"
+#, c-format
+msgid ""
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(Not available)"
+msgid "Add..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
+msgid "Unable to create medium."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Files:\n"
+msgid ""
+"The installation is finished; %s.\n"
+"\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected size: %d MB"
+msgid "Browse..."
 msgstr ""
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "O paquete non se pode instalar"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
+msgid "Info..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
+msgid "You need to insert the medium to continue"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
+msgid "Copying file for media `%s'..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr " ten conflictos con %s-%s-%s"
+msgid "Remove"
+msgstr "Impresora remota"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "O paquete non se pode instalar"
+msgid "Preparing packages installation..."
+msgstr "Preparando para a instalación"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
+msgid "by media repository"
+msgstr ""
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to fill up at least the two first entries."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Additional packages needed"
+msgid "Install"
+msgstr "Instalar"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Japan"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "O paquete non se pode instalar"
+msgid "Do nothing"
+msgstr "Máquina:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "No update"
+msgstr "Actualización de Linux-Mandrake"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Description: "
+msgstr "Descripcións"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
 "\n"
+"Do you really want to install all the selected packages?"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Some additional packages need to be removed"
-msgstr ""
+#, fuzzy, c-format
+msgid "Name: "
+msgstr "Nome: %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "More information on package..."
+msgid "Inspect..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Information on packages"
-msgstr "Non se pode abri-lo paquete"
+msgid "Editing media \"%s\":"
+msgstr "Medio"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
-#, c-format
-msgid "More info"
-msgstr ""
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "Preparando para a instalación"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Addable"
-msgstr "Instalar sistema"
+msgid "Australia"
+msgstr "serie"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Upgradable"
-msgstr "Actualización de Linux-Mandrake"
+msgid "Installation finished"
+msgstr "Instalar"
 
 #: ../rpmdrake:1
 #, c-format
-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."
+msgid "by update availability"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "No update"
-msgstr "Actualización de Linux-Mandrake"
+msgid "Poland"
+msgstr "Islandés"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "(none)"
+msgid "Version: "
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, listing packages..."
+msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "unknown package "
-msgstr "Non se pode abri-lo paquete"
+msgid "Upgradable"
+msgstr "Actualización de Linux-Mandrake"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
+msgid " done."
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please choose"
-msgstr "Agarde, por favor"
+msgid "Software Packages Installation"
+msgstr "Preparando para a instalación"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Additional packages needed"
+msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr " ten conflictos con %s-%s-%s"
+#, c-format
+msgid "Bugfixes updates"
+msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Selected"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
-"Seleccionar\n"
-"Todos"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Search results"
-msgstr "Buscar"
+msgid "Germany"
+msgstr "Alemán"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Stop"
-msgstr "Sector"
+msgid "Russia"
+msgstr "Ruso"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Please wait, searching..."
-msgstr "Agarde, por favor"
+msgid "Norway"
+msgstr "Noruegués"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Search results (none)"
-msgstr "Buscar"
+msgid "Problem during installation"
+msgstr "Preparando para a instalación"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Other"
-msgstr "Outros"
+msgid "Search"
+msgstr "Buscar"
 
 #: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Edit a media"
+msgstr "Medio"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Welcome to the packages source editor!\n"
-"\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
+msgid "Czech Republic"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
+msgid ""
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Erro..."
+msgid "Stop"
+msgstr "Sector"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Update..."
+msgid "Update"
 msgstr "Actualización de Linux-Mandrake"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add..."
-msgstr ""
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Edit"
-msgstr ""
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Source"
-msgstr "Forzar"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr ""
+msgid "Please wait, removing packages..."
+msgstr "Agarde, por favor"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Configure sources"
-msgstr "Engadir usuario"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Password:"
-msgstr "Contrasinal:"
+msgid "Normal information"
+msgstr "Actualización de Linux-Mandrake"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "User:"
+msgid "Media: "
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
+msgid "Downloading package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
+msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+msgid "Media"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Configure proxies"
-msgstr "Engadir usuario"
+msgid "Spain"
+msgstr "Español"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, updating medium..."
-msgstr "Agarde, por favor"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr ""
+msgid "Normal updates"
+msgstr "Actualización de Linux-Mandrake"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
+msgid "by selection state"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Save changes"
-msgstr "Paquetes"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "URL:"
+msgid "Login:"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Editing source \"%s\":"
+msgid "Adding a media:"
 msgstr "Medio"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Edit a source"
-msgstr "Medio"
+msgid "Austria"
+msgstr "serie"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing medium..."
+msgid "Fatal error"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Update..."
+msgstr "Actualización de Linux-Mandrake"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
+msgid "Starting download of `%s'..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Adding a source:"
-msgstr "Medio"
+#: ../rpmdrake:1
+#, c-format
+msgid "(none)"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
+"Removing these packages would break your system, sorry:\n"
+"\n"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
+msgid "Installing package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Name:"
-msgstr "Nome"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Login:"
+msgid "Currently installed version: "
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr ""
+msgid "Other"
+msgstr "Outros"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
+msgid "Reason for update: "
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Path or mount point:"
+msgid "Please choose the desired mirror."
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Removable device"
+msgid "Edit"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
+msgid "Please wait, finding available packages..."
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "FTP server"
+msgid "Relative path to synthesis/hdlist:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Path:"
-msgstr "Porto:"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Local files"
-msgstr "Etiqueta"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Add a source"
-msgstr "Medio"
+msgid "Search results (none)"
+msgstr "Buscar"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
+msgid "Danmark"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to create medium."
+msgid "China"
 msgstr ""
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Update"
-msgstr "Actualización de Linux-Mandrake"
-
-#: ../rpmdrake.pm:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
+msgid "United States"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Please wait, updating media..."
-msgstr "Agarde, por favor"
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid " failed!"
-msgstr "Etiqueta"
+msgid "changes:"
+msgstr "Paquetes"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " done."
+msgid "Some additional packages need to be removed"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr ""
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
+msgid "No"
 msgstr ""
 
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure medias"
+msgstr "Engadir usuario"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a media"
+msgstr "Medio"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Summary: "
+msgstr "Resume"
+
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Starting download of `%s'..."
-msgstr ""
+#, fuzzy, c-format
+msgid "Canada"
+msgstr "Canadiano (Québec)"
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr ""
+#, fuzzy, c-format
+msgid "Greece"
+msgstr "Grego"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Examining file of source `%s'..."
+msgid ""
+"There was an error downloading the mirrors list:\n"
+"\n"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Copying file for source `%s'..."
+msgid "Unable to get source packages, sorry. %s"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Please choose the desired mirror."
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Path:"
+msgstr "Porto:"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during removal"
+msgstr "Preparando para a instalación"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Selected"
 msgstr ""
+"Seleccionar\n"
+"Todos"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
+msgid "Netherlands"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Addable"
+msgstr "Instalar sistema"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "No mirror"
+msgid "(Not available)"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"There was an error downloading the mirrors list:\n"
+"Sorry, the following package(s) can't be selected:\n"
 "\n"
 "%s\n"
-"The network, or MandrakeSoft website, are maybe unavailable.\n"
-"Please try again later."
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Error during download"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Not selected"
+msgstr " ten conflictos con %s-%s-%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgid "Software Packages Removal"
 msgstr ""
 
 #: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Sweden"
+msgstr "Mirar"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
 "\n"
-"Is it ok to continue?"
+"\n"
+"Error(s) reported:\n"
+"%s"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United States"
+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.pm:1
 #, c-format
-msgid "China"
+msgid "Examining file of media `%s'..."
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United Kingdom"
+msgid "Download of `%s', speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Taiwan"
-msgstr "Localización"
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Sweden"
-msgstr "Mirar"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Saír"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Russia"
-msgstr "Ruso"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Portugal"
-msgstr "Porto:"
+msgid "Update media(s)"
+msgstr "Medio"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Poland"
-msgstr "Islandés"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "Aceptar"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Norway"
-msgstr "Noruegués"
+msgid "Please wait, adding medium..."
+msgstr "Agarde, por favor"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Netherlands"
+msgid "Unable to get source packages."
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Korea"
-msgstr "Forzar"
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
+msgid "Too many packages are selected"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Italy"
-msgstr "Instalar"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Israel"
-msgstr "Instalar"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Greece"
-msgstr "Grego"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "France"
-msgstr "Forzar"
-
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Finland"
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Spain"
-msgstr "Español"
+msgid "%s conflicts with %s"
+msgstr " ten conflictos con %s-%s-%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Danmark"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Germany"
-msgstr "Alemán"
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
+msgid "Mandrake choices"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
+msgid "Changelog:\n"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Canada"
-msgstr "Canadiano (Québec)"
+msgid "Korea"
+msgstr "Forzar"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Brazil"
+msgid "Removable device"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1173,29 +1164,38 @@ msgstr ""
 msgid "Belgium"
 msgstr "Belga"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Australia"
-msgstr "serie"
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Austria"
-msgstr "serie"
+msgid "Mandrake Update"
+msgstr "Actualización de Linux-Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
+msgid "by size"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
+msgid "FTP server"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Yes"
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
 msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:86
@@ -1473,6 +1473,14 @@ msgstr ""
 msgid "Software Sources Manager"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Source: "
+#~ msgstr "Forzar"
+
+#, fuzzy
+#~ msgid "Source"
+#~ msgstr "Forzar"
+
 #~ msgid "Installing/Upgrading Progress"
 #~ msgstr "Progreso da Instalación/Actualización"
 
diff --git a/po/he.po b/po/he.po
index 7df37daf..197bbea0 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: 2003-04-23 15:21-0400\n"
 "Last-Translator: nadav mavor <nadav@mavor.com>\n"
 "Language-Team:  <C@li.org>\n"
@@ -16,16 +16,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"ה�� להמשיך ?"
+msgid "Enabled?"
+msgstr "מופעל?"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "נתיב �ו נקודת חיבור (mount) : "
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Portugal"
+msgstr "פורטוגל"
 
 #: ../rpmdrake:1
 #, c-format
@@ -44,102 +48,54 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"ברוך בו�ך ל- MandrakeUpdate!\n"
-"\n"
-"כלי זה יעזור לך לבחור �ת העדכוני� שהנך רוצה להתקין על המחשב שלך."
+msgid "by group"
+msgstr "על פי קבוצה"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
-msgstr ""
-"ברוך בו�ך לכלי העזר להסרת חבילות תוכנה!\n"
-"\n"
-"כלי זה יעזור לך לבחור �יזה חבילות �תה רוצה להסיר מהמחשב שלך."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"שגי�ה קרתה בעת התקנת החבילות:\n"
-"\n"
-"%s"
+msgid "Name:"
+msgstr "ש�:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Problem during removal"
-msgstr "בעיה בזמן ההסרה"
+msgid "Italy"
+msgstr "�יטליה"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "נ� להמתין בעת הסרת החבילות..."
+msgid "How to choose manually your mirror"
+msgstr "�יך לבחור �ת �תר המר�ה ב�ופן ידני"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "נ� להמתין בעת קרי�ת מסד הנתוני� של החבילות..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"שגי�ה קרתה בעת התקנת החבילות:\n"
-"\n"
-"%s"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "מימשק HTTP נכשל\n"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "מכין חבילות להתקנה..."
+msgid "URL:"
+msgstr "כתובת (URL):"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "מכין חבילות להתקנה..."
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "מספר חבילות צריכות להמחק"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "כל החבילות המבוקשות הותקנו בהצלחה."
+msgid "More information on package..."
+msgstr "עוד מידע על החבילות..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "הכל הותקן בהצלחה."
+msgid "Yes"
+msgstr "כן"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
 msgstr ""
-"ההתקנה הסתיימה; %s.\n"
+"בחירת החבילה �ו החבילות הב�ות יבוטל כעת עקב תלויות\n"
+"\n"
 "\n"
-"כמה קבצי תצורה נוצרו בש�, `.rpmnew' �ו `.rpmsave'\n"
-"יש ב�פשרותך לעיין בה� בכדי להשלי� �ת עדכון המערכת שלך:"
 
 #: ../rpmdrake:1
 #, c-format
@@ -147,460 +103,451 @@ msgid "everything was installed correctly"
 msgstr "הכל הותקן בצורה תקינה."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "התגלו בעיות תוך כדי ההתקנה"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "מתקין �ת החבילה %s' (%s/%s)"
+msgid "%s KB"
+msgstr "%s KB"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "מכין חבילות להתקנה..."
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"יש ב�פשרותך לבחור �ת �תר המר�ה המבוקש ב�ופן ידני. לצורך זה,\n"
+"יש להפעיל �ת היישו� \"מנהל מ�גרי תוכנה\", ולהוסיף �ת מ�גר התוכנה\n"
+"'עדכוני �בטחה'.\n"
+"\n"
+"ל�חר מכן, יש להריץ מחדש �ת MandrakeUpdate."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
+"Welcome to the software removal tool!\n"
 "\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
 msgstr ""
+"ברוך בו�ך לכלי העזר להסרת חבילות תוכנה!\n"
 "\n"
-"\n"
-"דוח שגי�ות:\n"
-"%s"
+"כלי זה יעזור לך לבחור �יזה חבילות �תה רוצה להסיר מהמחשב שלך."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"ההתקנה נכשלה, כמה קבצי� חסרי�.\n"
-"יתכן שעלייך לעדכן �ת בסיס הנתוני� של מ�גרי התוכנה."
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "בכדי לשמור �ת השינויי�, עליך להכניס �ת המדיה �ל הכונן."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "שמירה ויצי�ה"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
+"There was a problem during the removal of packages:\n"
 "\n"
-"Do you want to continue installation?"
+"%s"
 msgstr ""
-"החבילות הב�ות יוסרו על מנת ל�פשר שדרוג של חבילות �חרות:\n"
-"\n"
-"%s\n"
+"שגי�ה קרתה בעת התקנת החבילות:\n"
 "\n"
-"ה�� להמשיך ?"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "מוריד �ת החבילה %s' (%s/%s)"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Cancel"
-msgstr "ביטול"
+msgid "Size: "
+msgstr "גודל : "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Ok"
-msgstr "�ישור"
+msgid "Security updates"
+msgstr "עדכוני �בטחה"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "נ� להכניס �ת המדיה בש� \"%s\" להתקן [%s]"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Change medium"
-msgstr "החלפת מדיה"
+msgid "Already existing update medias"
+msgstr "כבר קיי� מקור לעידקוני�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "מ�תחל..."
+msgid "Maximum information"
+msgstr "מידע מירבי"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "מכין חבילות להתקנה..."
+msgid "Proxy..."
+msgstr "שגי�ה..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "צר לי, רק משתמש על יכול להתקין חבילות."
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Unable to get source packages."
-msgstr "ייבו� חבילות מהמ�גר �ינו �פשרי"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspect..."
-msgstr "בחינה ...."
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
+msgstr ""
+"ההתקנה נכשלה, כמה קבצי� חסרי�.\n"
+"יתכן שעלייך לעדכן �ת בסיס הנתוני� של מ�גרי התוכנה."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Installation finished"
-msgstr "ההתקנה נגמרה"
+msgid "United Kingdom"
+msgstr "בריטניה"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "ל� לעשות כלו�"
+msgid "in names"
+msgstr "בשמות"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "שימוש ב .%s כקובץ ר�שי"
+msgid ""
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
+msgstr ""
+"�ין �פשרות למצו� �תר מת�י�.\n"
+"\n"
+"ישנן מספר סיבות �פשריות לבעיה מעין זו, שהנפוצה בהן הי� ש�רכיטקטורת\n"
+"המעבד הר�שי במחשב שלך ל� נתמכת על-ידי העדכוני� הרשמיי� של מנדרייק\n"
+"לינוקס."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Remove .%s"
 msgstr "הסרת .%s"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "changes:"
-msgstr "שינויי�:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspecting %s"
-msgstr "בחינת %s"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Please wait, finding available packages..."
-msgstr "נ� להמתין בעת חיפוש חבילות זמינות..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "נ� להמתין בעת הוספת המ�גר..."
+msgid "Finland"
+msgstr "פינלנד"
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
+"The following packages have bad signatures:\n"
 "\n"
-"Then, restart MandrakeUpdate."
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"יש ב�פשרותך לבחור �ת �תר המר�ה המבוקש ב�ופן ידני. לצורך זה,\n"
-"יש להפעיל �ת היישו� \"מנהל מ�גרי תוכנה\", ולהוסיף �ת מ�גר התוכנה\n"
-"'עדכוני �בטחה'.\n"
+"החבילות הב�ות יוסרו על מנת ל�פשר שדרוג של חבילות �חרות:\n"
 "\n"
-"ל�חר מכן, יש להריץ מחדש �ת MandrakeUpdate."
+"%s\n"
+"\n"
+"ה�� להמשיך ?"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "How to choose manually your mirror"
-msgstr "�יך לבחור �ת �תר המר�ה ב�ופן ידני"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Examining distant file of media `%s'..."
+msgstr "בחינת קובץ מרוחק במ�גר `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
+msgid "Verifying packages signatures..."
 msgstr ""
-"יש לך לפחות מקור �חד לעידקוני� ,�בל\n"
-"כול המקורות כרגע מבוטלי� �תה צריך להריץ �ת מנהל \n"
-"מקורות עידקוני� ל�פשר לפחות מקור �חד (תבדוק �ת העמודה של �ישור )\n"
-"ו�ז התחל �ת מנהל העידקוני�"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Already existing update sources"
-msgstr "כבר קיי� מקור לעידקוני�"
+msgid "France"
+msgstr "צרפת"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
+msgid "More info"
+msgstr "עוד מידע "
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
+"%s\n"
 "\n"
 "Is it ok to continue?"
 msgstr ""
-"יש צורך להתחבר לשרת על מנת לייב� �ת החבילות המעודכנות.\n"
-"נ� לבדוק שהמחשב שלך מחובר לרשת.\n"
+"%s\n"
 "\n"
-"ה�� ניתן להמשיך?"
+"ה�� להמשיך ?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr "שגי�ה חמורה קרתה : %s."
+msgid "Reload the packages list"
+msgstr "טעינה מחדש של רשימת החבילות"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "בחירת �תר מר�ה..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Fatal error"
-msgstr "שגי�ה בקובץ"
+msgid "Some packages can't be installed"
+msgstr "�ין �פשרות להתקין �ת החבילה '%s'\n"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
+msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "מכין חבילות להתקנה..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "עדכון מנדרייק"
+msgid "All packages,"
+msgstr "כל החבילות,"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Software Packages Removal"
-msgstr "הסרת חבילות תוכנה"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Type of media:"
+msgstr "סוג המ�גר:"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Quit"
-msgstr "יצי�ה"
+msgid "in files"
+msgstr "בקבצי�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "התקנה"
+msgid "All requested packages were installed successfully."
+msgstr "כל החבילות המבוקשות הותקנו בהצלחה."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove"
-msgstr "הסרה"
+msgid "Proxy hostname:"
+msgstr "ש� המחשב המ�רח של השרת המתווך:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Help"
-msgstr "עזרה"
+msgid "Local files"
+msgstr "קבצי� מקומיי�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search"
-msgstr "חיפוש"
+msgid "Inspecting %s"
+msgstr "בחינת %s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Find:"
-msgstr "חיפוש:"
+msgid "Israel"
+msgstr "ישר�ל"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"החבילות הב�ות יוסרו על מנת ל�פשר שדרוג של חבילות �חרות:\n"
-"\n"
-"%s\n"
-"\n"
-"ה�� להמשיך ?"
+msgid "Help"
+msgstr "עזרה"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "מספר חבילות צריכות להמחק"
+msgid "HTTP server"
+msgstr "שרת HTTP"
 
 #: ../rpmdrake:1
-#, c-format
-msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
-"\n"
-"Do you really want to install all the selected packages?"
-msgstr ""
-"�זהרה! נר�ה שכמות החבילות שנדרש להתקין עלול לגרו�\n"
-"לכך שהכונן הקשיח יתמל� לחלוטין; מצב מסוכן במיוחד \n"
-"בעת התקנת חבילות שיש להימנע ממנו.\n"
-"\n"
-"ה�� �כן ברצונך להתקין �ת כל החבילות שבחרת ?"
+#, fuzzy, c-format
+msgid "Installation failed"
+msgstr "מימשק HTTP נכשל\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "נבחרו יותר מידי חבילות"
+msgid "Use .%s as main file"
+msgstr "שימוש ב .%s כקובץ ר�שי"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "מידע מירבי"
+msgid "Search results"
+msgstr "תוצ�ות חיפוש"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Normal information"
-msgstr "מידע רגיל"
+msgid " failed!"
+msgstr " נכשל!"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Update source(s)"
-msgstr "עדכון מ�גר/י�"
+msgid "Brazil"
+msgstr "ברזיל"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "טעינה מחדש של רשימת החבילות"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"כבר יש מ�גר בש� זה, ה�� ברצונך \n"
+"להחליף �ותו ?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "�יפוס הבחירה"
+msgid "Find:"
+msgstr "חיפוש:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "בקבצי�"
+msgid "All packages, alphabetical"
+msgstr "כל החבילות, �לפבתי"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "בתי�ורי�"
+msgid "Please wait, searching..."
+msgstr "נ� להמתין בעת החיפוש..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "בשמות"
+msgid "Please wait, reading packages database..."
+msgstr "נ� להמתין בעת קרי�ת מסד הנתוני� של החבילות..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by update availability"
-msgstr "על פי נגישות עדכון"
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "ל� יכול לפתוח �ת החבילה '%s'\n"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by source repository"
-msgstr "לפי מ�גר התוכנה"
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "נ� להכניס �ת המדיה בש� \"%s\" להתקן [%s]"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by selection state"
-msgstr "על פי מצב בחירה"
+msgid "Reset the selection"
+msgstr "�יפוס הבחירה"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by size"
-msgstr "על פי גודל"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"�� נדרשת הגדרת שרת מתווך, יש להגדיר �ת ש� המחשב המ�רח וממשק (port) �ופציונלי "
+"(תחביר: <proxyhost[:port]>):"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-msgstr "על פי קבוצה"
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
+"החבילות הב�ות צריכות להימחק בגלל התלויות שלהן:\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "All packages,"
-msgstr "כל החבילות,"
+msgid "Costa Rica"
+msgstr "קוסטה-ריקו"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "All packages, alphabetical"
-msgstr "כל החבילות, �לפבתי"
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"שגי�ה קרתה בעת התקנת החבילות:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "בחירות מנדרייק"
+msgid "Please wait, removing medium..."
+msgstr "נ� להמתין בעת הסרת המ�גר..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
-msgstr "עדכוני� רגילי�"
+msgid "Password:"
+msgstr "סיסמה:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "תיקוני ב�גי�"
+msgid "Taiwan"
+msgstr "טיוו�ן"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Security updates"
-msgstr "עדכוני �בטחה"
+msgid "User:"
+msgstr "משתמש: "
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Description: "
-msgstr "תי�ור: "
+msgid "Please wait, updating medium..."
+msgstr "נ� להמתין בעת עדכון המ�גר..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reason for update: "
-msgstr "סיבת העדכון: "
+msgid "Please wait, listing packages..."
+msgstr "נ� להמתין בעת הכנת רשימת חבילות..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Summary: "
-msgstr "סיכו�:"
+msgid "Information on packages"
+msgstr "מידע על החבילות"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Importance: "
-msgstr "חשיבות : "
+msgid "Cancel"
+msgstr "ביטול"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Everything installed successfully"
+msgstr "הכל הותקן בהצלחה."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Size: "
-msgstr "גודל : "
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Select the media(s) you wish to update:"
+msgstr "נ� לבחור �ת המ�גרי� �ות� ברצונך לעדכן:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Version: "
-msgstr "גרסה: "
+msgid "Please wait, updating media..."
+msgstr "נ� להמתין בעת עדכון המ�גר..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "ש�: "
+msgid "A fatal error occurred: %s."
+msgstr "שגי�ה חמורה קרתה : %s."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "הגירסה המותקנת כרגע: "
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"החבילות הב�ות יוסרו על מנת ל�פשר שדרוג של חבילות �חרות:\n"
+"\n"
+"%s\n"
+"\n"
+"ה�� להמשיך ?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Source: "
-msgstr "מ�גר: "
+msgid "in descriptions"
+msgstr "בתי�ורי�"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(Not available)"
-msgstr "(ל�-זמין)"
+msgid "Configure proxies"
+msgstr "הגדרת שרתי� מתווכי�"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "רשימת שינויי�:\n"
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"יש צורך להתחבר ל�תר MandrakeSoft על מנת לייב� �ת רשימת �תרי המר�ה.\n"
+"נ� לבדוק שהמחשב שלך מחובר לרשת.\n"
+"\n"
+"ה�� ניתן להמשיך?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Files:\n"
-msgstr "קבצי�:\n"
+msgid "Please choose"
+msgstr "נ� לבחור"
 
 #: ../rpmdrake:1
 #, c-format
@@ -609,48 +556,28 @@ msgstr "גודל נבחר: %d MB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "גודל נבחר : %d MB /מקו� פנוי : %d MB"
+msgid "Initializing..."
+msgstr "מ�תחל..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
-msgstr ""
-"בחירת החבילה �ו החבילות הב�ות יבוטל כעת עקב תלויות\n"
-"\n"
-"\n"
+msgid "Save changes"
+msgstr "שמירת שינויי�"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr ""
-"מצטער, �ין ב�פשרותך לבחור �ת החבילה �ו החבילות הב�ות:\n"
-"\n"
-"%s\n"
-"\n"
-"הסיבות:\n"
-"\n"
-"%s"
+msgid "Error during download"
+msgstr "שגי�ה בזמן הורדה"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "סתירה ע�"
+msgid "Package installation..."
+msgstr "מכין חבילות להתקנה..."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "�ין �פשרות להתקין �ת החבילה '%s'\n"
+#, c-format
+msgid "Importance: "
+msgstr "חשיבות : "
 
 #: ../rpmdrake:1
 #, c-format
@@ -663,310 +590,309 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "חבילות נוספות נדרשות"
+msgid "Add..."
+msgstr "הוספה..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "�ין �פשרות להתקין �ת החבילה '%s'\n"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "הגדרת המ�גר נכשלה."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Removing these packages would break your system, sorry:\n"
+"The installation is finished; %s.\n"
 "\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
 msgstr ""
-"הסרת החבילות הב�ות, תהרוס לך �ת המערכת. מצטער: \n"
+"ההתקנה הסתיימה; %s.\n"
 "\n"
+"כמה קבצי תצורה נוצרו בש�, `.rpmnew' �ו `.rpmsave'\n"
+"יש ב�פשרותך לעיין בה� בכדי להשלי� �ת עדכון המערכת שלך:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"החבילות הב�ות צריכות להימחק בגלל התלויות שלהן:\n"
-"\n"
+msgid "Browse..."
+msgstr "דפדוף..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "�ין �פשרות להתקין �ת החבילה '%s'\n"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "יש להסיר מספר חבילות נוספות"
+msgid "Info..."
+msgstr "מידע..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "More information on package..."
-msgstr "עוד מידע על החבילות..."
+msgid "You need to insert the medium to continue"
+msgstr "עליך להכניס �ת המדיה בכדי להמשיך."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Copying file for media `%s'..."
+msgstr "העתקת קובץ מהמ�גר `%s'..."
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Information on packages"
-msgstr "מידע על החבילות"
+msgid "Remove"
+msgstr "הסרה"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
-#, c-format
-msgid "More info"
-msgstr "עוד מידע "
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "מכין חבילות להתקנה..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "by media repository"
+msgstr "לפי מ�גר התוכנה"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "בעלות יכולות הוספה"
+msgid "No mirror"
+msgstr "�ין שרת"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Upgradable"
-msgstr "בעלות יכולת שדרוג"
+msgid "You need to fill up at least the two first entries."
+msgstr "עליך למל� לפחות �ת שתי הכניסות הר�שונות."
 
 #: ../rpmdrake:1
 #, c-format
-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 ""
-"רשימת העידכוני� ריקה. מצב זה יכול לקרות ב��\n"
-"�ין עדכוני� זמיני� עבור החבילות המותקנות במחשבך,\n"
-"�ו שכבר התקנת �ת כל העידכוני�."
+msgid "Install"
+msgstr "התקנה"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "No update"
-msgstr "ל� לעדכן"
+msgid "Japan"
+msgstr "יפן"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "(none)"
-msgstr "(כלו�)"
+msgid "Do nothing"
+msgstr "ל� לעשות כלו�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "נ� להמתין בעת הכנת רשימת חבילות..."
+msgid "No update"
+msgstr "ל� לעדכן"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "ל� יכול לפתוח �ת החבילה '%s'\n"
+#, c-format
+msgid "Description: "
+msgstr "תי�ור: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "�חת החבילות הב�ות דרושה:"
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr ""
+"�זהרה! נר�ה שכמות החבילות שנדרש להתקין עלול לגרו�\n"
+"לכך שהכונן הקשיח יתמל� לחלוטין; מצב מסוכן במיוחד \n"
+"בעת התקנת חבילות שיש להימנע ממנו.\n"
+"\n"
+"ה�� �כן ברצונך להתקין �ת כל החבילות שבחרת ?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "נ� לבחור"
+msgid "Name: "
+msgstr "ש�: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Inspect..."
+msgstr "בחינה ...."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Not selected"
-msgstr "התגלו סתירות"
+msgid "Editing media \"%s\":"
+msgstr "עריכת מ�גר \"%s\":"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Selected"
-msgstr "נבחרה"
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "מכין חבילות להתקנה..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results"
-msgstr "תוצ�ות חיפוש"
+msgid "Australia"
+msgstr "�וסטרליה"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Stop"
-msgstr "עצירה"
+msgid "Installation finished"
+msgstr "ההתקנה נגמרה"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "נ� להמתין בעת החיפוש..."
+msgid "by update availability"
+msgstr "על פי נגישות עדכון"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results (none)"
-msgstr "תוצ�ות חיפוש (כלו�)"
+msgid "Poland"
+msgstr "פולין"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Other"
-msgstr "�חר"
+msgid "Version: "
+msgstr "גרסה: "
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the packages source editor!\n"
-"\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
-msgstr ""
-"ברוך בו�ך ל\"עורך מקורות התוכנה\"\n"
-"\n"
-"כלי זה יעזור לך להגדיר �ת מ�גרי התוכנה להתקנת חבילות שבהן ברצונך להשתמש\n"
-"במחשב זה. מ�גרי� �לו ישמשו להתקנת חבילות תוכנה חדשות �ו על-מנת לעדכן\n"
-"�ת המערכת."
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "ב�פשרותך לספק ש� מישתמש/סיסמה לצורך הזדהות בשרת המתווך:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
-msgstr "שמירה ויצי�ה"
+msgid "Upgradable"
+msgstr "בעלות יכולת שדרוג"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid " done."
+msgstr " סיו�."
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "שגי�ה..."
+msgid "Software Packages Installation"
+msgstr "מכין חבילות להתקנה..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Update..."
-msgstr "עדכון..."
+msgid "Additional packages needed"
+msgstr "חבילות נוספות נדרשות"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "הוספה..."
+msgid "Bugfixes updates"
+msgstr "תיקוני ב�גי�"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "עריכה"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "הורדה של `%s', זמן נותר:%s, במהירות: %s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Source"
-msgstr "מ�גר"
+msgid "Germany"
+msgstr "גרמניה"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Enabled?"
-msgstr "מופעל?"
+msgid "Russia"
+msgstr "רוסיה"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Configure sources"
-msgstr "הגדרת מ�גרי�"
+msgid "Norway"
+msgstr "נורווגיה"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Password:"
-msgstr "סיסמה:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during installation"
+msgstr "התגלו בעיות תוך כדי ההתקנה"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "User:"
-msgstr "משתמש: "
+msgid "Search"
+msgstr "חיפוש"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "ב�פשרותך לספק ש� מישתמש/סיסמה לצורך הזדהות בשרת המתווך:"
+#, fuzzy, c-format
+msgid "Edit a media"
+msgstr "עריכת מ�גר"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "ש� המחשב המ�רח של השרת המתווך:"
+msgid "Czech Republic"
+msgstr "הרפובליקה הצ'כית"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
+#: ../rpmdrake:1
+#, fuzzy, c-format
 msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"�� נדרשת הגדרת שרת מתווך, יש להגדיר �ת ש� המחשב המ�רח וממשק (port) �ופציונלי "
-"(תחביר: <proxyhost[:port]>):"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure proxies"
-msgstr "הגדרת שרתי� מתווכי�"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Please wait, updating medium..."
-msgstr "נ� להמתין בעת עדכון המ�גר..."
+"יש לך לפחות מקור �חד לעידקוני� ,�בל\n"
+"כול המקורות כרגע מבוטלי� �תה צריך להריץ �ת מנהל \n"
+"מקורות עידקוני� ל�פשר לפחות מקור �חד (תבדוק �ת העמודה של �ישור )\n"
+"ו�ז התחל �ת מנהל העידקוני�"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "בכדי לשמור �ת השינויי�, עליך להכניס �ת המדיה �ל הכונן."
+msgid "Stop"
+msgstr "עצירה"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "עליך להכניס �ת המדיה בכדי להמשיך."
+msgid "Update"
+msgstr "עדכון"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "שמירת שינויי�"
+msgid "Please wait, removing packages..."
+msgstr "נ� להמתין בעת הסרת החבילות..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "הנתיב לקובץ synthesis/hdlist:"
+msgid "Normal information"
+msgstr "מידע רגיל"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "כתובת (URL):"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "עריכת מ�גר \"%s\":"
+msgid "Media: "
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Edit a source"
-msgstr "עריכת מ�גר"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "מוריד �ת החבילה %s' (%s/%s)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "נ� להמתין בעת הסרת המ�גר..."
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "גודל נבחר : %d MB /מקו� פנוי : %d MB"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Type of source:"
-msgstr "סוג המ�גר:"
+msgid "Media"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Adding a source:"
-msgstr "הוספת מ�גר: "
+msgid "Spain"
+msgstr "ספרד"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
-msgstr ""
-"כבר יש מ�גר בש� זה, ה�� ברצונך \n"
-"להחליף �ותו ?"
+msgid "Normal updates"
+msgstr "עדכוני� רגילי�"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "עליך למל� לפחות �ת שתי הכניסות הר�שונות."
+msgid "by selection state"
+msgstr "על פי מצב בחירה"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Name:"
-msgstr "ש�:"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr " נ� להמתין בעת הורדת כתובות �תרי מר�ה מ�תר MandrakeSoft"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -974,147 +900,148 @@ msgid "Login:"
 msgstr "ש� מישתמש:"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Choose a mirror..."
-msgstr "בחירת �תר מר�ה..."
+#, fuzzy, c-format
+msgid "Adding a media:"
+msgstr "הוספת מ�גר: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Browse..."
-msgstr "דפדוף..."
+msgid "Austria"
+msgstr "�וסטריה"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Path or mount point:"
-msgstr "נתיב �ו נקודת חיבור (mount) : "
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Fatal error"
+msgstr "שגי�ה בקובץ"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Removable device"
-msgstr "התקן ניתן להסרה"
+msgid "Update..."
+msgstr "עדכון..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "בודק חות� זיהוי של '%s'..."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "שרת HTTP"
+msgid "(none)"
+msgstr "(כלו�)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "FTP server"
-msgstr "שרת FTP"
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
+"הסרת החבילות הב�ות, תהרוס לך �ת המערכת. מצטער: \n"
+"\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Path:"
-msgstr "נתיב:"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "מתקין �ת החבילה %s' (%s/%s)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "קבצי� מקומיי�"
+msgid "Currently installed version: "
+msgstr "הגירסה המותקנת כרגע: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add a source"
-msgstr "הוספת מ�גר"
+msgid "Other"
+msgstr "�חר"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr ""
-"עדכון המ�גר נכשל, מ�גר זה ינוטרל ב�ופן �וטומטי.\n"
-"\n"
-"שגי�ות:\n"
-"%s"
+msgid "Reason for update: "
+msgstr "סיבת העדכון: "
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to create medium."
-msgstr "הגדרת המ�גר נכשלה."
+msgid "Please choose the desired mirror."
+msgstr "נ� לבחור �ת השרת �ליו ברצונך להתחבר."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "עדכון"
+msgid "Edit"
+msgstr "עריכה"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "נ� לבחור �ת המ�גרי� �ות� ברצונך לעדכן:"
+msgid "Please wait, finding available packages..."
+msgstr "נ� להמתין בעת חיפוש חבילות זמינות..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "נ� להמתין בעת עדכון המ�גר..."
+msgid "Relative path to synthesis/hdlist:"
+msgstr "הנתיב לקובץ synthesis/hdlist:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " failed!"
-msgstr " נכשל!"
+msgid "Search results (none)"
+msgstr "תוצ�ות חיפוש (כלו�)"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid " done."
-msgstr " סיו�."
+msgid "Danmark"
+msgstr "דנמרק"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "הורדה של `%s' במהירות: %s"
+msgid "China"
+msgstr "סין"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "הורדה של `%s', זמן נותר:%s, במהירות: %s"
+msgid "United States"
+msgstr "�רה\"ב"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "בודק חות� זיהוי של '%s'..."
+#: ../rpmdrake:1
+#, c-format
+msgid "changes:"
+msgstr "שינויי�:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "בחינת קובץ מרוחק במ�גר `%s'..."
+msgid "Some additional packages need to be removed"
+msgstr "יש להסיר מספר חבילות נוספות"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "בחינת קובץ במ�גר `%s'..."
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "העתקת קובץ מהמ�גר `%s'..."
+msgid "No"
+msgstr "ל�"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure medias"
+msgstr "הגדרת מ�גרי�"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a media"
+msgstr "הוספת מ�גר"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Please choose the desired mirror."
-msgstr "נ� לבחור �ת השרת �ליו ברצונך להתחבר."
+msgid "Summary: "
+msgstr "סיכו�:"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
-msgstr ""
-"�ין �פשרות למצו� �תר מת�י�.\n"
-"\n"
-"ישנן מספר סיבות �פשריות לבעיה מעין זו, שהנפוצה בהן הי� ש�רכיטקטורת\n"
-"המעבד הר�שי במחשב שלך ל� נתמכת על-ידי העדכוני� הרשמיי� של מנדרייק\n"
-"לינוקס."
+msgid "Canada"
+msgstr "קנדה"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No mirror"
-msgstr "�ין שרת"
+msgid "Greece"
+msgstr "יוון"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1131,178 +1058,251 @@ msgstr ""
 "יתכן והרשת, �ו ה�תר של MandrakeSoft �ינ� זמיני�.\n"
 "נ� לנסות שוב מ�וחר יותר."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr "צר לי, רק משתמש על יכול להתקין חבילות."
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Error during download"
-msgstr "שגי�ה בזמן הורדה"
+msgid "Path:"
+msgstr "נתיב:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr " נ� להמתין בעת הורדת כתובות �תרי מר�ה מ�תר MandrakeSoft"
+msgid "Problem during removal"
+msgstr "בעיה בזמן ההסרה"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"יש צורך להתחבר ל�תר MandrakeSoft על מנת לייב� �ת רשימת �תרי המר�ה.\n"
-"נ� לבדוק שהמחשב שלך מחובר לרשת.\n"
-"\n"
-"ה�� ניתן להמשיך?"
+msgid "Selected"
+msgstr "נבחרה"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United States"
-msgstr "�רה\"ב"
+msgid "Netherlands"
+msgstr "הולנד"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "China"
-msgstr "סין"
+msgid "Addable"
+msgstr "בעלות יכולות הוספה"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "בריטניה"
+msgid "(Not available)"
+msgstr "(ל�-זמין)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "טיוו�ן"
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
+msgstr ""
+"מצטער, �ין ב�פשרותך לבחור �ת החבילה �ו החבילות הב�ות:\n"
+"\n"
+"%s\n"
+"\n"
+"הסיבות:\n"
+"\n"
+"%s"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Not selected"
+msgstr "התגלו סתירות"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
+msgstr "הסרת חבילות תוכנה"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Sweden"
 msgstr "שוודיה"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Russia"
-msgstr "רוסיה"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
+msgstr ""
+"\n"
+"\n"
+"דוח שגי�ות:\n"
+"%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Portugal"
-msgstr "פורטוגל"
+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 ""
+"רשימת העידכוני� ריקה. מצב זה יכול לקרות ב��\n"
+"�ין עדכוני� זמיני� עבור החבילות המותקנות במחשבך,\n"
+"�ו שכבר התקנת �ת כל העידכוני�."
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Poland"
-msgstr "פולין"
+#, fuzzy, c-format
+msgid "Examining file of media `%s'..."
+msgstr "בחינת קובץ במ�גר `%s'..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Norway"
-msgstr "נורווגיה"
+msgid "Download of `%s', speed:%s"
+msgstr "הורדה של `%s' במהירות: %s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Netherlands"
-msgstr "הולנד"
+msgid "One of the following packages is needed:"
+msgstr "�חת החבילות הב�ות דרושה:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Korea"
-msgstr "קורי�ה"
+msgid "Quit"
+msgstr "יצי�ה"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "יפן"
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"יש צורך להתחבר לשרת על מנת לייב� �ת החבילות המעודכנות.\n"
+"נ� לבדוק שהמחשב שלך מחובר לרשת.\n"
+"\n"
+"ה�� ניתן להמשיך?"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Italy"
-msgstr "�יטליה"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update media(s)"
+msgstr "עדכון מ�גר/י�"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Israel"
-msgstr "ישר�ל"
+msgid "Ok"
+msgstr "�ישור"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Greece"
-msgstr "יוון"
+msgid "Please wait, adding medium..."
+msgstr "נ� להמתין בעת הוספת המ�גר..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "France"
-msgstr "צרפת"
+msgid "Unable to get source packages."
+msgstr "ייבו� חבילות מהמ�גר �ינו �פשרי"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "פינלנד"
+msgid "Too many packages are selected"
+msgstr "נבחרו יותר מידי חבילות"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Spain"
-msgstr "ספרד"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"ברוך בו�ך ל\"עורך מקורות התוכנה\"\n"
+"\n"
+"כלי זה יעזור לך להגדיר �ת מ�גרי התוכנה להתקנת חבילות שבהן ברצונך להשתמש\n"
+"במחשב זה. מ�גרי� �לו ישמשו להתקנת חבילות תוכנה חדשות �ו על-מנת לעדכן\n"
+"�ת המערכת."
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Danmark"
-msgstr "דנמרק"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
+msgstr "סתירה ע�"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "גרמניה"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"ברוך בו�ך ל- MandrakeUpdate!\n"
+"\n"
+"כלי זה יעזור לך לבחור �ת העדכוני� שהנך רוצה להתקין על המחשב שלך."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
-msgstr "הרפובליקה הצ'כית"
+msgid "Mandrake choices"
+msgstr "בחירות מנדרייק"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "קוסטה-ריקו"
+msgid "Changelog:\n"
+msgstr "רשימת שינויי�:\n"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "קנדה"
+msgid "Korea"
+msgstr "קורי�ה"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Brazil"
-msgstr "ברזיל"
+msgid "Removable device"
+msgstr "התקן ניתן להסרה"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "בלגיה"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "�וסטרליה"
+msgid "Change medium"
+msgstr "החלפת מדיה"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "�וסטריה"
+msgid "Mandrake Update"
+msgstr "עדכון מנדרייק"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
-msgstr "מידע..."
+msgid "by size"
+msgstr "על פי גודל"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "ל�"
+msgid "FTP server"
+msgstr "שרת FTP"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "קבצי�:\n"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Yes"
-msgstr "כן"
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr ""
+"עדכון המ�גר נכשל, מ�גר זה ינוטרל ב�ופן �וטומטי.\n"
+"\n"
+"שגי�ות:\n"
+"%s"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -1574,6 +1574,12 @@ msgstr "הסרת תוכנה"
 msgid "Software Sources Manager"
 msgstr "ניהול מקורות תוכנה"
 
+#~ msgid "Source: "
+#~ msgstr "מ�גר: "
+
+#~ msgid "Source"
+#~ msgstr "מ�גר"
+
 #~ msgid ""
 #~ "some packages failed to install\n"
 #~ "correctly"
diff --git a/po/hr.po b/po/hr.po
index b9c2f715..ddd456ae 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: Fri Apr 21 2000 17:32:14+0200\n"
 "Last-Translator: Vlatko Kosturjak <kost@iname.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -14,14 +14,21 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KTranslator v 0.5.0\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
+msgid "Enabled?"
 msgstr ""
 
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Path or mount point:"
+msgstr "putanja ili mjesto za montiranje: "
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Portugal"
+msgstr "Port:"
+
 #: ../rpmdrake:1
 #, c-format
 msgid ""
@@ -34,128 +41,163 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
+msgid "by group"
 msgstr ""
 
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Name:"
+msgstr "Ime"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Italy"
+msgstr "Instaliraj"
+
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
+msgid "How to choose manually your mirror"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr "Pripremam se za instalaciju"
+msgid "URL:"
+msgstr "URL: "
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during removal"
-msgstr "Dogodili su se problemi prilikom instalacije"
+#, c-format
+msgid "Some packages need to be removed"
+msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, removing packages..."
+#, c-format
+msgid "More information on package..."
 msgstr ""
-"Molimo prièekajte\n"
-"Sortiram pakete"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, reading packages database..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
 msgstr ""
-"Molimo prièekajte\n"
-"Sortiram pakete"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"There was a problem during the installation:\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"%s"
-msgstr "Pripremam se za instalaciju"
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Instaliraj sve"
+msgid "everything was installed correctly"
+msgstr "Paket je veæ instaliran"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Pripremam se za instalaciju"
+msgid "%s KB"
+msgstr "%.1f KB"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Pripremam se za instalaciju"
+#, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
+msgid ""
+"Welcome to the software removal tool!\n"
+"\n"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Everything installed successfully"
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
+msgid "Save and quit"
+msgstr ""
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"There was a problem during the removal of packages:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
-msgstr ""
+"%s"
+msgstr "Pripremam se za instalaciju"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "everything was installed correctly"
-msgstr "Paket je veæ instaliran"
+msgid "Size: "
+msgstr "Velièina"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Security updates"
+msgstr "Prika¾i sigurnosne nadogradnje"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Dogodili su se problemi prilikom instalacije"
+msgid "Already existing update medias"
+msgstr "Provjeravam ovisnosti..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
+msgid "Maximum information"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Pripremam se za instalaciju"
+msgid "Proxy..."
+msgstr "Gre¹ka..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
 msgstr ""
 
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr "Ujedinjeno Kraljevstvo"
+
 #: ../rpmdrake:1
 #, c-format
+msgid "in names"
+msgstr ""
+
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Remove .%s"
+msgstr "Prenosivi medij"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Finland"
+msgstr "Pronaði:"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -165,70 +207,109 @@ msgid ""
 "Do you want to continue installation?"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Verifying packages signatures..."
+msgid "Examining distant file of media `%s'..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
+msgid "Verifying packages signatures..."
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Cancel"
-msgstr "Odustani"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Ok"
-msgstr "U Redu"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "France"
+msgstr "Prisili"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+msgid "More info"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Change medium"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Initializing..."
-msgstr "Instaliram:"
+msgid "Reload the packages list"
+msgstr "Paket %s nije potpisan"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Choose a mirror..."
+msgstr "Izaberite mirror:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Package installation..."
+msgid "Some packages can't be installed"
+msgstr "Nisam u stanju instalirati paket"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Pripremam se za instalaciju"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Lo¹i, neèitljivi ili nisu pronaðeni paketi"
+msgid "All packages,"
+msgstr "0 paketa, 0 byte-ova"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Type of media:"
+msgstr "Tip izvora:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unable to get source packages."
-msgstr "Izaberite va¹e pakete"
+msgid "in files"
+msgstr "Lokalno"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
+msgid "All requested packages were installed successfully."
 msgstr ""
 
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Proxy hostname:"
+msgstr "Proxy korisnik:"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Local files"
+msgstr "Lokalno"
+
 #: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr ""
+
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Installation finished"
-msgstr "Instalirano"
+msgid "Israel"
+msgstr "Instaliraj"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Do nothing"
-msgstr "ali ne odgovara"
+msgid "Help"
+msgstr "/_Pomoæ"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "HTTP server"
+msgstr ""
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Installation failed"
+msgstr "Instaliraj sve"
 
 #: ../rpmdrake:1
 #, c-format
@@ -237,125 +318,156 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Remove .%s"
-msgstr "Prenosivi medij"
+msgid "Search results"
+msgstr "Rezultati pretra¾ivanja"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "changes:"
-msgstr "Paketi"
+msgid " failed!"
+msgstr "Lokalno"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
+msgstr "Brazil"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
+msgid "Find:"
+msgstr "Pronaði:"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, finding available packages..."
+msgid "Please wait, searching..."
+msgstr "Molimo prièekajte dok rpm uklanja navedene pakete:"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, reading packages database..."
 msgstr ""
 "Molimo prièekajte\n"
 "Sortiram pakete"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, adding medium..."
-msgstr "Provjeravam ovisnosti..."
+msgid "unknown package "
+msgstr "nepoznato"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
-"\n"
-"Then, restart MandrakeUpdate."
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
+msgid "Reset the selection"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Already existing update sources"
+#, fuzzy, c-format
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
 msgstr ""
+"U pravilu da zadovoljite sve ovisnosti,\n"
+"slijedeæi paketi biti æe uklonjeni:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
+msgid "Costa Rica"
+msgstr "Kosta Rika"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
+"There was a problem during the installation:\n"
 "\n"
-"Is it ok to continue?"
-msgstr ""
+"%s"
+msgstr "Pripremam se za instalaciju"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, removing medium..."
+msgstr "Provjeravam ovisnosti..."
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Password:"
+msgstr "Lozinka:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Gre¹a pri pisanju\n"
+msgid "Taiwan"
+msgstr "Tajland"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Pripremam se za instalaciju"
+msgid "User:"
+msgstr "Korisnik:"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, updating medium..."
+msgstr "Provjeravam ovisnosti..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Mandrake Update"
-msgstr "MandrakeUpdate postavke"
+msgid "Please wait, listing packages..."
+msgstr ""
+"Molimo prièekajte\n"
+"Sortiram pakete"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Software Packages Removal"
-msgstr " Upravitelj programima "
+msgid "Information on packages"
+msgstr "Izaberite va¹e pakete"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "Zavr¹i"
+msgid "Cancel"
+msgstr "Odustani"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Instaliraj"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Remove"
-msgstr "Popis za uklanjanje"
+msgid "Everything installed successfully"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Help"
-msgstr "/_Pomoæ"
+msgid "Select the media(s) you wish to update:"
+msgstr ""
+"Molim odaberite izvore\n"
+"koje ¾elite dograditi:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Search"
-msgstr "potraga"
+msgid "Please wait, updating media..."
+msgstr "Provjeravam ovisnosti..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Pronaði:"
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -368,855 +480,743 @@ msgid ""
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Some packages need to be removed"
-msgstr ""
+#, fuzzy, c-format
+msgid "in descriptions"
+msgstr "Opisi"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure proxies"
+msgstr "Podesiti izvor?"
+
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
 "\n"
-"Do you really want to install all the selected packages?"
+"Is it ok to continue?"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Too many packages are selected"
-msgstr "Paketa veæ instalirano"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
+msgid "Please choose"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Normal information"
-msgstr "normalne dogradnje"
+msgid "Selected size: %d MB"
+msgstr "%d izabranih paketa: %.1f MB"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Update source(s)"
-msgstr "A¾uriraj izvore"
+msgid "Initializing..."
+msgstr "Instaliram:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Reload the packages list"
-msgstr "Paket %s nije potpisan"
+msgid "Save changes"
+msgstr "Paketi"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Reset the selection"
+msgid "Error during download"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "in files"
-msgstr "Lokalno"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "in descriptions"
-msgstr "Opisi"
+msgid "Package installation..."
+msgstr "Pripremam se za instalaciju"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
+msgid "Importance: "
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
+msgid ""
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by source repository"
+msgid "Add..."
 msgstr ""
 
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Unable to create medium."
+msgstr "Ne mogu napraviti report datoteku, prekidam.\n"
+
 #: ../rpmdrake:1
 #, c-format
-msgid "by selection state"
+msgid ""
+"The installation is finished; %s.\n"
+"\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "by size"
-msgstr "Veliè. Dub."
-
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by group"
+msgid "Browse..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "All packages,"
-msgstr "0 paketa, 0 byte-ova"
+msgid "Some packages can't be removed"
+msgstr "Nisam u stanju instalirati paket"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "All packages, alphabetical"
+msgid "Info..."
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Mandrake choices"
-msgstr "MandrakeDogradnja"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Normal updates"
-msgstr "Normalne nadogradnje"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
+msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Bugfixes updates"
-msgstr "Prika¾i ispravke gre¹aka"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Copying file for media `%s'..."
+msgstr ""
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Security updates"
-msgstr "Prika¾i sigurnosne nadogradnje"
+msgid "Remove"
+msgstr "Popis za uklanjanje"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Description: "
-msgstr "Opisi"
+msgid "Preparing packages installation..."
+msgstr "Pripremam se za instalaciju"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reason for update: "
+msgid "by media repository"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Summary: "
-msgstr "Sumarno"
+msgid "No mirror"
+msgstr "mirror:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Importance: "
+msgid "You need to fill up at least the two first entries."
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s KB"
-msgstr "%.1f KB"
+#, c-format
+msgid "Install"
+msgstr "Instaliraj"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Japan"
+msgstr "Japan"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Size: "
-msgstr "Velièina"
+msgid "Do nothing"
+msgstr "ali ne odgovara"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Version: "
-msgstr "Verzija:"
+msgid "No update"
+msgstr "Napravi Nadogradnje"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Name: "
-msgstr "Ime: %s"
+msgid "Description: "
+msgstr "Opisi"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Currently installed version: "
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Source: "
-msgstr "Izvor"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "(Not available)"
-msgstr ""
+msgid "Name: "
+msgstr "Ime: %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Changelog:\n"
+msgid "Inspect..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Files:\n"
-msgstr "/_Datoteka"
+msgid "Editing media \"%s\":"
+msgstr "A¾uriraj izvore"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Selected size: %d MB"
-msgstr "%d izabranih paketa: %.1f MB"
+msgid "No package found for installation."
+msgstr "Pripremam se za instalaciju"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr ""
+msgid "Australia"
+msgstr "Australija"
 
 #: ../rpmdrake:1
-#, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "Installation finished"
+msgstr "Instalirano"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
+msgid "by update availability"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr " je u konfliktu s %s-%s-%s"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
+msgstr "Poljska"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Nisam u stanju instalirati paket"
+msgid "Version: "
+msgstr "Verzija:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
+msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Upgradable"
+msgstr "Nadogradi"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Additional packages needed"
+msgid " done."
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "Nisam u stanju instalirati paket"
+msgid "Software Packages Installation"
+msgstr "Pripremam se za instalaciju"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
+msgid "Additional packages needed"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"U pravilu da zadovoljite sve ovisnosti,\n"
-"slijedeæi paketi biti æe uklonjeni:"
+msgid "Bugfixes updates"
+msgstr "Prika¾i ispravke gre¹aka"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some additional packages need to be removed"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
-"Ovi dodatni paketi su potrebni da budu instalirani u pravilu da sve radi "
-"ispravno:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "More information on package..."
-msgstr ""
+msgid "Germany"
+msgstr "Njemaèka"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Information on packages"
-msgstr "Izaberite va¹e pakete"
+msgid "Russia"
+msgstr "Ruska"
 
-#. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "More info"
-msgstr ""
+msgid "Norway"
+msgstr "Norve¹ka"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Addable"
-msgstr ""
+#, fuzzy, c-format
+msgid "Problem during installation"
+msgstr "Dogodili su se problemi prilikom instalacije"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Upgradable"
-msgstr "Nadogradi"
+msgid "Search"
+msgstr "potraga"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Edit a media"
+msgstr "A¾uriraj izvore"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
+msgstr "Èe¹ka Republika"
 
 #: ../rpmdrake:1
 #, c-format
 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."
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "No update"
-msgstr "Napravi Nadogradnje"
+#, c-format
+msgid "Stop"
+msgstr "Zaustavljanje"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(none)"
-msgstr "(nema)"
+msgid "Update"
+msgstr "Nadogradi"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, listing packages..."
+msgid "Please wait, removing packages..."
 msgstr ""
 "Molimo prièekajte\n"
 "Sortiram pakete"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "unknown package "
-msgstr "nepoznato"
+msgid "Normal information"
+msgstr "normalne dogradnje"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "One of the following packages is needed:"
+msgid "Media: "
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
+msgid "Downloading package `%s' (%s/%s)..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr " je u konfliktu s %s-%s-%s"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Selected"
+msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr ""
-"Izaberi\n"
-"sve"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Search results"
-msgstr "Rezultati pretra¾ivanja"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Stop"
-msgstr "Zaustavljanje"
+msgid "Media"
+msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, searching..."
-msgstr "Molimo prièekajte dok rpm uklanja navedene pakete:"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "©panjolska"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Search results (none)"
-msgstr "Rezultati pretra¾ivanja"
+msgid "Normal updates"
+msgstr "Normalne nadogradnje"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Other"
-msgstr "Ostali"
+msgid "by selection state"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Welcome to the packages source editor!\n"
-"\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Save and quit"
-msgstr ""
+msgid "Login:"
+msgstr "Login:"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Gre¹ka..."
+msgid "Adding a media:"
+msgstr ""
+"Molim prièekajte\n"
+"Dodajem izvor"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
+msgstr "Austrija"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Fatal error"
+msgstr "Gre¹a pri pisanju\n"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Update..."
 msgstr "Nadogradi"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Add..."
+msgid "Starting download of `%s'..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Edit"
-msgstr "A¾uriraj"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Source"
-msgstr "Izvor"
+msgid "(none)"
+msgstr "(nema)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Enabled?"
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Configure sources"
-msgstr "Podesiti izvor?"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "Lozinka:"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "User:"
-msgstr "Korisnik:"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
+msgid "Currently installed version: "
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Proxy hostname:"
-msgstr "Proxy korisnik:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Ostali"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+msgid "Reason for update: "
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Configure proxies"
-msgstr "Podesiti izvor?"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Please wait, updating medium..."
-msgstr "Provjeravam ovisnosti..."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
+msgid "Please choose the desired mirror."
 msgstr ""
+"Molimo prièekajte\n"
+"Dohvaæam listu mirror-a"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr ""
+msgid "Edit"
+msgstr "A¾uriraj"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Save changes"
-msgstr "Paketi"
+msgid "Please wait, finding available packages..."
+msgstr ""
+"Molimo prièekajte\n"
+"Sortiram pakete"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "relativna putanja do synthesis ili hdlist: "
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "URL:"
-msgstr "URL: "
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "A¾uriraj izvore"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Edit a source"
-msgstr "A¾uriraj izvore"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Please wait, removing medium..."
-msgstr "Provjeravam ovisnosti..."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Type of source:"
-msgstr "Tip izvora:"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Adding a source:"
-msgstr ""
-"Molim prièekajte\n"
-"Dodajem izvor"
+msgid "Search results (none)"
+msgstr "Rezultati pretra¾ivanja"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
+msgid "Danmark"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr ""
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Name:"
-msgstr "Ime"
+msgid "China"
+msgstr "Kina"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Login:"
-msgstr "Login:"
+msgid "United States"
+msgstr "Sjedinjene Amerièke Dr¾ave"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Choose a mirror..."
-msgstr "Izaberite mirror:"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Browse..."
-msgstr ""
+msgid "changes:"
+msgstr "Paketi"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Path or mount point:"
-msgstr "putanja ili mjesto za montiranje: "
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Removable device"
+msgid "Some additional packages need to be removed"
 msgstr ""
+"Ovi dodatni paketi su potrebni da budu instalirani u pravilu da sve radi "
+"ispravno:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr ""
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
+msgid "No"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Path:"
-msgstr "Port:"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Local files"
-msgstr "Lokalno"
+msgid "Configure medias"
+msgstr "Podesiti izvor?"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Add a source"
+msgid "Add a media"
 msgstr ""
 "Molim prièekajte\n"
 "Dodajem izvor"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Summary: "
+msgstr "Sumarno"
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Unable to create medium."
-msgstr "Ne mogu napraviti report datoteku, prekidam.\n"
+#, c-format
+msgid "Canada"
+msgstr "Kanada"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Update"
-msgstr "Nadogradi"
+msgid "Greece"
+msgstr "Grèka"
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Select the source(s) you wish to update:"
+#, c-format
+msgid ""
+"There was an error downloading the mirrors list:\n"
+"\n"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
-"Molim odaberite izvore\n"
-"koje ¾elite dograditi:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, updating media..."
-msgstr "Provjeravam ovisnosti..."
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Lo¹i, neèitljivi ili nisu pronaðeni paketi"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid " failed!"
-msgstr "Lokalno"
+msgid "Path:"
+msgstr "Port:"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid " done."
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during removal"
+msgstr "Dogodili su se problemi prilikom instalacije"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Download of `%s', speed:%s"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Selected"
 msgstr ""
+"Izaberi\n"
+"sve"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr ""
+msgid "Netherlands"
+msgstr "Nizozemska"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Starting download of `%s'..."
+msgid "Addable"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
+msgid "(Not available)"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining file of source `%s'..."
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Copying file for source `%s'..."
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Not selected"
+msgstr " je u konfliktu s %s-%s-%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please choose the desired mirror."
-msgstr ""
-"Molimo prièekajte\n"
-"Dohvaæam listu mirror-a"
+msgid "Software Packages Removal"
+msgstr " Upravitelj programima "
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
-msgstr ""
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "No mirror"
-msgstr "mirror:"
+msgid "Sweden"
+msgstr "©vedska"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"There was an error downloading the mirrors list:\n"
 "\n"
-"%s\n"
-"The network, or MandrakeSoft website, are maybe unavailable.\n"
-"Please try again later."
+"\n"
+"Error(s) reported:\n"
+"%s"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
+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.pm:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgid "Examining file of media `%s'..."
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
+msgid "Download of `%s', speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United States"
-msgstr "Sjedinjene Amerièke Dr¾ave"
+msgid "One of the following packages is needed:"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "China"
-msgstr "Kina"
+msgid "Quit"
+msgstr "Zavr¹i"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Ujedinjeno Kraljevstvo"
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Taiwan"
-msgstr "Tajland"
+msgid "Update media(s)"
+msgstr "A¾uriraj izvore"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Sweden"
-msgstr "©vedska"
+msgid "Ok"
+msgstr "U Redu"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Russia"
-msgstr "Ruska"
+msgid "Please wait, adding medium..."
+msgstr "Provjeravam ovisnosti..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Portugal"
-msgstr "Port:"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Poland"
-msgstr "Poljska"
+msgid "Unable to get source packages."
+msgstr "Izaberite va¹e pakete"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Norway"
-msgstr "Norve¹ka"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Too many packages are selected"
+msgstr "Paketa veæ instalirano"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Netherlands"
-msgstr "Nizozemska"
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Korea"
-msgstr "Prisili"
+msgid "%s conflicts with %s"
+msgstr " je u konfliktu s %s-%s-%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "Japan"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Italy"
-msgstr "Instaliraj"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Israel"
-msgstr "Instaliraj"
+msgid "Mandrake choices"
+msgstr "MandrakeDogradnja"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Greece"
-msgstr "Grèka"
+msgid "Changelog:\n"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "France"
+msgid "Korea"
 msgstr "Prisili"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Finland"
-msgstr "Pronaði:"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Spain"
-msgstr "©panjolska"
-
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Danmark"
+msgid "Removable device"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Germany"
-msgstr "Njemaèka"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Czech Republic"
-msgstr "Èe¹ka Republika"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Costa Rica"
-msgstr "Kosta Rika"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Canada"
-msgstr "Kanada"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Brazil"
-msgstr "Brazil"
-
-#: ../rpmdrake.pm:1
-#, c-format
 msgid "Belgium"
 msgstr "Belgija"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Australija"
+msgid "Change medium"
+msgstr ""
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Austria"
-msgstr "Austrija"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mandrake Update"
+msgstr "MandrakeUpdate postavke"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Info..."
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "by size"
+msgstr "Veliè. Dub."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
+msgid "FTP server"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Files:\n"
+msgstr "/_Datoteka"
+
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Yes"
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
 msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:86
@@ -1493,6 +1493,13 @@ msgid "Software Sources Manager"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Source: "
+#~ msgstr "Izvor"
+
+#~ msgid "Source"
+#~ msgstr "Izvor"
+
+#, fuzzy
 #~ msgid ""
 #~ "some packages failed to install\n"
 #~ "correctly"
diff --git a/po/hu.po b/po/hu.po
index e669a0d0..8010a71a 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: 2003-02-23 11:02+0100\n"
 "Last-Translator: Arpad Biro <biro_arpad@yahoo.com>\n"
 "Language-Team: Hungarian\n"
@@ -16,16 +16,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"Kívánja folytatni?"
+msgid "Enabled?"
+msgstr "Engedélyezve?"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Útvonal vagy csatolási pont:"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Portugal"
+msgstr "Portugália"
 
 #: ../rpmdrake:1
 #, c-format
@@ -44,104 +48,53 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"Üdvözli a MandrakeUpdate (Mandrake-frissítés).\n"
-"\n"
-"Ezzel a programmal kiválaszthatja, mely frissítéseket kívánja\n"
-"telepíteni a gépére."
+msgid "by group"
+msgstr "csoport szerint"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
-msgstr ""
-"Üdvözli a szoftvereltávolító program.\n"
-"\n"
-"Ezzel a programmal kiválaszthatja, mely szoftvertermékeket kívánja\n"
-"eltávolítani a gépérõl."
+msgid "Name:"
+msgstr "Név:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Hiba történt a csomagtelepítés közben:\n"
-"\n"
-"%s"
+msgid "Italy"
+msgstr "Telepítés"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Problem during removal"
-msgstr "Probléma adódott az eltávolítás során"
+msgid "How to choose manually your mirror"
+msgstr "Hogyan lehet tükörkiszolgálót választani saját kezûleg"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "Csomagok eltávolítása folyamatban..."
+msgid "URL:"
+msgstr "URL:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Csomag-adatbázis olvasása..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Hiba történt a csomagtelepítés közben:\n"
-"\n"
-"%s"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Teljes telepítés"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Csomagok elõkészítése a telepítéshez..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Csomagok elõkészítése a telepítéshez..."
+msgid "Some packages need to be removed"
+msgstr "Bizonyos csomagokat el kell távolítani"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Az összes kért csomag telepítve lett."
+msgid "More information on package..."
+msgstr "További információ a csomagról..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Sikeresen telepítve lett minden"
+msgid "Yes"
+msgstr "Igen"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
 msgstr ""
-"A telepítés befejezõdött; %s.\n"
+"A függõségeik miatt a következõ csomag(ok) kijelölését törölni kell:\n"
 "\n"
-"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:1
 #, fuzzy, c-format
@@ -149,462 +102,453 @@ msgid "everything was installed correctly"
 msgstr "Sikeresen telepítve lett minden"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Problémák adódtak a telepítés során"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "\"%s\" csomag telepítése (%s/%s)..."
+msgid "%s KB"
+msgstr "%s KByte"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Csomagok elõkészítése a telepítéshez..."
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"A kívánt tükörkiszolgáló saját kezûleg is kiválasztható; ehhez\n"
+"indítsa el a szoftverforrás-kezelõt, majd vegyen fel egy \"Biztonsági\n"
+"frissítések\" forrást.\n"
+"\n"
+"Ez után indítsa el újra a MandrakeUpdate programot."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
+"Welcome to the software removal tool!\n"
 "\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
 msgstr ""
+"Üdvözli a szoftvereltávolító program.\n"
 "\n"
-"\n"
-"Hibaüzenetek:\n"
-"%s"
+"Ezzel a programmal kiválaszthatja, mely szoftvertermékeket kívánja\n"
+"eltávolítani a gépérõl."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"In order to save the changes, you need to insert the medium in the drive."
 msgstr ""
-"A telepítés sikertelen volt, mivel bizonyos fájlok\n"
-"nem találhatók. Esetleg frissítse a forrás-adatbázist."
+"A módosítások mentéséhez be kell helyeznie az adathordozót a meghajtóba."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Mentés és kilépés"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
+"There was a problem during the removal of packages:\n"
 "\n"
-"Do you want to continue installation?"
+"%s"
 msgstr ""
-"A következõ csomagokat el kell távolítani ahhoz, hogy más csomagokat\n"
-"frissíteni lehessen:\n"
-"\n"
-"%s\n"
+"Hiba történt a csomagtelepítés közben:\n"
 "\n"
-"Kívánja folytatni?"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "\"%s\" csomag letöltése (%s/%s)..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Cancel"
-msgstr "Mégsem"
+msgid "Size: "
+msgstr "Méret: "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Ok"
-msgstr "OK"
+msgid "Security updates"
+msgstr "Biztonsági frissítések"
 
 #: ../rpmdrake:1
 #, fuzzy, 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"
+msgid "Already existing update medias"
+msgstr "Hiba a frissítési adatforrás felvétele közben"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Change medium"
-msgstr "Adatforrás váltása"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Initializing..."
-msgstr "Inicializálás..."
+msgid "Maximum information"
+msgstr "Maximális mennyiségû információ"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Csomagok elõkészítése a telepítéshez..."
+msgid "Proxy..."
+msgstr "Hiba..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Csomagtelepítéshez rendszergazdai jogosultság szükséges."
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Unable to get source packages."
-msgstr "A forráscsomagok letöltése sikertelen."
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspect..."
-msgstr "Vizsgálat..."
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
+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:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Installation finished"
-msgstr "A telepítés befejezõdött"
+msgid "United Kingdom"
+msgstr "Egyesült Királyság"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Ne tegyen semmit"
+msgid "in names"
+msgstr "a nevekben"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr ".%s használata fõfájlként"
+msgid ""
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
+msgstr ""
+"Nem található megfelelõ tükörkiszolgáló.\n"
+"\n"
+"A problémának többféle oka is lehet; a leggyakoribb az, hogy\n"
+"a hivatalos Mandrake Linux-frissítések nem támogatják az Ön\n"
+"gépében levõ processzort."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Remove .%s"
 msgstr ".%s eltávolítása"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "changes:"
-msgstr "módosítások:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspecting %s"
-msgstr "%s vizsgálata"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Please wait, finding available packages..."
-msgstr "A rendelkezésre álló csomagok lekérdezése..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "Az adatforrás felvétele folyamatban..."
+msgid "Finland"
+msgstr "Finnország"
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
+"The following packages have bad signatures:\n"
 "\n"
-"Then, restart MandrakeUpdate."
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"A kívánt tükörkiszolgáló saját kezûleg is kiválasztható; ehhez\n"
-"indítsa el a szoftverforrás-kezelõt, majd vegyen fel egy \"Biztonsági\n"
-"frissítések\" forrást.\n"
+"A következõ csomagokat el kell távolítani ahhoz, hogy más csomagokat\n"
+"frissíteni lehessen:\n"
 "\n"
-"Ez után indítsa el újra a MandrakeUpdate programot."
+"%s\n"
+"\n"
+"Kívánja folytatni?"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "How to choose manually your mirror"
-msgstr "Hogyan lehet tükörkiszolgálót választani saját kezûleg"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Examining distant file of media `%s'..."
+msgstr "Távoli fájl vizsgálata: \"%s\"..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
+msgid "Verifying packages signatures..."
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Already existing update sources"
-msgstr ""
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "France"
+msgstr "Akkor is"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "More info"
+msgstr "További információ"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
+"%s\n"
 "\n"
 "Is it ok to continue?"
 msgstr ""
-"A frissítõcsomagok letöltéséhez most kapcsolódni kell a\n"
-"tükörkiszolgálóhoz. Ellenõrizze, hogy a hálózat elérhetõ-e.\n"
+"%s\n"
 "\n"
 "Kívánja folytatni?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Reload the packages list"
+msgstr "A csomaglista újraolvasása"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Válasszon ki egy tükröt..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Fájlhiba"
+msgid "Some packages can't be installed"
+msgstr "A(z) \"%s\" csomag nem telepíthetõ\n"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
+msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Csomagok elõkészítése a telepítéshez..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Mandrake-frissítés"
+msgid "All packages,"
+msgstr "Az összes csomag,"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Software Packages Removal"
-msgstr "Szoftvercsomag-eltávolítás"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Type of media:"
+msgstr "Az adatforrás típusa:"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Quit"
-msgstr "Kilépés"
+msgid "in files"
+msgstr "a fájlokban"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Telepítés"
+msgid "All requested packages were installed successfully."
+msgstr "Az összes kért csomag telepítve lett."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove"
-msgstr "Eltávolítás"
+msgid "Proxy hostname:"
+msgstr "A proxy gépneve:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Help"
-msgstr "Segítség"
+msgid "Local files"
+msgstr "Helyi fájlok"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search"
-msgstr "Keresés"
+msgid "Inspecting %s"
+msgstr "%s vizsgálata"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Find:"
-msgstr "Keresés:"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Israel"
+msgstr "Telepítés"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"A következõ csomagokat el kell távolítani ahhoz, hogy más csomagokat\n"
-"frissíteni lehessen:\n"
-"\n"
-"%s\n"
-"\n"
-"Kívánja folytatni?"
+msgid "Help"
+msgstr "Segítség"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Bizonyos csomagokat el kell távolítani"
+msgid "HTTP server"
+msgstr "HTTP-kiszolgáló"
 
 #: ../rpmdrake:1
-#, c-format
-msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
-"\n"
-"Do you really want to install all the selected packages?"
-msgstr ""
-"Figyelmeztetés: úgy tûnik, hogy a telepítésre kijelölt csomagok\n"
-"nem fognak elférni a fájlrendszerben, vagy pedig nem marad szabad\n"
-"hely a telepítés után. Ez veszélyes lehet, ezért átgondolandó.\n"
-"\n"
-"Biztos abban, hogy telepíteni kívánja az összes kijelölt csomagot?"
+#, fuzzy, c-format
+msgid "Installation failed"
+msgstr "Teljes telepítés"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Túl sok csomag van kijelölve"
+msgid "Use .%s as main file"
+msgstr ".%s használata fõfájlként"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "Maximális mennyiségû információ"
+msgid "Search results"
+msgstr "Keresési eredmény"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Normal information"
-msgstr "Normál mennyiségû információ"
+msgid " failed!"
+msgstr " nem sikerült"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Update source(s)"
-msgstr "Forrás(ok) frissítése"
+msgid "Brazil"
+msgstr "Brazília"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "A csomaglista újraolvasása"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr "Már van ilyen néven adatforrás. Szeretné azt felülírni?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "A kijelölés visszaállítása"
+msgid "Find:"
+msgstr "Keresés:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "a fájlokban"
+msgid "All packages, alphabetical"
+msgstr "Az összes csomag, ábécérendben"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "a leírásokban"
+msgid "Please wait, searching..."
+msgstr "Keresés..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "a nevekben"
+msgid "Please wait, reading packages database..."
+msgstr "Csomag-adatbázis olvasása..."
 
-# it's a sort method
-# "new or update"
 #: ../rpmdrake:1
-#, c-format
-msgid "by update availability"
-msgstr "telepítettség alapján"
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "A(z) \"%s\" csomag nem nyitható meg\n"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by source repository"
-msgstr "forrás alapján"
+#, fuzzy, 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"
 
-# it's a sort method
-# "selected or not"
 #: ../rpmdrake:1
 #, c-format
-msgid "by selection state"
-msgstr "kijelölési állapot szerint"
+msgid "Reset the selection"
+msgstr "A kijelölés visszaállítása"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by size"
-msgstr "méret szerint"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"Ha szüksége van proxyra, adja meg annak gépnevét és opcionálisan a "
+"portszámát (formátum: <gépnév[:port]>):"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-msgstr "csoport szerint"
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
+"A függõségeik miatt a következõ csomago(ka)t is el kell távolítani:\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "All packages,"
-msgstr "Az összes csomag,"
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "All packages, alphabetical"
-msgstr "Az összes csomag, ábécérendben"
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Hiba történt a csomagtelepítés közben:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Mandrake-válogatás"
+msgid "Please wait, removing medium..."
+msgstr "Az adatforrás eltávolítása folyamatban..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
-msgstr "Normál frissítések"
+msgid "Password:"
+msgstr "Jelszó:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Hibajavító frissítések"
+msgid "Taiwan"
+msgstr "Tajvan"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Security updates"
-msgstr "Biztonsági frissítések"
+msgid "User:"
+msgstr "Felhasználó:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Description: "
-msgstr "Leírás: "
+msgid "Please wait, updating medium..."
+msgstr "Az adatforrás frissítése folyamatban..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reason for update: "
-msgstr "A frissítés oka: "
+msgid "Please wait, listing packages..."
+msgstr "A csomagok listázása folyamatban..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Summary: "
-msgstr "Összefoglaló: "
+msgid "Information on packages"
+msgstr "Információ a csomagokról"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Importance: "
-msgstr "Fontosság: "
+msgid "Cancel"
+msgstr "Mégsem"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KByte"
+msgid "Everything installed successfully"
+msgstr "Sikeresen telepítve lett minden"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Size: "
-msgstr "Méret: "
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Select the media(s) you wish to update:"
+msgstr "Válassza ki, mely forrás(oka)t kívánja frissíteni:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Version: "
-msgstr "Verzió: "
+msgid "Please wait, updating media..."
+msgstr "Az adatforrások frissítése folyamatban..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "Név: "
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "A jelenleg telepített verzió: "
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"A következõ csomagokat el kell távolítani ahhoz, hogy más csomagokat\n"
+"frissíteni lehessen:\n"
+"\n"
+"%s\n"
+"\n"
+"Kívánja folytatni?"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Source: "
-msgstr "Akkor is"
+#, c-format
+msgid "in descriptions"
+msgstr "a leírásokban"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(Not available)"
-msgstr "(Nem elérhetõ)"
+msgid "Configure proxies"
+msgstr "Proxyk beállítása"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Változások jegyzéke:\n"
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"A tükörkiszolgálók listájának letöltéséhez most kapcsolódni kell\n"
+"a MandrakeSoft weboldalához. Ellenõrizze, hogy a hálózat elérhetõ-e.\n"
+"\n"
+"Kívánja folytatni?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Files:\n"
-msgstr "Fájlok:\n"
+msgid "Please choose"
+msgstr "Válasszon"
 
 #: ../rpmdrake:1
 #, c-format
@@ -613,42 +557,28 @@ msgstr "Kijelölve: %d MB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Kijelölve: %d MB / Üres hely a lemezen: %d MB"
+msgid "Initializing..."
+msgstr "Inicializálás..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
-msgstr ""
-"A függõségeik miatt a következõ csomag(ok) kijelölését törölni kell:\n"
-"\n"
+msgid "Save changes"
+msgstr "Módosítások mentése"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr ""
-"A következõ csomag(ok) nem választható(k):\n"
-"\n"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "Hiba a letöltés közben"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "ütközik ezzel:"
+msgid "Package installation..."
+msgstr "Csomagok elõkészítése a telepítéshez..."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "A(z) \"%s\" csomag nem telepíthetõ\n"
+#, c-format
+msgid "Importance: "
+msgstr "Fontosság: "
 
 #: ../rpmdrake:1
 #, c-format
@@ -660,458 +590,459 @@ msgstr ""
 "A függõségek miatt a következõ csomago(ka)t is telepíteni kell:\n"
 "\n"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "Szükség van további csomagokra"
+msgid "Add..."
+msgstr "Felvétel..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "A(z) \"%s\" csomag nem telepíthetõ\n"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "Az adatforrás létrehozása nem sikerült."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Removing these packages would break your system, sorry:\n"
+"The installation is finished; %s.\n"
 "\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
 msgstr ""
-"Ezen csomagok eltávolítása rendszerproblémákhoz vezetne:\n"
+"A telepítés befejezõdött; %s.\n"
 "\n"
+"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:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"A függõségeik miatt a következõ csomago(ka)t is el kell távolítani:\n"
-"\n"
+msgid "Browse..."
+msgstr "Böngészés..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "A(z) \"%s\" csomag nem telepíthetõ\n"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Néhány további csomagot is el kell távolítani"
+msgid "Info..."
+msgstr "Információ..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "More information on package..."
-msgstr "További információ a csomagról..."
+msgid "You need to insert the medium to continue"
+msgstr "A folytatáshoz be kell helyeznie az adathordozót"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Copying file for media `%s'..."
+msgstr "Fájl másolása: \"%s\"..."
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Information on packages"
-msgstr "Információ a csomagokról"
+msgid "Remove"
+msgstr "Eltávolítás"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "More info"
-msgstr "További információ"
+msgid "Preparing packages installation..."
+msgstr "Csomagok elõkészítése a telepítéshez..."
 
-# "Addable" and "Upgradable": these are the two lists of packages when user selects
-# "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:1
+#, fuzzy, c-format
+msgid "by media repository"
+msgstr "forrás alapján"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "Telepíthetõ"
+msgid "No mirror"
+msgstr "Tükörkiszolgáló nem található"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Upgradable"
-msgstr "Frissíthetõ"
+msgid "You need to fill up at least the two first entries."
+msgstr "Legalább az elsõ két bejegyzést ki kell tölteni."
 
 #: ../rpmdrake:1
 #, c-format
-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 ""
-"A frissítési lista üres. Ez azt jelenti, hogy vagy nincsen az Ön\n"
-"gépére telepített csomagokhoz frissítés, vagy pedig már telepítve\n"
-"lett az összes."
+msgid "Install"
+msgstr "Telepítés"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "No update"
-msgstr "Frissítés nem található"
+msgid "Japan"
+msgstr "Japán"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "(none)"
-msgstr "(egyik sem)"
+msgid "Do nothing"
+msgstr "Ne tegyen semmit"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "A csomagok listázása folyamatban..."
+msgid "No update"
+msgstr "Frissítés nem található"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "A(z) \"%s\" csomag nem nyitható meg\n"
+#, c-format
+msgid "Description: "
+msgstr "Leírás: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Szükség van a következõ csomagok valamelyikére:"
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr ""
+"Figyelmeztetés: úgy tûnik, hogy a telepítésre kijelölt csomagok\n"
+"nem fognak elférni a fájlrendszerben, vagy pedig nem marad szabad\n"
+"hely a telepítés után. Ez veszélyes lehet, ezért átgondolandó.\n"
+"\n"
+"Biztos abban, hogy telepíteni kívánja az összes kijelölt csomagot?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Válasszon"
+msgid "Name: "
+msgstr "Név: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Inspect..."
+msgstr "Vizsgálat..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Not selected"
-msgstr "Ütközések találhatók"
+msgid "Editing media \"%s\":"
+msgstr "\"%s\" forrás szerkesztése:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Selected"
-msgstr "Kijelölve"
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "Csomagok elõkészítése a telepítéshez..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results"
-msgstr "Keresési eredmény"
+msgid "Australia"
+msgstr "Ausztrália"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Stop"
-msgstr "Leállítás"
+msgid "Installation finished"
+msgstr "A telepítés befejezõdött"
 
+# it's a sort method
+# "new or update"
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Keresés..."
+msgid "by update availability"
+msgstr "telepítettség alapján"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Keresési eredmény (nincs)"
+msgid "Poland"
+msgstr "Lengyelország"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Other"
-msgstr "Egyéb"
+msgid "Version: "
+msgstr "Verzió: "
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the packages source editor!\n"
-"\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
-msgstr ""
-"Üdvözli a csomagforrás-szerkesztõ.\n"
-"\n"
-"Ezzel a programmal beállíthatja a gépen használni kívánt csomagforrásokat.\n"
-"Ezt követõen a források felhasználásával új programokat telepíthet és\n"
-"frissítheti a meglevõket."
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "A proxyhoz szükséges felhasználónév és jelszó:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
-msgstr "Mentés és kilépés"
+msgid "Upgradable"
+msgstr "Frissíthetõ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid " done."
+msgstr " kész"
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Hiba..."
+msgid "Software Packages Installation"
+msgstr "Csomagok elõkészítése a telepítéshez..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Update..."
-msgstr "Frissítés..."
+msgid "Additional packages needed"
+msgstr "Szükség van további csomagokra"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "Felvétel..."
+msgid "Bugfixes updates"
+msgstr "Hibajavító frissítések"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "Módosítás"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Source"
-msgstr "Akkor is"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "\"%s\" letöltése; hátralevõ idõ: %s; sebesség: %s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Enabled?"
-msgstr "Engedélyezve?"
+msgid "Germany"
+msgstr "Németország"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Configure sources"
-msgstr "Források beállítása"
+msgid "Russia"
+msgstr "Oroszország"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Password:"
-msgstr "Jelszó:"
+msgid "Norway"
+msgstr "Norvégia"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "User:"
-msgstr "Felhasználó:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during installation"
+msgstr "Problémák adódtak a telepítés során"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "A proxyhoz szükséges felhasználónév és jelszó:"
+msgid "Search"
+msgstr "Keresés"
 
 #: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Edit a media"
+msgstr "Forrás szerkesztése"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "A proxy gépneve:"
+msgid "Czech Republic"
+msgstr "Cseh Köztársaság"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"Ha szüksége van proxyra, adja meg annak gépnevét és opcionálisan a "
-"portszámát (formátum: <gépnév[:port]>):"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Proxyk beállítása"
+msgid "Stop"
+msgstr "Leállítás"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Az adatforrás frissítése folyamatban..."
+msgid "Update"
+msgstr "Frissítés"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
+msgid "Please wait, removing packages..."
+msgstr "Csomagok eltávolítása folyamatban..."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal information"
+msgstr "Normál mennyiségû információ"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Media: "
 msgstr ""
-"A módosítások mentéséhez be kell helyeznie az adathordozót a meghajtóba."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "A folytatáshoz be kell helyeznie az adathordozót"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "\"%s\" csomag letöltése (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "Módosítások mentése"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Kijelölve: %d MB / Üres hely a lemezen: %d MB"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
+msgid "Media"
 msgstr ""
-"A kiterjesztett függõséglista illetve fejléclista relatív elérési útja:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "Spain"
+msgstr "Spanyolország"
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "\"%s\" forrás szerkesztése:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal updates"
+msgstr "Normál frissítések"
 
-#: ../edit-urpm-sources.pl:1
+# it's a sort method
+# "selected or not"
+#: ../rpmdrake:1
 #, c-format
-msgid "Edit a source"
-msgstr "Forrás szerkesztése"
+msgid "by selection state"
+msgstr "kijelölési állapot szerint"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Az adatforrás eltávolítása folyamatban..."
+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..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Type of source:"
-msgstr "Az adatforrás típusa:"
+msgid "Login:"
+msgstr "Felhasználónév:"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Adding a source:"
+#, fuzzy, c-format
+msgid "Adding a media:"
 msgstr "Forrás felvétele:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
-msgstr "Már van ilyen néven adatforrás. Szeretné azt felülírni?"
+msgid "Austria"
+msgstr "Ausztria"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Legalább az elsõ két bejegyzést ki kell tölteni."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Fatal error"
+msgstr "Fájlhiba"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Name:"
-msgstr "Név:"
+msgid "Update..."
+msgstr "Frissítés..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "\"%s\" aláírásának ellenõrzése..."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Login:"
-msgstr "Felhasználónév:"
+msgid "(none)"
+msgstr "(egyik sem)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr "Válasszon ki egy tükröt..."
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
+"Ezen csomagok eltávolítása rendszerproblémákhoz vezetne:\n"
+"\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
-msgstr "Böngészés..."
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "\"%s\" csomag telepítése (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Path or mount point:"
-msgstr "Útvonal vagy csatolási pont:"
+msgid "Currently installed version: "
+msgstr "A jelenleg telepített verzió: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Removable device"
-msgstr "Cserélhetõ eszköz"
+msgid "Other"
+msgstr "Egyéb"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "HTTP-kiszolgáló"
+msgid "Reason for update: "
+msgstr "A frissítés oka: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "FTP-kiszolgáló"
+msgid "Please choose the desired mirror."
+msgstr "Válassza ki a kívánt tükörkiszolgálót."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Path:"
-msgstr "Útvonal:"
+msgid "Edit"
+msgstr "Módosítás"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "Helyi fájlok"
+msgid "Please wait, finding available packages..."
+msgstr "A rendelkezésre álló csomagok lekérdezése..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Add a source"
-msgstr "Forrás felvétele"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr "Az adatforrás frissítése nem sikerült, ezért letiltásra kerül."
+msgid "Relative path to synthesis/hdlist:"
+msgstr ""
+"A kiterjesztett függõséglista illetve fejléclista relatív elérési útja:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Unable to create medium."
-msgstr "Az adatforrás létrehozása nem sikerült."
+msgid "Search results (none)"
+msgstr "Keresési eredmény (nincs)"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Update"
-msgstr "Frissítés"
+msgid "Danmark"
+msgstr "Dánia"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Válassza ki, mely forrás(oka)t kívánja frissíteni:"
+msgid "China"
+msgstr "Kína"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Az adatforrások frissítése folyamatban..."
+msgid "United States"
+msgstr "Amerikai Egyesült Államok"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " failed!"
-msgstr " nem sikerült"
+msgid "changes:"
+msgstr "módosítások:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " done."
-msgstr " kész"
+msgid "Some additional packages need to be removed"
+msgstr "Néhány további csomagot is el kell távolítani"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "\"%s\" letöltése; sebesség: %s"
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "\"%s\" letöltése; hátralevõ idõ: %s; sebesség: %s"
+msgid "No"
+msgstr "Nem"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "\"%s\" aláírásának ellenõrzése..."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "Távoli fájl vizsgálata: \"%s\"..."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Examining file of source `%s'..."
-msgstr "Fájl vizsgálata: \"%s\"..."
+msgid "Configure medias"
+msgstr "Források beállítása"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Copying file for source `%s'..."
-msgstr "Fájl másolása: \"%s\"..."
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a media"
+msgstr "Forrás felvétele"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please choose the desired mirror."
-msgstr "Válassza ki a kívánt tükörkiszolgálót."
+msgid "Summary: "
+msgstr "Összefoglaló: "
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
-msgstr ""
-"Nem található megfelelõ tükörkiszolgáló.\n"
-"\n"
-"A problémának többféle oka is lehet; a leggyakoribb az, hogy\n"
-"a hivatalos Mandrake Linux-frissítések nem támogatják az Ön\n"
-"gépében levõ processzort."
+msgid "Canada"
+msgstr "Kanada"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No mirror"
-msgstr "Tükörkiszolgáló nem található"
+msgid "Greece"
+msgstr "Görögország"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1128,178 +1059,247 @@ 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:1
-#, c-format
-msgid "Error during download"
-msgstr "Hiba a letöltés közben"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Csomagtelepítéshez rendszergazdai jogosultság szükséges."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-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..."
+msgid "Path:"
+msgstr "Útvonal:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"A tükörkiszolgálók listájának letöltéséhez most kapcsolódni kell\n"
-"a MandrakeSoft weboldalához. Ellenõrizze, hogy a hálózat elérhetõ-e.\n"
-"\n"
-"Kívánja folytatni?"
+msgid "Problem during removal"
+msgstr "Probléma adódott az eltávolítás során"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United States"
-msgstr "Amerikai Egyesült Államok"
+msgid "Selected"
+msgstr "Kijelölve"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "Kína"
+msgid "Netherlands"
+msgstr "Hollandia"
 
-#: ../rpmdrake.pm:1
+# "Addable" and "Upgradable": these are the two lists of packages when user selects
+# "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:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Egyesült Királyság"
+msgid "Addable"
+msgstr "Telepíthetõ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Tajvan"
+msgid "(Not available)"
+msgstr "(Nem elérhetõ)"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Sweden"
-msgstr "Svédország"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
+msgstr ""
+"A következõ csomag(ok) nem választható(k):\n"
+"\n"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Russia"
-msgstr "Oroszország"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Not selected"
+msgstr "Ütközések találhatók"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Portugal"
-msgstr "Portugália"
+msgid "Software Packages Removal"
+msgstr "Szoftvercsomag-eltávolítás"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Poland"
-msgstr "Lengyelország"
+msgid "Sweden"
+msgstr "Svédország"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Norway"
-msgstr "Norvégia"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
+msgstr ""
+"\n"
+"\n"
+"Hibaüzenetek:\n"
+"%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Netherlands"
-msgstr "Hollandia"
+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 ""
+"A frissítési lista üres. Ez azt jelenti, hogy vagy nincsen az Ön\n"
+"gépére telepített csomagokhoz frissítés, vagy pedig már telepítve\n"
+"lett az összes."
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Korea"
-msgstr "Akkor is"
+msgid "Examining file of media `%s'..."
+msgstr "Fájl vizsgálata: \"%s\"..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Japan"
-msgstr "Japán"
+msgid "Download of `%s', speed:%s"
+msgstr "\"%s\" letöltése; sebesség: %s"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Italy"
-msgstr "Telepítés"
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Szükség van a következõ csomagok valamelyikére:"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Israel"
-msgstr "Telepítés"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Kilépés"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Greece"
-msgstr "Görögország"
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"A frissítõcsomagok letöltéséhez most kapcsolódni kell a\n"
+"tükörkiszolgálóhoz. Ellenõrizze, hogy a hálózat elérhetõ-e.\n"
+"\n"
+"Kívánja folytatni?"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "France"
-msgstr "Akkor is"
+msgid "Update media(s)"
+msgstr "Forrás(ok) frissítése"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Finland"
-msgstr "Finnország"
+msgid "Ok"
+msgstr "OK"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Spain"
-msgstr "Spanyolország"
+msgid "Please wait, adding medium..."
+msgstr "Az adatforrás felvétele folyamatban..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Danmark"
-msgstr "Dánia"
+msgid "Unable to get source packages."
+msgstr "A forráscsomagok letöltése sikertelen."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "Németország"
+msgid "Too many packages are selected"
+msgstr "Túl sok csomag van kijelölve"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"Üdvözli a csomagforrás-szerkesztõ.\n"
+"\n"
+"Ezzel a programmal beállíthatja a gépen használni kívánt csomagforrásokat.\n"
+"Ezt követõen a források felhasználásával új programokat telepíthet és\n"
+"frissítheti a meglevõket."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
+msgstr "ütközik ezzel:"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Cseh Köztársaság"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Üdvözli a MandrakeUpdate (Mandrake-frissítés).\n"
+"\n"
+"Ezzel a programmal kiválaszthatja, mely frissítéseket kívánja\n"
+"telepíteni a gépére."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Costa Rica"
+msgid "Mandrake choices"
+msgstr "Mandrake-válogatás"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Canada"
-msgstr "Kanada"
+msgid "Changelog:\n"
+msgstr "Változások jegyzéke:\n"
 
 #: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Korea"
+msgstr "Akkor is"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Brazil"
-msgstr "Brazília"
+msgid "Removable device"
+msgstr "Cserélhetõ eszköz"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Belgium"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Ausztrália"
+msgid "Change medium"
+msgstr "Adatforrás váltása"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "Ausztria"
+msgid "Mandrake Update"
+msgstr "Mandrake-frissítés"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
-msgstr "Információ..."
+msgid "by size"
+msgstr "méret szerint"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "Nem"
+msgid "FTP server"
+msgstr "FTP-kiszolgáló"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "Igen"
+msgid "Files:\n"
+msgstr "Fájlok:\n"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr "Az adatforrás frissítése nem sikerült, ezért letiltásra kerül."
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -1573,6 +1573,14 @@ msgstr "Szoftvereltávolítás"
 msgid "Software Sources Manager"
 msgstr "Szoftverforrás-kezelõ"
 
+#, fuzzy
+#~ msgid "Source: "
+#~ msgstr "Akkor is"
+
+#, fuzzy
+#~ msgid "Source"
+#~ msgstr "Akkor is"
+
 #~ msgid ""
 #~ "some packages failed to install\n"
 #~ "correctly"
@@ -1613,9 +1621,6 @@ msgstr "Szoftverforrás-kezelõ"
 #~ "\n"
 #~ "Próbálkozik egy másik tükörkiszolgálóval?"
 
-#~ msgid "Error adding update medium"
-#~ msgstr "Hiba a frissítési adatforrás felvétele közben"
-
 #~ 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..."
diff --git a/po/id.po b/po/id.po
index 0436b053..7498027c 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: 2003-03-18 16:36+0900\n"
 "Last-Translator: Budi Rachmanto <rac@linux-mandrake.com>\n"
 "Language-Team: Bahasa Indonesia <id@li.org>\n"
@@ -16,16 +16,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.6\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"Lanjutkan?"
+msgid "Enabled?"
+msgstr "Diaktifkan?"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Path atau titik mount:"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Portugal"
+msgstr "Port:"
 
 #: ../rpmdrake:1
 #, c-format
@@ -44,16 +48,78 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "by group"
+msgstr "menurut grup"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Name:"
+msgstr "Nama"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Italy"
+msgstr "Install"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Cara memilih mirror"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "Beberapa paket perlu dihapus"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
+msgstr "Info tambahan paket..."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Ya"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Welcome to MandrakeUpdate!\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
 msgstr ""
-"Selamat Datang di MandrakeUpdate!\n"
+"Karena aspek ketergantungan, paket berikut harus tak dipilih:\n"
 "\n"
-"Perkakas ini membantu Anda memilih update yang ingin Anda instal di\n"
-"komputer Anda."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "semua sudah diinstal dengan benar"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "%s KB"
+msgstr "%.1f KB"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"Anda dapat juga memilih mirror kesukaan Anda secara manual: untuk\n"
+"melakukannya, luncurkan Manajer Source Software, dan tambahkan source\n"
+"`Security updates'.\n"
+"\n"
+"Lalu, restart MandrakeUpdate."
 
 #: ../rpmdrake:1
 #, c-format
@@ -68,40 +134,21 @@ msgstr ""
 "Perkakas ini membantu Anda memilih piranti lunak yang ingin Anda hapus\n"
 "dari komputer Anda."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:1
+#, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Error saat instalasi paket:\n"
-"\n"
-"%s"
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "Untuk menyimpan perubahan, masukkan media ke dalam drive."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Problem during removal"
-msgstr "Masalah saat penghapusan"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, removing packages..."
-msgstr ""
-"Silahkan Tunggu\n"
-"Saya sedang mengurutkan paket"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, reading packages database..."
-msgstr ""
-"Silahkan Tunggu\n"
-"Saya sedang mengurutkan paket"
+msgid "Save and quit"
+msgstr "Simpan dan keluar"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"There was a problem during the installation:\n"
+"There was a problem during the removal of packages:\n"
 "\n"
 "%s"
 msgstr ""
@@ -111,84 +158,71 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Install semua"
+msgid "Size: "
+msgstr "Ukuran"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Paket sedang disiapkan untuk instalasi..."
+msgid "Security updates"
+msgstr "Tampilkan update sekuriti"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Paket sedang disiapkan untuk instalasi..."
+msgid "Already existing update medias"
+msgstr "Error saat penambahan media"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Semua paket yg diminta telah sukses diinstal."
+msgid "Maximum information"
+msgstr "Info maximum"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Everything installed successfully"
-msgstr "Semua sukses diinstal"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Proxy..."
+msgstr "Error..."
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The installation is finished; %s.\n"
-"\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
 msgstr ""
-"Instalasi usai; %s.\n"
-"\n"
-"Beberapa file konfigurasi telah dibuat dg extensi `.rpmnew' atau `."
-"rpmsave',\n"
-"Anda mungkin perlu memeriksanya sekarang untuk bertindak selanjutnya:"
+"Instalasi gagal, beberapa file hilang.\n"
+"Anda mungkin perlu meng-update database sumber."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "everything was installed correctly"
-msgstr "semua sudah diinstal dengan benar"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Ada masalah saat instalasi"
+msgid "United Kingdom"
+msgstr "Inggris"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Instalasi paket `%s' (%s/%s)..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Paket sedang disiapkan untuk instalasi..."
+msgid "in names"
+msgstr "dalam nama"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
+"I can't find any suitable mirror.\n"
 "\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
+"Tak ditemukan mirror yang cocok.\n"
 "\n"
-"\n"
-"Error yg dilaporkan:\n"
-"%s"
+"Sebabnya mungkin banyak; yang paling sering yaitu jika arsitektur\n"
+"prosesor Anda tak ditunjang oleh Update Resmi Linux Mandrake."
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"Instalasi gagal, beberapa file hilang.\n"
-"Anda mungkin perlu meng-update database sumber."
+msgid "Remove .%s"
+msgstr "Hapus .%s"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "Finlandia"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -205,206 +239,270 @@ msgstr ""
 "\n"
 "Jalan terus?"
 
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Examining distant file of media `%s'..."
+msgstr "Periksa file jauh source `%s'..."
+
 #: ../rpmdrake:1
 #, c-format
 msgid "Verifying packages signatures..."
 msgstr ""
 
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "France"
+msgstr "Force"
+
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "More info"
+msgstr "Info lain"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Download packet `%s' (%s/%s)..."
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Lanjutkan?"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "Batal"
+msgid "Reload the packages list"
+msgstr "Muat ulang daftar paket"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid "Choose a mirror..."
+msgstr "Pilih mirror..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Masukkan media \"%s\" di device [%s]"
+msgid "Some packages can't be installed"
+msgstr "Paket `%s' tak dapat diinstal\n"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "Paket sedang disiapkan untuk instalasi..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Change medium"
-msgstr "Ubah media"
+msgid "All packages,"
+msgstr "Semua paket,"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Type of media:"
+msgstr "Jenis source:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "Inisialisasi..."
+msgid "in files"
+msgstr "dalam file"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "Semua paket yg diminta telah sukses diinstal."
+
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Paket sedang disiapkan untuk instalasi..."
+msgid "Proxy hostname:"
+msgstr "Username proxy:"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "File lokal"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr "Pemeriksaan %s"
+
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Maaf, untuk menginstal paket, Anda harus jadi root."
+msgid "Israel"
+msgstr "Install"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unable to get source packages."
-msgstr "Pilih paket Anda"
+msgid "Help"
+msgstr "/_Help"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Inspect..."
-msgstr "Periksa..."
+msgid "HTTP server"
+msgstr "Server HTTP"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Installation finished"
-msgstr "Terinstall"
+msgid "Installation failed"
+msgstr "Install semua"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Menganggur"
+msgid "Use .%s as main file"
+msgstr "Gunakan .%s sebagai file utama"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Gunakan .%s sebagai file utama"
+msgid "Search results"
+msgstr "Hasil pencarian"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid " failed!"
+msgstr " gagal!"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
+msgstr "Brazil"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr "Sudah ada media dengan nama tersebut. Akan ditindih?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Hapus .%s"
+msgid "Find:"
+msgstr "Cari:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "changes:"
-msgstr "perubahan:"
+msgid "All packages, alphabetical"
+msgstr "Semua paket, menurut abjad"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Pemeriksaan %s"
+msgid "Please wait, searching..."
+msgstr "Tunggu, sedang dicari..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, finding available packages..."
+msgid "Please wait, reading packages database..."
 msgstr ""
 "Silahkan Tunggu\n"
 "Saya sedang mengurutkan paket"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Please wait, adding medium..."
-msgstr "Media sedang ditambahkan..."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "tidak tahu"
 
 #: ../rpmdrake:1
-#, c-format
-msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
-"\n"
-"Then, restart MandrakeUpdate."
-msgstr ""
-"Anda dapat juga memilih mirror kesukaan Anda secara manual: untuk\n"
-"melakukannya, luncurkan Manajer Source Software, dan tambahkan source\n"
-"`Security updates'.\n"
-"\n"
-"Lalu, restart MandrakeUpdate."
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Masukkan media \"%s\" di device [%s]"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "Cara memilih mirror"
+msgid "Reset the selection"
+msgstr "Reset pilihan"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
 msgstr ""
+"Jika perlu proxy, masukkan nama host dan port (syntax: <proxyhost[:port]>):"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Already existing update sources"
-msgstr ""
+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:1
+#: ../rpmdrake.pm:1
 #, c-format
+msgid "Costa Rica"
+msgstr "Kosta Rika"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
+"There was a problem during the installation:\n"
 "\n"
-"Is it ok to continue?"
+"%s"
 msgstr ""
-"Mirror harus dihubungi untuk mendapatkan paket update terbaru.\n"
-"Pastikan bahwa jaringan Anda sedang berjalan.\n"
+"Error saat instalasi paket:\n"
 "\n"
-"Jalan terus?"
+"%s"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Please wait, removing medium..."
+msgstr "Media sedang dihapus..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Error file"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "Password:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "Taiwan"
+
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Paket sedang disiapkan untuk instalasi..."
+msgid "User:"
+msgstr "Username:"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr "Media sedang di-update..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Mandrake Update"
-msgstr "Setting MandrakeUpdate"
+msgid "Please wait, listing packages..."
+msgstr ""
+"Silahkan Tunggu\n"
+"Saya sedang mengurutkan paket"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Software Packages Removal"
-msgstr "Penghapusan Paket Software"
+#, fuzzy, c-format
+msgid "Information on packages"
+msgstr "Pilih paket Anda"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "Keluar"
+msgid "Cancel"
+msgstr "Batal"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Install"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Remove"
-msgstr "Hapus"
+msgid "Everything installed successfully"
+msgstr "Semua sukses diinstal"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Help"
-msgstr "/_Help"
+msgid "Select the media(s) you wish to update:"
+msgstr "Pilih source yg ingin di-update:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search"
-msgstr "Cari"
+msgid "Please wait, updating media..."
+msgstr "Media sedang di-update..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Cari:"
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -422,161 +520,186 @@ msgstr ""
 "Jalan terus?"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "in descriptions"
+msgstr "Keterangan"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Beberapa paket perlu dihapus"
+msgid "Configure proxies"
+msgstr "Konfigurasikan proxy"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
 "\n"
-"Do you really want to install all the selected packages?"
+"Is it ok to continue?"
 msgstr ""
-"Awas: Tampaknya Anda mencoba menambahkan begitu banyak paket\n"
-"yg mungkin membuat sistem file Anda kehabisan ruang disk,\n"
-"selama atau setelah instalasi paket ; ini berbahaya\n"
-"dan harus difikirkan hati-hati.\n"
+"Website MandrakeSoft harus dihubungi untuk mendapatkan daftar mirror.\n"
+"Pastikan bahwa jaringan Anda berjalan baik.\n"
 "\n"
-"Benarkah Anda ingin menginstal semua paket terpilih?"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Too many packages are selected"
-msgstr "Terlalu banyak paket dipilih"
+"Jalan terus?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "Info maximum"
+msgid "Please choose"
+msgstr "Pilihlah"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Normal information"
-msgstr "Info normal"
-
-#: ../rpmdrake:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Update source(s)"
-msgstr "Update source"
+#, fuzzy, c-format
+msgid "Selected size: %d MB"
+msgstr "paket terpilih ada %d sebesar: %.1f MB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Muat ulang daftar paket"
+msgid "Initializing..."
+msgstr "Inisialisasi..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reset the selection"
-msgstr "Reset pilihan"
+msgid "Save changes"
+msgstr "Simpan perubahan"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "in files"
-msgstr "dalam file"
+msgid "Error during download"
+msgstr "Error saat download"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "in descriptions"
-msgstr "Keterangan"
+msgid "Package installation..."
+msgstr "Paket sedang disiapkan untuk instalasi..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "dalam nama"
+msgid "Importance: "
+msgstr "Derajat Kepentingan: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
-msgstr "menurut kesediaan update"
+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:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by source repository"
-msgstr "menurut repositori sumber"
+msgid "Add..."
+msgstr "Tambahkan..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by selection state"
-msgstr "menurut status pilihan"
+msgid "Unable to create medium."
+msgstr "Gagal membuat media."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by size"
-msgstr "menurut ukuran"
+msgid ""
+"The installation is finished; %s.\n"
+"\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
+msgstr ""
+"Instalasi usai; %s.\n"
+"\n"
+"Beberapa file konfigurasi telah dibuat dg extensi `.rpmnew' atau `."
+"rpmsave',\n"
+"Anda mungkin perlu memeriksanya sekarang untuk bertindak selanjutnya:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by group"
-msgstr "menurut grup"
+msgid "Browse..."
+msgstr "Selancar..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "Paket `%s' tak dapat diinstal\n"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "All packages,"
-msgstr "Semua paket,"
+msgid "Info..."
+msgstr "Info..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Semua paket, menurut abjad"
+msgid "You need to insert the medium to continue"
+msgstr "Untuk melanjutkan, masukkan media"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Copying file for media `%s'..."
+msgstr "Salin file utk source `%s'..."
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Pilihan Mandrake"
+msgid "Remove"
+msgstr "Hapus"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Normal updates"
-msgstr "Lakukan update"
+msgid "Preparing packages installation..."
+msgstr "Paket sedang disiapkan untuk instalasi..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Bugfixes updates"
-msgstr "Tampilkan update bugfix"
+msgid "by media repository"
+msgstr "menurut repositori sumber"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Security updates"
-msgstr "Tampilkan update sekuriti"
+msgid "No mirror"
+msgstr "Mirror:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Description: "
-msgstr "Keterangan"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to fill up at least the two first entries."
+msgstr "Setidaknya dua entri pertama harus diisi."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Alasan update: "
+msgid "Install"
+msgstr "Install"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Summary: "
-msgstr "Ringkasan"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Japan"
+msgstr "Jepang"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Importance: "
-msgstr "Derajat Kepentingan: "
+msgid "Do nothing"
+msgstr "Menganggur"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "%s KB"
-msgstr "%.1f KB"
+msgid "No update"
+msgstr "Lakukan update"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Size: "
-msgstr "Ukuran"
+msgid "Description: "
+msgstr "Keterangan"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Version: "
-msgstr "Versi:"
+#, c-format
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr ""
+"Awas: Tampaknya Anda mencoba menambahkan begitu banyak paket\n"
+"yg mungkin membuat sistem file Anda kehabisan ruang disk,\n"
+"selama atau setelah instalasi paket ; ini berbahaya\n"
+"dan harus difikirkan hati-hati.\n"
+"\n"
+"Benarkah Anda ingin menginstal semua paket terpilih?"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -585,80 +708,63 @@ msgstr "Nama: %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Versi terinstal: "
+msgid "Inspect..."
+msgstr "Periksa..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Source: "
-msgstr "Sumber"
+msgid "Editing media \"%s\":"
+msgstr "Edit source \"%s\":"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "(Not available)"
-msgstr "(Tak tersedia)"
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "Paket sedang disiapkan untuk instalasi..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Changelog:\n"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Files:\n"
-msgstr "/_File"
+msgid "Australia"
+msgstr "Australia"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Selected size: %d MB"
-msgstr "paket terpilih ada %d sebesar: %.1f MB"
+msgid "Installation finished"
+msgstr "Terinstall"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Terpilih: %d MB / Tersedia: %d MB"
+msgid "by update availability"
+msgstr "menurut kesediaan update"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
-msgstr ""
-"Karena aspek ketergantungan, paket berikut harus tak dipilih:\n"
-"\n"
+msgid "Poland"
+msgstr "Polandia"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr ""
-"Maaf, paket berikut tak dapat dipilih:\n"
-"\n"
+msgid "Version: "
+msgstr "Versi:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "konflik dengan"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Anda dapat menentukan pengguna/katakunci untuk otentikasi proxy:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Paket `%s' tak dapat diinstal\n"
+msgid "Upgradable"
+msgstr "Update"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-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"
+msgid " done."
+msgstr " selesai."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Software Packages Installation"
+msgstr "Paket sedang disiapkan untuk instalasi..."
 
 #: ../rpmdrake:1
 #, c-format
@@ -667,634 +773,528 @@ msgstr "Dibutuhkan paket tambahan"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "Paket `%s' tak dapat diinstal\n"
+msgid "Bugfixes updates"
+msgstr "Tampilkan update bugfix"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
-"Maaf, menghapus paket ini berarti merusak sistem Anda:\n"
-"\n"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "Download `%s', waktu yg dibutuhkan:%s, kecepatan:%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-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"
+msgid "Germany"
+msgstr "Jerman"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Beberapa paket tambahan perlu dihapus"
+msgid "Russia"
+msgstr "Rusia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "More information on package..."
-msgstr "Info tambahan paket..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Information on packages"
-msgstr "Pilih paket Anda"
+msgid "Norway"
+msgstr "Norwegia"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "More info"
-msgstr "Info lain"
+msgid "Problem during installation"
+msgstr "Ada masalah saat instalasi"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Addable"
-msgstr "Dapat ditambahkan"
+msgid "Search"
+msgstr "Cari"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Upgradable"
-msgstr "Update"
+msgid "Edit a media"
+msgstr "Edit source"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
+msgstr "Republik Ceko"
 
 #: ../rpmdrake:1
 #, c-format
 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."
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"Daftar update kosong. Artinya tidak ada update untuk paket yang\n"
-"terinstal di komputer Anda, atau Anda sudah menginstalnya."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "No update"
-msgstr "Lakukan update"
+#, c-format
+msgid "Stop"
+msgstr "Stop"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(none)"
-msgstr "(tiada)"
+msgid "Update"
+msgstr "Update"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, listing packages..."
+msgid "Please wait, removing packages..."
 msgstr ""
 "Silahkan Tunggu\n"
 "Saya sedang mengurutkan paket"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "tidak tahu"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Satu di antara paket berikut diperlukan:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Please choose"
-msgstr "Pilihlah"
+msgid "Normal information"
+msgstr "Info normal"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr "Konflik terdeteksi"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Selected"
+msgid "Media: "
 msgstr ""
-"Pilih\n"
-"semua"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Search results"
-msgstr "Hasil pencarian"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Stop"
-msgstr "Stop"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Tunggu, sedang dicari..."
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Search results (none)"
-msgstr "Hasil pencarian (tak ada)"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "Download packet `%s' (%s/%s)..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Other"
-msgstr "Lainnya"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Terpilih: %d MB / Tersedia: %d MB"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the packages source editor!\n"
-"\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
+msgid "Media"
 msgstr ""
-"Selamat datang di editor sumber paket!\n"
-"\n"
-"Perkakas ini membantu Anda mengkonfigurasikan sumber paket yang ingin Anda\n"
-"pakai di komputer Anda, yang kemudian dapat digunakan untuk menginstal\n"
-"piranti lunak baru atau meng-update"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Save and quit"
-msgstr "Simpan dan keluar"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Error..."
+msgid "Spain"
+msgstr "Spanyol"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Update..."
-msgstr "Update"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add..."
-msgstr "Tambahkan..."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Edit"
-msgstr "Edit"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Source"
-msgstr "Sumber"
+msgid "Normal updates"
+msgstr "Lakukan update"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Enabled?"
-msgstr "Diaktifkan?"
+msgid "by selection state"
+msgstr "menurut status pilihan"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Configure sources"
-msgstr "Konfigurasikan source"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "Tunggu, alamat mirror sedang diambil dari website MandrakeSoft."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Password:"
-msgstr "Password:"
+msgid "Login:"
+msgstr "Login:"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "User:"
-msgstr "Username:"
+msgid "Adding a media:"
+msgstr "Penambahan source:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "Anda dapat menentukan pengguna/katakunci untuk otentikasi proxy:"
+msgid "Austria"
+msgstr "Austria"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy hostname:"
-msgstr "Username proxy:"
+msgid "Fatal error"
+msgstr "Error file"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
-msgstr ""
-"Jika perlu proxy, masukkan nama host dan port (syntax: <proxyhost[:port]>):"
+#, fuzzy, c-format
+msgid "Update..."
+msgstr "Update"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure proxies"
-msgstr "Konfigurasikan proxy"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "Verifikasi tandatangan `%s'..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Media sedang di-update..."
+msgid "(none)"
+msgstr "(tiada)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "Untuk menyimpan perubahan, masukkan media ke dalam drive."
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
+"Maaf, menghapus paket ini berarti merusak sistem Anda:\n"
+"\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "Untuk melanjutkan, masukkan media"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Instalasi paket `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "Simpan perubahan"
+msgid "Currently installed version: "
+msgstr "Versi terinstal: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Path relatif terhadap sintesa atau hdlist:"
+msgid "Other"
+msgstr "Lainnya"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "Reason for update: "
+msgstr "Alasan update: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "Edit source \"%s\":"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Edit a source"
-msgstr "Edit source"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Please wait, removing medium..."
-msgstr "Media sedang dihapus..."
+msgid "Please choose the desired mirror."
+msgstr ""
+"Silahkan tunggu\n"
+"Saya sedang mengambil daftar mirror"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Type of source:"
-msgstr "Jenis source:"
+msgid "Edit"
+msgstr "Edit"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Adding a source:"
-msgstr "Penambahan source:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, finding available packages..."
+msgstr ""
+"Silahkan Tunggu\n"
+"Saya sedang mengurutkan paket"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
-msgstr "Sudah ada media dengan nama tersebut. Akan ditindih?"
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Path relatif terhadap sintesa atau hdlist:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Setidaknya dua entri pertama harus diisi."
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Name:"
-msgstr "Nama"
+msgid "Search results (none)"
+msgstr "Hasil pencarian (tak ada)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Login:"
-msgstr "Login:"
+msgid "Danmark"
+msgstr "Denmark"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr "Pilih mirror..."
+msgid "China"
+msgstr "Cina"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Browse..."
-msgstr "Selancar..."
+msgid "United States"
+msgstr "Amerika Serikat"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Path or mount point:"
-msgstr "Path atau titik mount:"
+msgid "changes:"
+msgstr "perubahan:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Removable device"
-msgstr "Perangkat portabel"
+msgid "Some additional packages need to be removed"
+msgstr "Beberapa paket tambahan perlu dihapus"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "Server HTTP"
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "Server FTP"
+msgid "No"
+msgstr "Tidak"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Path:"
-msgstr "Port:"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Local files"
-msgstr "File lokal"
+msgid "Configure medias"
+msgstr "Konfigurasikan source"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add a source"
+#, fuzzy, c-format
+msgid "Add a media"
 msgstr "Tambah source"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr "Update media gagal; media akan dinon-aktifkan."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Unable to create medium."
-msgstr "Gagal membuat media."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Update"
-msgstr "Update"
+msgid "Summary: "
+msgstr "Ringkasan"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Pilih source yg ingin di-update:"
+msgid "Canada"
+msgstr "Kanada"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Media sedang di-update..."
+msgid "Greece"
+msgstr "Yunani"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid " failed!"
-msgstr " gagal!"
+msgid ""
+"There was an error downloading the mirrors list:\n"
+"\n"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
+msgstr ""
+"Error saat pengambilan daftar mirror:\n"
+"\n"
+"%s\n"
+"Jaringan, atau website MandrakeSoft mungkin tak dapat dipakai.\n"
+"Cobalah lagi nanti."
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid " done."
-msgstr " selesai."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Maaf, untuk menginstal paket, Anda harus jadi root."
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "Download `%s', kecepatan:%s"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Path:"
+msgstr "Port:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "Download `%s', waktu yg dibutuhkan:%s, kecepatan:%s"
+msgid "Problem during removal"
+msgstr "Masalah saat penghapusan"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "Verifikasi tandatangan `%s'..."
+msgid "Selected"
+msgstr ""
+"Pilih\n"
+"semua"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "Periksa file jauh source `%s'..."
+msgid "Netherlands"
+msgstr "Belanda"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "Periksa file source `%s'..."
+msgid "Addable"
+msgstr "Dapat ditambahkan"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "Salin file utk source `%s'..."
+msgid "(Not available)"
+msgstr "(Tak tersedia)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please choose the desired mirror."
-msgstr ""
-"Silahkan tunggu\n"
-"Saya sedang mengambil daftar mirror"
-
-#: ../rpmdrake.pm:1
-#, c-format
 msgid ""
-"I can't find any suitable mirror.\n"
+"Sorry, the following package(s) can't be selected:\n"
 "\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
-msgstr ""
-"Tak ditemukan mirror yang cocok.\n"
+"%s\n"
 "\n"
-"Sebabnya mungkin banyak; yang paling sering yaitu jika arsitektur\n"
-"prosesor Anda tak ditunjang oleh Update Resmi Linux Mandrake."
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "No mirror"
-msgstr "Mirror:"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid ""
-"There was an error downloading the mirrors list:\n"
+"Reasons follow:\n"
 "\n"
-"%s\n"
-"The network, or MandrakeSoft website, are maybe unavailable.\n"
-"Please try again later."
+"%s"
 msgstr ""
-"Error saat pengambilan daftar mirror:\n"
+"Maaf, paket berikut tak dapat dipilih:\n"
 "\n"
-"%s\n"
-"Jaringan, atau website MandrakeSoft mungkin tak dapat dipakai.\n"
-"Cobalah lagi nanti."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Not selected"
+msgstr "Konflik terdeteksi"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
-msgstr "Error saat download"
+msgid "Software Packages Removal"
+msgstr "Penghapusan Paket Software"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr "Tunggu, alamat mirror sedang diambil dari website MandrakeSoft."
+msgid "Sweden"
+msgstr "Swedia"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
 "\n"
-"Is it ok to continue?"
+"\n"
+"Error(s) reported:\n"
+"%s"
 msgstr ""
-"Website MandrakeSoft harus dihubungi untuk mendapatkan daftar mirror.\n"
-"Pastikan bahwa jaringan Anda berjalan baik.\n"
 "\n"
-"Jalan terus?"
+"\n"
+"Error yg dilaporkan:\n"
+"%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United States"
-msgstr "Amerika Serikat"
+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 ""
+"Daftar update kosong. Artinya tidak ada update untuk paket yang\n"
+"terinstal di komputer Anda, atau Anda sudah menginstalnya."
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "China"
-msgstr "Cina"
+#, fuzzy, c-format
+msgid "Examining file of media `%s'..."
+msgstr "Periksa file source `%s'..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Inggris"
+msgid "Download of `%s', speed:%s"
+msgstr "Download `%s', kecepatan:%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Taiwan"
+msgid "One of the following packages is needed:"
+msgstr "Satu di antara paket berikut diperlukan:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Sweden"
-msgstr "Swedia"
+msgid "Quit"
+msgstr "Keluar"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Russia"
-msgstr "Rusia"
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Mirror harus dihubungi untuk mendapatkan paket update terbaru.\n"
+"Pastikan bahwa jaringan Anda sedang berjalan.\n"
+"\n"
+"Jalan terus?"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Portugal"
-msgstr "Port:"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Poland"
-msgstr "Polandia"
+msgid "Update media(s)"
+msgstr "Update source"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Norway"
-msgstr "Norwegia"
+msgid "Ok"
+msgstr "Ok"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Netherlands"
-msgstr "Belanda"
+msgid "Please wait, adding medium..."
+msgstr "Media sedang ditambahkan..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Korea"
-msgstr "Force"
+msgid "Unable to get source packages."
+msgstr "Pilih paket Anda"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "Jepang"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Italy"
-msgstr "Install"
+msgid "Too many packages are selected"
+msgstr "Terlalu banyak paket dipilih"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Israel"
-msgstr "Install"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Greece"
-msgstr "Yunani"
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"Selamat datang di editor sumber paket!\n"
+"\n"
+"Perkakas ini membantu Anda mengkonfigurasikan sumber paket yang ingin Anda\n"
+"pakai di komputer Anda, yang kemudian dapat digunakan untuk menginstal\n"
+"piranti lunak baru atau meng-update"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "France"
-msgstr "Force"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Finland"
-msgstr "Finlandia"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Spain"
-msgstr "Spanyol"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Danmark"
-msgstr "Denmark"
+msgid "%s conflicts with %s"
+msgstr "konflik dengan"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "Jerman"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Selamat Datang di MandrakeUpdate!\n"
+"\n"
+"Perkakas ini membantu Anda memilih update yang ingin Anda instal di\n"
+"komputer Anda."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Republik Ceko"
+msgid "Mandrake choices"
+msgstr "Pilihan Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Kosta Rika"
+msgid "Changelog:\n"
+msgstr "Changelog:\n"
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Canada"
-msgstr "Kanada"
+#, fuzzy, c-format
+msgid "Korea"
+msgstr "Force"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Brazil"
-msgstr "Brazil"
+msgid "Removable device"
+msgstr "Perangkat portabel"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Belgia"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Australia"
+msgid "Change medium"
+msgstr "Ubah media"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Austria"
-msgstr "Austria"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mandrake Update"
+msgstr "Setting MandrakeUpdate"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
-msgstr "Info..."
+msgid "by size"
+msgstr "menurut ukuran"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "Tidak"
+msgid "FTP server"
+msgstr "Server FTP"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Files:\n"
+msgstr "/_File"
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Yes"
-msgstr "Ya"
+#, fuzzy, c-format
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr "Update media gagal; media akan dinon-aktifkan."
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -1568,6 +1568,13 @@ msgstr "Hapus Software"
 msgid "Software Sources Manager"
 msgstr "Manajer Source Software"
 
+#, fuzzy
+#~ msgid "Source: "
+#~ msgstr "Sumber"
+
+#~ msgid "Source"
+#~ msgstr "Sumber"
+
 #~ msgid ""
 #~ "some packages failed to install\n"
 #~ "correctly"
@@ -1602,9 +1609,6 @@ msgstr "Manajer Source Software"
 #~ "\n"
 #~ "Do you want to try another mirror?"
 
-#~ msgid "Error adding update medium"
-#~ msgstr "Error saat penambahan media"
-
 #~ msgid "Please wait, contacting mirror to initialize updates packages."
 #~ msgstr "Mirror sedang dihubungi untuk memulai update paket."
 
diff --git a/po/is.po b/po/is.po
index 7c655b50..9939edca 100644
--- a/po/is.po
+++ b/po/is.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+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"
@@ -13,14 +13,21 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
+msgid "Enabled?"
 msgstr ""
 
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr ""
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Portugal"
+msgstr "Port:"
+
 #: ../rpmdrake:1
 #, c-format
 msgid ""
@@ -33,121 +40,160 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
+msgid "by group"
 msgstr ""
 
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Name:"
+msgstr "Nafn"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Italy"
+msgstr "Set inn"
+
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
+msgid "How to choose manually your mirror"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr "Undirbý innsetningu"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during removal"
-msgstr "Undirbý innsetningu"
+#, c-format
+msgid "Some packages need to be removed"
+msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, removing packages..."
-msgstr "Augnablik..."
+#, c-format
+msgid "More information on package..."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, reading packages database..."
+msgid "Yes"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"There was a problem during the installation:\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"%s"
-msgstr "Undirbý innsetningu"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Set inn:"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Undirbý innsetningu"
+msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Undirbý innsetningu"
+#, c-format
+msgid "everything was installed correctly"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
+msgid "%s KB"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Welcome to the software removal tool!\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "everything was installed correctly"
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr ""
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Problem during installation"
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
 msgstr "Undirbý innsetningu"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Size: "
+msgstr "Stærð"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
+msgid "Security updates"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Undirbý innsetningu"
+msgid "Already existing update medias"
+msgstr "Augnablik..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+msgid "Maximum information"
 msgstr ""
 
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Proxy..."
+msgstr "Villa..."
+
 #: ../rpmdrake:1
 #, c-format
 msgid ""
 "Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"You may want to update your medias database."
+msgstr ""
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
+msgstr ""
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid ""
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
+msgstr ""
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Remove .%s"
+msgstr "Fjarlægja"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -160,70 +206,109 @@ msgid ""
 "Do you want to continue installation?"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Verifying packages signatures..."
+msgid "Examining distant file of media `%s'..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
+msgid "Verifying packages signatures..."
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "France"
+msgstr "Neyða"
+
+#. -PO: Keep it short, this is gonna be on a button
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "Hætta við"
+msgid "More info"
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Ok"
-msgstr "Í lagi"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+msgid "Reload the packages list"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Change medium"
+msgid "Choose a mirror..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Initializing..."
-msgstr "Set inn:"
+msgid "Some packages can't be installed"
+msgstr "Get ekki sett inn þennan pakka"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Package installation..."
+msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Undirbý innsetningu"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "All packages,"
+msgstr "Fjarlægja"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Unable to get source packages, sorry. %s"
+msgid "Type of media:"
 msgstr ""
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "in files"
+msgstr "Nafn"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Unable to get source packages."
+msgid "All requested packages were installed successfully."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Inspect..."
+msgid "Proxy hostname:"
 msgstr ""
 
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Local files"
+msgstr "Nafn"
+
 #: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr ""
+
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Installation finished"
+msgid "Israel"
 msgstr "Set inn"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Help"
+msgstr "Hjálp"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "HTTP server"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Do nothing"
-msgstr "Staðbundinn prentari"
+msgid "Installation failed"
+msgstr "Set inn:"
 
 #: ../rpmdrake:1
 #, c-format
@@ -232,122 +317,147 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Remove .%s"
-msgstr "Fjarlægja"
+msgid "Search results"
+msgstr "Leita"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "changes:"
-msgstr "Pakka"
+msgid " failed!"
+msgstr "Nafn"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
+msgid "Find:"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, finding available packages..."
+msgid "All packages, alphabetical"
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, adding medium..."
+msgid "Please wait, searching..."
 msgstr "Augnablik..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
-"\n"
-"Then, restart MandrakeUpdate."
+msgid "Please wait, reading packages database..."
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "How to choose manually your mirror"
-msgstr ""
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "Get ekki opnað pakka"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Already existing update sources"
+msgid "Reset the selection"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Fatal error"
+msgid "Costa Rica"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
 msgstr "Undirbý innsetningu"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr ""
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "Lykilorð:"
+
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Mandrake Update"
-msgstr "Linux-Mandrake uppfærsla"
+msgid "Taiwan"
+msgstr "Upplýsingar"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Software Packages Removal"
+msgid "User:"
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, updating medium..."
+msgstr "Augnablik..."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Quit"
-msgstr "Hætta"
+msgid "Please wait, listing packages..."
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Install"
-msgstr "Set inn:"
+msgid "Information on packages"
+msgstr "Get ekki opnað pakka"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Remove"
-msgstr "Viðföng fyrir fjartengda lpd prentara"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
+msgstr "Hætta við"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Help"
-msgstr "Hjálp"
+msgid "Everything installed successfully"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search"
-msgstr "Leita"
+msgid "Select the media(s) you wish to update:"
+msgstr ""
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Please wait, updating media..."
+msgstr "Augnablik..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
+msgid "A fatal error occurred: %s."
 msgstr ""
 
 #: ../rpmdrake:1
@@ -361,811 +471,692 @@ msgid ""
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Some packages need to be removed"
-msgstr ""
+#, fuzzy, c-format
+msgid "in descriptions"
+msgstr "Lýsingar"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure proxies"
+msgstr "Bæta við notanda"
+
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
 "\n"
-"Do you really want to install all the selected packages?"
+"Is it ok to continue?"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Too many packages are selected"
-msgstr ""
+#, fuzzy, c-format
+msgid "Please choose"
+msgstr "Augnablik..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
+msgid "Selected size: %d MB"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Normal information"
-msgstr "Linux-Mandrake uppfærsla"
+msgid "Initializing..."
+msgstr "Set inn:"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Update source(s)"
-msgstr "Miðlungs"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Reload the packages list"
-msgstr ""
+msgid "Save changes"
+msgstr "Pakka"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Reset the selection"
+msgid "Error during download"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "in files"
-msgstr "Nafn"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "in descriptions"
-msgstr "Lýsingar"
+msgid "Package installation..."
+msgstr "Undirbý innsetningu"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
+msgid "Importance: "
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
+msgid ""
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by source repository"
+msgid "Add..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by selection state"
+msgid "Unable to create medium."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by size"
+msgid ""
+"The installation is finished; %s.\n"
+"\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by group"
+msgid "Browse..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "All packages,"
-msgstr "Fjarlægja"
+msgid "Some packages can't be removed"
+msgstr "Get ekki sett inn þennan pakka"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "All packages, alphabetical"
+msgid "Info..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Mandrake choices"
+msgid "You need to insert the medium to continue"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Normal updates"
-msgstr "Linux-Mandrake uppfærsla"
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Bugfixes updates"
+msgid "Copying file for media `%s'..."
 msgstr ""
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Security updates"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Description: "
-msgstr "Lýsingar"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
-msgstr ""
+msgid "Remove"
+msgstr "Viðföng fyrir fjartengda lpd prentara"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Summary: "
-msgstr "Yfirlit"
+msgid "Preparing packages installation..."
+msgstr "Undirbý innsetningu"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Importance: "
+msgid "by media repository"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "%s KB"
+msgid "No mirror"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Size: "
-msgstr "Stærð"
-
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Version: "
+msgid "You need to fill up at least the two first entries."
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Name: "
-msgstr "Nafn: %s"
+msgid "Install"
+msgstr "Set inn:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Currently installed version: "
+msgid "Japan"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Source: "
-msgstr "Neyða"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "(Not available)"
-msgstr ""
+msgid "Do nothing"
+msgstr "Staðbundinn prentari"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Changelog:\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "No update"
+msgstr "Linux-Mandrake uppfærsla"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Files:\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "Description: "
+msgstr "Lýsingar"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr ""
+#, fuzzy, c-format
+msgid "Name: "
+msgstr "Nafn: %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
+msgid "Inspect..."
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing media \"%s\":"
+msgstr "Miðlungs"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr " brýtur í bága við %s-%s-%s"
+msgid "No package found for installation."
+msgstr "Undirbý innsetningu"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Get ekki sett inn þennan pakka"
+msgid "Australia"
+msgstr "raðtengd"
 
 #: ../rpmdrake:1
-#, c-format
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "Installation finished"
+msgstr "Set inn"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Additional packages needed"
+msgid "by update availability"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "Get ekki sett inn þennan pakka"
+msgid "Poland"
+msgstr "�slenskt"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
+msgid "Version: "
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
+msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some additional packages need to be removed"
+msgid "Upgradable"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "More information on package..."
+msgid " done."
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Information on packages"
-msgstr "Get ekki opnað pakka"
+msgid "Software Packages Installation"
+msgstr "Undirbý innsetningu"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "More info"
+msgid "Additional packages needed"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Addable"
-msgstr "Setja kerfið inn"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "Upgradable"
+msgid "Bugfixes updates"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-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."
+msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "No update"
-msgstr "Linux-Mandrake uppfærsla"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "(none)"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Please wait, listing packages..."
-msgstr ""
+msgid "Germany"
+msgstr "Þýskt"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "unknown package "
-msgstr "Get ekki opnað pakka"
+msgid "Russia"
+msgstr "Rússneskt"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "One of the following packages is needed:"
-msgstr ""
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Norway"
+msgstr "Norkst"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please choose"
-msgstr "Augnablik..."
+msgid "Problem during installation"
+msgstr "Undirbý innsetningu"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Search"
+msgstr "Leita"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Not selected"
-msgstr " brýtur í bága við %s-%s-%s"
+msgid "Edit a media"
+msgstr "Miðlungs"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Selected"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
 msgstr ""
-"Velja\n"
-"alla"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Search results"
-msgstr "Leita"
+#, c-format
+msgid ""
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Stop"
 msgstr "Geiri"
 
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update"
+msgstr "Linux-Mandrake uppfærsla"
+
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, searching..."
+msgid "Please wait, removing packages..."
 msgstr "Augnablik..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Search results (none)"
-msgstr "Leita"
+msgid "Normal information"
+msgstr "Linux-Mandrake uppfærsla"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Other"
-msgstr "Annað"
+msgid "Media: "
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to the packages source editor!\n"
-"\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
+msgid "Downloading package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
+msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Media"
+msgstr ""
+
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Villa..."
+msgid "Spain"
+msgstr "Spænskt"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Update..."
+msgid "Normal updates"
 msgstr "Linux-Mandrake uppfærsla"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
+msgid "by selection state"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Source"
-msgstr "Neyða"
-
-#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Enabled?"
+msgid "Login:"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Configure sources"
-msgstr "Bæta við notanda"
+msgid "Adding a media:"
+msgstr "Miðlungs"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Password:"
-msgstr "Lykilorð:"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Austria"
+msgstr "raðtengd"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "User:"
+msgid "Fatal error"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Update..."
+msgstr "Linux-Mandrake uppfærsla"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
+msgid "Starting download of `%s'..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
+msgid "(none)"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+"Removing these packages would break your system, sorry:\n"
+"\n"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Configure proxies"
-msgstr "Bæta við notanda"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Please wait, updating medium..."
-msgstr "Augnablik..."
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
+msgid "Installing package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
+msgid "Currently installed version: "
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Save changes"
-msgstr "Pakka"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr ""
+msgid "Other"
+msgstr "Annað"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
+msgid "Reason for update: "
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "Miðlungs"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Edit a source"
-msgstr "Miðlungs"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, removing medium..."
+msgid "Please choose the desired mirror."
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Type of source:"
+msgid "Edit"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Adding a source:"
-msgstr "Miðlungs"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
+msgid "Please wait, finding available packages..."
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
+msgid "Relative path to synthesis/hdlist:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Name:"
-msgstr "Nafn"
+msgid "Search results (none)"
+msgstr "Leita"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Login:"
+msgid "Danmark"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Choose a mirror..."
+msgid "China"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Browse..."
+msgid "United States"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Path or mount point:"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "changes:"
+msgstr "Pakka"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Removable device"
+msgid "Some additional packages need to be removed"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr ""
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
+msgid "No"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Path:"
-msgstr "Port:"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Local files"
-msgstr "Nafn"
+msgid "Configure medias"
+msgstr "Bæta við notanda"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Add a source"
+msgid "Add a media"
 msgstr "Miðlungs"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr ""
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Unable to create medium."
-msgstr ""
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Update"
-msgstr "Linux-Mandrake uppfærsla"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr ""
+msgid "Summary: "
+msgstr "Yfirlit"
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Please wait, updating media..."
-msgstr "Augnablik..."
+msgid "Canada"
+msgstr "Kanadískt (Quebec)"
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid " failed!"
-msgstr "Nafn"
+msgid "Greece"
+msgstr "Grískt"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid " done."
+msgid ""
+"There was an error downloading the mirrors list:\n"
+"\n"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Download of `%s', speed:%s"
+msgid "Unable to get source packages, sorry. %s"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Path:"
+msgstr "Port:"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Starting download of `%s'..."
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during removal"
+msgstr "Undirbý innsetningu"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Examining distant file of source `%s'..."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Selected"
 msgstr ""
+"Velja\n"
+"alla"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Examining file of source `%s'..."
+msgid "Netherlands"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Copying file for source `%s'..."
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Addable"
+msgstr "Setja kerfið inn"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please choose the desired mirror."
+msgid "(Not available)"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"I can't find any suitable mirror.\n"
+"Sorry, the following package(s) can't be selected:\n"
 "\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Not selected"
+msgstr " brýtur í bága við %s-%s-%s"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "No mirror"
+msgid "Software Packages Removal"
 msgstr ""
 
 #: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Sweden"
+msgstr "Skoða"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"There was an error downloading the mirrors list:\n"
 "\n"
-"%s\n"
-"The network, or MandrakeSoft website, are maybe unavailable.\n"
-"Please try again later."
+"\n"
+"Error(s) reported:\n"
+"%s"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
+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.pm:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgid "Examining file of media `%s'..."
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
+msgid "Download of `%s', speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United States"
+msgid "One of the following packages is needed:"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "China"
-msgstr ""
+msgid "Quit"
+msgstr "Hætta"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Taiwan"
-msgstr "Upplýsingar"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Sweden"
-msgstr "Skoða"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Russia"
-msgstr "Rússneskt"
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Portugal"
-msgstr "Port:"
+msgid "Update media(s)"
+msgstr "Miðlungs"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Poland"
-msgstr "�slenskt"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "Í lagi"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Norway"
-msgstr "Norkst"
+msgid "Please wait, adding medium..."
+msgstr "Augnablik..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Netherlands"
+msgid "Unable to get source packages."
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Korea"
-msgstr "Neyða"
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
+msgid "Too many packages are selected"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Italy"
-msgstr "Set inn"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Israel"
-msgstr "Set inn"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Greece"
-msgstr "Grískt"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "France"
-msgstr "Neyða"
-
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Finland"
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Spain"
-msgstr "Spænskt"
+msgid "%s conflicts with %s"
+msgstr " brýtur í bága við %s-%s-%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Danmark"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Germany"
-msgstr "Þýskt"
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
+msgid "Mandrake choices"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
+msgid "Changelog:\n"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Canada"
-msgstr "Kanadískt (Quebec)"
+msgid "Korea"
+msgstr "Neyða"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Brazil"
+msgid "Removable device"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1173,29 +1164,38 @@ msgstr ""
 msgid "Belgium"
 msgstr "Belgískt"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Australia"
-msgstr "raðtengd"
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Austria"
-msgstr "raðtengd"
+msgid "Mandrake Update"
+msgstr "Linux-Mandrake uppfærsla"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
+msgid "by size"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
+msgid "FTP server"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Yes"
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
 msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:86
@@ -1473,6 +1473,14 @@ msgstr ""
 msgid "Software Sources Manager"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Source: "
+#~ msgstr "Neyða"
+
+#, fuzzy
+#~ msgid "Source"
+#~ msgstr "Neyða"
+
 #~ msgid "Installing/Upgrading Progress"
 #~ msgstr "Gangur innsetningar/uppfærslu"
 
diff --git a/po/it.po b/po/it.po
index af5c164b..f26c763e 100644
--- a/po/it.po
+++ b/po/it.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: 2003-02-21 18:18+0100\n"
 "Last-Translator: Simone Riccio <s.riccio@aeb.informatica.it>\n"
 "Language-Team: Italian <IT@li.org>\n"
@@ -19,16 +19,20 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"Andiamo avanti?"
+msgid "Enabled?"
+msgstr "Abilitato?"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Percorso o punto di mount:"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Portugal"
+msgstr "Porta:"
 
 #: ../rpmdrake:1
 #, c-format
@@ -48,17 +52,79 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "by group"
+msgstr "per gruppo"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Name:"
+msgstr "Nome"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Italy"
+msgstr "Installa"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Come scegliere manualmente il mirror"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "Alcuni pacchetti devono essere rimossi"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
+msgstr "Ulteriori informazioni sul pacchetto..."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Sì"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Welcome to MandrakeUpdate!\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
 msgstr ""
-"Benvenuto in MandrakeUpdate!\n"
+"Per soddisfare le dipendenze, i seguenti pacchetti devono essere\n"
+"deselezionati ora:\n"
 "\n"
-"Questo programma ti aiuterà a scegliere gli aggiornamenti che vuoi "
-"installare sul tuo\n"
-"computer."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "tutto è stato installato correttamente"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "%s KB"
+msgstr "%.1f Kb"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"Potete anche scegliere il mirror che preferite manualmente: per far questo,\n"
+"lanciate il Software Sources Manager e aggiungete una fonte \"Aggiornamenti\n"
+"di sicurezza\".\n"
+"\n"
+"Quindi riavviate MandrakeUpdate."
 
 #: ../rpmdrake:1
 #, c-format
@@ -73,40 +139,21 @@ msgstr ""
 "Questa utilità ti aiuterà a scegliere che software vuoi rimuovere dal\n"
 "tuo computer."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:1
+#, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Si è verificato un errore durante l'installazione dei pacchetti:\n"
-"\n"
-"%s"
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "Per salvare le modifiche devi inserire il supporto nel drive"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Problem during removal"
-msgstr "Si sono verificati dei problemi durante la rimozione"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, removing packages..."
-msgstr ""
-"Attendi...\n"
-"Ordino i pacchetti"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, reading packages database..."
-msgstr ""
-"Attendi...\n"
-"Ordino i pacchetti"
+msgid "Save and quit"
+msgstr "Salva ed esci"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"There was a problem during the installation:\n"
+"There was a problem during the removal of packages:\n"
 "\n"
 "%s"
 msgstr ""
@@ -116,83 +163,72 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Installa tutto"
+msgid "Size: "
+msgstr "Dimensioni"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Sto preparando i pacchetti per l'installazione..."
+msgid "Security updates"
+msgstr "Mostra aggiornamenti sulla sicurezza"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Sto preparando i pacchetti per l'installazione..."
+msgid "Already existing update medias"
+msgstr "Errore durante l'aggiunta del supporto per gli aggiornamenti"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Tutti i pacchetti richiesti sono stati installati con successo."
+msgid "Maximum information"
+msgstr "Tutte le informazioni"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Everything installed successfully"
-msgstr "Tutto è stato installato con successo."
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Proxy..."
+msgstr "Errore..."
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The installation is finished; %s.\n"
-"\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
 msgstr ""
-"L'installazione è terminata, %s.\n"
-"\n"
-"Sono stati creati alcuni file di configurazione `.rpmnew' o `.rpmsave',\n"
-"adesso puoi ispezionarli in modo da decidere cosa fare:"
+"Installazione fallita, alcuni file mancano.\n"
+"Potrebbe essere una buona idea aggiornare il database delle sorgenti."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "everything was installed correctly"
-msgstr "tutto è stato installato correttamente"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Si sono verificati dei problemi durante l'installazione"
+msgid "United Kingdom"
+msgstr "Regno Unito"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Sto installando il pacchetto `%s' (%s/%s)..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Sto preparando i pacchetti per l'installazione..."
+msgid "in names"
+msgstr "nei nomi"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
+"I can't find any suitable mirror.\n"
 "\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
+"Non riesco a trovare un mirror adatto.\n"
 "\n"
-"\n"
-"Errore/i riportati:\n"
-"%s"
+"Possono esserci molte ragioni per questo problema; la più comun è\n"
+"il caso nel quale l'architettura del tuo processore non è supportata\n"
+"dagli update ufficiali di Mandrake Linux."
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"Installazione fallita, alcuni file mancano.\n"
-"Potrebbe essere una buona idea aggiornare il database delle sorgenti."
+msgid "Remove .%s"
+msgstr "Rimuovi .%s"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "Finlandia"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -209,207 +245,278 @@ msgstr ""
 "\n"
 "Proseguiamo?"
 
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Examining distant file of media `%s'..."
+msgstr "Esamino il file remoto della sorgente '%s'..."
+
 #: ../rpmdrake:1
 #, c-format
 msgid "Verifying packages signatures..."
 msgstr ""
 
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "France"
+msgstr "Forza"
+
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "More info"
+msgstr "Maggiori informazioni"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Sto scaricando il pacchetto `%s' (%s/%s)..."
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Andiamo avanti?"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "Annulla"
+msgid "Reload the packages list"
+msgstr "Ricarica la lista dei pacchetti"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid "Choose a mirror..."
+msgstr "Scegli un mirror..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr ""
-"Per favore inserisci il supporto etichettato \"%s\" nel dispositivo [%s]"
+msgid "Some packages can't be installed"
+msgstr "Il pacchetto `%s' non può essere installato\n"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "Sto preparando i pacchetti per l'installazione..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Change medium"
-msgstr "Cambia supporto"
+msgid "All packages,"
+msgstr "Tutti i pacchetti,"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Type of media:"
+msgstr "Tipo di sorgente:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "Inizializzazione..."
+msgid "in files"
+msgstr "nei file"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "Tutti i pacchetti richiesti sono stati installati con successo."
+
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Sto preparando i pacchetti per l'installazione..."
+msgid "Proxy hostname:"
+msgstr "Username per il Proxy:"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "File locali"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr "Ispezione di %s"
+
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Devi essere root per installare dei pacchetti."
+msgid "Israel"
+msgstr "Installa"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unable to get source packages."
-msgstr "Scegli i tuoi pacchetti"
+msgid "Help"
+msgstr "/_Guida"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Inspect..."
-msgstr "Ispezionare..."
+msgid "HTTP server"
+msgstr "Server HTTP"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Installation finished"
-msgstr "Installato"
+msgid "Installation failed"
+msgstr "Installa tutto"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Non fare niente"
+msgid "Use .%s as main file"
+msgstr "Usa .%s come file principale"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Usa .%s come file principale"
+msgid "Search results"
+msgstr "Risultati della Ricerca"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid " failed!"
+msgstr " fallita!"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
+msgstr "Brasile"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"C'è già un supporto con quel nome, vuoi\n"
+"veramente sostrituirlo?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Rimuovi .%s"
+msgid "Find:"
+msgstr "Trova:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "changes:"
-msgstr "modifiche:"
+msgid "All packages, alphabetical"
+msgstr "Tutti i pacchetti, alfabeticamente"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Ispezione di %s"
+msgid "Please wait, searching..."
+msgstr "Per favore attendere, ricerca in corso..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, finding available packages..."
+msgid "Please wait, reading packages database..."
 msgstr ""
 "Attendi...\n"
 "Ordino i pacchetti"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Please wait, adding medium..."
-msgstr "Attendere l'aggiunta del supporto..."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "sconosciuto"
 
 #: ../rpmdrake:1
-#, c-format
-msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
-"\n"
-"Then, restart MandrakeUpdate."
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
-"Potete anche scegliere il mirror che preferite manualmente: per far questo,\n"
-"lanciate il Software Sources Manager e aggiungete una fonte \"Aggiornamenti\n"
-"di sicurezza\".\n"
-"\n"
-"Quindi riavviate MandrakeUpdate."
+"Per favore inserisci il supporto etichettato \"%s\" nel dispositivo [%s]"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "Come scegliere manualmente il mirror"
+msgid "Reset the selection"
+msgstr "Annulla la selezione"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
 msgstr ""
+"Se hai bisogno di specificare un proxy, digita il nome dell'host e "
+"opzionalmente la porta\n"
+"(sintassi: <proxy[:porta]>):"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Already existing update sources"
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
 msgstr ""
+"Per soddisfare le dipendenze, anche i seguenti pacchetti devono essere\n"
+"rimossi:\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
+msgid "Costa Rica"
+msgstr "Costa Rica"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
+"There was a problem during the installation:\n"
 "\n"
-"Is it ok to continue?"
+"%s"
 msgstr ""
-"Devo contattare il mirror per recuperare gli ultimi aggiornamenti.\n"
-"Controlla che la rete sia in funzione.\n"
+"Si è verificato un errore durante l'installazione dei pacchetti:\n"
 "\n"
-"Proseguiamo?"
+"%s"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Please wait, removing medium..."
+msgstr "Attendere la rimozione supporto..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Errore nel file"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "Password:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "Taiwan"
+
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Sto preparando i pacchetti per l'installazione..."
+msgid "User:"
+msgstr "Nome utente:"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr "Attendere l'aggiornamento del supporto..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Mandrake Update"
-msgstr "MandrakeUpdate: Preferenze"
+msgid "Please wait, listing packages..."
+msgstr ""
+"Attendi...\n"
+"Ordino i pacchetti"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Software Packages Removal"
-msgstr "Rimozione Pacchetti Software"
+#, fuzzy, c-format
+msgid "Information on packages"
+msgstr "Scegli i tuoi pacchetti"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "Esci"
+msgid "Cancel"
+msgstr "Annulla"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Installa"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Remove"
-msgstr "Rimuovi"
+msgid "Everything installed successfully"
+msgstr "Tutto è stato installato con successo."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Help"
-msgstr "/_Guida"
+msgid "Select the media(s) you wish to update:"
+msgstr "Seleziona la sorgente che vuoi aggiornare:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search"
-msgstr "Cerca"
+msgid "Please wait, updating media..."
+msgstr "Attendere l'aggiornamento del supporto..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Trova:"
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -427,161 +534,188 @@ msgstr ""
 "Proseguiamo?"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "in descriptions"
+msgstr "Descrizioni"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Alcuni pacchetti devono essere rimossi"
+msgid "Configure proxies"
+msgstr "Configurazione dei proxy"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
 "\n"
-"Do you really want to install all the selected packages?"
+"Is it ok to continue?"
 msgstr ""
-"Attenzione: sembra che il tentativo di aggiungere un numero\n"
-"così elevato di pacchetti potrebbe portare all'esaurimento dello\n"
-"spazio su disco, durante o subito dopo l'installazione dei pacchetti.\n"
-"Questo è particolarmente pericoloso e merita una riflessione.\n"
+"Devo contattare il sito di MandrakeSoft per recuperare la lista dei mirror.\n"
+"Controlla che la tua rete sia in funzione.\n"
 "\n"
-"Vuoi davvero installare tutti i pacchetti selezionati?"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Too many packages are selected"
-msgstr "Troppi pacchetti selezionati"
+"Proseguiamo?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "Tutte le informazioni"
+msgid "Please choose"
+msgstr "Per favore scegli"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Normal information"
-msgstr "Informazioni normali"
-
-#: ../rpmdrake:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Update source(s)"
-msgstr "Aggiorna sorgente(i)"
+#, fuzzy, c-format
+msgid "Selected size: %d MB"
+msgstr "%d pacchetti selezionati: %.1f Mb"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Ricarica la lista dei pacchetti"
+msgid "Initializing..."
+msgstr "Inizializzazione..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reset the selection"
-msgstr "Annulla la selezione"
+msgid "Save changes"
+msgstr "Salva le modifiche"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "in files"
-msgstr "nei file"
+msgid "Error during download"
+msgstr "Errore durante lo scaricamento"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "in descriptions"
-msgstr "Descrizioni"
+msgid "Package installation..."
+msgstr "Sto preparando i pacchetti per l'installazione..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "nei nomi"
+msgid "Importance: "
+msgstr "Importanza: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
-msgstr "per disponibilità aggiornamenti"
+msgid ""
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
+msgstr ""
+"Per soddisfare le dipendenze, anche i seguenti pacchetti devono\n"
+"essere installati:\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by source repository"
-msgstr "per repositorio di sorgente"
+msgid "Add..."
+msgstr "Aggiungi..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by selection state"
-msgstr "per selezione"
+msgid "Unable to create medium."
+msgstr "Impossibile creare il supporto."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by size"
-msgstr "per dimensione"
+msgid ""
+"The installation is finished; %s.\n"
+"\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
+msgstr ""
+"L'installazione è terminata, %s.\n"
+"\n"
+"Sono stati creati alcuni file di configurazione `.rpmnew' o `.rpmsave',\n"
+"adesso puoi ispezionarli in modo da decidere cosa fare:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by group"
-msgstr "per gruppo"
+msgid "Browse..."
+msgstr "Sfoglia..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "Il pacchetto `%s' non può essere installato\n"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "All packages,"
-msgstr "Tutti i pacchetti,"
+msgid "Info..."
+msgstr "Informazioni..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Tutti i pacchetti, alfabeticamente"
+msgid "You need to insert the medium to continue"
+msgstr "Devi inserire il supporto per continuare"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Copying file for media `%s'..."
+msgstr "Copio il file per la sorgente '%s'..."
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Scelte di Mandrake"
+msgid "Remove"
+msgstr "Rimuovi"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Normal updates"
-msgstr "Aggiornamenti normali"
+msgid "Preparing packages installation..."
+msgstr "Sto preparando i pacchetti per l'installazione..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Bugfixes updates"
-msgstr "Mostra gli aggiornamenti bugfix"
+msgid "by media repository"
+msgstr "per repositorio di sorgente"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Security updates"
-msgstr "Mostra aggiornamenti sulla sicurezza"
+msgid "No mirror"
+msgstr "mirror:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Description: "
-msgstr "Descrizioni"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to fill up at least the two first entries."
+msgstr "Dovresti compilare almeno le prime due caselle."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Causa dell'aggiornamento:"
+msgid "Install"
+msgstr "Installa"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Summary: "
-msgstr "Sommario"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Japan"
+msgstr "Giappone"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Importance: "
-msgstr "Importanza: "
+msgid "Do nothing"
+msgstr "Non fare niente"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "%s KB"
-msgstr "%.1f Kb"
+msgid "No update"
+msgstr "Fai gli aggiornamenti"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Size: "
-msgstr "Dimensioni"
+msgid "Description: "
+msgstr "Descrizioni"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Version: "
-msgstr "Versione:"
+#, c-format
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr ""
+"Attenzione: sembra che il tentativo di aggiungere un numero\n"
+"così elevato di pacchetti potrebbe portare all'esaurimento dello\n"
+"spazio su disco, durante o subito dopo l'installazione dei pacchetti.\n"
+"Questo è particolarmente pericoloso e merita una riflessione.\n"
+"\n"
+"Vuoi davvero installare tutti i pacchetti selezionati?"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -590,84 +724,65 @@ msgstr "Nome: %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Versione attualmente installata:"
+msgid "Inspect..."
+msgstr "Ispezionare..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Source: "
-msgstr "Proviene da"
+msgid "Editing media \"%s\":"
+msgstr "Modifica sorgente \"%s\":"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "(Not available)"
-msgstr "(Non disponibile)"
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "Sto preparando i pacchetti per l'installazione..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Changelog:\n"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Files:\n"
-msgstr "/_File"
+msgid "Australia"
+msgstr "Australia"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Selected size: %d MB"
-msgstr "%d pacchetti selezionati: %.1f Mb"
+msgid "Installation finished"
+msgstr "Installato"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Selezionati: %d MB / Spazio libero su disco: %d MB"
+msgid "by update availability"
+msgstr "per disponibilità aggiornamenti"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
-msgstr ""
-"Per soddisfare le dipendenze, i seguenti pacchetti devono essere\n"
-"deselezionati ora:\n"
-"\n"
+msgid "Poland"
+msgstr "Polonia"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
+msgid "Version: "
+msgstr "Versione:"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
-"Spiacente, i seguenti pacchetti non possono essere selezionati:\n"
-"\n"
+"Devi specificare nome utente/password per l'autenticazione da parte del "
+"proxy:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "è in conflitto con"
+msgid "Upgradable"
+msgstr "Aggiorna"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Il pacchetto `%s' non può essere installato\n"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid " done."
+msgstr " fatto."
 
 #: ../rpmdrake:1
-#, c-format
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
-msgstr ""
-"Per soddisfare le dipendenze, anche i seguenti pacchetti devono\n"
-"essere installati:\n"
-"\n"
+#, fuzzy, c-format
+msgid "Software Packages Installation"
+msgstr "Sto preparando i pacchetti per l'installazione..."
 
 #: ../rpmdrake:1
 #, c-format
@@ -676,649 +791,534 @@ msgstr "Sono necessari altri pacchetti"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "Il pacchetto `%s' non può essere installato\n"
+msgid "Bugfixes updates"
+msgstr "Mostra gli aggiornamenti bugfix"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
-"Spiacente, la rimozione di questi pacchetti danneggerebbe il tuo sitema:\n"
-"\n"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "Scaricamento di '%s', tempo rimasto: %s, velocità: %s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"Per soddisfare le dipendenze, anche i seguenti pacchetti devono essere\n"
-"rimossi:\n"
-"\n"
+msgid "Germany"
+msgstr "Germania"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Ci sono altri pacchetti da rimuovere"
+msgid "Russia"
+msgstr "Russia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "More information on package..."
-msgstr "Ulteriori informazioni sul pacchetto..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Information on packages"
-msgstr "Scegli i tuoi pacchetti"
+msgid "Norway"
+msgstr "Norvegia"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "More info"
-msgstr "Maggiori informazioni"
+msgid "Problem during installation"
+msgstr "Si sono verificati dei problemi durante l'installazione"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Addable"
-msgstr "Aggiungibile"
+msgid "Search"
+msgstr "Cerca"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Upgradable"
-msgstr "Aggiorna"
+msgid "Edit a media"
+msgstr "Modifica una sorgente"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
+msgstr "Repubblica Ceca"
 
 #: ../rpmdrake:1
 #, c-format
 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."
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"La lista degli aggiornamenti è vuota. Ciò potrebbe voler dire che\n"
-"non ci sono aggiornamenti per i pacchetti installati sul tuo computer,\n"
-"o che li hai già installati tutti."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "No update"
-msgstr "Fai gli aggiornamenti"
+#, c-format
+msgid "Stop"
+msgstr "Stop"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(none)"
-msgstr "(nessuno)"
+msgid "Update"
+msgstr "Aggiorna"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, listing packages..."
+msgid "Please wait, removing packages..."
 msgstr ""
 "Attendi...\n"
 "Ordino i pacchetti"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "sconosciuto"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Uno dei seguenti pacchetti è necessario:"
+msgid "Normal information"
+msgstr "Informazioni normali"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Per favore scegli"
+msgid "Media: "
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr "Individuati dei conflitti"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Selected"
-msgstr ""
-"Seleziona\n"
-"tutto"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "Sto scaricando il pacchetto `%s' (%s/%s)..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results"
-msgstr "Risultati della Ricerca"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Selezionati: %d MB / Spazio libero su disco: %d MB"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Stop"
-msgstr "Stop"
+msgid "Media"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Per favore attendere, ricerca in corso..."
+msgid "Spain"
+msgstr "Spagna"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Search results (none)"
-msgstr "Risultati della Ricerca (nessuno)"
+#, fuzzy, c-format
+msgid "Normal updates"
+msgstr "Aggiornamenti normali"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Other"
-msgstr "Altro"
+msgid "by selection state"
+msgstr "per selezione"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Welcome to the packages source editor!\n"
-"\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
-"Benvenuto all'editor delle sorgenti dei pacchetti!\n"
-"\n"
-"Questa utilità ti aiuterà a configurare le sorgenti dei pacchetti che vuoi "
-"usare\n"
-"sul tuo computer. Poi saranno disponibili per installare nuovi pacchetti "
-"software\n"
-"o per effettuare aggiornamenti."
+"Attendere il download  degli indirizzi dei mirror dal sito di MandrakeSoft."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Save and quit"
-msgstr "Salva ed esci"
+msgid "Login:"
+msgstr "Login:"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Errore..."
+msgid "Adding a media:"
+msgstr "Aggiunta sorgente:"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
+msgstr "Austria"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Fatal error"
+msgstr "Errore nel file"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Update..."
 msgstr "Aggiorna"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add..."
-msgstr "Aggiungi..."
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "Sto verificando la firma di `%s'..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Edit"
-msgstr "Modifica"
+msgid "(none)"
+msgstr "(nessuno)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Source"
-msgstr "Proviene da"
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
+"Spiacente, la rimozione di questi pacchetti danneggerebbe il tuo sitema:\n"
+"\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Enabled?"
-msgstr "Abilitato?"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Sto installando il pacchetto `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure sources"
-msgstr "Configura sorgenti"
+msgid "Currently installed version: "
+msgstr "Versione attualmente installata:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "Password:"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "User:"
-msgstr "Nome utente:"
+msgid "Other"
+msgstr "Altro"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr ""
-"Devi specificare nome utente/password per l'autenticazione da parte del "
-"proxy:"
+msgid "Reason for update: "
+msgstr "Causa dell'aggiornamento:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Proxy hostname:"
-msgstr "Username per il Proxy:"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+msgid "Please choose the desired mirror."
 msgstr ""
-"Se hai bisogno di specificare un proxy, digita il nome dell'host e "
-"opzionalmente la porta\n"
-"(sintassi: <proxy[:porta]>):"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure proxies"
-msgstr "Configurazione dei proxy"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Please wait, updating medium..."
-msgstr "Attendere l'aggiornamento del supporto..."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "Per salvare le modifiche devi inserire il supporto nel drive"
+"Attendi...\n"
+"Sto recuperando la lista dei mirrors..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "Devi inserire il supporto per continuare"
+msgid "Edit"
+msgstr "Modifica"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Save changes"
-msgstr "Salva le modifiche"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, finding available packages..."
+msgstr ""
+"Attendi...\n"
+"Ordino i pacchetti"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Percorso relativo a synthesis/hdlist"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "Search results (none)"
+msgstr "Risultati della Ricerca (nessuno)"
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "Modifica sorgente \"%s\":"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
+msgstr "Danimarca"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit a source"
-msgstr "Modifica una sorgente"
+msgid "China"
+msgstr "Cina"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Attendere la rimozione supporto..."
+msgid "United States"
+msgstr "Stati Uniti"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Type of source:"
-msgstr "Tipo di sorgente:"
+msgid "changes:"
+msgstr "modifiche:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Aggiunta sorgente:"
+msgid "Some additional packages need to be removed"
+msgstr "Ci sono altri pacchetti da rimuovere"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
-msgstr ""
-"C'è già un supporto con quel nome, vuoi\n"
-"veramente sostrituirlo?"
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Dovresti compilare almeno le prime due caselle."
+msgid "No"
+msgstr "No"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Name:"
-msgstr "Nome"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Login:"
-msgstr "Login:"
+msgid "Configure medias"
+msgstr "Configura sorgenti"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Choose a mirror..."
-msgstr "Scegli un mirror..."
+#, fuzzy, c-format
+msgid "Add a media"
+msgstr "Aggiunta sorgente:"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Browse..."
-msgstr "Sfoglia..."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Summary: "
+msgstr "Sommario"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Path or mount point:"
-msgstr "Percorso o punto di mount:"
+msgid "Canada"
+msgstr "Canada"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "Dispositivo rimovibile"
+msgid "Greece"
+msgstr "Grecia"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "HTTP server"
-msgstr "Server HTTP"
+msgid ""
+"There was an error downloading the mirrors list:\n"
+"\n"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
+msgstr ""
+"Si è verificato un errore durante lo scaricamento della lista dei mirror:\n"
+"\n"
+"%s\n"
+"La rete, o il sito di MandrakeSoft, sono probabilmente non disponibili.\n"
+"Potresti riprovare più tardi."
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "FTP server"
-msgstr "Server FTP"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Devi essere root per installare dei pacchetti."
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Path:"
 msgstr "Porta:"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Local files"
-msgstr "File locali"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add a source"
-msgstr "Aggiunta sorgente:"
+msgid "Problem during removal"
+msgstr "Si sono verificati dei problemi durante la rimozione"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
+msgid "Selected"
 msgstr ""
-"Impossibile aggiornare il supporto, sarà automaticamente disabilitato."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Unable to create medium."
-msgstr "Impossibile creare il supporto."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Update"
-msgstr "Aggiorna"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Seleziona la sorgente che vuoi aggiornare:"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Please wait, updating media..."
-msgstr "Attendere l'aggiornamento del supporto..."
+"Seleziona\n"
+"tutto"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid " failed!"
-msgstr " fallita!"
+msgid "Netherlands"
+msgstr "Paesi Bassi"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " done."
-msgstr " fatto."
+msgid "Addable"
+msgstr "Aggiungibile"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "Scaricamento di '%s', velocità: %s"
+msgid "(Not available)"
+msgstr "(Non disponibile)"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "Scaricamento di '%s', tempo rimasto: %s, velocità: %s"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
+msgstr ""
+"Spiacente, i seguenti pacchetti non possono essere selezionati:\n"
+"\n"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "Sto verificando la firma di `%s'..."
+msgid "Not selected"
+msgstr "Individuati dei conflitti"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "Esamino il file remoto della sorgente '%s'..."
+msgid "Software Packages Removal"
+msgstr "Rimozione Pacchetti Software"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "Esamino il file della sorgente '%s'..."
+msgid "Sweden"
+msgstr "Svezia"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "Copio il file per la sorgente '%s'..."
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Please choose the desired mirror."
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
 msgstr ""
-"Attendi...\n"
-"Sto recuperando la lista dei mirrors..."
+"\n"
+"\n"
+"Errore/i riportati:\n"
+"%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
+"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 ""
-"Non riesco a trovare un mirror adatto.\n"
-"\n"
-"Possono esserci molte ragioni per questo problema; la più comun è\n"
-"il caso nel quale l'architettura del tuo processore non è supportata\n"
-"dagli update ufficiali di Mandrake Linux."
+"La lista degli aggiornamenti è vuota. Ciò potrebbe voler dire che\n"
+"non ci sono aggiornamenti per i pacchetti installati sul tuo computer,\n"
+"o che li hai già installati tutti."
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "No mirror"
-msgstr "mirror:"
+msgid "Examining file of media `%s'..."
+msgstr "Esamino il file della sorgente '%s'..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was an error downloading the mirrors list:\n"
-"\n"
-"%s\n"
-"The network, or MandrakeSoft website, are maybe unavailable.\n"
-"Please try again later."
-msgstr ""
-"Si è verificato un errore durante lo scaricamento della lista dei mirror:\n"
-"\n"
-"%s\n"
-"La rete, o il sito di MandrakeSoft, sono probabilmente non disponibili.\n"
-"Potresti riprovare più tardi."
+msgid "Download of `%s', speed:%s"
+msgstr "Scaricamento di '%s', velocità: %s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
-msgstr "Errore durante lo scaricamento"
+msgid "One of the following packages is needed:"
+msgstr "Uno dei seguenti pacchetti è necessario:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
-"Attendere il download  degli indirizzi dei mirror dal sito di MandrakeSoft."
+msgid "Quit"
+msgstr "Esci"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
 "\n"
 "Is it ok to continue?"
 msgstr ""
-"Devo contattare il sito di MandrakeSoft per recuperare la lista dei mirror.\n"
-"Controlla che la tua rete sia in funzione.\n"
+"Devo contattare il mirror per recuperare gli ultimi aggiornamenti.\n"
+"Controlla che la rete sia in funzione.\n"
 "\n"
 "Proseguiamo?"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "United States"
-msgstr "Stati Uniti"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "China"
-msgstr "Cina"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "United Kingdom"
-msgstr "Regno Unito"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Taiwan"
-msgstr "Taiwan"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Sweden"
-msgstr "Svezia"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Russia"
-msgstr "Russia"
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Portugal"
-msgstr "Porta:"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Poland"
-msgstr "Polonia"
+msgid "Update media(s)"
+msgstr "Aggiorna sorgente(i)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Norway"
-msgstr "Norvegia"
+msgid "Ok"
+msgstr "Ok"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Netherlands"
-msgstr "Paesi Bassi"
+msgid "Please wait, adding medium..."
+msgstr "Attendere l'aggiunta del supporto..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Korea"
-msgstr "Forza"
+msgid "Unable to get source packages."
+msgstr "Scegli i tuoi pacchetti"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "Giappone"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Italy"
-msgstr "Installa"
+msgid "Too many packages are selected"
+msgstr "Troppi pacchetti selezionati"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Israel"
-msgstr "Installa"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Greece"
-msgstr "Grecia"
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"Benvenuto all'editor delle sorgenti dei pacchetti!\n"
+"\n"
+"Questa utilità ti aiuterà a configurare le sorgenti dei pacchetti che vuoi "
+"usare\n"
+"sul tuo computer. Poi saranno disponibili per installare nuovi pacchetti "
+"software\n"
+"o per effettuare aggiornamenti."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "France"
-msgstr "Forza"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Finland"
-msgstr "Finlandia"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Spain"
-msgstr "Spagna"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Danmark"
-msgstr "Danimarca"
+msgid "%s conflicts with %s"
+msgstr "è in conflitto con"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "Germania"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Benvenuto in MandrakeUpdate!\n"
+"\n"
+"Questo programma ti aiuterà a scegliere gli aggiornamenti che vuoi "
+"installare sul tuo\n"
+"computer."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Repubblica Ceca"
+msgid "Mandrake choices"
+msgstr "Scelte di Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Costa Rica"
+msgid "Changelog:\n"
+msgstr "Changelog:\n"
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Canada"
-msgstr "Canada"
+#, fuzzy, c-format
+msgid "Korea"
+msgstr "Forza"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Brazil"
-msgstr "Brasile"
+msgid "Removable device"
+msgstr "Dispositivo rimovibile"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Belgio"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Australia"
+msgid "Change medium"
+msgstr "Cambia supporto"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Austria"
-msgstr "Austria"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mandrake Update"
+msgstr "MandrakeUpdate: Preferenze"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
-msgstr "Informazioni..."
+msgid "by size"
+msgstr "per dimensione"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "No"
+msgid "FTP server"
+msgstr "Server FTP"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Files:\n"
+msgstr "/_File"
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Yes"
-msgstr "Sì"
+#, fuzzy, c-format
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr ""
+"Impossibile aggiornare il supporto, sarà automaticamente disabilitato."
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -1592,6 +1592,13 @@ msgstr "Rimuovere Software"
 msgid "Software Sources Manager"
 msgstr "Gestore delle sorgenti software"
 
+#, fuzzy
+#~ msgid "Source: "
+#~ msgstr "Proviene da"
+
+#~ msgid "Source"
+#~ msgstr "Proviene da"
+
 #~ msgid ""
 #~ "some packages failed to install\n"
 #~ "correctly"
@@ -1634,9 +1641,6 @@ msgstr "Gestore delle sorgenti software"
 #~ "\n"
 #~ "Vuoi provare un altro mirror?"
 
-#~ msgid "Error adding update medium"
-#~ msgstr "Errore durante l'aggiunta del supporto per gli aggiornamenti"
-
 #~ msgid "Please wait, contacting mirror to initialize updates packages."
 #~ msgstr ""
 #~ "Attendere, contatto il mirror per inizializzare i pacchetti di "
diff --git a/po/ko.po b/po/ko.po
index ea3707ca..ededfb53 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: 2002-08-25 14:32+0900\n"
 "Last-Translator: Jaegeum Cze <baedaron@hanafos.com>\n"
 "Language-Team: Korean <baedaron@hananet.net>\n"
@@ -19,16 +19,20 @@ msgstr ""
 "Content-Type: text/plain; charset=euc-kr\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"°è¼ÓÇÒ±î¿ä?"
+msgid "Enabled?"
+msgstr "»ç¿ë°¡?"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "°æ·Î ¶Ç´Â ¸¶¿îÆ® À§Ä¡:"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Portugal"
+msgstr "Æ÷¸£Åõ°¥"
 
 #: ../rpmdrake:1
 #, c-format
@@ -48,104 +52,54 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"¸Çµå·¹ÀÌÅ© ¾÷µ¥ÀÌÆ®¿¡ Àß ¿À¼Ì½À´Ï´Ù!\n"
-"\n"
-"ÀÌ µµ±¸´Â ÄÄÇ»ÅÍ¿¡ ¼³Ä¡ÇÒ ¾÷µ¥ÀÌÆ®µÈ ¼ÒÇÁÆ®¿þ¾î¸¦ ¼±ÅÃÇÒ ¼ö ÀÖµµ·Ï\n"
-"µµ¿Í ÁÝ´Ï´Ù."
+msgid "by group"
+msgstr "±×·ìº°"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
-msgstr ""
-"¼ÒÇÁÆ®¿þ¾î Á¦°Å µµ±¸ÀÔ´Ï´Ù!\n"
-"\n"
-"ÀÌ µµ±¸´Â ÄÄÇ»ÅÍ¿¡¼­ Á¦°ÅÇÒ ¼ÒÇÁÆ®¿þ¾î¸¦ ¼±ÅÃÇÒ ¼ö ÀÖµµ·Ï\n"
-"µµ¿Í ÁÝ´Ï´Ù."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"ÆÑÅ°Áö ¼³Ä¡ Áß ¿À·ù°¡ ÀÖ¾ú½À´Ï´Ù:\n"
-"\n"
-"%s"
+msgid "Name:"
+msgstr "À̸§:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Problem during removal"
-msgstr ""
+msgid "Italy"
+msgstr "ÀÌŸ®"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "±â´Ù·Á ÁÖ¼¼¿ä. ÆÑÅ°Áö Á¦°Å Áß..."
+msgid "How to choose manually your mirror"
+msgstr "¼öµ¿À¸·Î ¹Ì·¯¸¦ ¼±ÅÃÇÏ´Â ¹æ¹ý"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "±â´Ù·Á ÁÖ¼¼¿ä. ÆÑÅ°Áö µ¥ÀÌÅͺ£À̽º Àд Áß..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"ÆÑÅ°Áö ¼³Ä¡ Áß ¿À·ù°¡ ÀÖ¾ú½À´Ï´Ù:\n"
-"\n"
-"%s"
+msgid "URL:"
+msgstr "URL:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation failed"
-msgstr "¼³Ä¡ ½ÇÆÐ"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "¼³Ä¡ÇÒ ÆÑÅ°Áö Áغñ Áß..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "¼³Ä¡ÇÒ ÆÑÅ°Áö Áغñ Áß..."
+msgid "Some packages need to be removed"
+msgstr "ÀϺΠÆÑÅ°Áö´Â Á¦°ÅµÇ¾î¾ß ÇÕ´Ï´Ù."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "¿äûµÈ ¸ðµç ÆÑÅ°ÁöÀÇ ¼³Ä¡¸¦ ¸¶ÃƽÀ´Ï´Ù."
+msgid "More information on package..."
+msgstr "Ãß°¡ ÆÑÅ°Áö Á¤º¸..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "¸ðµç ¼³Ä¡¸¦ ¸¶ÃƽÀ´Ï´Ù."
+msgid "Yes"
+msgstr "¿¹"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
 msgstr ""
-"¼³Ä¡¸¦ ¿Ï·áÇÏ¿´½À´Ï´Ù; %s.\n"
+"ÀÇÁ¸¼º ¹®Á¦·Î ÀÎÇÏ¿©, ´ÙÀ½ ÆÑÅ°ÁöµéÀº\n"
+"Áö±Ý ¼±Åà ÇØÁ¦µÇ¾î¾ß ÇÕ´Ï´Ù:\n"
 "\n"
-"ÀϺΠ¼³Á¤ ÆÄÀϵéÀº '.rpmnew' ¶Ç´Â '.rpmsave'·Î »ý¼ºµÇ¾ú½À´Ï´Ù.\n"
-"Á¶Ä¡¸¦ ÃëÇϱâ À§ÇØ ÀϺθ¦ Á¶»çÇØ º¼ ¼ö ÀÖ½À´Ï´Ù:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -153,454 +107,453 @@ msgid "everything was installed correctly"
 msgstr "¸ðµç ¼³Ä¡¸¦ ¸¶ÃƽÀ´Ï´Ù."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "¼³Ä¡Áß¿¡ ¹®Á¦°¡ ¹ß»ýÇß½À´Ï´Ù."
-
-#: ../rpmdrake:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "ÆÑÅ°Áö ¼³Ä¡ Áß: [%s] (%s/%s)..."
+msgid "%s KB"
+msgstr "%s KB"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "¼³Ä¡ÇÒ ÆÑÅ°Áö Áغñ Áß..."
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"¼öµ¿À¸·Î ¿øÇÏ´Â ¹Ì·¯¸¦ ¼±ÅÃÇÒ ¼ö ÀÖ½À´Ï´Ù: ±×·¯±â À§Çؼ­´Â,\n"
+"¼ÒÇÁÆ®¿þ¾î ¼Ò½º °ü¸®ÀÚ¸¦ ½ÇÇàÇÑ ÈÄ, [º¸¾È ¾÷µ¥ÀÌÆ®] ¼Ò½º¸¦\n"
+"Ãß°¡Çϼ¼¿ä.\n"
+"\n"
+"±×·± ÈÄ, ¸Çµå·¹ÀÌÅ© ¾÷µ¥ÀÌÆ®¸¦ ´Ù½Ã ½ÇÇàÇϼ¼¿ä."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
+"Welcome to the software removal tool!\n"
 "\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
 msgstr ""
+"¼ÒÇÁÆ®¿þ¾î Á¦°Å µµ±¸ÀÔ´Ï´Ù!\n"
+"\n"
+"ÀÌ µµ±¸´Â ÄÄÇ»ÅÍ¿¡¼­ Á¦°ÅÇÒ ¼ÒÇÁÆ®¿þ¾î¸¦ ¼±ÅÃÇÒ ¼ö ÀÖµµ·Ï\n"
+"µµ¿Í ÁÝ´Ï´Ù."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"¼³Ä¡ ½ÇÆÐ. ÀϺΠÆÄÀÏÀÌ ¾ø½À´Ï´Ù.\n"
-"¼Ò½º µ¥ÀÌÅͺ£À̽º¸¦ ¾÷µ¥ÀÌÆ®ÇØ º¸¼¼¿ä."
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "º¯°æ»çÇ×À» ÀúÀåÇÏ·Á¸é, ¸Åü¸¦ µå¶óÀ̺꿡 »ðÀÔÇØ¾ß ÇÕ´Ï´Ù."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "ÀúÀå ÈÄ Á¾·á"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
+"There was a problem during the removal of packages:\n"
 "\n"
-"Do you want to continue installation?"
+"%s"
 msgstr ""
-"´Ù¸¥ ÆÑÅ°Áö¸¦ ¾÷±×·¹À̵åÇϱâ À§ÇØ, ´ÙÀ½ ÆÑÅ°ÁöµéÀº Á¦°ÅµÇ¾î¾ß ÇÕ´Ï´Ù:\n"
-"\n"
-"%s\n"
+"ÆÑÅ°Áö ¼³Ä¡ Áß ¿À·ù°¡ ÀÖ¾ú½À´Ï´Ù:\n"
 "\n"
-"°è¼ÓÇÒ±î¿ä?"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "ÆÑÅ°Áö ³»·Á¹Þ´Â Áß: [%s] (%s/%s)..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Cancel"
-msgstr "Ãë¼Ò"
+msgid "Size: "
+msgstr "Å©±â: "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Ok"
-msgstr "È®ÀÎ"
+msgid "Security updates"
+msgstr "º¸¾È ¾÷µ¥ÀÌÆ®"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "[%s] ¸Åü¸¦ [%s]ÀåÄ¡¿¡ ³Ö¾î ÁÖ¼¼¿ä."
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Change medium"
-msgstr "¸Åü ±³È¯"
+msgid "Already existing update medias"
+msgstr "¾÷µ¥ÀÌÆ® ¸Åü Ãß°¡ Áß ¿À·ù"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "ÃʱâÈ­..."
+msgid "Maximum information"
+msgstr "ÃÖ´ë Á¤º¸"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "¼³Ä¡ÇÒ ÆÑÅ°Áö Áغñ Áß..."
+msgid "Proxy..."
+msgstr "¿À·ù..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "ÆÑÅ°Áö ¼³Ä¡´Â root »ç¿ëÀÚ¸¸ ÇÒ ¼ö ÀÖ½À´Ï´Ù."
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Unable to get source packages."
-msgstr "¼Ò½º ÆÑÅ°Áö¸¦ °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù."
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspect..."
-msgstr "Á¶»ç..."
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
+msgstr ""
+"¼³Ä¡ ½ÇÆÐ. ÀϺΠÆÄÀÏÀÌ ¾ø½À´Ï´Ù.\n"
+"¼Ò½º µ¥ÀÌÅͺ£À̽º¸¦ ¾÷µ¥ÀÌÆ®ÇØ º¸¼¼¿ä."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Installation finished"
-msgstr "¼³Ä¡ ¿Ï·á"
+msgid "United Kingdom"
+msgstr "¿µ±¹"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "±×³É µÒ"
+msgid "in names"
+msgstr "À̸§º°"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr ".%sÀ»(¸¦) ÁÖ ÆÄÀÏ·Î »ç¿ë"
+msgid ""
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
+msgstr ""
+"Àû´çÇÑ ¹Ì·¯¸¦ ãÀ» ¼ö ¾ø½À´Ï´Ù.\n"
+"\n"
+"ÀÌ ¹®Á¦ÀÇ ¿øÀÎÀº ¿©·¯°¡ÁöÀÏ ¼ö ÀÖ½À´Ï´Ù; °¡Àå ÈçÇÑ ¿øÀÎÀº\n"
+"ÀÌ ÄÄÇ»ÅÍÀÇ ÇÁ·Î¼¼¼­¸¦ ¸Çµå·¹ÀÌÅ© ¸®´ª½º °ø½Ä ¾÷µ¥ÀÌÆ®°¡\n"
+"Áö¿øÇÏÁö ¾Ê´Â °æ¿ìÀÔ´Ï´Ù."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Remove .%s"
 msgstr ".%s Á¦°Å"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "changes:"
-msgstr "º¯°æ»çÇ× ÀúÀå"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspecting %s"
-msgstr "%s Á¶»çÁß"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Please wait, finding available packages..."
-msgstr "±â´Ù·Á ÁÖ¼¼¿ä. À¯È¿ÇÑ ÆÑÅ°Áö °Ë»ö Áß..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "±â´Ù·Á ÁÖ¼¼¿ä. ¸Åü Ãß°¡ Áß..."
+msgid "Finland"
+msgstr "Çɶõµå"
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
+"The following packages have bad signatures:\n"
 "\n"
-"Then, restart MandrakeUpdate."
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"¼öµ¿À¸·Î ¿øÇÏ´Â ¹Ì·¯¸¦ ¼±ÅÃÇÒ ¼ö ÀÖ½À´Ï´Ù: ±×·¯±â À§Çؼ­´Â,\n"
-"¼ÒÇÁÆ®¿þ¾î ¼Ò½º °ü¸®ÀÚ¸¦ ½ÇÇàÇÑ ÈÄ, [º¸¾È ¾÷µ¥ÀÌÆ®] ¼Ò½º¸¦\n"
-"Ãß°¡Çϼ¼¿ä.\n"
+"´Ù¸¥ ÆÑÅ°Áö¸¦ ¾÷±×·¹À̵åÇϱâ À§ÇØ, ´ÙÀ½ ÆÑÅ°ÁöµéÀº Á¦°ÅµÇ¾î¾ß ÇÕ´Ï´Ù:\n"
 "\n"
-"±×·± ÈÄ, ¸Çµå·¹ÀÌÅ© ¾÷µ¥ÀÌÆ®¸¦ ´Ù½Ã ½ÇÇàÇϼ¼¿ä."
+"%s\n"
+"\n"
+"°è¼ÓÇÒ±î¿ä?"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "¼öµ¿À¸·Î ¹Ì·¯¸¦ ¼±ÅÃÇÏ´Â ¹æ¹ý"
+msgid "Examining distant file of media `%s'..."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
+msgid "Verifying packages signatures..."
 msgstr ""
 
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "France"
+msgstr "ÇÁ¶û½º"
+
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "Already existing update sources"
+msgid "More info"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
+"%s\n"
 "\n"
 "Is it ok to continue?"
 msgstr ""
-"ÃֽŠ¾÷µ¥ÀÌÆ® ÆÑÅ°ÁöµéÀ» °¡Á®¿À±â À§ÇØ ¹Ì·¯¿¡ Á¢¼ÓÇØ¾ß ÇÕ´Ï´Ù.\n"
-"ÇöÀç ³×Æ®¿÷ÀÌ °¡´ÉÇÑÁö È®ÀÎÇϼ¼¿ä.\n"
+"%s\n"
 "\n"
 "°è¼ÓÇÒ±î¿ä?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Reload the packages list"
+msgstr "ÆÑÅ°Áö ¸ñ·Ï ´Ù½Ã Àбâ"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "¹Ì·¯ ¼±ÅÃ..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Fatal error"
-msgstr "ÆÄÀÏ ¿À·ù"
+msgid "Some packages can't be installed"
+msgstr "[%s] ÆÑÅ°Áö¸¦ ¼³Ä¡ÇÒ ¼ö ¾ø½À´Ï´Ù.\n"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
+msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "¼³Ä¡ÇÒ ÆÑÅ°Áö Áغñ Áß..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "¸Çµå·¹ÀÌÅ© ¾÷µ¥ÀÌÆ®"
+msgid "All packages,"
+msgstr "¸ðµç ÆÑÅ°Áö"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Software Packages Removal"
-msgstr "¼ÒÇÁÆ®¿þ¾î ÆÑÅ°Áö Á¦°Å"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Type of media:"
+msgstr "¼Ò½º À¯Çü:"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Quit"
-msgstr "Á¾·á"
+msgid "in files"
+msgstr "ÆÄÀϺ°"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "¼³Ä¡"
+msgid "All requested packages were installed successfully."
+msgstr "¿äûµÈ ¸ðµç ÆÑÅ°ÁöÀÇ ¼³Ä¡¸¦ ¸¶ÃƽÀ´Ï´Ù."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove"
-msgstr "Á¦°Å"
+msgid "Proxy hostname:"
+msgstr "ÇÁ¶ô½Ã È£½ºÆ®¸í:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Help"
-msgstr "µµ¿ò¸»"
+msgid "Local files"
+msgstr "Áö¿ª ÆÄÀÏ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search"
-msgstr "°Ë»ö"
+msgid "Inspecting %s"
+msgstr "%s Á¶»çÁß"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Find:"
-msgstr "ã±â"
+msgid "Israel"
+msgstr "À̽º¶ó¿¤"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"´Ù¸¥ ÆÑÅ°Áö¸¦ ¾÷±×·¹À̵åÇϱâ À§ÇØ, ´ÙÀ½ ÆÑÅ°ÁöµéÀº Á¦°ÅµÇ¾î¾ß ÇÕ´Ï´Ù:\n"
-"\n"
-"%s\n"
-"\n"
-"°è¼ÓÇÒ±î¿ä?"
+msgid "Help"
+msgstr "µµ¿ò¸»"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "ÀϺΠÆÑÅ°Áö´Â Á¦°ÅµÇ¾î¾ß ÇÕ´Ï´Ù."
+msgid "HTTP server"
+msgstr "HTTP ¼­¹ö"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
-"\n"
-"Do you really want to install all the selected packages?"
-msgstr ""
-"°æ°í:\n"
-"¼³Ä¡ ¿Ï·áÈÄ ¶Ç´Â ¼³Ä¡°úÁ¤Áß¿¡ µð½ºÅ© °ø°£ ºÎÁ·À» ÀÏÀ¸Å³ ¼ö\n"
-"ÀÖÀ» Á¤µµ·Î ³Ê¹« ¸¹Àº ÆÑÅ°Áö¸¦ Ãß°¡ÇÏ·Á ÇÏ°í ÀÖ½À´Ï´Ù.\n"
-"À̴ ƯÈ÷ À§ÇèÇÒ ¼ö ÀÖÀ¸¹Ç·Î, \n"
-"ÁÖÀǸ¦ ¿äÇÕ´Ï´Ù.\n"
-"\n"
-"Á¤¸»·Î ¼±ÅÃµÈ ¸ðµç ÆÑÅ°Áö¸¦ ¼³Ä¡ÇϽðڽÀ´Ï±î?"
+msgid "Installation failed"
+msgstr "¼³Ä¡ ½ÇÆÐ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "³Ê¹« ¸¹Àº ÆÑÅ°Áö¸¦ ¼±ÅÃÇÏ¿´½À´Ï´Ù."
+msgid "Use .%s as main file"
+msgstr ".%sÀ»(¸¦) ÁÖ ÆÄÀÏ·Î »ç¿ë"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "ÃÖ´ë Á¤º¸"
+msgid "Search results"
+msgstr "°Ë»ö °á°ú"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Normal information"
-msgstr "ÀÏ¹Ý Á¤º¸"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid " failed!"
+msgstr "ÆÄÀϺ°"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Update source(s)"
-msgstr "¼Ò½º ¾÷µ¥ÀÌÆ®"
+msgid "Brazil"
+msgstr "ºê¶óÁú"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "ÆÑÅ°Áö ¸ñ·Ï ´Ù½Ã Àбâ"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"ÀÌ¹Ì µ¿ÀÏÇÑ À̸§ÀÇ ¸Åü°¡ ÀÖ½À´Ï´Ù.\n"
+"»õ·Î ¹Ù²Ù½Ã°Ú½À´Ï±î?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "¼±Åà Àç¼³Á¤"
+msgid "Find:"
+msgstr "ã±â"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "ÆÄÀϺ°"
+msgid "All packages, alphabetical"
+msgstr "¸ðµç ÆÑÅ°Áö, °¡³ª´Ù¼ø"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "¼³¸íº°"
+msgid "Please wait, searching..."
+msgstr "±â´Ù·Á ÁÖ¼¼¿ä. °Ë»ö Áß..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "À̸§º°"
+msgid "Please wait, reading packages database..."
+msgstr "±â´Ù·Á ÁÖ¼¼¿ä. ÆÑÅ°Áö µ¥ÀÌÅͺ£À̽º Àд Áß..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by update availability"
-msgstr "¾÷µ¥ÀÌÆ® °¡´É¼ºº°"
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "[%s] ÆÑÅ°Áö¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù.\n"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by source repository"
-msgstr "¼Ò½º µî·Ïº°"
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "[%s] ¸Åü¸¦ [%s]ÀåÄ¡¿¡ ³Ö¾î ÁÖ¼¼¿ä."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by selection state"
-msgstr "¼±Åà »óź°"
+msgid "Reset the selection"
+msgstr "¼±Åà Àç¼³Á¤"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by size"
-msgstr "Å©±âº°"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"ÇÁ¶ô½Ã°¡ ÇÊ¿äÇÏ´Ù¸é, ÇÁ¶ô½Ã È£½ºÆ®¸í°ú Æ÷Æ®(¿É¼Ç)¸¦ ÀÔ·ÂÇϼ¼¿ä.(¹®¹ý: <È£½ºÆ®"
+"¸í[:Æ÷Æ®]>):"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-msgstr "±×·ìº°"
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
+"ÀÇÁ¸¼º ¹®Á¦·Î ÀÎÇÏ¿©,\n"
+"´ÙÀ½ ÆÑÅ°Áöµéµµ Á¦°Å µÇ¾î¾ß ÇÕ´Ï´Ù:\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "All packages,"
-msgstr "¸ðµç ÆÑÅ°Áö"
+msgid "Costa Rica"
+msgstr "ÄÚ½ºÅ¸¸®Ä«"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "All packages, alphabetical"
-msgstr "¸ðµç ÆÑÅ°Áö, °¡³ª´Ù¼ø"
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"ÆÑÅ°Áö ¼³Ä¡ Áß ¿À·ù°¡ ÀÖ¾ú½À´Ï´Ù:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "¸Çµå·¹ÀÌÅ© ¼±ÅÃ"
+msgid "Please wait, removing medium..."
+msgstr "±â´Ù·Á ÁÖ¼¼¿ä. ¸Åü Á¦°Å Áß..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
-msgstr "ÀÏ¹Ý ¾÷µ¥ÀÌÆ®"
+msgid "Password:"
+msgstr "¾ÏÈ£:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "¹ö±×¼öÁ¤ ¾÷µ¥ÀÌÆ®"
+msgid "Taiwan"
+msgstr "´ë¸¸"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Security updates"
-msgstr "º¸¾È ¾÷µ¥ÀÌÆ®"
+msgid "User:"
+msgstr "»ç¿ëÀÚ:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Description: "
-msgstr "¼³¸í:"
+msgid "Please wait, updating medium..."
+msgstr "±â´Ù·Á ÁÖ¼¼¿ä. ¸Åü ¾÷µ¥ÀÌÆ® Áß..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reason for update: "
-msgstr "¾÷µ¥ÀÌÆ® ÀÌÀ¯:"
+msgid "Please wait, listing packages..."
+msgstr "±â´Ù·Á ÁÖ¼¼¿ä. ÆÑÅ°Áö ¸ñ·Ï Á¤·Ä Áß..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Summary: "
-msgstr "¿ä¾à ¼³¸í: "
+#, fuzzy, c-format
+msgid "Information on packages"
+msgstr "Ãß°¡ ÆÑÅ°Áö Á¤º¸..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Importance: "
-msgstr "Áß¿äµµ: "
+msgid "Cancel"
+msgstr "Ãë¼Ò"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Everything installed successfully"
+msgstr "¸ðµç ¼³Ä¡¸¦ ¸¶ÃƽÀ´Ï´Ù."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Size: "
-msgstr "Å©±â: "
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Select the media(s) you wish to update:"
+msgstr "¾÷µ¥ÀÌÆ®ÇÏ·Á´Â ¼Ò½ºÀ» ¼±ÅÃÇØ ÁÖ¼¼¿ä:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Version: "
-msgstr "¹öÀü: "
+msgid "Please wait, updating media..."
+msgstr "±â´Ù·Á ÁÖ¼¼¿ä. ¸Åü ¾÷µ¥ÀÌÆ® Áß..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "À̸§: "
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "¼³Ä¡µÈ ¹öÀü:"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"´Ù¸¥ ÆÑÅ°Áö¸¦ ¾÷±×·¹À̵åÇϱâ À§ÇØ, ´ÙÀ½ ÆÑÅ°ÁöµéÀº Á¦°ÅµÇ¾î¾ß ÇÕ´Ï´Ù:\n"
+"\n"
+"%s\n"
+"\n"
+"°è¼ÓÇÒ±î¿ä?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Source: "
-msgstr "¼Ò½º: "
+msgid "in descriptions"
+msgstr "¼³¸íº°"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(Not available)"
-msgstr "(À¯È¿ÇÏÁö ¾ÊÀ½)"
+msgid "Configure proxies"
+msgstr "ÇÁ¶ô½Ã ¼³Á¤"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "º¯°æ»çÇ×:\n"
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"¹Ì·¯ ¸ñ·ÏÀ» °¡Á®¿À±â À§Çؼ­ ¸Çµå·¹ÀÌÅ©¼ÒÇÁÆ® À¥»çÀÌÆ®¿¡ Á¢¼ÓÇØ¾ß ÇÕ´Ï´Ù.\n"
+"ÇöÀç ³×Æ®¿÷ÀÌ °¡´ÉÇÑÁö È®ÀÎÇϼ¼¿ä.\n"
+"\n"
+"°è¼ÓÇÒ±î¿ä?"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Files:\n"
-msgstr "%sÆÄÀϵé:\n"
+#, c-format
+msgid "Please choose"
+msgstr "¼±ÅÃÇϼ¼¿ä"
 
 #: ../rpmdrake:1
 #, c-format
@@ -609,43 +562,28 @@ msgstr "¼±ÅÃµÈ Å©±â: %d MB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "¼±ÅÃµÈ ¿ë·®: %d MB / ¿©À¯ °ø°£: %d MB"
+msgid "Initializing..."
+msgstr "ÃʱâÈ­..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
-msgstr ""
-"ÀÇÁ¸¼º ¹®Á¦·Î ÀÎÇÏ¿©, ´ÙÀ½ ÆÑÅ°ÁöµéÀº\n"
-"Áö±Ý ¼±Åà ÇØÁ¦µÇ¾î¾ß ÇÕ´Ï´Ù:\n"
-"\n"
+msgid "Save changes"
+msgstr "º¯°æ»çÇ× ÀúÀå"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr ""
-"´ÙÀ½ ÆÑÅ°ÁöµéÀº ¼±ÅÃµÉ ¼ö ¾ø½À´Ï´Ù:\n"
-"\n"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "³»·Á¹Þ±â Áß ¿À·ù"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "(Àº)´Â ´ÙÀ½°ú Ãæµ¹ÇÕ´Ï´Ù:"
+msgid "Package installation..."
+msgstr "¼³Ä¡ÇÒ ÆÑÅ°Áö Áغñ Áß..."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "[%s] ÆÑÅ°Áö¸¦ ¼³Ä¡ÇÒ ¼ö ¾ø½À´Ï´Ù.\n"
+#, c-format
+msgid "Importance: "
+msgstr "Áß¿äµµ: "
 
 #: ../rpmdrake:1
 #, c-format
@@ -658,75 +596,93 @@ msgstr ""
 "¼³Ä¡µÇ¾î¾ß ÇÕ´Ï´Ù.\n"
 "\n"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "Ãß°¡ ÆÑÅ°Áö°¡ ÇÊ¿äÇÕ´Ï´Ù."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "[%s] ÆÑÅ°Áö¸¦ ¼³Ä¡ÇÒ ¼ö ¾ø½À´Ï´Ù.\n"
+msgid "Add..."
+msgstr "Ãß°¡..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
+msgid "Unable to create medium."
+msgstr "¸Åü¸¦ »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"The installation is finished; %s.\n"
 "\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
 msgstr ""
-"ÀÇÁ¸¼º ¹®Á¦·Î ÀÎÇÏ¿©,\n"
-"´ÙÀ½ ÆÑÅ°Áöµéµµ Á¦°Å µÇ¾î¾ß ÇÕ´Ï´Ù:\n"
+"¼³Ä¡¸¦ ¿Ï·áÇÏ¿´½À´Ï´Ù; %s.\n"
 "\n"
+"ÀϺΠ¼³Á¤ ÆÄÀϵéÀº '.rpmnew' ¶Ç´Â '.rpmsave'·Î »ý¼ºµÇ¾ú½À´Ï´Ù.\n"
+"Á¶Ä¡¸¦ ÃëÇϱâ À§ÇØ ÀϺθ¦ Á¶»çÇØ º¼ ¼ö ÀÖ½À´Ï´Ù:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "ÀϺΠÆÑÅ°Áö°¡ ´õ Á¦°Å µÇ¾î¾ß ÇÕ´Ï´Ù."
+msgid "Browse..."
+msgstr "ã¾Æº¸±â..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "[%s] ÆÑÅ°Áö¸¦ ¼³Ä¡ÇÒ ¼ö ¾ø½À´Ï´Ù.\n"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "More information on package..."
-msgstr "Ãß°¡ ÆÑÅ°Áö Á¤º¸..."
+msgid "Info..."
+msgstr "Á¤º¸..."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
+msgstr "°Ô¼ÓÇÏ·Á¸é ¸Åü¸¦ »ðÀÔÇØ¾ß ÇÕ´Ï´Ù."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Copying file for media `%s'..."
+msgstr ""
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "Á¦°Å"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Information on packages"
-msgstr "Ãß°¡ ÆÑÅ°Áö Á¤º¸..."
+msgid "Preparing packages installation..."
+msgstr "¼³Ä¡ÇÒ ÆÑÅ°Áö Áغñ Áß..."
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "by media repository"
+msgstr "¼Ò½º µî·Ïº°"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "More info"
-msgstr ""
+msgid "No mirror"
+msgstr "¹Ì·¯ ¾øÀ½"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Addable"
-msgstr "Ãß°¡ °¡´É"
+msgid "You need to fill up at least the two first entries."
+msgstr "ÃÖ¼ÒÇÑ Ã³À½ µÎ Ç׸ñ¿¡´Â ±âÀÔÇØ¾ß ÇÕ´Ï´Ù."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Upgradable"
-msgstr "¾÷±×·¹ÀÌµå °¡´É"
+msgid "Install"
+msgstr "¼³Ä¡"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Japan"
+msgstr "ÀϺ»"
 
 #: ../rpmdrake:1
 #, c-format
-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 ""
-"¾÷µ¥ÀÌÆ® ¸ñ·ÏÀÌ ºñ¾ú½À´Ï´Ù. ½Ã½ºÅÛ »ó¿¡ ¼³Ä¡µÈ\n"
-"ÆÑÅ°Áö¿¡ ´ëÇÑ ¾÷µ¥ÀÌÆ®°¡ ¾ø°Å³ª,\n"
-"ÀÌ¹Ì ´Ù ¼³Ä¡µÈ °æ¿ìÀÔ´Ï´Ù."
+msgid "Do nothing"
+msgstr "±×³É µÒ"
 
 #: ../rpmdrake:1
 #, c-format
@@ -735,232 +691,213 @@ msgstr "¾÷µ¥ÀÌÆ® ¾øÀ½"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "(none)"
-msgstr "(¾øÀ½)"
+msgid "Description: "
+msgstr "¼³¸í:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "±â´Ù·Á ÁÖ¼¼¿ä. ÆÑÅ°Áö ¸ñ·Ï Á¤·Ä Áß..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "[%s] ÆÑÅ°Áö¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù.\n"
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr ""
+"°æ°í:\n"
+"¼³Ä¡ ¿Ï·áÈÄ ¶Ç´Â ¼³Ä¡°úÁ¤Áß¿¡ µð½ºÅ© °ø°£ ºÎÁ·À» ÀÏÀ¸Å³ ¼ö\n"
+"ÀÖÀ» Á¤µµ·Î ³Ê¹« ¸¹Àº ÆÑÅ°Áö¸¦ Ãß°¡ÇÏ·Á ÇÏ°í ÀÖ½À´Ï´Ù.\n"
+"À̴ ƯÈ÷ À§ÇèÇÒ ¼ö ÀÖÀ¸¹Ç·Î, \n"
+"ÁÖÀǸ¦ ¿äÇÕ´Ï´Ù.\n"
+"\n"
+"Á¤¸»·Î ¼±ÅÃµÈ ¸ðµç ÆÑÅ°Áö¸¦ ¼³Ä¡ÇϽðڽÀ´Ï±î?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "´ÙÀ½ ÆÑÅ°Áöµé Áß Çϳª°¡ ÇÊ¿äÇÕ´Ï´Ù:"
+msgid "Name: "
+msgstr "À̸§: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "¼±ÅÃÇϼ¼¿ä"
+msgid "Inspect..."
+msgstr "Á¶»ç..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing media \"%s\":"
+msgstr "¼Ò½º [%s] ÆíÁý:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Not selected"
-msgstr "Ãæµ¹ÀÌ °¨ÁöµÇ¾ú½À´Ï´Ù."
+msgid "No package found for installation."
+msgstr "¼³Ä¡ÇÒ ÆÑÅ°Áö Áغñ Áß..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Selected"
-msgstr "¼±ÅõÊ"
+msgid "Australia"
+msgstr "¿À½ºÆ®·¹Àϸ®¾Æ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results"
-msgstr "°Ë»ö °á°ú"
+msgid "Installation finished"
+msgstr "¼³Ä¡ ¿Ï·á"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Stop"
-msgstr "ÁßÁö"
+msgid "by update availability"
+msgstr "¾÷µ¥ÀÌÆ® °¡´É¼ºº°"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "±â´Ù·Á ÁÖ¼¼¿ä. °Ë»ö Áß..."
+msgid "Poland"
+msgstr "Æú¶õµå"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results (none)"
-msgstr "°Ë»ö °á°ú(¾øÀ½)"
+msgid "Version: "
+msgstr "¹öÀü: "
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Other"
-msgstr "±âŸ"
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "ÇÁ¶ô½Ã ÀÎÁõÀÌ ÀÖ´Ù¸é »ç¿ëÀÚ¸í°ú ¾ÏÈ£¸¦ ÀÔ·ÂÇÒ ¼ö ÀÖ½À´Ï´Ù:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to the packages source editor!\n"
-"\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
-msgstr ""
-"ÆÑÅ°Áö ¼Ò½º ÆíÁý±â¿¡ Àß ¿À¼Ì½À´Ï´Ù!\n"
-"\n"
-"ÀÌ µµ±¸´Â ÀÌ ÄÄÇ»ÅÍ »ó¿¡¼­ »ç¿ëÇÒ ÆÑÅ°Áö ¼Ò½º ¼³Á¤À» µµ¿Í ÁÝ´Ï´Ù.\n"
-"¼³Á¤µÈ ¼Ò½º´Â »õ ¼ÒÇÁÆ®¿þ¾î ÆÑÅ°Áö¸¦ ¼³Ä¡Çϰųª ¾÷µ¥ÀÌÆ®ÇÒ ¶§\n"
-"»ç¿ëµË´Ï´Ù."
+msgid "Upgradable"
+msgstr "¾÷±×·¹ÀÌµå °¡´É"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Save and quit"
-msgstr "ÀúÀå ÈÄ Á¾·á"
+msgid " done."
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "¿À·ù..."
+msgid "Software Packages Installation"
+msgstr "¼³Ä¡ÇÒ ÆÑÅ°Áö Áغñ Áß..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Update..."
-msgstr "¾÷µ¥ÀÌÆ®..."
+msgid "Additional packages needed"
+msgstr "Ãß°¡ ÆÑÅ°Áö°¡ ÇÊ¿äÇÕ´Ï´Ù."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "Ãß°¡..."
+msgid "Bugfixes updates"
+msgstr "¹ö±×¼öÁ¤ ¾÷µ¥ÀÌÆ®"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "ÆíÁý"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Source"
-msgstr "¼Ò½º"
+msgid "Germany"
+msgstr "µ¶ÀÏ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Enabled?"
-msgstr "»ç¿ë°¡?"
+msgid "Russia"
+msgstr "·¯½Ã¾Æ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Configure sources"
-msgstr "¼Ò½º ¼³Á¤"
+msgid "Norway"
+msgstr "³ë¸£¿þÀÌ"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Password:"
-msgstr "¾ÏÈ£:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during installation"
+msgstr "¼³Ä¡Áß¿¡ ¹®Á¦°¡ ¹ß»ýÇß½À´Ï´Ù."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "User:"
-msgstr "»ç¿ëÀÚ:"
+msgid "Search"
+msgstr "°Ë»ö"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "ÇÁ¶ô½Ã ÀÎÁõÀÌ ÀÖ´Ù¸é »ç¿ëÀÚ¸í°ú ¾ÏÈ£¸¦ ÀÔ·ÂÇÒ ¼ö ÀÖ½À´Ï´Ù:"
+#, fuzzy, c-format
+msgid "Edit a media"
+msgstr "¼Ò½º ÆíÁý"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "ÇÁ¶ô½Ã È£½ºÆ®¸í:"
+msgid "Czech Republic"
+msgstr "üÄÚ °øÈ­±¹"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"ÇÁ¶ô½Ã°¡ ÇÊ¿äÇÏ´Ù¸é, ÇÁ¶ô½Ã È£½ºÆ®¸í°ú Æ÷Æ®(¿É¼Ç)¸¦ ÀÔ·ÂÇϼ¼¿ä.(¹®¹ý: <È£½ºÆ®"
-"¸í[:Æ÷Æ®]>):"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "ÇÁ¶ô½Ã ¼³Á¤"
+msgid "Stop"
+msgstr "ÁßÁö"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "±â´Ù·Á ÁÖ¼¼¿ä. ¸Åü ¾÷µ¥ÀÌÆ® Áß..."
+msgid "Update"
+msgstr "¾÷µ¥ÀÌÆ® ¹öÀü"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "º¯°æ»çÇ×À» ÀúÀåÇÏ·Á¸é, ¸Åü¸¦ µå¶óÀ̺꿡 »ðÀÔÇØ¾ß ÇÕ´Ï´Ù."
+msgid "Please wait, removing packages..."
+msgstr "±â´Ù·Á ÁÖ¼¼¿ä. ÆÑÅ°Áö Á¦°Å Áß..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "°Ô¼ÓÇÏ·Á¸é ¸Åü¸¦ »ðÀÔÇØ¾ß ÇÕ´Ï´Ù."
+msgid "Normal information"
+msgstr "ÀÏ¹Ý Á¤º¸"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "º¯°æ»çÇ× ÀúÀå"
+msgid "Media: "
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "ÇÕ¼º/¸ñ·Ï ÆÄÀÏ·ÎÀÇ »ó´ë °æ·Î:"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "ÆÑÅ°Áö ³»·Á¹Þ´Â Áß: [%s] (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "¼Ò½º [%s] ÆíÁý:"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "¼±ÅÃµÈ ¿ë·®: %d MB / ¿©À¯ °ø°£: %d MB"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit a source"
-msgstr "¼Ò½º ÆíÁý"
+msgid "Media"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "±â´Ù·Á ÁÖ¼¼¿ä. ¸Åü Á¦°Å Áß..."
+msgid "Spain"
+msgstr "½ºÆäÀÎ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Type of source:"
-msgstr "¼Ò½º À¯Çü:"
+msgid "Normal updates"
+msgstr "ÀÏ¹Ý ¾÷µ¥ÀÌÆ®"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Adding a source:"
-msgstr "¼Ò½º Ãß°¡:"
+msgid "by selection state"
+msgstr "¼±Åà »óź°"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
-"ÀÌ¹Ì µ¿ÀÏÇÑ À̸§ÀÇ ¸Åü°¡ ÀÖ½À´Ï´Ù.\n"
-"»õ·Î ¹Ù²Ù½Ã°Ú½À´Ï±î?"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "ÃÖ¼ÒÇÑ Ã³À½ µÎ Ç׸ñ¿¡´Â ±âÀÔÇØ¾ß ÇÕ´Ï´Ù."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Name:"
-msgstr "À̸§:"
+"±â´Ù·Á ÁÖ¼¼¿ä. ¸Çµå·¹ÀÌÅ©¼ÒÇÁÆ® À¥»çÀÌÆ®¿¡¼­ ¹Ì·¯ ¸ñ·ÏÀ» ³»·Á¹Þ°í ÀÖ½À´Ï´Ù."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -968,143 +905,146 @@ msgid "Login:"
 msgstr "¾ÆÀ̵ð:"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Choose a mirror..."
-msgstr "¹Ì·¯ ¼±ÅÃ..."
+#, fuzzy, c-format
+msgid "Adding a media:"
+msgstr "¼Ò½º Ãß°¡:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Browse..."
-msgstr "ã¾Æº¸±â..."
+msgid "Austria"
+msgstr "¿À½ºÆ®¸®¾Æ"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Path or mount point:"
-msgstr "°æ·Î ¶Ç´Â ¸¶¿îÆ® À§Ä¡:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Fatal error"
+msgstr "ÆÄÀÏ ¿À·ù"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Removable device"
-msgstr "Å»Âø½Ä ÀåÄ¡"
+msgid "Update..."
+msgstr "¾÷µ¥ÀÌÆ®..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "[%s]ÀÇ ¼­¸í °ËÁõ Áß ..."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "HTTP ¼­¹ö"
+msgid "(none)"
+msgstr "(¾øÀ½)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "FTP server"
-msgstr "FTP ¼­¹ö"
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Path:"
-msgstr "°æ·Î:"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "ÆÑÅ°Áö ¼³Ä¡ Áß: [%s] (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "Áö¿ª ÆÄÀÏ"
+msgid "Currently installed version: "
+msgstr "¼³Ä¡µÈ ¹öÀü:"
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Add a source"
-msgstr "¼Ò½º Ãß°¡:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "±âŸ"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr "¸Åü¸¦ ¾÷µ¥ÀÌÆ®ÇÒ ¼ö ¾ø½À´Ï´Ù; ÀÚµ¿À¸·Î »ç¿ëºÒ°¡µÉ °ÍÀÔ´Ï´Ù."
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "¾÷µ¥ÀÌÆ® ÀÌÀ¯:"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to create medium."
-msgstr "¸Åü¸¦ »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù."
+msgid "Please choose the desired mirror."
+msgstr "Èñ¸ÁÇÏ´Â ¹Ì·¯¸¦ ¼±ÅÃÇϼ¼¿ä."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "¾÷µ¥ÀÌÆ® ¹öÀü"
+msgid "Edit"
+msgstr "ÆíÁý"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "¾÷µ¥ÀÌÆ®ÇÏ·Á´Â ¼Ò½ºÀ» ¼±ÅÃÇØ ÁÖ¼¼¿ä:"
+msgid "Please wait, finding available packages..."
+msgstr "±â´Ù·Á ÁÖ¼¼¿ä. À¯È¿ÇÑ ÆÑÅ°Áö °Ë»ö Áß..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "±â´Ù·Á ÁÖ¼¼¿ä. ¸Åü ¾÷µ¥ÀÌÆ® Áß..."
+msgid "Relative path to synthesis/hdlist:"
+msgstr "ÇÕ¼º/¸ñ·Ï ÆÄÀÏ·ÎÀÇ »ó´ë °æ·Î:"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid " failed!"
-msgstr "ÆÄÀϺ°"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
+msgstr "°Ë»ö °á°ú(¾øÀ½)"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid " done."
-msgstr ""
+msgid "Danmark"
+msgstr "µ§¸¶Å©"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr ""
+msgid "China"
+msgstr "Áß±¹"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr ""
+msgid "United States"
+msgstr "¹Ì±¹"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "[%s]ÀÇ ¼­¸í °ËÁõ Áß ..."
+msgid "changes:"
+msgstr "º¯°æ»çÇ× ÀúÀå"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr ""
+msgid "Some additional packages need to be removed"
+msgstr "ÀϺΠÆÑÅ°Áö°¡ ´õ Á¦°Å µÇ¾î¾ß ÇÕ´Ï´Ù."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr ""
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr ""
+msgid "No"
+msgstr "¾Æ´Ï¿À"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure medias"
+msgstr "¼Ò½º ¼³Á¤"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a media"
+msgstr "¼Ò½º Ãß°¡:"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Please choose the desired mirror."
-msgstr "Èñ¸ÁÇÏ´Â ¹Ì·¯¸¦ ¼±ÅÃÇϼ¼¿ä."
+msgid "Summary: "
+msgstr "¿ä¾à ¼³¸í: "
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
-msgstr ""
-"Àû´çÇÑ ¹Ì·¯¸¦ ãÀ» ¼ö ¾ø½À´Ï´Ù.\n"
-"\n"
-"ÀÌ ¹®Á¦ÀÇ ¿øÀÎÀº ¿©·¯°¡ÁöÀÏ ¼ö ÀÖ½À´Ï´Ù; °¡Àå ÈçÇÑ ¿øÀÎÀº\n"
-"ÀÌ ÄÄÇ»ÅÍÀÇ ÇÁ·Î¼¼¼­¸¦ ¸Çµå·¹ÀÌÅ© ¸®´ª½º °ø½Ä ¾÷µ¥ÀÌÆ®°¡\n"
-"Áö¿øÇÏÁö ¾Ê´Â °æ¿ìÀÔ´Ï´Ù."
+msgid "Canada"
+msgstr "ij³ª´Ù"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No mirror"
-msgstr "¹Ì·¯ ¾øÀ½"
+msgid "Greece"
+msgstr "±×¸®½º"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1121,179 +1061,239 @@ msgstr ""
 "³×Æ®¿÷ ¶Ç´Â ¸Çµå·¹ÀÌÅ©¼ÒÇÁÆ® À¥»çÀÌÆ®°¡ ÇöÀç À¯È¿ÇÏÁö ¾ÊÀº µí ÇÕ´Ï´Ù.\n"
 "³ªÁß¿¡ ´Ù½Ã ½ÃµµÇØ º¸¼¼¿ä."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr "ÆÑÅ°Áö ¼³Ä¡´Â root »ç¿ëÀÚ¸¸ ÇÒ ¼ö ÀÖ½À´Ï´Ù."
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Error during download"
-msgstr "³»·Á¹Þ±â Áß ¿À·ù"
+msgid "Path:"
+msgstr "°æ·Î:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgid "Problem during removal"
 msgstr ""
-"±â´Ù·Á ÁÖ¼¼¿ä. ¸Çµå·¹ÀÌÅ©¼ÒÇÁÆ® À¥»çÀÌÆ®¿¡¼­ ¹Ì·¯ ¸ñ·ÏÀ» ³»·Á¹Þ°í ÀÖ½À´Ï´Ù."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"¹Ì·¯ ¸ñ·ÏÀ» °¡Á®¿À±â À§Çؼ­ ¸Çµå·¹ÀÌÅ©¼ÒÇÁÆ® À¥»çÀÌÆ®¿¡ Á¢¼ÓÇØ¾ß ÇÕ´Ï´Ù.\n"
-"ÇöÀç ³×Æ®¿÷ÀÌ °¡´ÉÇÑÁö È®ÀÎÇϼ¼¿ä.\n"
-"\n"
-"°è¼ÓÇÒ±î¿ä?"
+msgid "Selected"
+msgstr "¼±ÅõÊ"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United States"
-msgstr "¹Ì±¹"
+msgid "Netherlands"
+msgstr "³×´ú¶õµå"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "China"
-msgstr "Áß±¹"
+msgid "Addable"
+msgstr "Ãß°¡ °¡´É"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "¿µ±¹"
+msgid "(Not available)"
+msgstr "(À¯È¿ÇÏÁö ¾ÊÀ½)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
+msgstr ""
+"´ÙÀ½ ÆÑÅ°ÁöµéÀº ¼±ÅÃµÉ ¼ö ¾ø½À´Ï´Ù:\n"
+"\n"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Not selected"
+msgstr "Ãæµ¹ÀÌ °¨ÁöµÇ¾ú½À´Ï´Ù."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "´ë¸¸"
+msgid "Software Packages Removal"
+msgstr "¼ÒÇÁÆ®¿þ¾î ÆÑÅ°Áö Á¦°Å"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Sweden"
 msgstr "½º¿þµ§"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Russia"
-msgstr "·¯½Ã¾Æ"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Portugal"
-msgstr "Æ÷¸£Åõ°¥"
+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 ""
+"¾÷µ¥ÀÌÆ® ¸ñ·ÏÀÌ ºñ¾ú½À´Ï´Ù. ½Ã½ºÅÛ »ó¿¡ ¼³Ä¡µÈ\n"
+"ÆÑÅ°Áö¿¡ ´ëÇÑ ¾÷µ¥ÀÌÆ®°¡ ¾ø°Å³ª,\n"
+"ÀÌ¹Ì ´Ù ¼³Ä¡µÈ °æ¿ìÀÔ´Ï´Ù."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Poland"
-msgstr "Æú¶õµå"
+msgid "Examining file of media `%s'..."
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Norway"
-msgstr "³ë¸£¿þÀÌ"
+msgid "Download of `%s', speed:%s"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Netherlands"
-msgstr "³×´ú¶õµå"
+msgid "One of the following packages is needed:"
+msgstr "´ÙÀ½ ÆÑÅ°Áöµé Áß Çϳª°¡ ÇÊ¿äÇÕ´Ï´Ù:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Korea"
-msgstr "´ëÇѹα¹"
+msgid "Quit"
+msgstr "Á¾·á"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "ÀϺ»"
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"ÃֽŠ¾÷µ¥ÀÌÆ® ÆÑÅ°ÁöµéÀ» °¡Á®¿À±â À§ÇØ ¹Ì·¯¿¡ Á¢¼ÓÇØ¾ß ÇÕ´Ï´Ù.\n"
+"ÇöÀç ³×Æ®¿÷ÀÌ °¡´ÉÇÑÁö È®ÀÎÇϼ¼¿ä.\n"
+"\n"
+"°è¼ÓÇÒ±î¿ä?"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Italy"
-msgstr "ÀÌŸ®"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update media(s)"
+msgstr "¼Ò½º ¾÷µ¥ÀÌÆ®"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Israel"
-msgstr "À̽º¶ó¿¤"
+msgid "Ok"
+msgstr "È®ÀÎ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Greece"
-msgstr "±×¸®½º"
+msgid "Please wait, adding medium..."
+msgstr "±â´Ù·Á ÁÖ¼¼¿ä. ¸Åü Ãß°¡ Áß..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "France"
-msgstr "ÇÁ¶û½º"
+msgid "Unable to get source packages."
+msgstr "¼Ò½º ÆÑÅ°Áö¸¦ °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "Çɶõµå"
+msgid "Too many packages are selected"
+msgstr "³Ê¹« ¸¹Àº ÆÑÅ°Áö¸¦ ¼±ÅÃÇÏ¿´½À´Ï´Ù."
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Spain"
-msgstr "½ºÆäÀÎ"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"ÆÑÅ°Áö ¼Ò½º ÆíÁý±â¿¡ Àß ¿À¼Ì½À´Ï´Ù!\n"
+"\n"
+"ÀÌ µµ±¸´Â ÀÌ ÄÄÇ»ÅÍ »ó¿¡¼­ »ç¿ëÇÒ ÆÑÅ°Áö ¼Ò½º ¼³Á¤À» µµ¿Í ÁÝ´Ï´Ù.\n"
+"¼³Á¤µÈ ¼Ò½º´Â »õ ¼ÒÇÁÆ®¿þ¾î ÆÑÅ°Áö¸¦ ¼³Ä¡Çϰųª ¾÷µ¥ÀÌÆ®ÇÒ ¶§\n"
+"»ç¿ëµË´Ï´Ù."
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Danmark"
-msgstr "µ§¸¶Å©"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
+msgstr "(Àº)´Â ´ÙÀ½°ú Ãæµ¹ÇÕ´Ï´Ù:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "µ¶ÀÏ"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"¸Çµå·¹ÀÌÅ© ¾÷µ¥ÀÌÆ®¿¡ Àß ¿À¼Ì½À´Ï´Ù!\n"
+"\n"
+"ÀÌ µµ±¸´Â ÄÄÇ»ÅÍ¿¡ ¼³Ä¡ÇÒ ¾÷µ¥ÀÌÆ®µÈ ¼ÒÇÁÆ®¿þ¾î¸¦ ¼±ÅÃÇÒ ¼ö ÀÖµµ·Ï\n"
+"µµ¿Í ÁÝ´Ï´Ù."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
-msgstr "üÄÚ °øÈ­±¹"
+msgid "Mandrake choices"
+msgstr "¸Çµå·¹ÀÌÅ© ¼±ÅÃ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "ÄÚ½ºÅ¸¸®Ä«"
+msgid "Changelog:\n"
+msgstr "º¯°æ»çÇ×:\n"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "ij³ª´Ù"
+msgid "Korea"
+msgstr "´ëÇѹα¹"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Brazil"
-msgstr "ºê¶óÁú"
+msgid "Removable device"
+msgstr "Å»Âø½Ä ÀåÄ¡"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "º§±â¿¡"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "¿À½ºÆ®·¹Àϸ®¾Æ"
+msgid "Change medium"
+msgstr "¸Åü ±³È¯"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "¿À½ºÆ®¸®¾Æ"
+msgid "Mandrake Update"
+msgstr "¸Çµå·¹ÀÌÅ© ¾÷µ¥ÀÌÆ®"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
-msgstr "Á¤º¸..."
+msgid "by size"
+msgstr "Å©±âº°"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "¾Æ´Ï¿À"
+msgid "FTP server"
+msgstr "FTP ¼­¹ö"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Files:\n"
+msgstr "%sÆÄÀϵé:\n"
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Yes"
-msgstr "¿¹"
+#, fuzzy, c-format
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr "¸Åü¸¦ ¾÷µ¥ÀÌÆ®ÇÒ ¼ö ¾ø½À´Ï´Ù; ÀÚµ¿À¸·Î »ç¿ëºÒ°¡µÉ °ÍÀÔ´Ï´Ù."
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -1567,6 +1567,12 @@ msgstr "¼ÒÇÁÆ®¿þ¾î Á¦°Å"
 msgid "Software Sources Manager"
 msgstr "¼ÒÇÁÆ®¿þ¾î ¼Ò½º °ü¸®ÀÚ"
 
+#~ msgid "Source: "
+#~ msgstr "¼Ò½º: "
+
+#~ msgid "Source"
+#~ msgstr "¼Ò½º"
+
 #~ msgid ""
 #~ "some packages failed to install\n"
 #~ "correctly"
@@ -1603,9 +1609,6 @@ msgstr "¼ÒÇÁÆ®¿þ¾î ¼Ò½º °ü¸®ÀÚ"
 #~ "\n"
 #~ "´Ù¸¥ ¹Ì·¯¸¦ »ç¿ëÇØ º¸½Ã°Ú½À´Ï±î?"
 
-#~ msgid "Error adding update medium"
-#~ msgstr "¾÷µ¥ÀÌÆ® ¸Åü Ãß°¡ Áß ¿À·ù"
-
 #~ msgid "Please wait, contacting mirror to initialize updates packages."
 #~ msgstr "±â´Ù·Á ÁÖ¼¼¿ä. ¾÷µ¥ÀÌÆ® ÆÑÅ°Áö¸¦ ÃʱâÈ­Çϱâ À§ÇØ ¹Ì·¯¿¡ Á¢¼Ó Áß..."
 
diff --git a/po/lt.po b/po/lt.po
index 5a08b07f..54be5d11 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: 2003-02-20 13:01+0200\n"
 "Last-Translator: Darius Liepuonis <dariusle@takas.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -16,12 +16,19 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-13\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
+msgid "Enabled?"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Path or mount point:"
+msgstr "prijungimo vieta:"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Portugal"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -36,131 +43,169 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
+msgid "by group"
 msgstr ""
 
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "Pavadinimas:"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Italy"
+msgstr "Ádiegti"
+
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
+msgid "How to choose manually your mirror"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
 msgstr ""
-"Ávyko klaida(os) diegiant paketa(us):\n"
-"\n"
-"%s"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during removal"
-msgstr "Ádiegimo metu ávyko klaida"
+#, c-format
+msgid "Some packages need to be removed"
+msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, removing packages..."
-msgstr "Praðom palaukti.Paðalinami paketai"
+#, c-format
+msgid "More information on package..."
+msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Praðom palaukti.Paðalinami paketai"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Taip"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"There was a problem during the installation:\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"%s"
 msgstr ""
-"Ávyko klaida(os) diegiant paketa(us):\n"
-"\n"
-"%s"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Ádiegiama "
+#, c-format
+msgid "everything was installed correctly"
+msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Ruoðiamasi paketo diegimui"
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Ruoðiamasi paketo diegimui"
+#, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
+msgid ""
+"Welcome to the software removal tool!\n"
+"\n"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Everything installed successfully"
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
+msgid "Save and quit"
+msgstr ""
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"There was a problem during the removal of packages:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"%s"
 msgstr ""
+"Ávyko klaida(os) diegiant paketa(us):\n"
+"\n"
+"%s"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Size: "
+msgstr "Dydis"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "everything was installed correctly"
-msgstr ""
+msgid "Security updates"
+msgstr "Saugumo atnaujinimai"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Ádiegimo metu ávyko klaida"
+msgid "Already existing update medias"
+msgstr ""
+"Praðom palaukti\n"
+"Iðmetama laikmena"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Ádiegiamas paketas `%s' (%s/%s)..."
+msgid "Maximum information"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Ruoðiamasi paketo diegimui"
+msgid "Proxy..."
+msgstr "Klaida..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
+msgstr ""
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "in names"
+msgstr ""
+
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
+msgid "Remove .%s"
+msgstr "Iðimama"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Finland"
+msgstr "Surasti:"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -174,338 +219,331 @@ msgstr ""
 "\n"
 "Ar vistiek norite tæsti (praleidþiant ðá paketà)?"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Verifying packages signatures..."
+msgid "Examining distant file of media `%s'..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Siunèiami paketai `%s' (%s/%s)..."
+msgid "Verifying packages signatures..."
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Cancel"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "France"
 msgstr "Nutraukti"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Ok"
-msgstr "Gerai"
-
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+msgid "More info"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Change medium"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Initializing..."
-msgstr "Ruoðiama ádiegimui..."
+#, fuzzy, c-format
+msgid "Reload the packages list"
+msgstr "Paketas %s nëra pasiraðytas"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Ruoðiamasi paketo diegimui"
+msgid "Choose a mirror..."
+msgstr "Pasirinkite veidrodá:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Atsipraðome, bet jums reikia perkrauti sistema kad ádiegti."
+msgid "Some packages can't be installed"
+msgstr "Paketas `%s' negali bûti ádiegtas\n"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Unable to get source packages."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "Ruoðiamasi paketo diegimui"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Inspect..."
-msgstr ""
+#, fuzzy, c-format
+msgid "All packages,"
+msgstr "0 paketø, 0 baitø"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Installation finished"
-msgstr "Ádiegiama "
+msgid "Type of media:"
+msgstr "Laikmenos tipas:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Do nothing"
-msgstr "Kompiuteris: "
+msgid "in files"
+msgstr "%d bylos"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
+msgid "All requested packages were installed successfully."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Remove .%s"
-msgstr "Iðimama"
+msgid "Proxy hostname:"
+msgstr "Tarpinës stoties (proxy) vartotojo vardas:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "changes:"
-msgstr "Paketai"
+msgid "Local files"
+msgstr "%d bylos"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspecting %s"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Praðom palaukti.Paðalinami paketai"
+msgid "Israel"
+msgstr "Ádiegti"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Please wait, adding medium..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Help"
+msgstr "Pagalba"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "HTTP server"
 msgstr ""
-"Praðom palaukti\n"
-"Iðmetama laikmena"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Installation failed"
+msgstr "Ádiegiama "
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
-"\n"
-"Then, restart MandrakeUpdate."
+msgid "Use .%s as main file"
 msgstr ""
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Search results"
+msgstr "Paieðkos rezultatai"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid " failed!"
+msgstr "%d bylos"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "How to choose manually your mirror"
+msgid "Brazil"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Already existing update sources"
-msgstr ""
+msgid "Find:"
+msgstr "Surasti:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
+msgid "All packages, alphabetical"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+#, fuzzy, c-format
+msgid "Please wait, searching..."
+msgstr "Praðom palaukti.Paðalinami paketai"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Raðymo klaida"
+msgid "Please wait, reading packages database..."
+msgstr "Praðom palaukti.Paðalinami paketai"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Ruoðiamasi paketo diegimui"
+msgid "unknown package "
+msgstr "Negaliu atidaryti paketo  `%s'\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Mandrake Update"
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Software Packages Removal"
+msgid "Reset the selection"
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Quit"
-msgstr "Iðeiti"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Install"
-msgstr "Ádiegti"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Remove"
-msgstr "Nutolæs spausdintuvas"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Help"
-msgstr "Pagalba"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Search"
-msgstr "Ieðkoti"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Find:"
-msgstr "Surasti:"
-
-#: ../rpmdrake:1
-#, c-format
 msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
 "\n"
-"Is it ok to continue?"
 msgstr ""
+"Kad bûtø patenkintos visos priklausomybës,\n"
+"ðie paketai bus paðalinti:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some packages need to be removed"
+msgid "Costa Rica"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
+"There was a problem during the installation:\n"
 "\n"
-"Do you really want to install all the selected packages?"
+"%s"
 msgstr ""
+"Ávyko klaida(os) diegiant paketa(us):\n"
+"\n"
+"%s"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Too many packages are selected"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, removing medium..."
 msgstr ""
+"Praðom palaukti\n"
+"Iðmetama laikmena"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Maximum information"
-msgstr ""
+msgid "Password:"
+msgstr "Slaptaþodis:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Normal information"
-msgstr "Saugumo atnaujinimai"
+msgid "Taiwan"
+msgstr "Vieta"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Update source(s)"
-msgstr "Atnaujinti laikmenà"
+msgid "User:"
+msgstr "Vartotojo vardas (username):"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Reload the packages list"
-msgstr "Paketas %s nëra pasiraðytas"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Reset the selection"
+msgid "Please wait, updating medium..."
 msgstr ""
+"Praðom palaukti\n"
+"Iðmetama laikmena"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "in files"
-msgstr "%d bylos"
+msgid "Please wait, listing packages..."
+msgstr "Praðom palaukti.Paðalinami paketai"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "in descriptions"
-msgstr "Apraðymai"
+msgid "Information on packages"
+msgstr "Negaliu atidaryti paketo"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "in names"
-msgstr ""
+msgid "Cancel"
+msgstr "Nutraukti"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
+msgid "Everything installed successfully"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by source repository"
+msgid "Select the media(s) you wish to update:"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "by selection state"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Please wait, updating media..."
 msgstr ""
+"Praðom palaukti\n"
+"Iðmetama laikmena"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by size"
+msgid "A fatal error occurred: %s."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "All packages,"
-msgstr "0 paketø, 0 baitø"
+msgid "in descriptions"
+msgstr "Apraðymai"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "All packages, alphabetical"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure proxies"
 msgstr ""
+"Atnaujinti\n"
+"laikmenà"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Normal updates"
-msgstr "Saugumo atnaujinimai"
+msgid "Please choose"
+msgstr "Praðom patvirtinti"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Bugfixes updates"
-msgstr "Saugumo atnaujinimai"
+msgid "Selected size: %d MB"
+msgstr "%d paþymëti paketai: %.1f MB"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Security updates"
-msgstr "Saugumo atnaujinimai"
+msgid "Initializing..."
+msgstr "Ruoðiama ádiegimui..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Description: "
-msgstr "Apraðymai"
+msgid "Save changes"
+msgstr "Paketai"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Reason for update: "
-msgstr ""
+msgid "Error during download"
+msgstr "Klaida siunèiant"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Summary: "
-msgstr "Turinys"
+msgid "Package installation..."
+msgstr "Ruoðiamasi paketo diegimui"
 
 #: ../rpmdrake:1
 #, c-format
@@ -514,719 +552,683 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Size: "
-msgstr "Dydis"
+msgid ""
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Version: "
-msgstr "Versija: "
+msgid "Add..."
+msgstr ""
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Unable to create medium."
+msgstr "Nepavyko sukurti raporto bylos, nutraukiu.\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "Pavadinimas: "
+msgid ""
+"The installation is finished; %s.\n"
+"\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
+msgid "Browse..."
 msgstr ""
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "Paketas `%s' negali bûti ádiegtas\n"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Source: "
-msgstr "Ðaltinis: "
+msgid "Info..."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(Not available)"
+msgid "You need to insert the medium to continue"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
+msgid "Copying file for media `%s'..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Files:\n"
-msgstr "/_Byla"
+msgid "Remove"
+msgstr "Nutolæs spausdintuvas"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Selected size: %d MB"
-msgstr "%d paþymëti paketai: %.1f MB"
+msgid "Preparing packages installation..."
+msgstr "Ruoðiamasi paketo diegimui"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "by media repository"
+msgstr ""
+
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "%d paþymëti paketai: %.1f MB"
+msgid "No mirror"
+msgstr "Lemtinga klaida"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
+msgid "You need to fill up at least the two first entries."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
+msgid "Install"
+msgstr "Ádiegti"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Japan"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr " konfliktuoja su "
+msgid "Do nothing"
+msgstr "Kompiuteris: "
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Paketas `%s' negali bûti ádiegtas\n"
+msgid "No update"
+msgstr "Saugumo atnaujinimai"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Description: "
+msgstr "Apraðymai"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
 "\n"
+"Do you really want to install all the selected packages?"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Additional packages needed"
-msgstr ""
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "Paketas `%s' negali bûti ádiegtas\n"
+msgid "Name: "
+msgstr "Pavadinimas: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
+msgid "Inspect..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"Kad bûtø patenkintos visos priklausomybës,\n"
-"ðie paketai bus paðalinti:"
+msgid "Editing media \"%s\":"
+msgstr "Redaguoti Laikmena"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some additional packages need to be removed"
-msgstr ""
-"Ðis papildomas paketas turi bûti ádiegtas kad viskas dirbtø gerai gerai:"
+msgid "No package found for installation."
+msgstr "Ruoðiamasi paketo diegimui"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "More information on package..."
-msgstr ""
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Australia"
+msgstr "nuoseklioji"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Information on packages"
-msgstr "Negaliu atidaryti paketo"
+msgid "Installation finished"
+msgstr "Ádiegiama "
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "More info"
+msgid "by update availability"
+msgstr ""
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Addable"
-msgstr "Galimi"
+#, c-format
+msgid "Version: "
+msgstr "Versija: "
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Upgradable"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-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."
+msgid " done."
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No update"
-msgstr "Saugumo atnaujinimai"
+msgid "Software Packages Installation"
+msgstr "Ruoðiamasi paketo diegimui"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "(none)"
+msgid "Additional packages needed"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, listing packages..."
-msgstr "Praðom palaukti.Paðalinami paketai"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "Negaliu atidaryti paketo  `%s'\n"
+msgid "Bugfixes updates"
+msgstr "Saugumo atnaujinimai"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
+msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr "Vokieèiø"
+
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Please choose"
-msgstr "Praðom patvirtinti"
+msgid "Russia"
+msgstr "Rusø"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Norway"
+msgstr "Norvegø"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Not selected"
-msgstr "Rasti konfliktai"
+msgid "Problem during installation"
+msgstr "Ádiegimo metu ávyko klaida"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Search"
+msgstr "Ieðkoti"
+
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Selected"
-msgstr "Pasirinkti visus"
+msgid "Edit a media"
+msgstr "Redaguoti Laikmena"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
+msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Search results"
-msgstr "Paieðkos rezultatai"
+#, c-format
+msgid ""
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Stop"
 msgstr "Sektorius"
 
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
+msgstr "Atnaujinti"
+
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, searching..."
+msgid "Please wait, removing packages..."
 msgstr "Praðom palaukti.Paðalinami paketai"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Search results (none)"
-msgstr "Paieðkos rezultatai"
+msgid "Normal information"
+msgstr "Saugumo atnaujinimai"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Other"
-msgstr "Kitas"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid ""
-"Welcome to the packages source editor!\n"
-"\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
+msgid "Media: "
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
-msgstr ""
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "Siunèiami paketai `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Klaida..."
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "%d paþymëti paketai: %.1f MB"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update..."
+msgid "Media"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Add..."
+msgid "Spain"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Edit"
-msgstr "Redaguoti"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Source"
-msgstr "Ðaltinis"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Normal updates"
+msgstr "Saugumo atnaujinimai"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Enabled?"
+msgid "by selection state"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Configure sources"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
-"Atnaujinti\n"
-"laikmenà"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Password:"
-msgstr "Slaptaþodis:"
+msgid "Login:"
+msgstr "Login:"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "User:"
-msgstr "Vartotojo vardas (username):"
+msgid "Adding a media:"
+msgstr "Redaguoti Laikmena"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr ""
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Austria"
+msgstr "nuoseklioji"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy hostname:"
-msgstr "Tarpinës stoties (proxy) vartotojo vardas:"
+msgid "Fatal error"
+msgstr "Raðymo klaida"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+msgid "Update..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Configure proxies"
-msgstr ""
-"Atnaujinti\n"
-"laikmenà"
+msgid "Starting download of `%s'..."
+msgstr "Tikrinu '%s' paraðà..."
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Please wait, updating medium..."
+#: ../rpmdrake:1
+#, c-format
+msgid "(none)"
 msgstr ""
-"Praðom palaukti\n"
-"Iðmetama laikmena"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
+"Removing these packages would break your system, sorry:\n"
+"\n"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr ""
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Ádiegiamas paketas `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Save changes"
-msgstr "Paketai"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "reliatyvus kelias iki hdlist: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Kitas"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
+msgid "Reason for update: "
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "Redaguoti Laikmena"
+msgid "Please choose the desired mirror."
+msgstr ""
+"Praðom palaukti\n"
+"Gabenamas veidrodþiø sàraðas"
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Edit a source"
-msgstr "Redaguoti Laikmena"
+#, c-format
+msgid "Edit"
+msgstr "Redaguoti"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, removing medium..."
-msgstr ""
-"Praðom palaukti\n"
-"Iðmetama laikmena"
+msgid "Please wait, finding available packages..."
+msgstr "Praðom palaukti.Paðalinami paketai"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Type of source:"
-msgstr "Laikmenos tipas:"
+msgid "Relative path to synthesis/hdlist:"
+msgstr "reliatyvus kelias iki hdlist: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Adding a source:"
-msgstr "Redaguoti Laikmena"
+msgid "Search results (none)"
+msgstr "Paieðkos rezultatai"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
+msgid "Danmark"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
+msgid "China"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Name:"
-msgstr "Pavadinimas:"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Login:"
-msgstr "Login:"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Choose a mirror..."
-msgstr "Pasirinkite veidrodá:"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Browse..."
-msgstr ""
+msgid "United States"
+msgstr "Jungtinës amerikos valstijos"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Path or mount point:"
-msgstr "prijungimo vieta:"
+msgid "changes:"
+msgstr "Paketai"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Removable device"
-msgstr "Iðmesti laikmenà"
+msgid "Some additional packages need to be removed"
+msgstr ""
+"Ðis papildomas paketas turi bûti ádiegtas kad viskas dirbtø gerai gerai:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr ""
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr ""
+msgid "No"
+msgstr "Ne"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Path:"
-msgstr "kelias:"
+msgid "Configure medias"
+msgstr ""
+"Atnaujinti\n"
+"laikmenà"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Local files"
-msgstr "%d bylos"
+msgid "Add a media"
+msgstr "Redaguoti Laikmena"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Add a source"
-msgstr "Redaguoti Laikmena"
+msgid "Summary: "
+msgstr "Turinys"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
+msgid "Canada"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Unable to create medium."
-msgstr "Nepavyko sukurti raporto bylos, nutraukiu.\n"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Update"
-msgstr "Atnaujinti"
+msgid "Greece"
+msgstr "Graikø"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
+msgid ""
+"There was an error downloading the mirrors list:\n"
+"\n"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, updating media..."
-msgstr ""
-"Praðom palaukti\n"
-"Iðmetama laikmena"
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Atsipraðome, bet jums reikia perkrauti sistema kad ádiegti."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid " failed!"
-msgstr "%d bylos"
+msgid "Path:"
+msgstr "kelias:"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid " done."
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during removal"
+msgstr "Ádiegimo metu ávyko klaida"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Download of `%s', speed:%s"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Selected"
+msgstr "Pasirinkti visus"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
+msgid "Netherlands"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "Tikrinu '%s' paraðà..."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr ""
+msgid "Addable"
+msgstr "Galimi"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining file of source `%s'..."
+msgid "(Not available)"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Copying file for source `%s'..."
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please choose the desired mirror."
-msgstr ""
-"Praðom palaukti\n"
-"Gabenamas veidrodþiø sàraðas"
+msgid "Not selected"
+msgstr "Rasti konfliktai"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
+msgid "Software Packages Removal"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "No mirror"
-msgstr "Lemtinga klaida"
+msgid "Sweden"
+msgstr "Pasiþiûrëti"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"There was an error downloading the mirrors list:\n"
 "\n"
-"%s\n"
-"The network, or MandrakeSoft website, are maybe unavailable.\n"
-"Please try again later."
+"\n"
+"Error(s) reported:\n"
+"%s"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
-msgstr "Klaida siunèiant"
+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.pm:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgid "Examining file of media `%s'..."
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
+msgid "Download of `%s', speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United States"
-msgstr "Jungtinës amerikos valstijos"
+msgid "One of the following packages is needed:"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "China"
-msgstr ""
+msgid "Quit"
+msgstr "Iðeiti"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Taiwan"
-msgstr "Vieta"
+msgid "Update media(s)"
+msgstr "Atnaujinti laikmenà"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Sweden"
-msgstr "Pasiþiûrëti"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "Gerai"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Russia"
-msgstr "Rusø"
+msgid "Please wait, adding medium..."
+msgstr ""
+"Praðom palaukti\n"
+"Iðmetama laikmena"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Portugal"
+msgid "Unable to get source packages."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
+msgid "Too many packages are selected"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Norway"
-msgstr "Norvegø"
-
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Netherlands"
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Korea"
-msgstr "Dar"
+msgid "%s conflicts with %s"
+msgstr " konfliktuoja su "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Italy"
-msgstr "Ádiegti"
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
+msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Israel"
-msgstr "Ádiegti"
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Greece"
-msgstr "Graikø"
+msgid "Korea"
+msgstr "Dar"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "France"
-msgstr "Nutraukti"
+msgid "Removable device"
+msgstr "Iðmesti laikmenà"
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Finland"
-msgstr "Surasti:"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Spain"
-msgstr ""
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Danmark"
-msgstr ""
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Germany"
-msgstr "Vokieèiø"
+msgid "Belgium"
+msgstr "Belgø"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
+msgid "Change medium"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
+msgid "Mandrake Update"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Canada"
+msgid "by size"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Brazil"
+msgid "FTP server"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Belgium"
-msgstr "Belgø"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Australia"
-msgstr "nuoseklioji"
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Austria"
-msgstr "nuoseklioji"
+msgid "Files:\n"
+msgstr "/_Byla"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Info..."
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "No"
-msgstr "Ne"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Yes"
-msgstr "Taip"
-
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
 msgstr "Siuntimo katalogo nëra"
@@ -1499,6 +1501,12 @@ msgstr ""
 msgid "Software Sources Manager"
 msgstr ""
 
+#~ msgid "Source: "
+#~ msgstr "Ðaltinis: "
+
+#~ msgid "Source"
+#~ msgstr "Ðaltinis"
+
 #, fuzzy
 #~ msgid "Please wait, removing packages to allow others to be upgraded..."
 #~ msgstr "Praðom palaukti.Paðalinami paketai"
diff --git a/po/lv.po b/po/lv.po
index 1c914c05..2e1a9d67 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: 2002-08-11 22:16+0200\n"
 "Last-Translator: Vitauts Stoèka <vit@dau.lv>\n"
 "Language-Team: Latvian <cooker-i18n@linux-mandrake.com>\n"
@@ -15,16 +15,20 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-13\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"Vai ir labi turpinât?"
+msgid "Enabled?"
+msgstr "Atïauts?"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Ceïð uz montçðanas punktu:"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Portugal"
+msgstr "Portugâle"
 
 #: ../rpmdrake:1
 #, c-format
@@ -43,16 +47,79 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "by group"
+msgstr "pçc grupas"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "Vârds:"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Italy"
+msgstr "Instalçt"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Kâ ar rokâm izvçlçties spoguïserveri"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "Daþas pakotnes nepiecieðams noòemt"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
+msgstr "Vairâk informâcijas par pakotni..."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr ""
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
 msgid ""
-"Welcome to MandrakeUpdate!\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
 msgstr ""
-"Laipni lûdzam MandrakeUpdate!\n"
+"Sakarâ ar atkarîbâm, sekojoðâm pakotnçm jânoòem atzîmçjums:\n"
 "\n"
-"Ðis rîks palîdzçs Jums izvçlçties atjauninâjumus, kurus vçlaties\n"
-"instalçt uz datora."
+"\n"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "viss tika uzinstalçts korekti"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"Varat izvçlçties spoguïserveri manuâli: lai to veiktu,\n"
+"palaidiet Programmatûras avotu pârvladnieku, un tad pievienojiet\n"
+"`Droðîbas jauninâjumi' avotu.\n"
+"\n"
+"Tad pârstartçjiet MandrakeUpdate."
 
 #: ../rpmdrake:1
 #, c-format
@@ -67,6 +134,17 @@ msgstr ""
 "Ðis rîks palîdzçs Jums izvçlçties, kuru programmatûru vçlaties\n"
 "noòemt no datora."
 
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "Lai saglabâtu izmaiòas, Jums jâieliek datu nesçjs iekârtâ."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Saglabât un iziet"
+
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
@@ -76,103 +154,73 @@ msgid ""
 msgstr "Tiek sagatavota instalçðana"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during removal"
-msgstr "Problçma instalçðanas laikâ"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "Lûdzu gaidiet, noòemu pakotnes..."
+msgid "Size: "
+msgstr "Apjoms: "
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Lûdzu gaidiet, nolasu pakotòu datubâzi..."
+msgid "Security updates"
+msgstr "Droðîbas atjauninâjumi"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr "Tiek sagatavota instalçðana"
+msgid "Already existing update medias"
+msgstr "Kïûda pievienojot atjaunoðanas datu nesçju"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Instalçt visu"
+#, c-format
+msgid "Maximum information"
+msgstr "Maksimâla informâcija"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Tiek sagatavota instalçðana"
+msgid "Proxy..."
+msgstr "Kïûda..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Tiek sagatavota instalçðana"
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
+msgstr ""
+"Instalçðana neizdevâs, trûkst daþi faili.\n"
+"Jûs varbût vçlaties atjauninât avotu datubâzi."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Visas pieprasîtâs pakotnes tika veiksmîgi instalçtas."
+msgid "United Kingdom"
+msgstr "Apvienotâ Karaliste"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Viss tika instalçts veiksmîgi"
+msgid "in names"
+msgstr "vârdos"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"I can't find any suitable mirror.\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
-"Instalçðana ir pabeigta; %s.\n"
+"Nevaru atrast piemçrotu spoguïserveri.\n"
 "\n"
-"Daþi konfigurâcijas faili tika izveidoti kâ `.rpmnew' vai `.rpmsave',\n"
-"jûs varat tagad pârbaudît daþus, lai veiktu darbîbas:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "everything was installed correctly"
-msgstr "viss tika uzinstalçts korekti"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Instalçðanas laikâ radâs problçmas"
+"Ðai problçmai varçtu bût daþâdi iemesli; visbieþâk ir gadîjums,\n"
+"ka procesora arhitektûra netiek atbalstîta no Mandrake Linux\n"
+"oficiâlo atjauninâjumu puses."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr ""
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Tiek sagatavota instalçðana"
+msgid "Remove .%s"
+msgstr "Noòemt .%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
-msgstr ""
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"Instalçðana neizdevâs, trûkst daþi faili.\n"
-"Jûs varbût vçlaties atjauninât avotu datubâzi."
+msgid "Finland"
+msgstr "Somija"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -189,357 +237,340 @@ msgstr ""
 "\n"
 "Vai ir labi turpinât?"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Verifying packages signatures..."
+msgid "Examining distant file of media `%s'..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
+msgid "Verifying packages signatures..."
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "France"
+msgstr "Piespiest"
+
+#. -PO: Keep it short, this is gonna be on a button
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "Atcelt"
+msgid "More info"
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Ok"
-msgstr "Labi"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Vai ir labi turpinât?"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Lûdzu, ievietojiet datu nesçju \"%s\" ierîcç [%s]"
+#, c-format
+msgid "Reload the packages list"
+msgstr "Pârlâdçjiet pakotòu sarakstu"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Change medium"
-msgstr "Nomainiet datu nesçju"
+msgid "Choose a mirror..."
+msgstr "Izvçlieties spoguïserveri..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Initializing..."
-msgstr "Instalçju:"
+msgid "Some packages can't be installed"
+msgstr "Pakotni neizdodas instalçt"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Package installation..."
+msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Tiek sagatavota instalçðana"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Atvainojiet, nebija iespçjams paòemt izejas pakotnes."
+#, c-format
+msgid "All packages,"
+msgstr "Visas pakotnes,"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Unable to get source packages."
-msgstr "Nebija iespçjams saòemt izejas pakotnes."
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspect..."
-msgstr "Pârbaude..."
+msgid "Type of media:"
+msgstr "Avota tips:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation finished"
-msgstr "Instalçðana pabeigta"
+msgid "in files"
+msgstr "failos"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Nedarît neko"
+msgid "All requested packages were installed successfully."
+msgstr "Visas pieprasîtâs pakotnes tika veiksmîgi instalçtas."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Lietojiet .%s kâ galveno failu"
+msgid "Proxy hostname:"
+msgstr "Proxy hosta vârds:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Noòemt .%s"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "changes:"
-msgstr "Saglabât izmaiòas"
+msgid "Local files"
+msgstr "Lokâlie faili"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspecting %s"
 msgstr "Pârbaudu %s"
 
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Israel"
+msgstr "Instalçt"
+
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Lûdzu gaidiet, meklçju pieejamâs pakotnes..."
+msgid "Help"
+msgstr "Palîdzîba"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "Lûdzu gaidiet, pievienoju datu nesçju..."
+msgid "HTTP server"
+msgstr "HTTP serveris"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
-"\n"
-"Then, restart MandrakeUpdate."
-msgstr ""
-"Varat izvçlçties spoguïserveri manuâli: lai to veiktu,\n"
-"palaidiet Programmatûras avotu pârvladnieku, un tad pievienojiet\n"
-"`Droðîbas jauninâjumi' avotu.\n"
-"\n"
-"Tad pârstartçjiet MandrakeUpdate."
+msgid "Installation failed"
+msgstr "Instalçt visu"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "Kâ ar rokâm izvçlçties spoguïserveri"
+msgid "Use .%s as main file"
+msgstr "Lietojiet .%s kâ galveno failu"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
-msgstr ""
+msgid "Search results"
+msgstr "Meklçðanas rezultâti"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid " failed!"
+msgstr "failos"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Already existing update sources"
-msgstr ""
+msgid "Brazil"
+msgstr "Brazîlija"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 msgstr ""
-"Man jâsazinas ar spoguïserveri, lai saòemtu pçdçjâs\n"
-"atjauninâðanas pakotnes. Lûdzu, pârbaudiet, vai tîkls\n"
-"ir patreiz pieejams.\n"
-"\n"
-"Vai ir labi turpinât?"
+"Jau ir datu nesçjs ar ðâdu vârdu,\n"
+"vai tieðâm vçlaties to aizvietot?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Ierakstîðanas kïûda\n"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Tiek sagatavota instalçðana"
+msgid "Find:"
+msgstr "Meklçt:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Mandrake atjauninâðana"
+msgid "All packages, alphabetical"
+msgstr "Visas pakotnes, pçc alfabçta"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Programmatûras pakotòu noòemðana"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Quit"
-msgstr "Iziet"
+msgid "Please wait, searching..."
+msgstr "Lûdzu gaidiet, meklçju..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Instalçt"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Remove"
-msgstr "Noòemt"
+msgid "Please wait, reading packages database..."
+msgstr "Lûdzu gaidiet, nolasu pakotòu datubâzi..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Help"
-msgstr "Palîdzîba"
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "Neizdodas atvçrt pakotni"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Search"
-msgstr "Meklçt"
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Lûdzu, ievietojiet datu nesçju \"%s\" ierîcç [%s]"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Meklçt:"
+msgid "Reset the selection"
+msgstr "Izvçlçties no jauna"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"Ja nepiecieðams proxy, ievadiet hosta vârdu un opcionâli portu (sintakse: "
+"<proxy hosts[:ports]>):"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
 "\n"
-"Is it ok to continue?"
 msgstr ""
-"Sekojoðas pakotnes jânoòem, lai varçtu atjauninât pârçjâs:\n"
-"\n"
-"%s\n"
+"Lai apmierinâtu visas atkarîbas,\n"
+"ir nepiecieðams noòemt arî sekojoða(s) pakotne(s):\n"
 "\n"
-"Vai ir labi turpinât?"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Daþas pakotnes nepiecieðams noòemt"
+msgid "Costa Rica"
+msgstr "Kostarika"
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
-"\n"
-"Do you really want to install all the selected packages?"
-msgstr ""
-"Brîdinâjums: ðíiet, ka mçìinat pievienot tik daudz\n"
-"pakotnes, ka Jûsu failu sistçmai var pietrûkt brîvas vietas\n"
-"pakotòu instalçðanas laikâ vai pçc tam; tas ir îpaði\n"
-"bîstami, un to vajadzçtu rûpîgi pârdomât.\n"
+"There was a problem during the installation:\n"
 "\n"
-"Vai tieðâm vçlaties instalçt visas izvçlçtâs pakotnes?"
+"%s"
+msgstr "Tiek sagatavota instalçðana"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Izvçlçtas pa daudz pakotnes"
+msgid "Please wait, removing medium..."
+msgstr "Lûdzu gaidiet, atvienoju datu nesçju..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Maximum information"
-msgstr "Maksimâla informâcija"
+msgid "Password:"
+msgstr "Parole:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Normal information"
-msgstr "Parasta informâcija"
-
-#: ../rpmdrake:1 ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Update source(s)"
-msgstr "Atjaunot avotus"
+msgid "Taiwan"
+msgstr "Taivâna"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Pârlâdçjiet pakotòu sarakstu"
+msgid "User:"
+msgstr "Lietotâjs:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reset the selection"
-msgstr "Izvçlçties no jauna"
+msgid "Please wait, updating medium..."
+msgstr "Lûdzu gaidiet, atjauninu datu nesçju..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "failos"
+msgid "Please wait, listing packages..."
+msgstr "Lûdzu gaidiet, veidoju pakotòu sarakstu..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "in descriptions"
-msgstr "aprakstos"
+#, fuzzy, c-format
+msgid "Information on packages"
+msgstr "Vairâk informâcijas par pakotni..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "in names"
-msgstr "vârdos"
+msgid "Cancel"
+msgstr "Atcelt"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
-msgstr "pçc atjauninâjuma pieejamîbas"
+msgid "Everything installed successfully"
+msgstr "Viss tika instalçts veiksmîgi"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "by source repository"
-msgstr "pçc avota repozitârija"
+msgid "Select the media(s) you wish to update:"
+msgstr ""
+"Lûdzu izvçlieties avotus,\n"
+"kurus vçlaties atnunot:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by selection state"
-msgstr "pçc izvçlçðanâs statusa"
+msgid "Please wait, updating media..."
+msgstr "Lûdzu gaidiet, atjuaninu datu nesçju"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by size"
-msgstr "pçc apjoma"
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-msgstr "pçc grupas"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Sekojoðas pakotnes jânoòem, lai varçtu atjauninât pârçjâs:\n"
+"\n"
+"%s\n"
+"\n"
+"Vai ir labi turpinât?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages,"
-msgstr "Visas pakotnes,"
+msgid "in descriptions"
+msgstr "aprakstos"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Visas pakotnes, pçc alfabçta"
+msgid "Configure proxies"
+msgstr "Konfigurçt proxy serverus"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Mandrake izvçles"
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Man jâkontaktçjas ar MandrakeSoft web vietu, lai saòemtu\n"
+"spoguïserveru sarakstu. Lûdzu, pârliecinieties, ka Jûsu tîkls\n"
+"patreiz darbojas.\n"
+"\n"
+"Vai ir labi turpinât?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Normal updates"
-msgstr "Parasti jauninâjumi"
+msgid "Please choose"
+msgstr "Lûdzu izvçlieties"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Kïûdu labojumu jauninâjumi"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Security updates"
-msgstr "Droðîbas atjauninâjumi"
+msgid "Selected size: %d MB"
+msgstr "Izvçles apjoms: %d MB"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Initializing..."
+msgstr "Instalçju:"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Description: "
-msgstr "Apraksts: "
+msgid "Save changes"
+msgstr "Saglabât izmaiòas"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Atjauninâðanas iemesls: "
+msgid "Error during download"
+msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Summary: "
-msgstr "Kopsavilkums: "
+#, fuzzy, c-format
+msgid "Package installation..."
+msgstr "Tiek sagatavota instalçðana"
 
 #: ../rpmdrake:1
 #, c-format
@@ -548,554 +579,463 @@ msgstr "Svarîgums: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid ""
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
+msgstr ""
+"Lai apmierinâtu visas atkarîbas,\n"
+"ir nepiecieðams instalçt arî sekojoða(s) pakotne(s):\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Size: "
-msgstr "Apjoms: "
+msgid "Add..."
+msgstr "Pievienot..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Version: "
-msgstr "Versija: "
+msgid "Unable to create medium."
+msgstr "Nevaru izveidot datu nesçju."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "Vârds: "
+msgid ""
+"The installation is finished; %s.\n"
+"\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
+msgstr ""
+"Instalçðana ir pabeigta; %s.\n"
+"\n"
+"Daþi konfigurâcijas faili tika izveidoti kâ `.rpmnew' vai `.rpmsave',\n"
+"jûs varat tagad pârbaudît daþus, lai veiktu darbîbas:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Patreiz instalçtâ versija: "
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Source: "
-msgstr "Piespiest"
+msgid "Browse..."
+msgstr "Pârlûkot..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "(Not available)"
-msgstr "(Nav pieejams)"
+msgid "Some packages can't be removed"
+msgstr "Pakotni neizdodas instalçt"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Izmaiòu þurnâls:\n"
+msgid "Info..."
+msgstr "Info..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Files:\n"
-msgstr "Faili:\n"
+msgid "You need to insert the medium to continue"
+msgstr "Jums jâielik datu nesçjs, lai turpinâtu"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "Izvçles apjoms: %d MB"
+msgid "Copying file for media `%s'..."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Izvçlçts: %d MB / brîvâ diska vieta: %d MB"
+msgid "Remove"
+msgstr "Noòemt"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
-msgstr ""
-"Sakarâ ar atkarîbâm, sekojoðâm pakotnçm jânoòem atzîmçjums:\n"
-"\n"
-"\n"
+msgid "Preparing packages installation..."
+msgstr "Tiek sagatavota instalçðana"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr ""
-"Atvainojiet, sekojoðas pakotnes nevar tikt izvçlçtas\"\n"
-"\n"
+msgid "by media repository"
+msgstr "pçc avota repozitârija"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr " konfliktç ar %s-%s-%s"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
+msgstr "Nav spoguïservera"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Pakotni neizdodas instalçt"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to fill up at least the two first entries."
+msgstr "Jums jâaizpilda vismaz pirmie divi ievadlauki."
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
-msgstr ""
-"Lai apmierinâtu visas atkarîbas,\n"
-"ir nepiecieðams instalçt arî sekojoða(s) pakotne(s):\n"
-"\n"
+msgid "Install"
+msgstr "Instalçt"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Japan"
+msgstr "Japâna"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "Papildus nepiecieðamâs pakotnes"
+msgid "Do nothing"
+msgstr "Nedarît neko"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "Pakotni neizdodas instalçt"
+#, c-format
+msgid "No update"
+msgstr "Nav jauninâjuma"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
+msgid "Description: "
+msgstr "Apraksts: "
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
 "\n"
+"Do you really want to install all the selected packages?"
 msgstr ""
-"Lai apmierinâtu visas atkarîbas,\n"
-"ir nepiecieðams noòemt arî sekojoða(s) pakotne(s):\n"
+"Brîdinâjums: ðíiet, ka mçìinat pievienot tik daudz\n"
+"pakotnes, ka Jûsu failu sistçmai var pietrûkt brîvas vietas\n"
+"pakotòu instalçðanas laikâ vai pçc tam; tas ir îpaði\n"
+"bîstami, un to vajadzçtu rûpîgi pârdomât.\n"
 "\n"
+"Vai tieðâm vçlaties instalçt visas izvçlçtâs pakotnes?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Nepiecieðams noòemt daþas papildus pakotnes"
+msgid "Name: "
+msgstr "Vârds: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "More information on package..."
-msgstr "Vairâk informâcijas par pakotni..."
+msgid "Inspect..."
+msgstr "Pârbaude..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Information on packages"
-msgstr "Vairâk informâcijas par pakotni..."
-
-#. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:1
-#, c-format
-msgid "More info"
-msgstr ""
+msgid "Editing media \"%s\":"
+msgstr "Laboju avotu \"%s\":"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Addable"
-msgstr "Pievienojams"
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "Tiek sagatavota instalçðana"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Upgradable"
-msgstr "Atjauninâms"
+msgid "Australia"
+msgstr "Austrâlija"
 
 #: ../rpmdrake:1
 #, c-format
-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 ""
-"Atjauninâjumu saraksts ir tukðs. Tas nozîmç, ka vai nu nav\n"
-"pieejami atjauninâjumi uz Jûsu datora instalçtajâm pakotnçm,\n"
-"vai arî Jûs tos visus jau esat uzinstalçjuði."
+msgid "Installation finished"
+msgstr "Instalçðana pabeigta"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "No update"
-msgstr "Nav jauninâjuma"
+msgid "by update availability"
+msgstr "pçc atjauninâjuma pieejamîbas"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(none)"
-msgstr "(neviens)"
+msgid "Poland"
+msgstr "Polija"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Lûdzu gaidiet, veidoju pakotòu sarakstu..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "Neizdodas atvçrt pakotni"
+msgid "Version: "
+msgstr "Versija: "
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Ir nepiecieðama viena no sekojoðâm pakotnçm:"
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Varat norâdît lietotâja vârdu/paroli priekði proxy autentifikâcijas:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Lûdzu izvçlieties"
+msgid "Upgradable"
+msgstr "Atjauninâms"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid " done."
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Not selected"
-msgstr " konfliktç ar %s-%s-%s"
+msgid "Software Packages Installation"
+msgstr "Tiek sagatavota instalçðana"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected"
-msgstr "Izvçlçts"
+msgid "Additional packages needed"
+msgstr "Papildus nepiecieðamâs pakotnes"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results"
-msgstr "Meklçðanas rezultâti"
+msgid "Bugfixes updates"
+msgstr "Kïûdu labojumu jauninâjumi"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Stop"
-msgstr "Stop"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Lûdzu gaidiet, meklçju..."
+msgid "Germany"
+msgstr "Vâcija"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Meklçðanas rezultâti (neviens)"
+msgid "Russia"
+msgstr "Krievija"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Other"
-msgstr "Cits"
+msgid "Norway"
+msgstr "Norvçìija"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid ""
-"Welcome to the packages source editor!\n"
-"\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
-msgstr ""
-"Laipni lûdzam pakotòu avota redaktorâ!\n"
-"\n"
-"Ðis rîks palîdzçs Jums konfigurçt pakotòu avotus, kurus vçlaties lietot\n"
-"uz Jûsu datora. Tie tad bûs pieejami, lai instalçtu jaunu programmatûras\n"
-"pakotni, vai lai veiktu jauninâjumus."
+msgid "Problem during installation"
+msgstr "Instalçðanas laikâ radâs problçmas"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
-msgstr "Saglabât un iziet"
+msgid "Search"
+msgstr "Meklçt"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Kïûda..."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Update..."
-msgstr "Atjauninât..."
+msgid "Edit a media"
+msgstr "Labot avotu"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Add..."
-msgstr "Pievienot..."
+msgid "Czech Republic"
+msgstr "Èehija"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Edit"
-msgstr "Rediìçt"
+msgid ""
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Source"
-msgstr "Piespiest"
+msgid "Stop"
+msgstr "Stop"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Enabled?"
-msgstr "Atïauts?"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Configure sources"
-msgstr "Konfigurçt izejas kodus"
+msgid "Update"
+msgstr "Atjauninât"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "Parole:"
+msgid "Please wait, removing packages..."
+msgstr "Lûdzu gaidiet, noòemu pakotnes..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "User:"
-msgstr "Lietotâjs:"
+msgid "Normal information"
+msgstr "Parasta informâcija"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "Varat norâdît lietotâja vârdu/paroli priekði proxy autentifikâcijas:"
+msgid "Media: "
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "Proxy hosta vârds:"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+msgid "Downloading package `%s' (%s/%s)..."
 msgstr ""
-"Ja nepiecieðams proxy, ievadiet hosta vârdu un opcionâli portu (sintakse: "
-"<proxy hosts[:ports]>):"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Konfigurçt proxy serverus"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Izvçlçts: %d MB / brîvâ diska vieta: %d MB"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Lûdzu gaidiet, atjauninu datu nesçju..."
+msgid "Media"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "Lai saglabâtu izmaiòas, Jums jâieliek datu nesçjs iekârtâ."
+msgid "Spain"
+msgstr "Spânija"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "Jums jâielik datu nesçjs, lai turpinâtu"
+msgid "Normal updates"
+msgstr "Parasti jauninâjumi"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "Saglabât izmaiòas"
+msgid "by selection state"
+msgstr "pçc izvçlçðanâs statusa"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Relatîvais èeïð uz synthesis/hdlist: "
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
+"Lûdzu gaidiet, lujuplâdçju spoguïserveru sarakstu no MandrakeSoft web vietas."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "Laboju avotu \"%s\":"
+msgid "Login:"
+msgstr "Lietotâjs:"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Edit a source"
-msgstr "Labot avotu"
+msgid "Adding a media:"
+msgstr "Pievienoju avotu:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Lûdzu gaidiet, atvienoju datu nesçju..."
+msgid "Austria"
+msgstr "Austrija"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Type of source:"
-msgstr "Avota tips:"
+msgid "Fatal error"
+msgstr "Ierakstîðanas kïûda\n"
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Adding a source:"
-msgstr "Pievienoju avotu:"
+#, c-format
+msgid "Update..."
+msgstr "Atjauninât..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
+msgid "Starting download of `%s'..."
 msgstr ""
-"Jau ir datu nesçjs ar ðâdu vârdu,\n"
-"vai tieðâm vçlaties to aizvietot?"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Jums jâaizpilda vismaz pirmie divi ievadlauki."
+msgid "(none)"
+msgstr "(neviens)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Name:"
-msgstr "Vârds:"
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Login:"
-msgstr "Lietotâjs:"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr "Izvçlieties spoguïserveri..."
+msgid "Currently installed version: "
+msgstr "Patreiz instalçtâ versija: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
-msgstr "Pârlûkot..."
+msgid "Other"
+msgstr "Cits"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Path or mount point:"
-msgstr "Ceïð uz montçðanas punktu:"
+msgid "Reason for update: "
+msgstr "Atjauninâðanas iemesls: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "Atvienojama ierîce"
+msgid "Please choose the desired mirror."
+msgstr "Lûdzu izvçlieties spoguïserveri"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "HTTP server"
-msgstr "HTTP serveris"
+msgid "Edit"
+msgstr "Rediìçt"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "FTP server"
-msgstr "FTP serveris"
+msgid "Please wait, finding available packages..."
+msgstr "Lûdzu gaidiet, meklçju pieejamâs pakotnes..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Path:"
-msgstr "Ceïð:"
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Relatîvais èeïð uz synthesis/hdlist: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "Lokâlie faili"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Add a source"
-msgstr "Pievienoju avotu:"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr "Nav iespçjams atjauninât datu nesçju; tas tiks automâtiski atslçgts."
+msgid "Search results (none)"
+msgstr "Meklçðanas rezultâti (neviens)"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to create medium."
-msgstr "Nevaru izveidot datu nesçju."
+msgid "Danmark"
+msgstr "Dânija"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Update"
-msgstr "Atjauninât"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr ""
-"Lûdzu izvçlieties avotus,\n"
-"kurus vçlaties atnunot:"
+msgid "China"
+msgstr "Íîna"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Lûdzu gaidiet, atjuaninu datu nesçju"
+msgid "United States"
+msgstr "ASV"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid " failed!"
-msgstr "failos"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid " done."
-msgstr ""
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Download of `%s', speed:%s"
-msgstr ""
+msgid "changes:"
+msgstr "Saglabât izmaiòas"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr ""
+msgid "Some additional packages need to be removed"
+msgstr "Nepiecieðams noòemt daþas papildus pakotnes"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Starting download of `%s'..."
-msgstr ""
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
+msgid "No"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Examining file of source `%s'..."
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure medias"
+msgstr "Konfigurçt izejas kodus"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Copying file for source `%s'..."
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a media"
+msgstr "Pievienoju avotu:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please choose the desired mirror."
-msgstr "Lûdzu izvçlieties spoguïserveri"
+msgid "Summary: "
+msgstr "Kopsavilkums: "
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
-msgstr ""
-"Nevaru atrast piemçrotu spoguïserveri.\n"
-"\n"
-"Ðai problçmai varçtu bût daþâdi iemesli; visbieþâk ir gadîjums,\n"
-"ka procesora arhitektûra netiek atbalstîta no Mandrake Linux\n"
-"oficiâlo atjauninâjumu puses."
+msgid "Canada"
+msgstr "Kanâda"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No mirror"
-msgstr "Nav spoguïservera"
+msgid "Greece"
+msgstr "Grieíija"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1112,180 +1052,240 @@ msgstr ""
 "Tîkls, vai arî MandrakeSoft web vieta, iespçjams, nav pieejami.\n"
 "Lûdzu, mçìiniet vçlreiz vçlâk."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Atvainojiet, nebija iespçjams paòemt izejas pakotnes."
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Error during download"
-msgstr ""
+msgid "Path:"
+msgstr "Ceïð:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during removal"
+msgstr "Problçma instalçðanas laikâ"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
-"Lûdzu gaidiet, lujuplâdçju spoguïserveru sarakstu no MandrakeSoft web vietas."
+msgid "Selected"
+msgstr "Izvçlçts"
 
 #: ../rpmdrake.pm:1
 #, c-format
+msgid "Netherlands"
+msgstr "Holande"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Addable"
+msgstr "Pievienojams"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "(Not available)"
+msgstr "(Nav pieejams)"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
 msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
+"Sorry, the following package(s) can't be selected:\n"
 "\n"
-"Is it ok to continue?"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
 msgstr ""
-"Man jâkontaktçjas ar MandrakeSoft web vietu, lai saòemtu\n"
-"spoguïserveru sarakstu. Lûdzu, pârliecinieties, ka Jûsu tîkls\n"
-"patreiz darbojas.\n"
+"Atvainojiet, sekojoðas pakotnes nevar tikt izvçlçtas\"\n"
 "\n"
-"Vai ir labi turpinât?"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "United States"
-msgstr "ASV"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "China"
-msgstr "Íîna"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "United Kingdom"
-msgstr "Apvienotâ Karaliste"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Not selected"
+msgstr " konfliktç ar %s-%s-%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Taivâna"
+msgid "Software Packages Removal"
+msgstr "Programmatûras pakotòu noòemðana"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Sweden"
 msgstr "Zviedrija"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Russia"
-msgstr "Krievija"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Portugal"
-msgstr "Portugâle"
+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 ""
+"Atjauninâjumu saraksts ir tukðs. Tas nozîmç, ka vai nu nav\n"
+"pieejami atjauninâjumi uz Jûsu datora instalçtajâm pakotnçm,\n"
+"vai arî Jûs tos visus jau esat uzinstalçjuði."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Poland"
-msgstr "Polija"
+msgid "Examining file of media `%s'..."
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Norway"
-msgstr "Norvçìija"
+msgid "Download of `%s', speed:%s"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Netherlands"
-msgstr "Holande"
+msgid "One of the following packages is needed:"
+msgstr "Ir nepiecieðama viena no sekojoðâm pakotnçm:"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Korea"
-msgstr "Piespiest"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Iziet"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "Japâna"
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Man jâsazinas ar spoguïserveri, lai saòemtu pçdçjâs\n"
+"atjauninâðanas pakotnes. Lûdzu, pârbaudiet, vai tîkls\n"
+"ir patreiz pieejams.\n"
+"\n"
+"Vai ir labi turpinât?"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Italy"
-msgstr "Instalçt"
+msgid "Update media(s)"
+msgstr "Atjaunot avotus"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Israel"
-msgstr "Instalçt"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "Labi"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Greece"
-msgstr "Grieíija"
+msgid "Please wait, adding medium..."
+msgstr "Lûdzu gaidiet, pievienoju datu nesçju..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "France"
-msgstr "Piespiest"
+msgid "Unable to get source packages."
+msgstr "Nebija iespçjams saòemt izejas pakotnes."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "Somija"
+msgid "Too many packages are selected"
+msgstr "Izvçlçtas pa daudz pakotnes"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Spain"
-msgstr "Spânija"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"Laipni lûdzam pakotòu avota redaktorâ!\n"
+"\n"
+"Ðis rîks palîdzçs Jums konfigurçt pakotòu avotus, kurus vçlaties lietot\n"
+"uz Jûsu datora. Tie tad bûs pieejami, lai instalçtu jaunu programmatûras\n"
+"pakotni, vai lai veiktu jauninâjumus."
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Danmark"
-msgstr "Dânija"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
+msgstr " konfliktç ar %s-%s-%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "Vâcija"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Laipni lûdzam MandrakeUpdate!\n"
+"\n"
+"Ðis rîks palîdzçs Jums izvçlçties atjauninâjumus, kurus vçlaties\n"
+"instalçt uz datora."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Èehija"
+msgid "Mandrake choices"
+msgstr "Mandrake izvçles"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Kostarika"
+msgid "Changelog:\n"
+msgstr "Izmaiòu þurnâls:\n"
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Canada"
-msgstr "Kanâda"
+#, fuzzy, c-format
+msgid "Korea"
+msgstr "Piespiest"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Brazil"
-msgstr "Brazîlija"
+msgid "Removable device"
+msgstr "Atvienojama ierîce"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Beïìija"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Austrâlija"
+msgid "Change medium"
+msgstr "Nomainiet datu nesçju"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "Austrija"
+msgid "Mandrake Update"
+msgstr "Mandrake atjauninâðana"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
-msgstr "Info..."
+msgid "by size"
+msgstr "pçc apjoma"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr ""
+msgid "FTP server"
+msgstr "FTP serveris"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr ""
+msgid "Files:\n"
+msgstr "Faili:\n"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr "Nav iespçjams atjauninât datu nesçju; tas tiks automâtiski atslçgts."
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -1561,6 +1561,14 @@ msgstr "Noòemt programmatûru"
 msgid "Software Sources Manager"
 msgstr "Programmatûras avotu pârvaldnieks"
 
+#, fuzzy
+#~ msgid "Source: "
+#~ msgstr "Piespiest"
+
+#, fuzzy
+#~ msgid "Source"
+#~ msgstr "Piespiest"
+
 #~ msgid ""
 #~ "some packages failed to install\n"
 #~ "correctly"
@@ -1600,9 +1608,6 @@ msgstr "Programmatûras avotu pârvaldnieks"
 #~ "\n"
 #~ "Vai vçlaties izvçlçties citu spoguïserveri?"
 
-#~ msgid "Error adding update medium"
-#~ msgstr "Kïûda pievienojot atjaunoðanas datu nesçju"
-
 #, fuzzy
 #~ msgid "Please wait, contacting mirror to initialize updates packages."
 #~ msgstr ""
diff --git a/po/ms.po b/po/ms.po
index 7eb1d81f..1a5cae48 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: 2003-02-20 03:24--730\n"
 "Last-Translator: Yuzz <yuzz@likom.com.my>\n"
 "Language-Team: Malaysia <yuzz@emasonline.com>\n"
@@ -14,14 +14,21 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
+msgid "Enabled?"
 msgstr ""
 
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Path or mount point:"
+msgstr "path atau titik mount:"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Portugal"
+msgstr "Port:"
+
 #: ../rpmdrake:1
 #, c-format
 msgid ""
@@ -34,91 +41,50 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
-msgstr ""
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
+msgid "by group"
 msgstr ""
-"Terdapat ralat semasa instalasi pakej:\n"
-"\n"
-"%s"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Problem during removal"
-msgstr "Ada masalah semasa instalasi"
+msgid "Name:"
+msgstr "Nama"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Please wait, removing packages..."
-msgstr "Tunggu, pakej berikut sedang dihapus:"
+msgid "Italy"
+msgstr "Terinstal"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr ""
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
+msgid "How to choose manually your mirror"
 msgstr ""
-"Terdapat ralat semasa instalasi pakej:\n"
-"\n"
-"%s"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "dapat diinstal"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Menyediakan pakej untuk instal..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Menyediakan pakej untuk instal..."
+msgid "URL:"
+msgstr "URL: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
+msgid "Some packages need to be removed"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
+msgid "More information on package..."
 msgstr ""
 
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Ya"
+
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -127,119 +93,101 @@ msgid "everything was installed correctly"
 msgstr "Pakej sudah diinstal sebelumnya"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Ada masalah semasa instalasi"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Install pakej `%s' (%s/%s)..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Menyediakan pakej untuk instal..."
+msgid "%s KB"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
 "\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"Then, restart MandrakeUpdate."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
+"Welcome to the software removal tool!\n"
 "\n"
-"Do you want to continue installation?"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
 msgstr ""
-"Fail yang berikut adalah tidak sah:\n"
-"\n"
-"%s\n"
-"\n"
-"Adakah anda ingin teruskan (langkui pakej ini)?"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Verifying packages signatures..."
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Muatturun pakej `%s' (%s/%s)..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Cancel"
-msgstr "Batal"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid "Save and quit"
+msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
 msgstr ""
+"Terdapat ralat semasa instalasi pakej:\n"
+"\n"
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Change medium"
+msgid "Size: "
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Initializing..."
-msgstr "Persediaan..."
+msgid "Security updates"
+msgstr "Kemaskini sekuriti"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Menyediakan pakej untuk instal..."
+msgid "Already existing update medias"
+msgstr "Penmeriksaan kebergantungan..."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Maaf, anda perlu jadi root untuk instal pakej-pakej."
+#, c-format
+msgid "Maximum information"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Unable to get source packages."
-msgstr "Pakej rosak, tidak boleh dibaca/dicari"
+msgid "Proxy..."
+msgstr "Ralat..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation finished"
-msgstr "dapat diinstal"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
+msgid "in names"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Use .%s as main file"
+msgid ""
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
 
 #: ../rpmdrake:1
@@ -247,365 +195,379 @@ msgstr ""
 msgid "Remove .%s"
 msgstr "Boleh dihapus"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "changes:"
-msgstr "Pakej"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspecting %s"
-msgstr ""
+msgid "Finland"
+msgstr "Cari:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, finding available packages..."
-msgstr "muat ulang senarai pakej yg tersedia"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Please wait, adding medium..."
-msgstr "Penmeriksaan kebergantungan..."
-
-#: ../rpmdrake:1
-#, c-format
 msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
+"The following packages have bad signatures:\n"
 "\n"
-"Then, restart MandrakeUpdate."
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
+"Fail yang berikut adalah tidak sah:\n"
+"\n"
+"%s\n"
+"\n"
+"Adakah anda ingin teruskan (langkui pakej ini)?"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "How to choose manually your mirror"
+msgid "Examining distant file of media `%s'..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
+msgid "Verifying packages signatures..."
 msgstr ""
 
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "France"
+msgstr "Batal"
+
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "Already existing update sources"
+msgid "More info"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
+"%s\n"
 "\n"
 "Is it ok to continue?"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+#, fuzzy, c-format
+msgid "Reload the packages list"
+msgstr "Pakej %s belum ditandatangani"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Choose a mirror..."
+msgstr "Sila pilih mirror:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Ralat fail"
+msgid "Some packages can't be installed"
+msgstr "Pakej `%s' tidak boleh diinstal\n"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
+msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Menyediakan pakej untuk instal..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Mandrake Update"
-msgstr ""
-"Mandrake\n"
-"Update"
+msgid "All packages,"
+msgstr "0 pakej, 0 bait"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Type of media:"
+msgstr "Jenis sumber:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Software Packages Removal"
-msgstr " Pengurus Perisian "
+msgid "in files"
+msgstr "Setempat"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Quit"
-msgstr "Keluar"
+msgid "All requested packages were installed successfully."
+msgstr ""
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Local files"
+msgstr "Setempat"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Install"
+msgid "Inspecting %s"
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Remove"
-msgstr "Boleh dihapus"
+msgid "Israel"
+msgstr "Terinstal"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Help"
 msgstr "Pertolongan"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Search"
-msgstr "Carian"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "HTTP server"
+msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Find:"
-msgstr "Cari:"
+#, fuzzy, c-format
+msgid "Installation failed"
+msgstr "dapat diinstal"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
-"\n"
-"Is it ok to continue?"
+msgid "Use .%s as main file"
 msgstr ""
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Search results"
+msgstr "Hasil Pencarian"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid " failed!"
+msgstr "Setempat"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some packages need to be removed"
+msgid "Brazil"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
-"\n"
-"Do you really want to install all the selected packages?"
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Too many packages are selected"
-msgstr "Pakej ini sudah diinstal sebelumnya"
+#, c-format
+msgid "Find:"
+msgstr "Cari:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
+msgid "All packages, alphabetical"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Normal information"
-msgstr "kemaskini normal"
-
-#: ../rpmdrake:1 ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Update source(s)"
-msgstr "Ubah Sumber"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Reload the packages list"
-msgstr "Pakej %s belum ditandatangani"
+msgid "Please wait, searching..."
+msgstr "Tunggu, pakej berikut sedang dihapus:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
+msgid "Please wait, reading packages database..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "in files"
-msgstr "Setempat"
+msgid "unknown package "
+msgstr "Tidak boleh membuka pakej `%s'\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
+msgid "Reset the selection"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by update availability"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by source repository"
+#, fuzzy, c-format
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
 msgstr ""
+"Untuk memenuhi kebergantungan,\n"
+"Pakej-pakej berikut akan dihapus:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by selection state"
+msgid "Costa Rica"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "by size"
-msgstr "Kedalaman"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "by group"
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
 msgstr ""
+"Terdapat ralat semasa instalasi pakej:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "All packages,"
-msgstr "0 pakej, 0 bait"
+msgid "Please wait, removing medium..."
+msgstr "Penmeriksaan kebergantungan..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Password:"
+msgstr "katalaluan:"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "All packages, alphabetical"
+msgid "Taiwan"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Mandrake choices"
-msgstr "MandrakeUpdate"
+msgid "Please wait, updating medium..."
+msgstr "Penmeriksaan kebergantungan..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Normal updates"
-msgstr "kemaskini normal"
+msgid "Please wait, listing packages..."
+msgstr "Tunggu, pakej berikut sedang dihapus:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Bugfixes updates"
-msgstr "Kemaskini sekuriti"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Security updates"
-msgstr "Kemaskini sekuriti"
+msgid "Information on packages"
+msgstr "Tidak boleh buka pakej"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Description: "
-msgstr ""
+msgid "Cancel"
+msgstr "Batal"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reason for update: "
+msgid "Everything installed successfully"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Summary: "
-msgstr ""
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Select the media(s) you wish to update:"
+msgstr "Pilih sumber yg ingin dikemaskini"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Importance: "
-msgstr ""
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Please wait, updating media..."
+msgstr "Penmeriksaan kebergantungan..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
+msgid "A fatal error occurred: %s."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Size: "
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Version: "
+msgid "in descriptions"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Name: "
-msgstr "Nama"
+msgid "Configure proxies"
+msgstr "Konfigurasikan sumber?"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Currently installed version: "
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Source: "
-msgstr "Sumber: "
+msgid "Please choose"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "(Not available)"
+msgid "Selected size: %d MB"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Changelog:\n"
-msgstr ""
+msgid "Initializing..."
+msgstr "Persediaan..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Save changes"
+msgstr "Pakej"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Files:\n"
-msgstr ""
+msgid "Error during download"
+msgstr "Ralat semasa muatturun"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Selected size: %d MB"
-msgstr ""
+#, fuzzy, c-format
+msgid "Package installation..."
+msgstr "Menyediakan pakej untuk instal..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
+msgid "Importance: "
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
+msgid "Add..."
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "konflik dengan"
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Pakej `%s' tidak boleh diinstal\n"
+msgid "Unable to create medium."
+msgstr "Gagal membuat laporan fail. keluar\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
+"The installation is finished; %s.\n"
 "\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
+msgid "Browse..."
 msgstr ""
 
 #: ../rpmdrake:1
@@ -613,60 +575,59 @@ msgstr ""
 msgid "Some packages can't be removed"
 msgstr "Pakej `%s' tidak boleh diinstal\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
+msgid "Info..."
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
 msgstr ""
-"Untuk memenuhi kebergantungan,\n"
-"Pakej-pakej berikut akan dihapus:"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Copying file for media `%s'..."
+msgstr ""
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Remove"
+msgstr "Boleh dihapus"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Pakej-pakej ini perlu diinstal dulu agar semuanya dapat berjalan baik."
+msgid "Preparing packages installation..."
+msgstr "Menyediakan pakej untuk instal..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "More information on package..."
+msgid "by media repository"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Information on packages"
-msgstr "Tidak boleh buka pakej"
+msgid "No mirror"
+msgstr "Tiada ralat"
 
-#. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "More info"
+msgid "You need to fill up at least the two first entries."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Addable"
-msgstr ""
+msgid "Install"
+msgstr "Install"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Upgradable"
+msgid "Japan"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-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."
+msgid "Do nothing"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -676,225 +637,205 @@ msgstr "kemaskini normal"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "(none)"
-msgstr "(tiada)"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, listing packages..."
-msgstr "Tunggu, pakej berikut sedang dihapus:"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "Tidak boleh membuka pakej `%s'\n"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "One of the following packages is needed:"
+msgid "Description: "
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Not selected"
-msgstr "Konflik dikesan"
+msgid "Name: "
+msgstr "Nama"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected"
+msgid "Inspect..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Search results"
-msgstr "Hasil Pencarian"
+msgid "Editing media \"%s\":"
+msgstr "Ubah Sumber"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "Menyediakan pakej untuk instal..."
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Stop"
+msgid "Australia"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, searching..."
-msgstr "Tunggu, pakej berikut sedang dihapus:"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Search results (none)"
-msgstr "Hasil Pencarian"
+msgid "Installation finished"
+msgstr "dapat diinstal"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Other"
+msgid "by update availability"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Welcome to the packages source editor!\n"
-"\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
+msgid "Poland"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
+msgid "Version: "
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Ralat..."
-
-#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update..."
+msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
+msgid "Upgradable"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "Ubah"
+msgid " done."
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Source"
-msgstr "Sumber"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Software Packages Installation"
+msgstr "Menyediakan pakej untuk instal..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Enabled?"
+msgid "Additional packages needed"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Configure sources"
-msgstr "Konfigurasikan sumber?"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Password:"
-msgstr "katalaluan:"
+msgid "Bugfixes updates"
+msgstr "Kemaskini sekuriti"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "User:"
+msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
+msgid "Germany"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Proxy hostname:"
+msgid "Russia"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+msgid "Norway"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Configure proxies"
-msgstr "Konfigurasikan sumber?"
+msgid "Problem during installation"
+msgstr "Ada masalah semasa instalasi"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, updating medium..."
-msgstr "Penmeriksaan kebergantungan..."
+msgid "Search"
+msgstr "Carian"
 
 #: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Edit a media"
+msgstr "Ubah Sumber"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
+msgid "Czech Republic"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
+msgid ""
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Save changes"
-msgstr "Pakej"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "path relatif  ke sintesis atau hdlist: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Stop"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "URL:"
-msgstr "URL: "
+msgid "Update"
+msgstr "Kemaskini saja"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "Ubah Sumber"
+msgid "Please wait, removing packages..."
+msgstr "Tunggu, pakej berikut sedang dihapus:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Edit a source"
-msgstr "Ubah Sumber"
+msgid "Normal information"
+msgstr "kemaskini normal"
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Please wait, removing medium..."
-msgstr "Penmeriksaan kebergantungan..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Media: "
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Type of source:"
-msgstr "Jenis sumber:"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "Muatturun pakej `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Adding a source:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr ""
-"Tunggu\n"
-"Penambahan sumber"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
+msgid "Media"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
+msgid "Spain"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Name:"
-msgstr "Nama"
+msgid "Normal updates"
+msgstr "kemaskini normal"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
+msgstr ""
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
@@ -903,141 +844,151 @@ msgstr "login:"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Choose a mirror..."
-msgstr "Sila pilih mirror:"
+msgid "Adding a media:"
+msgstr ""
+"Tunggu\n"
+"Penambahan sumber"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Browse..."
+msgid "Austria"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Path or mount point:"
-msgstr "path atau titik mount:"
+msgid "Fatal error"
+msgstr "Ralat fail"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Removable device"
+msgid "Update..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "Mengenalpasti tandatangan `%s'..."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr ""
+msgid "(none)"
+msgstr "(tiada)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "FTP server"
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Path:"
-msgstr "path: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Install pakej `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Local files"
-msgstr "Setempat"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Add a source"
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
 msgstr ""
-"Tunggu\n"
-"Penambahan sumber"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
+msgid "Reason for update: "
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Unable to create medium."
-msgstr "Gagal membuat laporan fail. keluar\n"
+msgid "Please choose the desired mirror."
+msgstr ""
+"Tunggu\n"
+"Senarai mirror sedang diambil"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Update"
-msgstr "Kemaskini saja"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "Ubah"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Pilih sumber yg ingin dikemaskini"
+msgid "Please wait, finding available packages..."
+msgstr "muat ulang senarai pakej yg tersedia"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Please wait, updating media..."
-msgstr "Penmeriksaan kebergantungan..."
+msgid "Relative path to synthesis/hdlist:"
+msgstr "path relatif  ke sintesis atau hdlist: "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid " failed!"
-msgstr "Setempat"
+msgid "Search results (none)"
+msgstr "Hasil Pencarian"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid " done."
+msgid "Danmark"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
+msgid "China"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
+msgid "United States"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "Mengenalpasti tandatangan `%s'..."
+msgid "changes:"
+msgstr "Pakej"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some additional packages need to be removed"
+msgstr "Pakej-pakej ini perlu diinstal dulu agar semuanya dapat berjalan baik."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr ""
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr ""
+msgid "No"
+msgstr "Tidak"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Please choose the desired mirror."
+msgid "Configure medias"
+msgstr "Konfigurasikan sumber?"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a media"
 msgstr ""
 "Tunggu\n"
-"Senarai mirror sedang diambil"
+"Penambahan sumber"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Summary: "
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
+msgid "Canada"
 msgstr ""
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "No mirror"
-msgstr "Tiada ralat"
+#, c-format
+msgid "Greece"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1049,143 +1000,181 @@ msgid ""
 "Please try again later."
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Error during download"
-msgstr "Ralat semasa muatturun"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Maaf, anda perlu jadi root untuk instal pakej-pakej."
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Path:"
+msgstr "path: "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during removal"
+msgstr "Ada masalah semasa instalasi"
+
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
+msgid "Selected"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United States"
+msgid "Netherlands"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "China"
+msgid "Addable"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
+msgid "(Not available)"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Not selected"
+msgstr "Konflik dikesan"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Software Packages Removal"
+msgstr " Pengurus Perisian "
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Sweden"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Russia"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Portugal"
-msgstr "Port:"
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
+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.pm:1
 #, c-format
-msgid "Norway"
+msgid "Examining file of media `%s'..."
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Netherlands"
+msgid "Download of `%s', speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Korea"
+msgid "One of the following packages is needed:"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Japan"
-msgstr ""
+msgid "Quit"
+msgstr "Keluar"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Italy"
-msgstr "Terinstal"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Israel"
-msgstr "Terinstal"
+msgid "Update media(s)"
+msgstr "Ubah Sumber"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Greece"
-msgstr ""
+msgid "Ok"
+msgstr "Ok"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "France"
-msgstr "Batal"
+msgid "Please wait, adding medium..."
+msgstr "Penmeriksaan kebergantungan..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Finland"
-msgstr "Cari:"
+msgid "Unable to get source packages."
+msgstr "Pakej rosak, tidak boleh dibaca/dicari"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Spain"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Too many packages are selected"
+msgstr "Pakej ini sudah diinstal sebelumnya"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Danmark"
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Germany"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
+msgstr "konflik dengan"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mandrake choices"
+msgstr "MandrakeUpdate"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
+msgid "Changelog:\n"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
+msgid "Korea"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Brazil"
+msgid "Removable device"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1193,30 +1182,41 @@ msgstr ""
 msgid "Belgium"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
+msgid "Change medium"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Austria"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mandrake Update"
 msgstr ""
+"Mandrake\n"
+"Update"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "by size"
+msgstr "Kedalaman"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Info..."
+msgid "FTP server"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "No"
-msgstr "Tidak"
+msgid "Files:\n"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Yes"
-msgstr "Ya"
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -1490,6 +1490,12 @@ msgstr ""
 msgid "Software Sources Manager"
 msgstr ""
 
+#~ msgid "Source: "
+#~ msgstr "Sumber: "
+
+#~ msgid "Source"
+#~ msgstr "Sumber"
+
 #, fuzzy
 #~ msgid ""
 #~ "some packages failed to install\n"
diff --git a/po/mt.po b/po/mt.po
index ddf868ca..4e6cbd0c 100644
--- a/po/mt.po
+++ b/po/mt.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: 2002-08-19 05:48+0200\n"
 "Last-Translator: Ramon Casha <ramon.casha@linux.org.mt>\n"
 "Language-Team: Maltese <mt@li.org>\n"
@@ -14,16 +14,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"Trid li nkomplu?"
+msgid "Enabled?"
+msgstr "Mixgħul?"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Direttorju jew punt ta' mmuntar:"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Portugal"
+msgstr "Portugall"
 
 #: ../rpmdrake:1
 #, c-format
@@ -42,16 +46,79 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "by group"
+msgstr "skond il-grupp"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "Isem:"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Italy"
+msgstr "Installa"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Kif tagħżel mera manwalment"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "Xi pakketti jridu jitneħħew"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
+msgstr "Iżjed tagħrif dwar il-pakkett..."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Iva"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Welcome to MandrakeUpdate!\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
 msgstr ""
-"Merħba għal MandrakeUpdate!\n"
+"Minħabba d-dipendenzi tagħhom, dawn il-pakketti jridu jitneħħew \n"
+"mill-għażla issa:\n"
 "\n"
-"Din l-għodda tgħinek tagħżel aġġornamenti li trid tinstalla fuq il-\n"
-"kompjuter tiegħek."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "Kollox Ä¡ie nstallat sew"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"Tista' wkoll tagħżel il-mera li tixtieq manwalment. Biex tagħmel dan,\n"
+"ħaddem il-Manager tas-sorsi ta' softwer, u mbagħad żid sors ta' \n"
+"Aġġornamenti ta' sigurtà\n"
+"\n"
+"Imbagħad, irristartja MandrakeUpdate"
 
 #: ../rpmdrake:1
 #, c-format
@@ -66,6 +133,17 @@ msgstr ""
 "Din l-għodda tgħinek tagħżel liema softwer trid tneħħi mill-kompjuter\n"
 "tiegħek."
 
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "Sabiex tikteb il-bidliet, trid iddaħħal id-diska fid-drajv"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Ikteb u oħroġ"
+
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
@@ -78,106 +156,73 @@ msgstr ""
 "%s"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during removal"
-msgstr "Problema waqt l-installazzjoni"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "Stenna ftit, qed jitneħħew il-pakketti..."
+msgid "Size: "
+msgstr "Daqs: "
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Stenna ftit, qed jinqara d-database tal-pakketti..."
+msgid "Security updates"
+msgstr "Aġġornamenti ta' sigurtà"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Inqalgħu problemi waqt l-installazzjoni tal-pakketti:\n"
-"\n"
-"%s"
+msgid "Already existing update medias"
+msgstr "Problema fiż-żieda ta' sors ta' aġġornamenti"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Installa kollox"
+#, c-format
+msgid "Maximum information"
+msgstr "Informazzjoni massima"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Qed jiġu ppreparati l-pakketti għall-installazzjoni..."
+msgid "Proxy..."
+msgstr "Problema..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Qed jiġu ppreparati l-pakketti għall-installazzjoni..."
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
+msgstr ""
+"Installazzjoni falliet, xi fajls huma neqsin.\n"
+"Jista' jkollok bżonn taġġorna d-database tas-sorsi."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Il-pakketti kollha mitluba Ä¡ew installati."
+msgid "United Kingdom"
+msgstr "Renju Unit"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Kollox Ä¡ie nstallat."
+msgid "in names"
+msgstr "fl-ismijiet"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"I can't find any suitable mirror.\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
-"L-installazzjoni lestiet; %s.\n"
+"Ma nista' nsib ebda mera adattata.\n"
 "\n"
-"Xi fajls ta' konfigurazzjoni inħolqu bħala \".rpmnew\" jew \".rpmsave\",\n"
-"issa tista' tinspezzjonahom sabiex tieħu azzjoni:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "everything was installed correctly"
-msgstr "Kollox Ä¡ie nstallat sew"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Inqalgħu problemi waqt l-installazzjoni"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Qed jiġi nstallat pakkett \"%s\" (%s/%s)..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Qed jiġu ppreparati l-pakketti għall-installazzjoni..."
+"Jista' jkun hemm diversi raġunijiet għal din il-problema. L-iżjed\n"
+"komuni huwa meta l-arkitettura tas-CPU tiegħek mhux sapportit\n"
+"mill-aġġornamenti uffiċjali tal-Mandrake Linux."
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
-msgstr ""
+msgid "Remove .%s"
+msgstr "Neħħi .%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"Installazzjoni falliet, xi fajls huma neqsin.\n"
-"Jista' jkollok bżonn taġġorna d-database tas-sorsi."
+msgid "Finland"
+msgstr "Finlandja"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -194,204 +239,271 @@ msgstr ""
 "\n"
 "Trid tkompli?"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Verifying packages signatures..."
+msgid "Examining distant file of media `%s'..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Qed jitniżżel pakkett \"%s\" (%s/%s)..."
+msgid "Verifying packages signatures..."
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "France"
+msgstr "Ġiegħel"
+
+#. -PO: Keep it short, this is gonna be on a button
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "Ikkanċella"
+msgid "More info"
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Trid li nkomplu?"
 
 #: ../rpmdrake:1
-#, fuzzy, 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]"
+#, c-format
+msgid "Reload the packages list"
+msgstr "Erġa' aqra l-lista ta' pakketti"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Change medium"
-msgstr "Ibdel sors"
+msgid "Choose a mirror..."
+msgstr "Agħżel mera..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Initializing..."
-msgstr "Qed ninizjalizza..."
+#, fuzzy, c-format
+msgid "Some packages can't be installed"
+msgstr "Pakkett \"%s\" ma jistax jiġi nstallat\n"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Package installation..."
+msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Qed jiġu ppreparati l-pakketti għall-installazzjoni..."
 
 #: ../rpmdrake:1
+#, c-format
+msgid "All packages,"
+msgstr "Pakketti kollha"
+
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Trid tkun \"root\" biex tinstalla dawn il-pakketti."
+msgid "Type of media:"
+msgstr "Tip ta' sors:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Unable to get source packages."
-msgstr "Ma nistax nikseb pakketti sors."
+msgid "in files"
+msgstr "fil-fajls"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "Spezzjona..."
+msgid "All requested packages were installed successfully."
+msgstr "Il-pakketti kollha mitluba Ä¡ew installati."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Installation finished"
-msgstr "Installazzjoni lesta"
+msgid "Proxy hostname:"
+msgstr "Kompjuter tal-proxy:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Do nothing"
-msgstr "Tagħmel xejn"
+msgid "Local files"
+msgstr "Fajls lokali"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Uża .%s bħala fajl prinċipali"
+msgid "Inspecting %s"
+msgstr "Qed jiġi nspezzjonat %s"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Israel"
+msgstr "Installa"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Neħħi .%s"
+msgid "Help"
+msgstr "Għajnuna"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "HTTP server"
+msgstr "Server HTTP"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "changes:"
-msgstr "Ikteb bidliet"
+msgid "Installation failed"
+msgstr "Installa kollox"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Qed jiġi nspezzjonat %s"
+msgid "Use .%s as main file"
+msgstr "Uża .%s bħala fajl prinċipali"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Stenna ftit, qed insib pakketti disponibbli..."
+msgid "Search results"
+msgstr "Riżultat tat-tfittxija"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid " failed!"
+msgstr "fil-fajls"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "Stenna ftit, qed jiġi miżjud medju..."
+msgid "Brazil"
+msgstr "Brażil"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
-"\n"
-"Then, restart MandrakeUpdate."
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 msgstr ""
-"Tista' wkoll tagħżel il-mera li tixtieq manwalment. Biex tagħmel dan,\n"
-"ħaddem il-Manager tas-sorsi ta' softwer, u mbagħad żid sors ta' \n"
-"Aġġornamenti ta' sigurtà\n"
-"\n"
-"Imbagħad, irristartja MandrakeUpdate"
+"Diġà hemm medju b'dak l-isem, żgur li trid\n"
+"tibdlu ma' dan?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "Kif tagħżel mera manwalment"
+msgid "Find:"
+msgstr "Sib:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
-msgstr ""
+msgid "All packages, alphabetical"
+msgstr "Pakketti kollha, alfabetiċi"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Already existing update sources"
+msgid "Please wait, searching..."
+msgstr "Stenna ftit, qed infittex..."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
+msgstr "Stenna ftit, qed jinqara d-database tal-pakketti..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "Ma setax jinfetaħ il-pakkett \"%s\"\n"
+
+#: ../rpmdrake:1
+#, fuzzy, 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:1
+#, c-format
+msgid "Reset the selection"
+msgstr "Irrisettja l-għażla"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
 msgstr ""
+"Jekk trid proxy, daħħal isem il-kompjuter u opzjonalment port (sintassi: "
+"<kompjuterproxy[:port]>):"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
 "\n"
-"Is it ok to continue?"
 msgstr ""
-"Għandi bżonn nikkuntattja l-mera biex nikseb l-aħħar pakketti aġġornati.\n"
-"IÄ‹Ä‹ekkja li n-network hija mtella'\n"
+"Minħabba d-dipendenzi tagħhom, dawn il-pakketti wkoll iridu jitneħħew:\n"
 "\n"
-"Trid tkompli?"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Problema fil-fajl"
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Inqalgħu problemi waqt l-installazzjoni tal-pakketti:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Qed jiġu ppreparati l-pakketti għall-installazzjoni..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr "Stenna ftit, qed jitneħħa l-medju..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "AÄ¡Ä¡ornament Mandrake"
+msgid "Password:"
+msgstr "Password:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Tneħħija ta' pakketti ta' softwer"
+msgid "Taiwan"
+msgstr "Tajwan"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Quit"
-msgstr "Oħroġ"
+msgid "User:"
+msgstr "User:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Install"
-msgstr "Installa"
+msgid "Please wait, updating medium..."
+msgstr "Stenna ftit, qed jiġi aġġornat il-medju..."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "Neħħi"
+msgid "Please wait, listing packages..."
+msgstr "Stenna ftit, qed jiġu llistjati l-pakketti..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Information on packages"
+msgstr "Iżjed tagħrif dwar il-pakkett..."
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Help"
-msgstr "Għajnuna"
+msgid "Cancel"
+msgstr "Ikkanċella"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search"
-msgstr "Fittex"
+msgid "Everything installed successfully"
+msgstr "Kollox Ä¡ie nstallat."
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Select the media(s) you wish to update:"
+msgstr "Agħżel is-sorsi li trid taġġorna:"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, updating media..."
+msgstr "Stenna ftit, qed jiġu aġġornati l-medji..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Sib:"
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -410,160 +522,187 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Xi pakketti jridu jitneħħew"
+msgid "in descriptions"
+msgstr "fid-deskrizzjonijiet"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "Ikkonfigura proxies"
+
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
 "\n"
-"Do you really want to install all the selected packages?"
+"Is it ok to continue?"
 msgstr ""
-"Twissija: jidher li qed tipprova żżid tant pakketti li l-\n"
-"filesystem tista' timtela waqt jew wara l-installazzjoni\n"
-"tal-pakketti ; dan huwa partikularment perikoluż u għandu\n"
-"jiġi kkunsidrat bl-attenzjoni.\n"
+"Għandi bżonn nikkuntattja l-website ta' MandrakeSoft biex nikseb lista\n"
+"ta' mirja. Iċċekkja li n-network qegħda taħdem.\n"
 "\n"
-"Żgur li trid tinstalla l-pakketti kollha magħżula?"
+"Nista' nkompli?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Hemm wisq pakketti magħżula"
+msgid "Please choose"
+msgstr "Jekk jogħġbok agħżel wieħed"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "Informazzjoni massima"
+msgid "Selected size: %d MB"
+msgstr "Daqs magħżula: %d MB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Normal information"
-msgstr "Informazzjoni normali"
+msgid "Initializing..."
+msgstr "Qed ninizjalizza..."
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update source(s)"
-msgstr "AÄ¡Ä¡orna sorsi"
+msgid "Save changes"
+msgstr "Ikteb bidliet"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Erġa' aqra l-lista ta' pakketti"
+msgid "Error during download"
+msgstr "Problema waqt it-tniżżil"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reset the selection"
-msgstr "Irrisettja l-għażla"
+#, fuzzy, c-format
+msgid "Package installation..."
+msgstr "Qed jiġu ppreparati l-pakketti għall-installazzjoni..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "fil-fajls"
+msgid "Importance: "
+msgstr "Importanza: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "fid-deskrizzjonijiet"
+msgid ""
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
+msgstr ""
+"Biex jiġu sodisfatti d-dipendenzi, dawn il-pakketti wkoll iridu\n"
+"jiġu nstallati:\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "in names"
-msgstr "fl-ismijiet"
+msgid "Add..."
+msgstr "Żid..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by update availability"
-msgstr "skond id-disponibbiltà ta' aġġornament"
+msgid "Unable to create medium."
+msgstr "Ma nistax noħloq medju."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by source repository"
-msgstr "skond is-sors"
+msgid ""
+"The installation is finished; %s.\n"
+"\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
+msgstr ""
+"L-installazzjoni lestiet; %s.\n"
+"\n"
+"Xi fajls ta' konfigurazzjoni inħolqu bħala \".rpmnew\" jew \".rpmsave\",\n"
+"issa tista' tinspezzjonahom sabiex tieħu azzjoni:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by selection state"
-msgstr "skond l-istat tal-għażla"
+msgid "Browse..."
+msgstr "Fittex..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by size"
-msgstr "skond id-daqs"
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "Pakkett \"%s\" ma jistax jiġi nstallat\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by group"
-msgstr "skond il-grupp"
+msgid "Info..."
+msgstr "Info..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "All packages,"
-msgstr "Pakketti kollha"
+msgid "You need to insert the medium to continue"
+msgstr "Trid iddaħħal id-diska biex tkompli"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Pakketti kollha, alfabetiċi"
+msgid "Copying file for media `%s'..."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Għażliet ta' Mandrake"
+msgid "Remove"
+msgstr "Neħħi"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Normal updates"
-msgstr "AÄ¡Ä¡ornamenti normali"
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Qed jiġu ppreparati l-pakketti għall-installazzjoni..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Bugfixes updates"
-msgstr "Tiswijiet ta' bugs"
+#, fuzzy, c-format
+msgid "by media repository"
+msgstr "skond is-sors"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Security updates"
-msgstr "Aġġornamenti ta' sigurtà"
+msgid "No mirror"
+msgstr "Ebda mera"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Description: "
-msgstr "Deskrizzjoni: "
+msgid "You need to fill up at least the two first entries."
+msgstr "Trid timla tal-inqas l-ewwel żewġ elementi."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Raġuni għall-aġġornament: "
+msgid "Install"
+msgstr "Installa"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Summary: "
-msgstr "Sommarju: "
+msgid "Japan"
+msgstr "Ä appun"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Importance: "
-msgstr "Importanza: "
+msgid "Do nothing"
+msgstr "Tagħmel xejn"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "No update"
+msgstr "Ebda aġġornament"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Size: "
-msgstr "Daqs: "
+msgid "Description: "
+msgstr "Deskrizzjoni: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Version: "
-msgstr "Verżjoni: "
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr ""
+"Twissija: jidher li qed tipprova żżid tant pakketti li l-\n"
+"filesystem tista' timtela waqt jew wara l-installazzjoni\n"
+"tal-pakketti ; dan huwa partikularment perikoluż u għandu\n"
+"jiġi kkunsidrat bl-attenzjoni.\n"
+"\n"
+"Żgur li trid tinstalla l-pakketti kollha magħżula?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -572,84 +711,63 @@ msgstr "Isem: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Verżjoni nstallata bħalissa: "
+msgid "Inspect..."
+msgstr "Spezzjona..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Source: "
-msgstr "Ġiegħel"
+msgid "Editing media \"%s\":"
+msgstr "Editja s-sors \"%s\":"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "Qed jiġu ppreparati l-pakketti għall-installazzjoni..."
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
-msgstr "(Mhux disponibbli)"
+msgid "Australia"
+msgstr "Awstralja"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Log tal-bidliet:\n"
+msgid "Installation finished"
+msgstr "Installazzjoni lesta"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Files:\n"
-msgstr "Fajls:\n"
+msgid "by update availability"
+msgstr "skond id-disponibbiltà ta' aġġornament"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "Daqs magħżula: %d MB"
+msgid "Poland"
+msgstr "Polonja"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Magħżula: %d MB / Spazju disponibbli: %d MB"
+msgid "Version: "
+msgstr "Verżjoni: "
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
-msgstr ""
-"Minħabba d-dipendenzi tagħhom, dawn il-pakketti jridu jitneħħew \n"
-"mill-għażla issa:\n"
-"\n"
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Trid tispeċifika user/password għall-awtenitikazzjoni tal-proxy:"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr ""
-"Jiddispjaċini, dawn il-pakketti ma jistgħux jiġu magħżula:\n"
-"\n"
+#, c-format
+msgid "Upgradable"
+msgstr "Jistgħu jiġu aġġornati"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "għandu konflitt ma'"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid " done."
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Pakkett \"%s\" ma jistax jiġi nstallat\n"
-
-#: ../rpmdrake:1
-#, c-format
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
-msgstr ""
-"Biex jiġu sodisfatti d-dipendenzi, dawn il-pakketti wkoll iridu\n"
-"jiġu nstallati:\n"
-"\n"
+msgid "Software Packages Installation"
+msgstr "Qed jiġu ppreparati l-pakketti għall-installazzjoni..."
 
 #: ../rpmdrake:1
 #, c-format
@@ -657,639 +775,521 @@ msgid "Additional packages needed"
 msgstr "Pakketti oħra meħtieġa"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "Pakkett \"%s\" ma jistax jiġi nstallat\n"
+#, c-format
+msgid "Bugfixes updates"
+msgstr "Tiswijiet ta' bugs"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
-"Jiddispjaċini, jekk tneħħi dawn il-pakketti s-sistema ma tibqax taħdem:\n"
-"\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"Minħabba d-dipendenzi tagħhom, dawn il-pakketti wkoll iridu jitneħħew:\n"
-"\n"
+msgid "Germany"
+msgstr "Ä ermanja"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Xi pakketti oħra jridu jitneħħew"
+msgid "Russia"
+msgstr "Russja"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "More information on package..."
-msgstr "Iżjed tagħrif dwar il-pakkett..."
+msgid "Norway"
+msgstr "Norveġja"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Information on packages"
-msgstr "Iżjed tagħrif dwar il-pakkett..."
+msgid "Problem during installation"
+msgstr "Inqalgħu problemi waqt l-installazzjoni"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "More info"
-msgstr ""
+msgid "Search"
+msgstr "Fittex"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Addable"
-msgstr "Jistgħu jiġu miżjuda"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Edit a media"
+msgstr "Editja sors"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Upgradable"
-msgstr "Jistgħu jiġu aġġornati"
+msgid "Czech Republic"
+msgstr "Repubblika ÄŠeka"
 
 #: ../rpmdrake:1
 #, c-format
 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."
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"Il-lista ta' aġġornamenti hija vojta. Dan ifisser li, jew m'hemm ebda "
-"aġġornamenti x'isiru għall-pakketti installati fuq il-kompjuter, jew diġà "
-"nstallajthom kollha."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "No update"
-msgstr "Ebda aġġornament"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "(none)"
-msgstr "(ebda)"
+msgid "Stop"
+msgstr "Ieqaf"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Stenna ftit, qed jiġu llistjati l-pakketti..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "Ma setax jinfetaħ il-pakkett \"%s\"\n"
+msgid "Update"
+msgstr "AÄ¡Ä¡orna"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Wieħed minn dawn il-pakketti huwa meħtieġ:"
+msgid "Please wait, removing packages..."
+msgstr "Stenna ftit, qed jitneħħew il-pakketti..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Jekk jogħġbok agħżel wieħed"
+msgid "Normal information"
+msgstr "Informazzjoni normali"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr "Instabu konflitti"
+msgid "Media: "
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected"
-msgstr "Magħżul"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "Qed jitniżżel pakkett \"%s\" (%s/%s)..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results"
-msgstr "Riżultat tat-tfittxija"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Magħżula: %d MB / Spazju disponibbli: %d MB"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Stop"
-msgstr "Ieqaf"
+msgid "Media"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Stenna ftit, qed infittex..."
+msgid "Spain"
+msgstr "Spanja"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Riżultat tat-tfittxija (ebda)"
+msgid "Normal updates"
+msgstr "AÄ¡Ä¡ornamenti normali"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Other"
-msgstr "Oħrajn"
+msgid "by selection state"
+msgstr "skond l-istat tal-għażla"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Welcome to the packages source editor!\n"
-"\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
-"Merħba għall-editur ta' sorsi ta' pakketti!\n"
-"\n"
-"Din l-għodda tgħinek biex tikkonfigura s-sorsi ta' pakketti li tixtieq tuża "
-"fuq\n"
-"il-kompjuter tiegħek. Dawn ikunu disponibbli biex minnhom tinstalla "
-"pakketti\n"
-"ġodda jew biex taġġorna s-sistema."
+"Stenna ftit, qed jitniżżlu indirizzi ta' mirja mill-website ta' MandrakeSoft."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Save and quit"
-msgstr "Ikteb u oħroġ"
+msgid "Login:"
+msgstr "Login:"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Problema..."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Update..."
-msgstr "AÄ¡Ä¡orna..."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add..."
-msgstr "Żid..."
+msgid "Adding a media:"
+msgstr "Qed jiġi miżjud sors:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "Editja"
+msgid "Austria"
+msgstr "Awstrija"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Source"
-msgstr "Ġiegħel"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "Mixgħul?"
+msgid "Fatal error"
+msgstr "Problema fil-fajl"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Configure sources"
-msgstr "Ikkonfigura sorsi"
+msgid "Update..."
+msgstr "AÄ¡Ä¡orna..."
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Password:"
-msgstr "Password:"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "Qed nivverifika l-firma ta' \"%s\"..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "User:"
-msgstr "User:"
+msgid "(none)"
+msgstr "(ebda)"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "Trid tispeċifika user/password għall-awtenitikazzjoni tal-proxy:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
+"Jiddispjaċini, jekk tneħħi dawn il-pakketti s-sistema ma tibqax taħdem:\n"
+"\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "Kompjuter tal-proxy:"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Qed jiġi nstallat pakkett \"%s\" (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
-msgstr ""
-"Jekk trid proxy, daħħal isem il-kompjuter u opzjonalment port (sintassi: "
-"<kompjuterproxy[:port]>):"
+msgid "Currently installed version: "
+msgstr "Verżjoni nstallata bħalissa: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Ikkonfigura proxies"
+msgid "Other"
+msgstr "Oħrajn"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Stenna ftit, qed jiġi aġġornat il-medju..."
+msgid "Reason for update: "
+msgstr "Raġuni għall-aġġornament: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "Sabiex tikteb il-bidliet, trid iddaħħal id-diska fid-drajv"
+msgid "Please choose the desired mirror."
+msgstr "Jekk jogħġbok agħżel mera li tixtieq."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "Trid iddaħħal id-diska biex tkompli"
+msgid "Edit"
+msgstr "Editja"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "Ikteb bidliet"
+msgid "Please wait, finding available packages..."
+msgstr "Stenna ftit, qed insib pakketti disponibbli..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Direttorju relattiv għas-sintesi jew hdlist:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "Editja s-sors \"%s\":"
+msgid "Search results (none)"
+msgstr "Riżultat tat-tfittxija (ebda)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit a source"
-msgstr "Editja sors"
+msgid "Danmark"
+msgstr "Danimarka"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Stenna ftit, qed jitneħħa l-medju..."
+msgid "China"
+msgstr "ÄŠina"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "Tip ta' sors:"
+msgid "United States"
+msgstr "Stati Uniti"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Adding a source:"
-msgstr "Qed jiġi miżjud sors:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "changes:"
+msgstr "Ikteb bidliet"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
-msgstr ""
-"Diġà hemm medju b'dak l-isem, żgur li trid\n"
-"tibdlu ma' dan?"
+msgid "Some additional packages need to be removed"
+msgstr "Xi pakketti oħra jridu jitneħħew"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Trid timla tal-inqas l-ewwel żewġ elementi."
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Name:"
-msgstr "Isem:"
+msgid "No"
+msgstr "Le"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Login:"
-msgstr "Login:"
+#, fuzzy, c-format
+msgid "Configure medias"
+msgstr "Ikkonfigura sorsi"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Choose a mirror..."
-msgstr "Agħżel mera..."
+#, fuzzy, c-format
+msgid "Add a media"
+msgstr "Qed jiġi miżjud sors:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
-msgstr "Fittex..."
+msgid "Summary: "
+msgstr "Sommarju: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Path or mount point:"
-msgstr "Direttorju jew punt ta' mmuntar:"
+msgid "Canada"
+msgstr "Kanada"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "Apparat jinħareġ"
+msgid "Greece"
+msgstr "Greċja"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "HTTP server"
-msgstr "Server HTTP"
+msgid ""
+"There was an error downloading the mirrors list:\n"
+"\n"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
+msgstr ""
+"Kien hemm problema waqt it-tniżżil tal-lista ta' mirja:\n"
+"\n"
+"%s\n"
+"In-network, jew il-website ta' MandrakeSoft, tista' ma tkunx \n"
+"disponibbli. Erġa' pprova iżjed tard."
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "FTP server"
-msgstr "Server FTP"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Trid tkun \"root\" biex tinstalla dawn il-pakketti."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Path:"
 msgstr "Direttorju: "
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Local files"
-msgstr "Fajls lokali"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Add a source"
-msgstr "Qed jiġi miżjud sors:"
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr "Ma nistax naġġorna medju, se jiġi diżabbilit awtomatikament."
+msgid "Problem during removal"
+msgstr "Problema waqt l-installazzjoni"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Unable to create medium."
-msgstr "Ma nistax noħloq medju."
+msgid "Selected"
+msgstr "Magħżul"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Update"
-msgstr "AÄ¡Ä¡orna"
+msgid "Netherlands"
+msgstr "Netherlands"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Agħżel is-sorsi li trid taġġorna:"
+msgid "Addable"
+msgstr "Jistgħu jiġu miżjuda"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Stenna ftit, qed jiġu aġġornati l-medji..."
+msgid "(Not available)"
+msgstr "(Mhux disponibbli)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid " failed!"
-msgstr "fil-fajls"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid " done."
-msgstr ""
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Download of `%s', speed:%s"
-msgstr ""
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
 msgstr ""
+"Jiddispjaċini, dawn il-pakketti ma jistgħux jiġu magħżula:\n"
+"\n"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "Qed nivverifika l-firma ta' \"%s\"..."
+msgid "Not selected"
+msgstr "Instabu konflitti"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr ""
+msgid "Software Packages Removal"
+msgstr "Tneħħija ta' pakketti ta' softwer"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr ""
+msgid "Sweden"
+msgstr "Svezja"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Copying file for source `%s'..."
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Please choose the desired mirror."
-msgstr "Jekk jogħġbok agħżel mera li tixtieq."
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
+"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 ""
-"Ma nista' nsib ebda mera adattata.\n"
-"\n"
-"Jista' jkun hemm diversi raġunijiet għal din il-problema. L-iżjed\n"
-"komuni huwa meta l-arkitettura tas-CPU tiegħek mhux sapportit\n"
-"mill-aġġornamenti uffiċjali tal-Mandrake Linux."
+"Il-lista ta' aġġornamenti hija vojta. Dan ifisser li, jew m'hemm ebda "
+"aġġornamenti x'isiru għall-pakketti installati fuq il-kompjuter, jew diġà "
+"nstallajthom kollha."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No mirror"
-msgstr "Ebda mera"
+msgid "Examining file of media `%s'..."
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was an error downloading the mirrors list:\n"
-"\n"
-"%s\n"
-"The network, or MandrakeSoft website, are maybe unavailable.\n"
-"Please try again later."
+msgid "Download of `%s', speed:%s"
 msgstr ""
-"Kien hemm problema waqt it-tniżżil tal-lista ta' mirja:\n"
-"\n"
-"%s\n"
-"In-network, jew il-website ta' MandrakeSoft, tista' ma tkunx \n"
-"disponibbli. Erġa' pprova iżjed tard."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
-msgstr "Problema waqt it-tniżżil"
+msgid "One of the following packages is needed:"
+msgstr "Wieħed minn dawn il-pakketti huwa meħtieġ:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
-"Stenna ftit, qed jitniżżlu indirizzi ta' mirja mill-website ta' MandrakeSoft."
+msgid "Quit"
+msgstr "Oħroġ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
 "\n"
 "Is it ok to continue?"
 msgstr ""
-"Għandi bżonn nikkuntattja l-website ta' MandrakeSoft biex nikseb lista\n"
-"ta' mirja. Iċċekkja li n-network qegħda taħdem.\n"
+"Għandi bżonn nikkuntattja l-mera biex nikseb l-aħħar pakketti aġġornati.\n"
+"IÄ‹Ä‹ekkja li n-network hija mtella'\n"
 "\n"
-"Nista' nkompli?"
+"Trid tkompli?"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "United States"
-msgstr "Stati Uniti"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update media(s)"
+msgstr "AÄ¡Ä¡orna sorsi"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "ÄŠina"
+msgid "Ok"
+msgstr "Ok"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Renju Unit"
+msgid "Please wait, adding medium..."
+msgstr "Stenna ftit, qed jiġi miżjud medju..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Tajwan"
+msgid "Unable to get source packages."
+msgstr "Ma nistax nikseb pakketti sors."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Sweden"
-msgstr "Svezja"
+msgid "Too many packages are selected"
+msgstr "Hemm wisq pakketti magħżula"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Russia"
-msgstr "Russja"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"Merħba għall-editur ta' sorsi ta' pakketti!\n"
+"\n"
+"Din l-għodda tgħinek biex tikkonfigura s-sorsi ta' pakketti li tixtieq tuża "
+"fuq\n"
+"il-kompjuter tiegħek. Dawn ikunu disponibbli biex minnhom tinstalla "
+"pakketti\n"
+"ġodda jew biex taġġorna s-sistema."
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Portugal"
-msgstr "Portugall"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
+msgstr "għandu konflitt ma'"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
-msgstr "Polonja"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Merħba għal MandrakeUpdate!\n"
+"\n"
+"Din l-għodda tgħinek tagħżel aġġornamenti li trid tinstalla fuq il-\n"
+"kompjuter tiegħek."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Norway"
-msgstr "Norveġja"
+msgid "Mandrake choices"
+msgstr "Għażliet ta' Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Netherlands"
-msgstr "Netherlands"
+msgid "Changelog:\n"
+msgstr "Log tal-bidliet:\n"
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Korea"
 msgstr "Ġiegħel"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Japan"
-msgstr "Ä appun"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Italy"
-msgstr "Installa"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Israel"
-msgstr "Installa"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Greece"
-msgstr "Greċja"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "France"
-msgstr "Ġiegħel"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Finland"
-msgstr "Finlandja"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Spain"
-msgstr "Spanja"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Danmark"
-msgstr "Danimarka"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Germany"
-msgstr "Ä ermanja"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Czech Republic"
-msgstr "Repubblika ÄŠeka"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Costa Rica"
-msgstr "Costa Rica"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Canada"
-msgstr "Kanada"
-
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Brazil"
-msgstr "Brażil"
+msgid "Removable device"
+msgstr "Apparat jinħareġ"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Belġju"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Awstralja"
+msgid "Change medium"
+msgstr "Ibdel sors"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "Awstrija"
+msgid "Mandrake Update"
+msgstr "AÄ¡Ä¡ornament Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
-msgstr "Info..."
+msgid "by size"
+msgstr "skond id-daqs"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "Le"
+msgid "FTP server"
+msgstr "Server FTP"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "Iva"
+msgid "Files:\n"
+msgstr "Fajls:\n"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr "Ma nistax naġġorna medju, se jiġi diżabbilit awtomatikament."
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -1564,6 +1564,14 @@ msgstr "Neħħi softwer"
 msgid "Software Sources Manager"
 msgstr "Maniġġjar ta' sorsi tas-softwer"
 
+#, fuzzy
+#~ msgid "Source: "
+#~ msgstr "Ġiegħel"
+
+#, fuzzy
+#~ msgid "Source"
+#~ msgstr "Ġiegħel"
+
 #~ msgid ""
 #~ "some packages failed to install\n"
 #~ "correctly"
@@ -1601,9 +1609,6 @@ msgstr "Maniġġjar ta' sorsi tas-softwer"
 #~ "\n"
 #~ "Trid tipprova mera oħra?"
 
-#~ msgid "Error adding update medium"
-#~ msgstr "Problema fiż-żieda ta' sors ta' aġġornamenti"
-
 #~ msgid "Please wait, contacting mirror to initialize updates packages."
 #~ msgstr ""
 #~ "Stenna ftit, qed nikkuntattja l-mera biex nibda' l-aġġornament ta' "
diff --git a/po/nl.po b/po/nl.po
index 177de142..e56f1206 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: 2003-02-24 16:17+0100\n"
 "Last-Translator: Hendrik-Jan Heins <hjh@passys.nl>\n"
 "Language-Team: Nederlands <vertaling@nl.linux.org>\n"
@@ -17,16 +17,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"Is het goed om door te gaan?"
+msgid "Enabled?"
+msgstr "Ingeschakeld?"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Pad of koppelpunt::"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Portugal"
+msgstr "Portugal"
 
 #: ../rpmdrake:1
 #, c-format
@@ -45,104 +49,55 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"Welkom bij Mandrake Vernieuwen!\n"
-"\n"
-"Dit hulpprogramma helpt u bij het kiezen van de vernieuwingen dit u op\n"
-"uw computer wilt installeren."
+msgid "by group"
+msgstr "op groep"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
-msgstr ""
-"Welkom bij het software-verwijderprogramma!\n"
-"\n"
-"Dit hulpprogramma helpt u bij het kiezen welke software u van uw\n"
-"computer wilt verwijderen."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Er is een fout opgetreden tijdens het installeren van pakketten:\n"
-"\n"
-"%s"
+msgid "Name:"
+msgstr "Naam:"
 
-#: ../rpmdrake:1
+#  Use plural for "installed" if your language
+#  * distinguish plural and singular here
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Problem during removal"
-msgstr "Probleem bij het verwijderen"
+msgid "Italy"
+msgstr "Italië"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "Even geduld, bezig met het verwijderen van pakketten..."
+msgid "How to choose manually your mirror"
+msgstr "Hoe u handmatig uw mirror kunt kiezen"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Even geduld, bezig met lezen van pakkettendatabase..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Er is een fout opgetreden tijdens het installeren van pakketten:\n"
-"\n"
-"%s"
+msgid "URL:"
+msgstr "URL: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation failed"
-msgstr "Installatie mislukt"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Klaarmaken pakketten voor installatie"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Klaarmaken pakketten voor installatie"
+msgid "Some packages need to be removed"
+msgstr "Enkele pakketten dienen verwijderd te worden"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Alle gevraagde pakketten zijn succesvol geïnstalleerd."
+msgid "More information on package..."
+msgstr "Meer informatie over pakket..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Alles is succesvol geïnstalleerd"
+msgid "Yes"
+msgstr "Ja"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
 msgstr ""
-"De istallatie is voltooid; %s.\n"
-"\n"
-"Sommige configuratiebestanden zijn gecreëerd als `.rpmnew' of `.rpmsave',\n"
-"u kunt er nu enkele inspecteren om zonodig actie te ondernemen:"
+"Vanwege hun afhankelijkheden dienen de volgende pakket(ten)\n"
+"nu gedeselecteerd te worden:\n"
 
 #: ../rpmdrake:1
 #, c-format
@@ -150,127 +105,120 @@ msgid "everything was installed correctly"
 msgstr "Alles is correct geïnstalleerd"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Problemen tijdens de installatie"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Installeren pakket `%s' (%s/%s)..."
+msgid "%s KB"
+msgstr "%s KB"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Klaarmaken pakketten voor installatie"
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"U kunt ook uw gewenste mirror handmatig kiezen: daarvoor start\n"
+"u het Software-Bronnenbeheer en voegt u een `Beveiligingsvernieuwingen'-\n"
+"bron toe.\n"
+"\n"
+"Daarna herstart u Mandrake Vernieuwen."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
+"Welcome to the software removal tool!\n"
 "\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
 msgstr ""
+"Welkom bij het software-verwijderprogramma!\n"
 "\n"
-"\n"
-"Gerapporteerde fout(en):\n"
-"%s"
+"Dit hulpprogramma helpt u bij het kiezen welke software u van uw\n"
+"computer wilt verwijderen."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"In order to save the changes, you need to insert the medium in the drive."
 msgstr ""
-"Installatie mislukt, sommige bestanden missen.\n"
-"U wilt misschien uw bronnen-database verversen."
+"Om de veranderingen op te kunnen slaan, dient u het medium in het station te "
+"plaatsen."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Opslaan en afsluiten"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
+"There was a problem during the removal of packages:\n"
 "\n"
-"Do you want to continue installation?"
+"%s"
 msgstr ""
-"De volgende pakketten dienen verwijderd te worden om andere te kunnen "
-"opwaarderen:\n"
-"\n"
-"%s\n"
+"Er is een fout opgetreden tijdens het installeren van pakketten:\n"
 "\n"
-"Is het goed om door te gaan?"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Ophalen pakket `%s' (%s/%s)..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Cancel"
-msgstr "Annuleren"
+msgid "Size: "
+msgstr "Grootte: "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid "Security updates"
+msgstr "Beveiligingsverbeteringen"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Voer het medium in met de naam \"%s\" in apparaat [%s]"
+msgid "Already existing update medias"
+msgstr "Er is een fout opgetreden bij het toevoegen van een vernieuwingsmedium"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Change medium"
-msgstr "Medium veranderen"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Initializing..."
-msgstr "Initialiseren..."
+msgid "Maximum information"
+msgstr "Maximale informatie"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Klaarmaken pakketten voor installatie"
+msgid "Proxy..."
+msgstr "Fout..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "U moet root zijn om pakketten te kunnen installeren, excuus."
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Unable to get source packages."
-msgstr "Niet in staat bronpakketten op te halen"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspect..."
-msgstr "Inspecteren..."
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
+msgstr ""
+"Installatie mislukt, sommige bestanden missen.\n"
+"U wilt misschien uw bronnen-database verversen."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Installation finished"
-msgstr "Installatie voltooid"
+msgid "United Kingdom"
+msgstr "Verenigd Koninkrijk"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Niets doen"
+msgid "in names"
+msgstr "in namen"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr ".%s als hoofdbestand gebruiken"
+msgid ""
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
+msgstr ""
+"Niet in staat om een geschikte mirror te vinden.\n"
+"\n"
+"Er kunnen veel redenen zijn voor dit probleem; het meest voorkomend\n"
+"is het geval waarin de architectuur van uw centrale verwerkingseenheid\n"
+"niet ondersteund wordt door de officiële Mandrake Linux vernieuwingen."
 
 #  Removable media
 #: ../rpmdrake:1
@@ -278,339 +226,342 @@ msgstr ".%s als hoofdbestand gebruiken"
 msgid "Remove .%s"
 msgstr ".%s verwijderen"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "changes:"
-msgstr "veranderingen:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspecting %s"
-msgstr "Bezig met inspecteren van %s"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Even geduld, bezig met opzoeken van verkrijgbare pakketten..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "Even geduld, bezig met toevoegen medium..."
+msgid "Finland"
+msgstr "Finland"
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
+"The following packages have bad signatures:\n"
 "\n"
-"Then, restart MandrakeUpdate."
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"U kunt ook uw gewenste mirror handmatig kiezen: daarvoor start\n"
-"u het Software-Bronnenbeheer en voegt u een `Beveiligingsvernieuwingen'-\n"
-"bron toe.\n"
+"De volgende pakketten dienen verwijderd te worden om andere te kunnen "
+"opwaarderen:\n"
 "\n"
-"Daarna herstart u Mandrake Vernieuwen."
+"%s\n"
+"\n"
+"Is het goed om door te gaan?"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "How to choose manually your mirror"
-msgstr "Hoe u handmatig uw mirror kunt kiezen"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Examining distant file of media `%s'..."
+msgstr "Onderzoeken van afstandsbestand van bron `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
+msgid "Verifying packages signatures..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Already existing update sources"
-msgstr ""
+msgid "France"
+msgstr "Frankrijk"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "More info"
+msgstr "Meer info"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
+"%s\n"
 "\n"
 "Is it ok to continue?"
 msgstr ""
-"Het is nodig de mirror te contacteren om de laatste\n"
-"vernieuwingspakketten op te halen. Ga na of uw netwerk\n"
-"momenteel draait.\n"
+"%s\n"
 "\n"
 "Is het goed om door te gaan?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Reload the packages list"
+msgstr "Pakkettenlijst herladen"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Kies uw mirror..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Bestandsfout"
+msgid "Some packages can't be installed"
+msgstr "Pakket `%s' kan niet worden geïnstalleerd\n"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
+msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Klaarmaken pakketten voor installatie"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Mandrake Vernieuwen"
+msgid "All packages,"
+msgstr "Alle pakketten,"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Software Packages Removal"
-msgstr "Softwarepakketten verwijderen"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Type of media:"
+msgstr "Brontype:"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#  Local media
+#: ../rpmdrake:1
 #, c-format
-msgid "Quit"
-msgstr "Afsluiten"
+msgid "in files"
+msgstr "in bestanden"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Installeren"
+msgid "All requested packages were installed successfully."
+msgstr "Alle gevraagde pakketten zijn succesvol geïnstalleerd."
 
-#  Removable media
-#
-#  I don't know why it says 'removable media' here, but translating
-#  it in the sense of taking out the media is definately wrong!
-#  -Reinout
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove"
-msgstr "Verwijderen"
+msgid "Proxy hostname:"
+msgstr "Proxy-hostnaam:"
 
-#: ../rpmdrake:1
+#  Local media
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Help"
-msgstr "Hulp"
+msgid "Local files"
+msgstr "Lokale bestanden"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search"
-msgstr "Zoeken"
+msgid "Inspecting %s"
+msgstr "Bezig met inspecteren van %s"
 
-#: ../rpmdrake:1
+#  Use plural for "installed" if your language
+#  * distinguish plural and singular here
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Find:"
-msgstr "Zoek:"
+msgid "Israel"
+msgstr "Israël"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"De volgende pakketten dienen verwijderd te worden om andere te kunnen "
-"opwaarderen:\n"
-"\n"
-"%s\n"
-"\n"
-"Is het goed om door te gaan?"
+msgid "Help"
+msgstr "Hulp"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Enkele pakketten dienen verwijderd te worden"
+msgid "HTTP server"
+msgstr "HTTP server"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
-"\n"
-"Do you really want to install all the selected packages?"
-msgstr ""
-"Waarschuwing: het lijkt erop dat u probeert zoveel pakketten\n"
-"toe te voegen dat uw bestandssysteem wel eens vol zou kunnen\n"
-"raken tijdens of na de pakketinstallatie; dit is bijzonder \n"
-"riskant en moet zorgvuldig overwogen worden.\n"
-"\n"
-"Weet u zeker dat u alle geselecteerde pakketten wilt installeren?"
+msgid "Installation failed"
+msgstr "Installatie mislukt"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Te veel pakketten zijn geselecteerd"
+msgid "Use .%s as main file"
+msgstr ".%s als hoofdbestand gebruiken"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "Maximale informatie"
+msgid "Search results"
+msgstr "Zoekresultaat"
 
-#: ../rpmdrake:1
+#  Local media
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Normal information"
-msgstr "Normale informatie"
+msgid " failed!"
+msgstr " mislukt!"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Update source(s)"
-msgstr "Bron(nen) verversen"
+msgid "Brazil"
+msgstr "Brazilië"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Pakkettenlijst herladen"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"Er bestaat reeds een medium met die naam, weet u\n"
+"zeker dat u deze wilt vervangen?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "Alle selecties opheffen"
+msgid "Find:"
+msgstr "Zoek:"
 
-#  Local media
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "in bestanden"
+msgid "All packages, alphabetical"
+msgstr "Alle pakketten, alfabetisch"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "in omschrijvingen"
+msgid "Please wait, searching..."
+msgstr "Even geduld, bezig met zoeken..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "in namen"
+msgid "Please wait, reading packages database..."
+msgstr "Even geduld, bezig met lezen van pakkettendatabase..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by update availability"
-msgstr "op beschikbaarheid vernieuwingen"
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "Kan pakket `%s' niet openen\n"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by source repository"
-msgstr "op bron"
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Voer het medium in met de naam \"%s\" in apparaat [%s]"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by selection state"
-msgstr "op selectie-status"
+msgid "Reset the selection"
+msgstr "Alle selecties opheffen"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by size"
-msgstr "op grootte"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"Indien u een proxy nodig heeft, geef dan de hostnaam en optioneel eenpoort "
+"(syntax: <proxyhost[:port]>):"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-msgstr "op groep"
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
+"Om alle afhankelijkheden te laten kloppen, zullen deze pakket(ten)\n"
+"verwijderd worden:\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "All packages,"
-msgstr "Alle pakketten,"
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "All packages, alphabetical"
-msgstr "Alle pakketten, alfabetisch"
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Er is een fout opgetreden tijdens het installeren van pakketten:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Mandrake keuzes"
+msgid "Please wait, removing medium..."
+msgstr "Even geduld, bezig met verwijderen van medium..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
-msgstr "Gewone vernieuwingen"
+msgid "Password:"
+msgstr "Wachtwoord:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Programmareparaties vernieuwingen"
+msgid "Taiwan"
+msgstr "Taiwan"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Security updates"
-msgstr "Beveiligingsverbeteringen"
+msgid "User:"
+msgstr "Gebruiker:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Description: "
-msgstr "Beschrijving:"
+msgid "Please wait, updating medium..."
+msgstr "Even geduld, bezig met verversen van medium..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Reden voor vernieuwing: "
+msgid "Please wait, listing packages..."
+msgstr "Even geduld, bezig met opsommen van pakketten..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Summary: "
-msgstr "Samenvatting: "
+msgid "Information on packages"
+msgstr "Informatie over pakketten..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Importance: "
-msgstr "Belang: "
+msgid "Cancel"
+msgstr "Annuleren"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Everything installed successfully"
+msgstr "Alles is succesvol geïnstalleerd"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Size: "
-msgstr "Grootte: "
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Select the media(s) you wish to update:"
+msgstr "Selecteer de bron(nen) die u wilt verversen:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Version: "
-msgstr "Versie: "
+msgid "Please wait, updating media..."
+msgstr "Even geduld, bezig met verversen van media..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "Naam: "
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Momenteel geïnstalleerde versie: "
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"De volgende pakketten dienen verwijderd te worden om andere te kunnen "
+"opwaarderen:\n"
+"\n"
+"%s\n"
+"\n"
+"Is het goed om door te gaan?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Source: "
-msgstr "Bron: "
+msgid "in descriptions"
+msgstr "in omschrijvingen"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(Not available)"
-msgstr "(Niet beschikbaar)"
+msgid "Configure proxies"
+msgstr "Proxy's configureren"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Veranderingen-logboek:\n"
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Het is nodig de MandrakeSoft-website te contacteren om de\n"
+"mirrors-lijst op te halen. Ga na of uw netwerk momenteel draait.\n"
+"\n"
+"Is het goed om door te gaan?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Files:\n"
-msgstr "Bestanden:\n"
+msgid "Please choose"
+msgstr "Gelieve te kiezen"
 
 #: ../rpmdrake:1
 #, c-format
@@ -619,42 +570,28 @@ msgstr "Geselecteerde grootte: %d MB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Geselecteerd: %d MB / Vrije schijfruimte: %d MB"
+msgid "Initializing..."
+msgstr "Initialiseren..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
-msgstr ""
-"Vanwege hun afhankelijkheden dienen de volgende pakket(ten)\n"
-"nu gedeselecteerd te worden:\n"
+msgid "Save changes"
+msgstr "Veranderingen opslaan"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr ""
-"Sorry, maar de volgende pakket(ten) kunnen niet geselecteerd worden:\n"
-"\n"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "Fout tijdens ophalen"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "conflicteert met"
+msgid "Package installation..."
+msgstr "Klaarmaken pakketten voor installatie"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Pakket `%s' kan niet worden geïnstalleerd\n"
+#, c-format
+msgid "Importance: "
+msgstr "Belang: "
 
 #: ../rpmdrake:1
 #, c-format
@@ -667,464 +604,465 @@ msgstr ""
 "pakket(ten) ook geïnstalleerd te worden:\n"
 "\n"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "Extra pakketten benodigd"
+msgid "Add..."
+msgstr "Toevoegen..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "Pakket `%s' kan niet worden geïnstalleerd\n"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "Niet in staat medium te creëren"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Removing these packages would break your system, sorry:\n"
+"The installation is finished; %s.\n"
 "\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
 msgstr ""
-"Sorry, maar het verwijderen van deze pakketten zou uw systeem\n"
-"beschadigen:\n"
+"De istallatie is voltooid; %s.\n"
 "\n"
+"Sommige configuratiebestanden zijn gecreëerd als `.rpmnew' of `.rpmsave',\n"
+"u kunt er nu enkele inspecteren om zonodig actie te ondernemen:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"Om alle afhankelijkheden te laten kloppen, zullen deze pakket(ten)\n"
-"verwijderd worden:\n"
-"\n"
+msgid "Browse..."
+msgstr "Bladeren..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "Pakket `%s' kan niet worden geïnstalleerd\n"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Enkele extra pakketten dienen verwijderd te worden"
+msgid "Info..."
+msgstr "Info..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "More information on package..."
-msgstr "Meer informatie over pakket..."
+msgid "You need to insert the medium to continue"
+msgstr "U dient het medium te plaatsen om door te gaan"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Copying file for media `%s'..."
+msgstr "Kopiëren van bestand voor bron `%s'..."
+
+#  Removable media
+#
+#  I don't know why it says 'removable media' here, but translating
+#  it in the sense of taking out the media is definately wrong!
+#  -Reinout
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Information on packages"
-msgstr "Informatie over pakketten..."
+msgid "Remove"
+msgstr "Verwijderen"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "More info"
-msgstr "Meer info"
+msgid "Preparing packages installation..."
+msgstr "Klaarmaken pakketten voor installatie"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "by media repository"
+msgstr "op bron"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "Toevoegbaar"
+msgid "No mirror"
+msgstr "Geen mirror"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Upgradable"
-msgstr "Opwaardeerbaar"
+msgid "You need to fill up at least the two first entries."
+msgstr "U dient tenminste de eerste twee velden in te vullen."
 
 #: ../rpmdrake:1
 #, c-format
-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 ""
-"De lijst met vernieuwingen is leeg. Dit betekent dat er ofwel\n"
-"geen vernieuwingen beschikbaar zijn voor de op uw computer\n"
-"geïnstalleerde pakketten, ofwel dat u ze reeds allemaal\n"
-"geïnstalleerd heeft."
+msgid "Install"
+msgstr "Installeren"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "No update"
-msgstr "Geen vernieuwing"
+msgid "Japan"
+msgstr "Japan"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "(none)"
-msgstr "(geen)"
+msgid "Do nothing"
+msgstr "Niets doen"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Even geduld, bezig met opsommen van pakketten..."
+msgid "No update"
+msgstr "Geen vernieuwing"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "Kan pakket `%s' niet openen\n"
+#, c-format
+msgid "Description: "
+msgstr "Beschrijving:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Eén van de volgende pakketten is benodigd:"
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr ""
+"Waarschuwing: het lijkt erop dat u probeert zoveel pakketten\n"
+"toe te voegen dat uw bestandssysteem wel eens vol zou kunnen\n"
+"raken tijdens of na de pakketinstallatie; dit is bijzonder \n"
+"riskant en moet zorgvuldig overwogen worden.\n"
+"\n"
+"Weet u zeker dat u alle geselecteerde pakketten wilt installeren?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Gelieve te kiezen"
+msgid "Name: "
+msgstr "Naam: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Inspect..."
+msgstr "Inspecteren..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Not selected"
-msgstr "Tegenstrijdigheden ontdekt"
+msgid "Editing media \"%s\":"
+msgstr "Bewerken van bron \"%s\":"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Selected"
-msgstr "Geselecteerd"
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "Klaarmaken pakketten voor installatie"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results"
-msgstr "Zoekresultaat"
+msgid "Australia"
+msgstr "Australië"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Stop"
-msgstr "Stoppen"
+msgid "Installation finished"
+msgstr "Installatie voltooid"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Even geduld, bezig met zoeken..."
+msgid "by update availability"
+msgstr "op beschikbaarheid vernieuwingen"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Zoekresultaat (niets)"
+msgid "Poland"
+msgstr "Polen"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Other"
-msgstr "Overige"
+msgid "Version: "
+msgstr "Versie: "
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the packages source editor!\n"
-"\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
+msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
-"Welkom bij de pakketbron-editor!\n"
-"\n"
-"Dit hulpprogramma helpt u om de pakketbronnen te configureren die u wenst\n"
-"te gebruiken op uw computer. Deze zullen dan beschikbaar zijn om nieuwe\n"
-"softwarepakketten te installeren of om vernieuwingen uit te voeren."
+"U kunt een gebruikersnaam/wachtwoord aangeven voor de proxy-aanmelding:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
-msgstr "Opslaan en afsluiten"
+msgid "Upgradable"
+msgstr "Opwaardeerbaar"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid " done."
+msgstr " klaar."
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Fout..."
+msgid "Software Packages Installation"
+msgstr "Klaarmaken pakketten voor installatie"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Update..."
-msgstr "Verversen..."
+msgid "Additional packages needed"
+msgstr "Extra pakketten benodigd"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "Toevoegen..."
+msgid "Bugfixes updates"
+msgstr "Programmareparaties vernieuwingen"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "Bewerken"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "Downloaden van `%s', tijd over:%s, snelheid:%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Source"
-msgstr "Bron"
+msgid "Germany"
+msgstr "Duitsland"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Enabled?"
-msgstr "Ingeschakeld?"
+msgid "Russia"
+msgstr "Rusland"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Configure sources"
-msgstr "Bronnen configureren"
+msgid "Norway"
+msgstr "Noorwegen"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during installation"
+msgstr "Problemen tijdens de installatie"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "Wachtwoord:"
+msgid "Search"
+msgstr "Zoeken"
 
 #: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Edit a media"
+msgstr "Een bron bewerken"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "User:"
-msgstr "Gebruiker:"
+msgid "Czech Republic"
+msgstr "Tsjechië"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
+msgid ""
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"U kunt een gebruikersnaam/wachtwoord aangeven voor de proxy-aanmelding:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "Proxy-hostnaam:"
+msgid "Stop"
+msgstr "Stoppen"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
-msgstr ""
-"Indien u een proxy nodig heeft, geef dan de hostnaam en optioneel eenpoort "
-"(syntax: <proxyhost[:port]>):"
+msgid "Update"
+msgstr "Verversen"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Proxy's configureren"
+msgid "Please wait, removing packages..."
+msgstr "Even geduld, bezig met het verwijderen van pakketten..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Even geduld, bezig met verversen van medium..."
+msgid "Normal information"
+msgstr "Normale informatie"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
+msgid "Media: "
 msgstr ""
-"Om de veranderingen op te kunnen slaan, dient u het medium in het station te "
-"plaatsen."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "U dient het medium te plaatsen om door te gaan"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "Ophalen pakket `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "Veranderingen opslaan"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Geselecteerd: %d MB / Vrije schijfruimte: %d MB"
 
-#  The hdlist
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Relatief pad naar synthesis of hdlist: "
+msgid "Media"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "URL:"
-msgstr "URL: "
+msgid "Spain"
+msgstr "Spanje"
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "Bewerken van bron \"%s\":"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal updates"
+msgstr "Gewone vernieuwingen"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Edit a source"
-msgstr "Een bron bewerken"
+msgid "by selection state"
+msgstr "op selectie-status"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Even geduld, bezig met verwijderen van medium..."
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
+"Even geduld, bezig met downloaden van mirror-adressen van de MandrakeSoft "
+"website."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Type of source:"
-msgstr "Brontype:"
+msgid "Login:"
+msgstr "Aanmeldnaam:"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Adding a source:"
+#, fuzzy, c-format
+msgid "Adding a media:"
 msgstr "Bezig met toevoegen van bron:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
-msgstr ""
-"Er bestaat reeds een medium met die naam, weet u\n"
-"zeker dat u deze wilt vervangen?"
+msgid "Austria"
+msgstr "Oostenrijk"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "U dient tenminste de eerste twee velden in te vullen."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Fatal error"
+msgstr "Bestandsfout"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Name:"
-msgstr "Naam:"
+msgid "Update..."
+msgstr "Verversen..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "Controleren handtekening van `%s'..."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Login:"
-msgstr "Aanmeldnaam:"
+msgid "(none)"
+msgstr "(geen)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr "Kies uw mirror..."
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
+"Sorry, maar het verwijderen van deze pakketten zou uw systeem\n"
+"beschadigen:\n"
+"\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
-msgstr "Bladeren..."
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Installeren pakket `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Path or mount point:"
-msgstr "Pad of koppelpunt::"
+msgid "Currently installed version: "
+msgstr "Momenteel geïnstalleerde versie: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Removable device"
-msgstr "Verwisselbaar apparaat"
+msgid "Other"
+msgstr "Overige"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "HTTP server"
+msgid "Reason for update: "
+msgstr "Reden voor vernieuwing: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "FTP server"
+msgid "Please choose the desired mirror."
+msgstr "Kies de gewenste mirror."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Path:"
-msgstr "Pad:"
+msgid "Edit"
+msgstr "Bewerken"
 
-#  Local media
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "Lokale bestanden"
+msgid "Please wait, finding available packages..."
+msgstr "Even geduld, bezig met opzoeken van verkrijgbare pakketten..."
 
+#  The hdlist
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Add a source"
-msgstr "Bron toevoegen"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr ""
-"Niet in staat medium te verversen; het wordt automatisch uitgeschakeld."
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Relatief pad naar synthesis of hdlist: "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Unable to create medium."
-msgstr "Niet in staat medium te creëren"
+msgid "Search results (none)"
+msgstr "Zoekresultaat (niets)"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Update"
-msgstr "Verversen"
+msgid "Danmark"
+msgstr "Denemarken"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Selecteer de bron(nen) die u wilt verversen:"
+msgid "China"
+msgstr "China"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Even geduld, bezig met verversen van media..."
+msgid "United States"
+msgstr "Verenigde Staten"
 
-#  Local media
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " failed!"
-msgstr " mislukt!"
+msgid "changes:"
+msgstr "veranderingen:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " done."
-msgstr " klaar."
+msgid "Some additional packages need to be removed"
+msgstr "Enkele extra pakketten dienen verwijderd te worden"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "Downloaden van `%s', snelheid:%s"
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "Downloaden van `%s', tijd over:%s, snelheid:%s"
+msgid "No"
+msgstr "Nee"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "Controleren handtekening van `%s'..."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "Onderzoeken van afstandsbestand van bron `%s'..."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Examining file of source `%s'..."
-msgstr "Onderzoeken van bestand van bron `%s'..."
+msgid "Configure medias"
+msgstr "Bronnen configureren"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Copying file for source `%s'..."
-msgstr "Kopiëren van bestand voor bron `%s'..."
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a media"
+msgstr "Bron toevoegen"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please choose the desired mirror."
-msgstr "Kies de gewenste mirror."
+msgid "Summary: "
+msgstr "Samenvatting: "
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
-msgstr ""
-"Niet in staat om een geschikte mirror te vinden.\n"
-"\n"
-"Er kunnen veel redenen zijn voor dit probleem; het meest voorkomend\n"
-"is het geval waarin de architectuur van uw centrale verwerkingseenheid\n"
-"niet ondersteund wordt door de officiële Mandrake Linux vernieuwingen."
+msgid "Canada"
+msgstr "Canada"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No mirror"
-msgstr "Geen mirror"
+msgid "Greece"
+msgstr "Griekenland"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1141,184 +1079,246 @@ msgstr ""
 "Het netwerk, of de MandrakeSoft-website, zijn wellicht onbereikbaar.\n"
 "Probeert u het later opnieuw."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr "U moet root zijn om pakketten te kunnen installeren, excuus."
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Error during download"
-msgstr "Fout tijdens ophalen"
+msgid "Path:"
+msgstr "Pad:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
-"Even geduld, bezig met downloaden van mirror-adressen van de MandrakeSoft "
-"website."
+msgid "Problem during removal"
+msgstr "Probleem bij het verwijderen"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Het is nodig de MandrakeSoft-website te contacteren om de\n"
-"mirrors-lijst op te halen. Ga na of uw netwerk momenteel draait.\n"
-"\n"
-"Is het goed om door te gaan?"
+msgid "Selected"
+msgstr "Geselecteerd"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United States"
-msgstr "Verenigde Staten"
+msgid "Netherlands"
+msgstr "Nederland"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "China"
-msgstr "China"
+msgid "Addable"
+msgstr "Toevoegbaar"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Verenigd Koninkrijk"
+msgid "(Not available)"
+msgstr "(Niet beschikbaar)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
+msgstr ""
+"Sorry, maar de volgende pakket(ten) kunnen niet geselecteerd worden:\n"
+"\n"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Not selected"
+msgstr "Tegenstrijdigheden ontdekt"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Taiwan"
+msgid "Software Packages Removal"
+msgstr "Softwarepakketten verwijderen"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Sweden"
 msgstr "Zweden"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Russia"
-msgstr "Rusland"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
+msgstr ""
+"\n"
+"\n"
+"Gerapporteerde fout(en):\n"
+"%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Portugal"
-msgstr "Portugal"
+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 ""
+"De lijst met vernieuwingen is leeg. Dit betekent dat er ofwel\n"
+"geen vernieuwingen beschikbaar zijn voor de op uw computer\n"
+"geïnstalleerde pakketten, ofwel dat u ze reeds allemaal\n"
+"geïnstalleerd heeft."
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Poland"
-msgstr "Polen"
+#, fuzzy, c-format
+msgid "Examining file of media `%s'..."
+msgstr "Onderzoeken van bestand van bron `%s'..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Norway"
-msgstr "Noorwegen"
+msgid "Download of `%s', speed:%s"
+msgstr "Downloaden van `%s', snelheid:%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Netherlands"
-msgstr "Nederland"
+msgid "One of the following packages is needed:"
+msgstr "Eén van de volgende pakketten is benodigd:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Korea"
-msgstr "Korea, Republiek"
+msgid "Quit"
+msgstr "Afsluiten"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "Japan"
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Het is nodig de mirror te contacteren om de laatste\n"
+"vernieuwingspakketten op te halen. Ga na of uw netwerk\n"
+"momenteel draait.\n"
+"\n"
+"Is het goed om door te gaan?"
 
-#  Use plural for "installed" if your language
-#  * distinguish plural and singular here
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Italy"
-msgstr "Italië"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update media(s)"
+msgstr "Bron(nen) verversen"
 
-#  Use plural for "installed" if your language
-#  * distinguish plural and singular here
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Israel"
-msgstr "Israël"
+msgid "Ok"
+msgstr "Ok"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Greece"
-msgstr "Griekenland"
+msgid "Please wait, adding medium..."
+msgstr "Even geduld, bezig met toevoegen medium..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "France"
-msgstr "Frankrijk"
+msgid "Unable to get source packages."
+msgstr "Niet in staat bronpakketten op te halen"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "Finland"
+msgid "Too many packages are selected"
+msgstr "Te veel pakketten zijn geselecteerd"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Spain"
-msgstr "Spanje"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"Welkom bij de pakketbron-editor!\n"
+"\n"
+"Dit hulpprogramma helpt u om de pakketbronnen te configureren die u wenst\n"
+"te gebruiken op uw computer. Deze zullen dan beschikbaar zijn om nieuwe\n"
+"softwarepakketten te installeren of om vernieuwingen uit te voeren."
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Danmark"
-msgstr "Denemarken"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
+msgstr "conflicteert met"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "Duitsland"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Welkom bij Mandrake Vernieuwen!\n"
+"\n"
+"Dit hulpprogramma helpt u bij het kiezen van de vernieuwingen dit u op\n"
+"uw computer wilt installeren."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Tsjechië"
+msgid "Mandrake choices"
+msgstr "Mandrake keuzes"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Costa Rica"
+msgid "Changelog:\n"
+msgstr "Veranderingen-logboek:\n"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "Canada"
+msgid "Korea"
+msgstr "Korea, Republiek"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Brazil"
-msgstr "Brazilië"
+msgid "Removable device"
+msgstr "Verwisselbaar apparaat"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "België"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Australië"
+msgid "Change medium"
+msgstr "Medium veranderen"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "Oostenrijk"
+msgid "Mandrake Update"
+msgstr "Mandrake Vernieuwen"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
-msgstr "Info..."
+msgid "by size"
+msgstr "op grootte"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "Nee"
+msgid "FTP server"
+msgstr "FTP server"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "Ja"
+msgid "Files:\n"
+msgstr "Bestanden:\n"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr ""
+"Niet in staat medium te verversen; het wordt automatisch uitgeschakeld."
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -1591,6 +1591,12 @@ msgstr "Software verwijderen"
 msgid "Software Sources Manager"
 msgstr "Software Bronnenbeheer"
 
+#~ msgid "Source: "
+#~ msgstr "Bron: "
+
+#~ msgid "Source"
+#~ msgstr "Bron"
+
 #~ msgid ""
 #~ "some packages failed to install\n"
 #~ "correctly"
@@ -1631,10 +1637,6 @@ msgstr "Software Bronnenbeheer"
 #~ "\n"
 #~ "Wilt u een andere mirror proberen?"
 
-#~ msgid "Error adding update medium"
-#~ msgstr ""
-#~ "Er is een fout opgetreden bij het toevoegen van een vernieuwingsmedium"
-
 #~ msgid "Please wait, contacting mirror to initialize updates packages."
 #~ msgstr ""
 #~ "Even geduld, bezig met verbinden met mirror om pakketvernieuwingen te "
diff --git a/po/no.po b/po/no.po
index c95050fb..dc469d82 100644
--- a/po/no.po
+++ b/po/no.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: 2003-02-13 17:56+0100\n"
 "Last-Translator: Per Øyvind Karlsen <peroyvind@sintrax.net>\n"
 "Language-Team: Norsk Bokmål <cooker-i18n@linux-mandrake.com>\n"
@@ -15,16 +15,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"Er det ok å fortsette?"
+msgid "Enabled?"
+msgstr "Slått på?"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Sti eller monteringspunkt:"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Portugal"
+msgstr "Port:"
 
 #: ../rpmdrake:1
 #, c-format
@@ -43,16 +47,79 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "by group"
+msgstr "ved gruppe"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Name:"
+msgstr "Navn"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Italy"
+msgstr "Installer"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Hvordan velge ditt speil manuelt"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "Noen pakker må fjernes"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
+msgstr "Mere informasjon om pakke..."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Ja"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Welcome to MandrakeUpdate!\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
 msgstr ""
-"Velkommen til MandrakeUpdate!\n"
+"På grunn av disses avhengigheter, må følgende pakke(r) velges\n"
+"vekk nå:\n"
 "\n"
-"Dette verktøyet vil hjelpe deg å velge oppdateringene du skal installere\n"
-"på maskinen din."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "alt ble installert korrekt"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "%s KB"
+msgstr "%.1f KB"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"Du kan også velge ditt ønskede speil manuelt: for å gjøre dette\n"
+"start Programvare kilde håndtereren, og legg så til en `Sikkerhets\n"
+"updateringer' kilde.\n"
+"\n"
+"Start så MandrakeUpdate på nytt."
 
 #: ../rpmdrake:1
 #, c-format
@@ -67,40 +134,21 @@ msgstr ""
 "Dette verktøyet vil hjelpe deg å velge vilken programvare du skal fjerne\n"
 "fra maskinen din."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:1
+#, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Det var en feil under installasjonen av pakker:\n"
-"\n"
-"%s"
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "For å kunne lagre endringene må du settee inn et medium i stasjonen."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Problem during removal"
-msgstr "Problem under fjerning"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, removing packages..."
-msgstr ""
-"Vennligst vent\n"
-"Sorterer pakker"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, reading packages database..."
-msgstr ""
-"Vennligst vent\n"
-"Sorterer pakker"
+msgid "Save and quit"
+msgstr "Lagre og avslutt"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"There was a problem during the installation:\n"
+"There was a problem during the removal of packages:\n"
 "\n"
 "%s"
 msgstr ""
@@ -110,83 +158,72 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Installer alle"
+msgid "Size: "
+msgstr "Størrelse"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Forbereder pakker for installasjon..."
+msgid "Security updates"
+msgstr "Vis sikkerhetsoppdateringer"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Forbereder pakker for installasjon..."
+msgid "Already existing update medias"
+msgstr "Kunne ikke legge til oppdateringsmedia"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Alle pakker ble vellykket installert"
+msgid "Maximum information"
+msgstr "Maksimum informasjon"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Everything installed successfully"
-msgstr "Alt installert vellykket"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Proxy..."
+msgstr "Feil..."
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The installation is finished; %s.\n"
-"\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
 msgstr ""
-"Installasjonen er ferdig; %s.\n"
-"\n"
-"Noen konfigureringsfiler ble opprettet som `.rpmnew' ellr `.rpmsave',\n"
-"du kan no sjekke noen for å utføre noen handlinger:"
+"Installasjon mislykket, noen filer mangler.\n"
+"Du vil kanskje oppdatere din kildedatabase."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "everything was installed correctly"
-msgstr "alt ble installert korrekt"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Det oppsto problemer under installasjonen"
+msgid "United Kingdom"
+msgstr "Storbritannia"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Installerer pakke `%s' (%s/%s)..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Forbereder pakker for installasjon..."
+msgid "in names"
+msgstr "i navn"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
+"I can't find any suitable mirror.\n"
 "\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
+"Jeg kan ikke finne noen passende speil.\n"
 "\n"
-"\n"
-"Feil rapportert:\n"
-"%s"
+"Det kan være mange årsaker til dette problemet; den mest vanlige er\n"
+"når arkitekturen til prosessoren din ikke er støttet\n"
+"av Mandrake Linux offisielle oppdateringer."
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"Installasjon mislykket, noen filer mangler.\n"
-"Du vil kanskje oppdatere din kildedatabase."
+msgid "Remove .%s"
+msgstr "Fjern .%s"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "Finland"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -203,206 +240,276 @@ msgstr ""
 "\n"
 "ER det ok å fortsette?"
 
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Examining distant file of media `%s'..."
+msgstr "Utforsker fjern fil fra kilde `%s'..."
+
 #: ../rpmdrake:1
 #, c-format
 msgid "Verifying packages signatures..."
 msgstr ""
 
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "France"
+msgstr "Tving"
+
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "More info"
+msgstr "Mere info"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Laster ned pakke `%s' (%s/%s)..."
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Er det ok å fortsette?"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "Avbryt"
+msgid "Reload the packages list"
+msgstr "Last pakkelisten på nytt"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid "Choose a mirror..."
+msgstr "Velg et speil..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Vennligst sett inn media kalt \"%s\" på enhet [%s]"
+msgid "Some packages can't be installed"
+msgstr "Pakke `%s' kan ikke installeres\n"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "Forbereder pakker for installasjon..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Change medium"
-msgstr "Endre media"
+msgid "All packages,"
+msgstr "Alle pakker,"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Type of media:"
+msgstr "Type kilde:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "Initialiserer..."
+msgid "in files"
+msgstr "i filer"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "Alle pakker ble vellykket installert"
+
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Forbereder pakker for installasjon..."
+msgid "Proxy hostname:"
+msgstr "Proxy brukernavn:"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "Lokale filer"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr "Sjekker %s"
+
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Du må være root for å installere pakker, beklager"
+msgid "Israel"
+msgstr "Installer"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unable to get source packages."
-msgstr "Velg pakkene dine"
+msgid "Help"
+msgstr "/_Hjelp"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Inspect..."
-msgstr "Sjekk..."
+msgid "HTTP server"
+msgstr "HTTP tjener"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Installation finished"
-msgstr "Installert"
+msgid "Installation failed"
+msgstr "Installer alle"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Ikke gjør noe"
+msgid "Use .%s as main file"
+msgstr "Bruk .%s som hovedfil"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Bruk .%s som hovedfil"
+msgid "Search results"
+msgstr "Søkeresultater"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid " failed!"
+msgstr " feilet!"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
+msgstr "Brasil"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"Det er allerede et media med det navnet, vil du\n"
+"virkelig bytte det ut?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Fjern .%s"
+msgid "Find:"
+msgstr "Finn:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "changes:"
-msgstr "endringer:"
+msgid "All packages, alphabetical"
+msgstr "Alle pakker, alfabetisk"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Sjekker %s"
+msgid "Please wait, searching..."
+msgstr "Vennligst vent, søker..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, finding available packages..."
+msgid "Please wait, reading packages database..."
 msgstr ""
 "Vennligst vent\n"
 "Sorterer pakker"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Please wait, adding medium..."
-msgstr "Vennligst vent, legger til media..."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "ukjent"
 
 #: ../rpmdrake:1
-#, c-format
-msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
-"\n"
-"Then, restart MandrakeUpdate."
-msgstr ""
-"Du kan også velge ditt ønskede speil manuelt: for å gjøre dette\n"
-"start Programvare kilde håndtereren, og legg så til en `Sikkerhets\n"
-"updateringer' kilde.\n"
-"\n"
-"Start så MandrakeUpdate på nytt."
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Vennligst sett inn media kalt \"%s\" på enhet [%s]"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "Hvordan velge ditt speil manuelt"
+msgid "Reset the selection"
+msgstr "Resett valget"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
 msgstr ""
+"Hvis du trenger en proxy, entre vertsnavnet og en port (syntaks: <proxyvert[:"
+"port]>):"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Already existing update sources"
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
 msgstr ""
+"På grunn av disses avhengigheter, trenger følgende pakke(r) også\n"
+"å bli fjernet:\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
+msgid "Costa Rica"
+msgstr "Costa Rica"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
+"There was a problem during the installation:\n"
 "\n"
-"Is it ok to continue?"
+"%s"
 msgstr ""
-"Jeg må kontakte speilet for å få tak i siste oppdateringspakker.\n"
-"Vennligst sjekk at nettverket ditt er oppe og går.\n"
+"Det var en feil under installasjonen av pakker:\n"
 "\n"
-"Er det ok å fortsette?"
+"%s"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Please wait, removing medium..."
+msgstr "Vennligst vent, fjerner media..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Fil feil"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "Passord:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "Taiwan"
+
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Forbereder pakker for installasjon..."
+msgid "User:"
+msgstr "Brukernavn:"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr "Vennligst vent, oppdaterer media..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Mandrake Update"
-msgstr "MandrakeUpdates valg"
+msgid "Please wait, listing packages..."
+msgstr ""
+"Vennligst vent\n"
+"Sorterer pakker"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Software Packages Removal"
-msgstr "Fjerning av programvarepakker"
+#, fuzzy, c-format
+msgid "Information on packages"
+msgstr "Velg pakkene dine"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "Avslutt"
+msgid "Cancel"
+msgstr "Avbryt"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Installer"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Remove"
-msgstr "Fjern"
+msgid "Everything installed successfully"
+msgstr "Alt installert vellykket"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Help"
-msgstr "/_Hjelp"
+msgid "Select the media(s) you wish to update:"
+msgstr "Velg kilden(e) du ønsker å oppdatere:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search"
-msgstr "søk"
+msgid "Please wait, updating media..."
+msgstr "Vennligst vent, oppdaterer media..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Finn:"
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -420,161 +527,188 @@ msgstr ""
 "ER det ok å fortsette?"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "in descriptions"
+msgstr "Beskrivelser"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Noen pakker må fjernes"
+msgid "Configure proxies"
+msgstr "Konfigurer proxier"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
 "\n"
-"Do you really want to install all the selected packages?"
+"Is it ok to continue?"
 msgstr ""
-"Advarsel: det ser ut til at du forsøker å legge til så mange\n"
-"pakker at filsystemet ditt ikke har nok ledig diskplass\n"
-"under eller etter pakkeinstallasjon ; dette er spesielt\n"
-"farlig bør gjøres med forsiktighet.\n"
+"Jeg må kontakte MandrakeSoft website for å få listen over speil.\n"
+"Vennligst sjekk at nettverket ditt er opp og går.\n"
 "\n"
-"Ønsker du virkelig å installere alle valgte pakker?"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Too many packages are selected"
-msgstr "For mange pakker er valgt"
+"Er det ok å fortsette?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "Maksimum informasjon"
+msgid "Please choose"
+msgstr "Vennligst velg"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Normal information"
-msgstr "Normal informasjon"
-
-#: ../rpmdrake:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Update source(s)"
-msgstr "Oppdaterer kilde(r)"
+#, fuzzy, c-format
+msgid "Selected size: %d MB"
+msgstr "%d valgte pakker: %.1f MB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Last pakkelisten på nytt"
+msgid "Initializing..."
+msgstr "Initialiserer..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reset the selection"
-msgstr "Resett valget"
+msgid "Save changes"
+msgstr "Lagrer endringer"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "in files"
-msgstr "i filer"
+msgid "Error during download"
+msgstr "Feil under nedlasting"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "in descriptions"
-msgstr "Beskrivelser"
+msgid "Package installation..."
+msgstr "Forbereder pakker for installasjon..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "i navn"
+msgid "Importance: "
+msgstr "Viktighet: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
-msgstr "ved oppdateringstilgjengelighet"
+msgid ""
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
+msgstr ""
+"For å tilfredstille avhengigheter, må følgende pakke(r) også\n"
+"installeres:\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by source repository"
-msgstr "ved kildelager"
+msgid "Add..."
+msgstr "Legg til..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by selection state"
-msgstr "ved utvelgelsestilstand"
+msgid "Unable to create medium."
+msgstr "Kan ikke opprette media."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by size"
-msgstr "ved størrelse"
+msgid ""
+"The installation is finished; %s.\n"
+"\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
+msgstr ""
+"Installasjonen er ferdig; %s.\n"
+"\n"
+"Noen konfigureringsfiler ble opprettet som `.rpmnew' ellr `.rpmsave',\n"
+"du kan no sjekke noen for å utføre noen handlinger:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by group"
-msgstr "ved gruppe"
+msgid "Browse..."
+msgstr "Kikke..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "Pakke `%s' kan ikke installeres\n"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "All packages,"
-msgstr "Alle pakker,"
+msgid "Info..."
+msgstr "Info..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Alle pakker, alfabetisk"
+msgid "You need to insert the medium to continue"
+msgstr "Du må sette inn mediumet for å fortsette"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Copying file for media `%s'..."
+msgstr "Kopierer fil for kilde `%s'..."
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Mandrake valg"
+msgid "Remove"
+msgstr "Fjern"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Normal updates"
-msgstr "Normale oppdateringer"
+msgid "Preparing packages installation..."
+msgstr "Forbereder pakker for installasjon..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Bugfixes updates"
-msgstr "Vis bugfiks-oppdateringer"
+msgid "by media repository"
+msgstr "ved kildelager"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Security updates"
-msgstr "Vis sikkerhetsoppdateringer"
+msgid "No mirror"
+msgstr "Speil:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Description: "
-msgstr "Beskrivelser"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to fill up at least the two first entries."
+msgstr "Du må fylle opp minst de to første inngangene."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Grunn til oppdatering: "
+msgid "Install"
+msgstr "Installer"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Summary: "
-msgstr "Oppsummering"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Japan"
+msgstr "Japan"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Importance: "
-msgstr "Viktighet: "
+msgid "Do nothing"
+msgstr "Ikke gjør noe"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "%s KB"
-msgstr "%.1f KB"
+msgid "No update"
+msgstr "Utfør oppdateringer"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Size: "
-msgstr "Størrelse"
+msgid "Description: "
+msgstr "Beskrivelser"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Version: "
-msgstr "Versjon:"
+#, c-format
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr ""
+"Advarsel: det ser ut til at du forsøker å legge til så mange\n"
+"pakker at filsystemet ditt ikke har nok ledig diskplass\n"
+"under eller etter pakkeinstallasjon ; dette er spesielt\n"
+"farlig bør gjøres med forsiktighet.\n"
+"\n"
+"Ønsker du virkelig å installere alle valgte pakker?"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -583,84 +717,63 @@ msgstr "Navn: %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Installert versjon: "
+msgid "Inspect..."
+msgstr "Sjekk..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Source: "
-msgstr "Kilde"
+msgid "Editing media \"%s\":"
+msgstr "Rediger kilde \"%s\":"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "(Not available)"
-msgstr "(Ingen tilgjengelig)"
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "Forbereder pakker for installasjon..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Changelog:\n"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Files:\n"
-msgstr "/_Fil"
+msgid "Australia"
+msgstr "Australia"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Selected size: %d MB"
-msgstr "%d valgte pakker: %.1f MB"
+msgid "Installation finished"
+msgstr "Installert"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Valgte: %d MB / Ledig diskplass: %d MB"
+msgid "by update availability"
+msgstr "ved oppdateringstilgjengelighet"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
-msgstr ""
-"På grunn av disses avhengigheter, må følgende pakke(r) velges\n"
-"vekk nå:\n"
-"\n"
+msgid "Poland"
+msgstr "Polen"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr ""
-"Beklager, følgende pakke(r) kan ikke velges:\n"
-"\n"
+msgid "Version: "
+msgstr "Versjon:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "er i konflikt"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Du kan spesifisere en /bruker/passord for proxy autentifiseringen:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Pakke `%s' kan ikke installeres\n"
+msgid "Upgradable"
+msgstr "Oppdater"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
-msgstr ""
-"For å tilfredstille avhengigheter, må følgende pakke(r) også\n"
-"installeres:\n"
-"\n"
+msgid " done."
+msgstr " ferdig."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Software Packages Installation"
+msgstr "Forbereder pakker for installasjon..."
 
 #: ../rpmdrake:1
 #, c-format
@@ -669,645 +782,532 @@ msgstr "Ytterligere pakker trengs"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "Pakke `%s' kan ikke installeres\n"
+msgid "Bugfixes updates"
+msgstr "Vis bugfiks-oppdateringer"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
-"Beklager, men fjerning av disse pakkene vil ødelegge systemet ditt:\n"
-"\n"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "Nedlastning av `%s', tid som gjenstår:%s, hastighet:%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"På grunn av disses avhengigheter, trenger følgende pakke(r) også\n"
-"å bli fjernet:\n"
-"\n"
+msgid "Germany"
+msgstr "Tyskland"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Noen ytterligere pakker renger å fjernes"
+msgid "Russia"
+msgstr "Russland"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "More information on package..."
-msgstr "Mere informasjon om pakke..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Information on packages"
-msgstr "Velg pakkene dine"
+msgid "Norway"
+msgstr "Norge"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "More info"
-msgstr "Mere info"
+msgid "Problem during installation"
+msgstr "Det oppsto problemer under installasjonen"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Addable"
-msgstr "Kan legge til"
+msgid "Search"
+msgstr "søk"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Upgradable"
-msgstr "Oppdater"
+msgid "Edit a media"
+msgstr "Rediger en kilde"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
+msgstr "Sjekkiske Republikk"
 
 #: ../rpmdrake:1
 #, c-format
 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."
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"Listen over oppdateringer er tom. Dette betyr enten at det ikke er\n"
-"noen tilgjengelige oppdateringer for pakkene som er installert på\n"
-"din maskin, eller at du allerede har installert alle sammen."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "No update"
-msgstr "Utfør oppdateringer"
+#, c-format
+msgid "Stop"
+msgstr "Stopp"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(none)"
-msgstr "(ingen)"
+msgid "Update"
+msgstr "Oppdater"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, listing packages..."
+msgid "Please wait, removing packages..."
 msgstr ""
 "Vennligst vent\n"
 "Sorterer pakker"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "ukjent"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "One of the following packages is needed:"
-msgstr "En av følgende pakker behøves:"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Vennligst velg"
+msgid "Normal information"
+msgstr "Normal informasjon"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr "Konflikter oppdaget"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Selected"
+msgid "Media: "
 msgstr ""
-"Velg\n"
-"alle"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Search results"
-msgstr "Søkeresultater"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Stop"
-msgstr "Stopp"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Vennligst vent, søker..."
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Search results (none)"
-msgstr "Søkeresultater (ingen)"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "Laster ned pakke `%s' (%s/%s)..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Other"
-msgstr "Andre"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Valgte: %d MB / Ledig diskplass: %d MB"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the packages source editor!\n"
-"\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
+msgid "Media"
 msgstr ""
-"Velkommen til pakkekilde redigereren!\n"
-"\n"
-"Dette verktøyet vil hjelpe deg å konfigurere pakkekildene du ønsker å bruke "
-"på\n"
-"maskinen din. De vil da bli tilgjengelige til å installere ny "
-"programvarepakke\n"
-"eller å utføre oppdateringer."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Save and quit"
-msgstr "Lagre og avslutt"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Feil..."
+msgid "Spain"
+msgstr "Spania"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Update..."
-msgstr "Oppdater"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add..."
-msgstr "Legg til..."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Edit"
-msgstr "Rediger"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Source"
-msgstr "Kilde"
+msgid "Normal updates"
+msgstr "Normale oppdateringer"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Enabled?"
-msgstr "Slått på?"
+msgid "by selection state"
+msgstr "ved utvelgelsestilstand"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Configure sources"
-msgstr "Konfigurer kilder"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
+"Vennligst vent, laster ned adresser over speil fra MandrakeSoft website."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Password:"
-msgstr "Passord:"
+msgid "Login:"
+msgstr "Logg inn:"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "User:"
-msgstr "Brukernavn:"
+msgid "Adding a media:"
+msgstr "Legger til en kilde:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "Du kan spesifisere en /bruker/passord for proxy autentifiseringen:"
+msgid "Austria"
+msgstr "Østerrike"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy hostname:"
-msgstr "Proxy brukernavn:"
+msgid "Fatal error"
+msgstr "Fil feil"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
-msgstr ""
-"Hvis du trenger en proxy, entre vertsnavnet og en port (syntaks: <proxyvert[:"
-"port]>):"
+#, fuzzy, c-format
+msgid "Update..."
+msgstr "Oppdater"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure proxies"
-msgstr "Konfigurer proxier"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "Verifiserer signatur av `%s'..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Vennligst vent, oppdaterer media..."
+msgid "(none)"
+msgstr "(ingen)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "For å kunne lagre endringene må du settee inn et medium i stasjonen."
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
+"Beklager, men fjerning av disse pakkene vil ødelegge systemet ditt:\n"
+"\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "Du må sette inn mediumet for å fortsette"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Installerer pakke `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "Lagrer endringer"
+msgid "Currently installed version: "
+msgstr "Installert versjon: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Relativ sti til synthesis/hdlist:"
+msgid "Other"
+msgstr "Andre"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "Reason for update: "
+msgstr "Grunn til oppdatering: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "Rediger kilde \"%s\":"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Edit a source"
-msgstr "Rediger en kilde"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Please wait, removing medium..."
-msgstr "Vennligst vent, fjerner media..."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Type of source:"
-msgstr "Type kilde:"
+msgid "Please choose the desired mirror."
+msgstr ""
+"Vennligst vent\n"
+"Henter liste over speil"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Legger til en kilde:"
+msgid "Edit"
+msgstr "Rediger"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, finding available packages..."
 msgstr ""
-"Det er allerede et media med det navnet, vil du\n"
-"virkelig bytte det ut?"
+"Vennligst vent\n"
+"Sorterer pakker"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Du må fylle opp minst de to første inngangene."
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Relativ sti til synthesis/hdlist:"
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Name:"
-msgstr "Navn"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
+msgstr "Søkeresultater (ingen)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Login:"
-msgstr "Logg inn:"
+msgid "Danmark"
+msgstr "Danmark"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr "Velg et speil..."
+msgid "China"
+msgstr "Kina"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Browse..."
-msgstr "Kikke..."
+msgid "United States"
+msgstr "USA"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Path or mount point:"
-msgstr "Sti eller monteringspunkt:"
+msgid "changes:"
+msgstr "endringer:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Removable device"
-msgstr "Fjernbar enhet"
+msgid "Some additional packages need to be removed"
+msgstr "Noen ytterligere pakker renger å fjernes"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "HTTP tjener"
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "FTP tjener"
+msgid "No"
+msgstr "Nei"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Path:"
-msgstr "Port:"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Local files"
-msgstr "Lokale filer"
+msgid "Configure medias"
+msgstr "Konfigurer kilder"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add a source"
+#, fuzzy, c-format
+msgid "Add a media"
 msgstr "Legg til en kilde"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr "Kan ikke oppdatere media, den vil bli automatisk slått av."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Unable to create medium."
-msgstr "Kan ikke opprette media."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Update"
-msgstr "Oppdater"
+msgid "Summary: "
+msgstr "Oppsummering"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Velg kilden(e) du ønsker å oppdatere:"
+msgid "Canada"
+msgstr "Canada"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Vennligst vent, oppdaterer media..."
+msgid "Greece"
+msgstr "Hellas"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid " failed!"
-msgstr " feilet!"
+msgid ""
+"There was an error downloading the mirrors list:\n"
+"\n"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
+msgstr ""
+"Det oppsto en feil ved nedlasting av liste over speil:\n"
+"\n"
+"%s\n"
+"Nettverket, eller MandrakeSoft website, er kanskje ikke tilgjengelig.\n"
+"Vennligst prøv igjen senere."
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid " done."
-msgstr " ferdig."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Du må være root for å installere pakker, beklager"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "Nedlastning av `%s', hastighet:%s"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Path:"
+msgstr "Port:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "Nedlastning av `%s', tid som gjenstår:%s, hastighet:%s"
+msgid "Problem during removal"
+msgstr "Problem under fjerning"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "Verifiserer signatur av `%s'..."
+msgid "Selected"
+msgstr ""
+"Velg\n"
+"alle"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "Utforsker fjern fil fra kilde `%s'..."
+msgid "Netherlands"
+msgstr "Nederland"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "Utforsker fil fra kilde `%s'..."
+msgid "Addable"
+msgstr "Kan legge til"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "Kopierer fil for kilde `%s'..."
+msgid "(Not available)"
+msgstr "(Ingen tilgjengelig)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please choose the desired mirror."
-msgstr ""
-"Vennligst vent\n"
-"Henter liste over speil"
-
-#: ../rpmdrake.pm:1
-#, c-format
 msgid ""
-"I can't find any suitable mirror.\n"
+"Sorry, the following package(s) can't be selected:\n"
 "\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
-msgstr ""
-"Jeg kan ikke finne noen passende speil.\n"
+"%s\n"
 "\n"
-"Det kan være mange årsaker til dette problemet; den mest vanlige er\n"
-"når arkitekturen til prosessoren din ikke er støttet\n"
-"av Mandrake Linux offisielle oppdateringer."
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "No mirror"
-msgstr "Speil:"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid ""
-"There was an error downloading the mirrors list:\n"
+"Reasons follow:\n"
 "\n"
-"%s\n"
-"The network, or MandrakeSoft website, are maybe unavailable.\n"
-"Please try again later."
+"%s"
 msgstr ""
-"Det oppsto en feil ved nedlasting av liste over speil:\n"
+"Beklager, følgende pakke(r) kan ikke velges:\n"
 "\n"
-"%s\n"
-"Nettverket, eller MandrakeSoft website, er kanskje ikke tilgjengelig.\n"
-"Vennligst prøv igjen senere."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Not selected"
+msgstr "Konflikter oppdaget"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
-msgstr "Feil under nedlasting"
+msgid "Software Packages Removal"
+msgstr "Fjerning av programvarepakker"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
-"Vennligst vent, laster ned adresser over speil fra MandrakeSoft website."
+msgid "Sweden"
+msgstr "Sverige"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
 "\n"
-"Is it ok to continue?"
+"\n"
+"Error(s) reported:\n"
+"%s"
 msgstr ""
-"Jeg må kontakte MandrakeSoft website for å få listen over speil.\n"
-"Vennligst sjekk at nettverket ditt er opp og går.\n"
 "\n"
-"Er det ok å fortsette?"
+"\n"
+"Feil rapportert:\n"
+"%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United States"
-msgstr "USA"
+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 ""
+"Listen over oppdateringer er tom. Dette betyr enten at det ikke er\n"
+"noen tilgjengelige oppdateringer for pakkene som er installert på\n"
+"din maskin, eller at du allerede har installert alle sammen."
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "China"
-msgstr "Kina"
+#, fuzzy, c-format
+msgid "Examining file of media `%s'..."
+msgstr "Utforsker fil fra kilde `%s'..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Storbritannia"
+msgid "Download of `%s', speed:%s"
+msgstr "Nedlastning av `%s', hastighet:%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Taiwan"
+msgid "One of the following packages is needed:"
+msgstr "En av følgende pakker behøves:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Sweden"
-msgstr "Sverige"
+msgid "Quit"
+msgstr "Avslutt"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Russia"
-msgstr "Russland"
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Jeg må kontakte speilet for å få tak i siste oppdateringspakker.\n"
+"Vennligst sjekk at nettverket ditt er oppe og går.\n"
+"\n"
+"Er det ok å fortsette?"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Portugal"
-msgstr "Port:"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Poland"
-msgstr "Polen"
+msgid "Update media(s)"
+msgstr "Oppdaterer kilde(r)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Norway"
-msgstr "Norge"
+msgid "Ok"
+msgstr "Ok"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Netherlands"
-msgstr "Nederland"
+msgid "Please wait, adding medium..."
+msgstr "Vennligst vent, legger til media..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Korea"
-msgstr "Tving"
+msgid "Unable to get source packages."
+msgstr "Velg pakkene dine"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "Japan"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Italy"
-msgstr "Installer"
+msgid "Too many packages are selected"
+msgstr "For mange pakker er valgt"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Israel"
-msgstr "Installer"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Greece"
-msgstr "Hellas"
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"Velkommen til pakkekilde redigereren!\n"
+"\n"
+"Dette verktøyet vil hjelpe deg å konfigurere pakkekildene du ønsker å bruke "
+"på\n"
+"maskinen din. De vil da bli tilgjengelige til å installere ny "
+"programvarepakke\n"
+"eller å utføre oppdateringer."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "France"
-msgstr "Tving"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Finland"
-msgstr "Finland"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Spain"
-msgstr "Spania"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Danmark"
-msgstr "Danmark"
+msgid "%s conflicts with %s"
+msgstr "er i konflikt"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "Tyskland"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Velkommen til MandrakeUpdate!\n"
+"\n"
+"Dette verktøyet vil hjelpe deg å velge oppdateringene du skal installere\n"
+"på maskinen din."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Sjekkiske Republikk"
+msgid "Mandrake choices"
+msgstr "Mandrake valg"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Costa Rica"
+msgid "Changelog:\n"
+msgstr "Changelog:\n"
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Canada"
-msgstr "Canada"
+#, fuzzy, c-format
+msgid "Korea"
+msgstr "Tving"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Brazil"
-msgstr "Brasil"
+msgid "Removable device"
+msgstr "Fjernbar enhet"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Belgia"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Australia"
+msgid "Change medium"
+msgstr "Endre media"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Austria"
-msgstr "Østerrike"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mandrake Update"
+msgstr "MandrakeUpdates valg"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
-msgstr "Info..."
+msgid "by size"
+msgstr "ved størrelse"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "Nei"
+msgid "FTP server"
+msgstr "FTP tjener"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Files:\n"
+msgstr "/_Fil"
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Yes"
-msgstr "Ja"
+#, fuzzy, c-format
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr "Kan ikke oppdatere media, den vil bli automatisk slått av."
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -1581,6 +1581,13 @@ msgstr "Fjerner programvare"
 msgid "Software Sources Manager"
 msgstr "Programvare kilde håndterer"
 
+#, fuzzy
+#~ msgid "Source: "
+#~ msgstr "Kilde"
+
+#~ msgid "Source"
+#~ msgstr "Kilde"
+
 #~ msgid ""
 #~ "some packages failed to install\n"
 #~ "correctly"
@@ -1619,9 +1626,6 @@ msgstr "Programvare kilde håndterer"
 #~ "\n"
 #~ "Vil du prøve et annet speil?"
 
-#~ msgid "Error adding update medium"
-#~ msgstr "Kunne ikke legge til oppdateringsmedia"
-
 #~ msgid "Please wait, contacting mirror to initialize updates packages."
 #~ msgstr ""
 #~ "Vennligst vent, kontakter speil for å initialisere oppdateringspakker."
diff --git a/po/pl.po b/po/pl.po
index cff1a640..19ed0585 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: 2003-05-13 23:54+0200\n"
 "Last-Translator: Arkadiusz Lipiec <alipiec@elka.pw.edu.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -13,16 +13,20 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"Czy chcesz kontynuować?"
+msgid "Enabled?"
+msgstr "WÅ‚Ä…czone?"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Ścieżka lub punkt montowania:"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Portugal"
+msgstr "Portugalia"
 
 #: ../rpmdrake:1
 #, c-format
@@ -41,104 +45,54 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"Witaj w MandrakeUpdate!\n"
-"\n"
-"To narzędzie pomoże ci wybrać aktualizacje, które możesz chcieć\n"
-"zainstalować na tym komputerze."
-
-#: ../rpmdrake:1
-#, c-format
-msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
-msgstr ""
-"Witaj w narzędziu usuwania oprogramowania!\n"
-"\n"
-"To narzędzie pomoże ci wybrać programy, które mogą zostać usunięte\n"
-"z komputera."
-
-#: ../rpmdrake:1
-#, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Wystąpił błąd podczas usuwania pakietów:\n"
-"\n"
-"%s"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Problem during removal"
-msgstr "Problem podczas usuwania"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Please wait, removing packages..."
-msgstr "Proszę czekać, usuwanie pakietów..."
+msgid "by group"
+msgstr "według grupy"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Proszę czekać, odczytywanie bazy danych pakietów..."
+msgid "Name:"
+msgstr "Nazwa:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Wystąpił błąd podczas instalacji pakietów:\n"
-"\n"
-"%s"
+msgid "Italy"
+msgstr "WÅ‚ochy"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation failed"
-msgstr "Instalacja zakończona niepowodzeniem"
+msgid "How to choose manually your mirror"
+msgstr "Sposób ręcznego wyboru serwera zwierciadlanego"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Nierozpoznany błąd: nie znaleziono pakietu do instalacji, sorry."
+msgid "URL:"
+msgstr "URL:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "No package found for installation."
-msgstr "Nie znaleziono pakietu do instalacji."
+msgid "Some packages need to be removed"
+msgstr "Niektóre pakiety muszą zostać usunięte"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Wszystkie żądane pakiety zostały pomyślnie zainstalowane."
+msgid "More information on package..."
+msgstr "Więcej informacji o pakiecie..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Wszystko zostało pomyślnie zainstalowane"
+msgid "Yes"
+msgstr "Tak"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
 msgstr ""
-"Zakończono instalację; %s.\n"
+"Z powodu swoich zależności, poniższe pakiety muszą zostać\n"
+"teraz odznaczone:\n"
 "\n"
-"Pewne pliki konfiguracyjne zostały utworzone jako `.rpmnew' lub `.rpmsave',\n"
-"Można je sprawdzić aby podjąć odpowiednie działanie:"
 
 #: ../rpmdrake:1
 #, c-format
@@ -147,463 +101,453 @@ msgstr "wszystko zostało pomyślnie zainstalowane"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Problem during installation"
-msgstr "Wystąpił problem podczas instalacji"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Instalowanie pakietu \"%s\" (%s/%s)..."
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Preparing packages installation..."
-msgstr "Przygotowywanie instalacji pakietów..."
+msgid "%s KB"
+msgstr "%s KB"
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
 "\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"Then, restart MandrakeUpdate."
 msgstr ""
+"Można także wybrać żądany serwer zwierciadlany ręcznie: aby\n"
+"to zrobić, uruchom Menedżera Źródeł Oprogramowania, a następnie\n"
+"dodaj źródło \"Aktualizacje z dziedziny bezpieczeństwa\".\n"
 "\n"
-"\n"
-"Zgłoszono błąd(błędy):\n"
-"%s"
-
-#: ../rpmdrake:1
-#, c-format
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"Instalacja nie powiodła się, brak niektórych plików.\n"
-"Może zachodzić potrzeba aktualizacji bazy danych źródeł."
+"Następnie ponownie uruchom MandrakeUpdate."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
+"Welcome to the software removal tool!\n"
 "\n"
-"Do you want to continue installation?"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
 msgstr ""
-"Poniższe pakiety posiadają niepoprawne podpisy:\n"
-"\n"
-"%s\n"
+"Witaj w narzędziu usuwania oprogramowania!\n"
 "\n"
-"Czy chcesz kontynuować instalację?"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Verifying packages signatures..."
-msgstr "Weryfikowanie podpisów pakietów..."
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Pobieranie pakietu \"%s\" (%s/%s)..."
+"To narzędzie pomoże ci wybrać programy, które mogą zostać usunięte\n"
+"z komputera."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Cancel"
-msgstr "Anuluj"
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "By zapisać zmiany, musisz włożyć nośnik do napędu."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid "Save and quit"
+msgstr "Zapisz i zakończ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Wsuń nośnik oznaczony \"%s\" do urządzenia [%s]"
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"Wystąpił błąd podczas usuwania pakietów:\n"
+"\n"
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Change medium"
-msgstr "Zmień nośnik"
+msgid "Size: "
+msgstr "Rozmiar: "
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Initializing..."
-msgstr "Inicjalizacja..."
+msgid "Security updates"
+msgstr "Aktualizacje z dziedziny bezpieczeństwa"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Package installation..."
-msgstr "Instalacja pakietów..."
+#, fuzzy, c-format
+msgid "Already existing update medias"
+msgstr "Już istniejące źródła aktulizacyjne"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Niestety, nie można pobrać pakietów źródłowych. %s"
+msgid "Maximum information"
+msgstr "Maksimum informacji"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Unable to get source packages."
-msgstr "Nie można pobrać pakietów źródłowych."
+msgid "Proxy..."
+msgstr "Pośrednik..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Inspect..."
-msgstr "Sprawdzaj..."
+#, fuzzy, c-format
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
+msgstr ""
+"Instalacja nie powiodła się, brak niektórych plików.\n"
+"Może zachodzić potrzeba aktualizacji bazy danych źródeł."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Installation finished"
-msgstr "Instalacja zakończona"
+msgid "United Kingdom"
+msgstr "Wielka Brytania"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Nic nie rób"
+msgid "in names"
+msgstr "w nazwach"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Użyj .%s jako plik podstawowy"
+msgid ""
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
+msgstr ""
+"Nie można znaleźć odpowiedniego serwera zwierciadlanego.\n"
+"\n"
+"Może być kilka przyczyn tego problemu: najczęstszy jest przypadek\n"
+"gdy architektura tego procesora nie jest obsługiwana przez Oficjalne\n"
+"Aktualizacje Pakietów Mandrake."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Remove .%s"
 msgstr "Usuń %s"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "changes:"
-msgstr "zmiany:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspecting %s"
-msgstr "Sprawdzanie %s"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Proszę czekać, wyszukiwanie dostępnych pakietów..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "Proszę czekać, dodawanie nośnika..."
+msgid "Finland"
+msgstr "Finlandia"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
+"The following packages have bad signatures:\n"
 "\n"
-"Then, restart MandrakeUpdate."
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"Można także wybrać żądany serwer zwierciadlany ręcznie: aby\n"
-"to zrobić, uruchom Menedżera Źródeł Oprogramowania, a następnie\n"
-"dodaj źródło \"Aktualizacje z dziedziny bezpieczeństwa\".\n"
+"Poniższe pakiety posiadają niepoprawne podpisy:\n"
 "\n"
-"Następnie ponownie uruchom MandrakeUpdate."
+"%s\n"
+"\n"
+"Czy chcesz kontynuować instalację?"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Examining distant file of media `%s'..."
+msgstr "Badanie odległego pliku źródła \"%s\"..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "Sposób ręcznego wyboru serwera zwierciadlanego"
+msgid "Verifying packages signatures..."
+msgstr "Weryfikowanie podpisów pakietów..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
-msgstr ""
-"Posiadasz już co najmniej jedno skonfigurowane źródło aktualizacyjne\n"
-"lecz wszystkie są aktualnie wyłączone. Należy uruchomić Menedżera\n"
-"Źródeł Oprogramowania aby włączyć co najmniej jedno (zaznacz je\n"
-"w kolumnie WÅ‚Ä…czone?).\n"
-"\n"
-"Następnie uruchom ponownie MandrakeUpdate."
+msgid "France"
+msgstr "Francja"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "Already existing update sources"
-msgstr "Już istniejące źródła aktulizacyjne"
+msgid "More info"
+msgstr "Więcej info"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
+"%s\n"
 "\n"
 "Is it ok to continue?"
 msgstr ""
-"Konieczne jest skontaktowanie siÄ™ z serwerem zwierciadlanym\n"
-"w celu pobrania najnowszych pakietów aktualizacyjnych.\n"
-"Sprawdź, czy sieć jest aktualnie włączona.\n"
+"%s\n"
 "\n"
 "Czy chcesz kontynuować?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr "Wystąpił poważny błąd: %s."
+msgid "Reload the packages list"
+msgstr "Przeładuj listę pakietów"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Fatal error"
-msgstr "Poważny błąd"
+msgid "Choose a mirror..."
+msgstr "Wybierz serwer zwierciadlany..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Software Packages Installation"
-msgstr "Instalacja pakietów oprogramowania"
+msgid "Some packages can't be installed"
+msgstr "Nie można zainstalować niektórych pakietów"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Aktualizacja Mandrake"
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "Nierozpoznany błąd: nie znaleziono pakietu do instalacji, sorry."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Usuwanie pakietów oprogramowania"
+msgid "All packages,"
+msgstr "Wszystkie pakiety,"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Quit"
-msgstr "Zakończ"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Type of media:"
+msgstr "Rodzaj źródła:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Zainstaluj"
+msgid "in files"
+msgstr "w plikach"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "Usuń"
+msgid "All requested packages were installed successfully."
+msgstr "Wszystkie żądane pakiety zostały pomyślnie zainstalowane."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Help"
-msgstr "Pomoc"
+msgid "Proxy hostname:"
+msgstr "Serwer proxy:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search"
-msgstr "Wyszukaj"
+msgid "Local files"
+msgstr "Lokalne pliki"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Znajdź:"
+msgid "Inspecting %s"
+msgstr "Sprawdzanie %s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Poniższe pakiety muszą zostać usunięte aby inne mogły być zaktualizowane:\n"
-"\n"
-"%s\n"
-"\n"
-"Czy chcesz kontynuować?"
+msgid "Israel"
+msgstr "Izrael"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Niektóre pakiety muszą zostać usunięte"
+msgid "Help"
+msgstr "Pomoc"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
-"\n"
-"Do you really want to install all the selected packages?"
-msgstr ""
-"Ostrzeżenie: wygląda na to, że próbujesz dodać za dużo\n"
-"pakietów i na twoim systemie plików może zabraknąć wolnego\n"
-"miejsca w czasie lub po instalacji pakietu; to jest sytuacja\n"
-"szczególnie niebezpieczna i należy ją traktować z ostrożnością.\n"
-"\n"
-"Czy naprawdę chcesz zainstalować wszystkie zaznaczone pakiety?"
+msgid "HTTP server"
+msgstr "Serwer HTTP"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Wybrano zbyt wiele pakietów"
+msgid "Installation failed"
+msgstr "Instalacja zakończona niepowodzeniem"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "Maksimum informacji"
+msgid "Use .%s as main file"
+msgstr "Użyj .%s jako plik podstawowy"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Normal information"
-msgstr "Podstawowe informacje"
+msgid "Search results"
+msgstr "Wyniki wyszukiwania"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Update source(s)"
-msgstr "Aktualizacja nośnika(-ów)"
+msgid " failed!"
+msgstr " niepowodzenie!"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Przeładuj listę pakietów"
+msgid "Brazil"
+msgstr "Brazylia"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reset the selection"
-msgstr "Usuń zaznaczenie"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"Już istnieje nośnik o tej nazwie, czy naprawdę\n"
+"chcesz go zastąpić?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "w plikach"
+msgid "Find:"
+msgstr "Znajdź:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "w opisach"
+msgid "All packages, alphabetical"
+msgstr "Wszystkie pakiety, alfabetycznie"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "w nazwach"
+msgid "Please wait, searching..."
+msgstr "Proszę czekać, wyszukiwanie..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
-msgstr "według dostępności aktualizacji"
+msgid "Please wait, reading packages database..."
+msgstr "Proszę czekać, odczytywanie bazy danych pakietów..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by source repository"
-msgstr "według repozytorium źródłowego"
+msgid "unknown package "
+msgstr "nieznany pakiet "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by selection state"
-msgstr "według stanu zaznaczenia"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Wsuń nośnik oznaczony \"%s\" do urządzenia [%s]"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by size"
-msgstr "według rozmiaru"
+msgid "Reset the selection"
+msgstr "Usuń zaznaczenie"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by group"
-msgstr "według grupy"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"Jeśli potrzebujesz proxy, wpisz nazwę komputera oraz opcjonalnie port "
+"(składnia: <proxyhost[:port]>):"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages,"
-msgstr "Wszystkie pakiety,"
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
+"Z powodu swoich zależności, poniższe pakiety także muszą zostać\n"
+"usunięte:\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Wszystkie pakiety, alfabetycznie"
+msgid "Costa Rica"
+msgstr "Kostaryka"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Lista wyboru Mandrake"
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Wystąpił błąd podczas instalacji pakietów:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
-msgstr "Zwykłe aktualizacje"
+msgid "Please wait, removing medium..."
+msgstr "Proszę czekać, usuwanie nośnika..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Aktualizacje poprawiające błędy"
+msgid "Password:"
+msgstr "Hasło:"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Security updates"
-msgstr "Aktualizacje z dziedziny bezpieczeństwa"
+msgid "Taiwan"
+msgstr "Tajwan"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Description: "
-msgstr "Opis:"
+msgid "User:"
+msgstr "Użytkownik:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Przyczyna uaktualnienia:"
+msgid "Please wait, updating medium..."
+msgstr "Proszę czekać, aktualizacja nośnika..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Summary: "
-msgstr "Podsumowanie: "
+msgid "Please wait, listing packages..."
+msgstr "Proszę czekać, wypisywanie pakietów..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Importance: "
-msgstr "Ważność: "
+msgid "Information on packages"
+msgstr "Informacje o pakietach"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Cancel"
+msgstr "Anuluj"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Size: "
-msgstr "Rozmiar: "
+msgid "Everything installed successfully"
+msgstr "Wszystko zostało pomyślnie zainstalowane"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Select the media(s) you wish to update:"
+msgstr "Wybierz źródła(-o) do aktualizacji:"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Version: "
-msgstr "Wersja: "
+msgid "Please wait, updating media..."
+msgstr "Proszę czekać, aktualizacja nośnika..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "Nazwa: "
+msgid "A fatal error occurred: %s."
+msgstr "Wystąpił poważny błąd: %s."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Aktualnie zainstalowana wersja:"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Poniższe pakiety muszą zostać usunięte aby inne mogły być zaktualizowane:\n"
+"\n"
+"%s\n"
+"\n"
+"Czy chcesz kontynuować?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Source: "
-msgstr "Źródło: "
+msgid "in descriptions"
+msgstr "w opisach"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(Not available)"
-msgstr "(Niedostępne)"
+msgid "Configure proxies"
+msgstr "Konfiguracja serwera proxy"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Dziennik zmian:\n"
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Konieczne jest skontaktowanie siÄ™ ze stronÄ… MandrakeSoft w celu\n"
+"pobrania listy serwerów zwierciadlanych.\n"
+"Sprawdź, czy sieć jest aktualnie włączona.\n"
+"\n"
+"Czy chcesz kontynuować?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Files:\n"
-msgstr "Plików:\n"
+msgid "Please choose"
+msgstr "Proszę wybrać"
 
 #: ../rpmdrake:1
 #, c-format
@@ -612,48 +556,28 @@ msgstr "Wybrany rozmiar: %d MB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Wybranych: %d MB / Miejsce na dysku: %d MB"
+msgid "Initializing..."
+msgstr "Inicjalizacja..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
-msgstr ""
-"Z powodu swoich zależności, poniższe pakiety muszą zostać\n"
-"teraz odznaczone:\n"
-"\n"
+msgid "Save changes"
+msgstr "Zapisz zmiany"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr ""
-"Niestety, poniższe pakiety nie mogą zostać wybrane:\n"
-"\n"
-"%s\n"
-"\n"
-"Z następujących powodów:\n"
-"\n"
-"%s"
+msgid "Error during download"
+msgstr "BÅ‚Ä…d podczas pobierania"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "%s conflicts with %s"
-msgstr "Pakiet %s koliduje z pakietem %s"
+msgid "Package installation..."
+msgstr "Instalacja pakietów..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages can't be installed"
-msgstr "Nie można zainstalować niektórych pakietów"
+msgid "Importance: "
+msgstr "Ważność: "
 
 #: ../rpmdrake:1
 #, c-format
@@ -666,311 +590,312 @@ msgstr ""
 "zostać zainstalowane:\n"
 "\n"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "Wymagane sÄ… dodatkowe pakiety"
+msgid "Add..."
+msgstr "Dodaj..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some packages can't be removed"
-msgstr "Nie można usunąć niektórych pakietów"
+msgid "Unable to create medium."
+msgstr "Nie można utworzyć nośnika."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Removing these packages would break your system, sorry:\n"
+"The installation is finished; %s.\n"
 "\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
 msgstr ""
-"Niestety, usunięcie tych pakietów może spowodować uszkodzenie systemu:\n"
+"Zakończono instalację; %s.\n"
 "\n"
+"Pewne pliki konfiguracyjne zostały utworzone jako `.rpmnew' lub `.rpmsave',\n"
+"Można je sprawdzić aby podjąć odpowiednie działanie:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"Z powodu swoich zależności, poniższe pakiety także muszą zostać\n"
-"usunięte:\n"
-"\n"
+msgid "Browse..."
+msgstr "PrzeglÄ…daj..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Zostanie usuniętych kilka dodatkowych pakietów"
+msgid "Some packages can't be removed"
+msgstr "Nie można usunąć niektórych pakietów"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "More information on package..."
-msgstr "Więcej informacji o pakiecie..."
+msgid "Info..."
+msgstr "Info..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Information on packages"
-msgstr "Informacje o pakietach"
+msgid "You need to insert the medium to continue"
+msgstr "Włóż nośnik, aby kontynuować"
 
-#. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:1
-#, c-format
-msgid "More info"
-msgstr "Więcej info"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Copying file for media `%s'..."
+msgstr "Kopiowanie pliku dla źródła \"%s\"..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Addable"
-msgstr "Dodawalne"
+msgid "Remove"
+msgstr "Usuń"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Upgradable"
-msgstr "Aktualizowalne"
+msgid "Preparing packages installation..."
+msgstr "Przygotowywanie instalacji pakietów..."
 
 #: ../rpmdrake:1
-#, c-format
-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 ""
-"Lista aktualizacji jest pusta. To oznacza, że albo brak jest\n"
-"dostępnych aktualizacji dla zainstalowanych pakietów lub też\n"
-"już zainstalowano wszystkie aktualizacje."
+#, fuzzy, c-format
+msgid "by media repository"
+msgstr "według repozytorium źródłowego"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "No update"
-msgstr "Brak aktualizacji"
+msgid "No mirror"
+msgstr "Brak serwerów zwierciadlanych"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
-msgstr "(brak)"
+msgid "You need to fill up at least the two first entries."
+msgstr "Należy wypełnić co najmniej dwa pierwsze pola."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Proszę czekać, wypisywanie pakietów..."
+msgid "Install"
+msgstr "Zainstaluj"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "unknown package "
-msgstr "nieznany pakiet "
+msgid "Japan"
+msgstr "Japonia"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Wymagany jest jeden z poniższych pakietów:"
+msgid "Do nothing"
+msgstr "Nic nie rób"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Proszę wybrać"
+msgid "No update"
+msgstr "Brak aktualizacji"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Description: "
+msgstr "Opis:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Not selected"
-msgstr "Nie wybrane"
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr ""
+"Ostrzeżenie: wygląda na to, że próbujesz dodać za dużo\n"
+"pakietów i na twoim systemie plików może zabraknąć wolnego\n"
+"miejsca w czasie lub po instalacji pakietu; to jest sytuacja\n"
+"szczególnie niebezpieczna i należy ją traktować z ostrożnością.\n"
+"\n"
+"Czy naprawdę chcesz zainstalować wszystkie zaznaczone pakiety?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected"
-msgstr "Wybrane"
+msgid "Name: "
+msgstr "Nazwa: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results"
-msgstr "Wyniki wyszukiwania"
+msgid "Inspect..."
+msgstr "Sprawdzaj..."
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing media \"%s\":"
+msgstr "Modyfikowanie Źródła \"%s\":"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Stop"
-msgstr "Zatrzymaj"
+msgid "No package found for installation."
+msgstr "Nie znaleziono pakietu do instalacji."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Proszę czekać, wyszukiwanie..."
+msgid "Australia"
+msgstr "Australia"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Wyniki wyszukiwania (brak)"
+msgid "Installation finished"
+msgstr "Instalacja zakończona"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Other"
-msgstr "Inne"
+msgid "by update availability"
+msgstr "według dostępności aktualizacji"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Welcome to the packages source editor!\n"
-"\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
-msgstr ""
-"Witaj w edytorze źródeł pakietów!\n"
-"\n"
-"To narzędzie pomoże ci skonfigurować źródła pakietów, które mogą być\n"
-"używane na komputerze. Będą one dostępne w celu instalacji nowych pakietów\n"
-"oprogramowania lub przy przeprowadzaniu aktualizacji."
+msgid "Poland"
+msgstr "Polska"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
-msgstr "Zapisz i zakończ"
+msgid "Version: "
+msgstr "Wersja: "
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Proxy..."
-msgstr "Pośrednik..."
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Możesz podać użytkownika/hasło dla uwierzytelniania pośrednika:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Update..."
-msgstr "Aktualizuj..."
+msgid "Upgradable"
+msgstr "Aktualizowalne"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Add..."
-msgstr "Dodaj..."
+msgid " done."
+msgstr " gotowe."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Edit"
-msgstr "Modyfikuj"
+msgid "Software Packages Installation"
+msgstr "Instalacja pakietów oprogramowania"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Source"
-msgstr "Źródło"
+msgid "Additional packages needed"
+msgstr "Wymagane sÄ… dodatkowe pakiety"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Enabled?"
-msgstr "WÅ‚Ä…czone?"
+msgid "Bugfixes updates"
+msgstr "Aktualizacje poprawiające błędy"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Configure sources"
-msgstr "Konfiguracja źródeł"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "Pobieranie pakietu \"%s\", czas zakończenia:%s, szybkość:%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Password:"
-msgstr "Hasło:"
+msgid "Germany"
+msgstr "Niemcy"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "User:"
-msgstr "Użytkownik:"
+msgid "Russia"
+msgstr "Rosja"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "Możesz podać użytkownika/hasło dla uwierzytelniania pośrednika:"
+msgid "Norway"
+msgstr "Norwegia"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "Serwer proxy:"
+msgid "Problem during installation"
+msgstr "Wystąpił problem podczas instalacji"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
-msgstr ""
-"Jeśli potrzebujesz proxy, wpisz nazwę komputera oraz opcjonalnie port "
-"(składnia: <proxyhost[:port]>):"
+msgid "Search"
+msgstr "Wyszukaj"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure proxies"
-msgstr "Konfiguracja serwera proxy"
+#, fuzzy, c-format
+msgid "Edit a media"
+msgstr "Modyfikuj Źródło"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Proszę czekać, aktualizacja nośnika..."
+msgid "Czech Republic"
+msgstr "Czechy"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
+#: ../rpmdrake:1
+#, fuzzy, c-format
 msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "By zapisać zmiany, musisz włożyć nośnik do napędu."
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"Posiadasz już co najmniej jedno skonfigurowane źródło aktualizacyjne\n"
+"lecz wszystkie są aktualnie wyłączone. Należy uruchomić Menedżera\n"
+"Źródeł Oprogramowania aby włączyć co najmniej jedno (zaznacz je\n"
+"w kolumnie WÅ‚Ä…czone?).\n"
+"\n"
+"Następnie uruchom ponownie MandrakeUpdate."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "Włóż nośnik, aby kontynuować"
+msgid "Stop"
+msgstr "Zatrzymaj"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Save changes"
-msgstr "Zapisz zmiany"
+msgid "Update"
+msgstr "Aktualizuj"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Względna ścieżka do pliku syntezy/hdlist:"
+msgid "Please wait, removing packages..."
+msgstr "Proszę czekać, usuwanie pakietów..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "Normal information"
+msgstr "Podstawowe informacje"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Editing source \"%s\":"
-msgstr "Modyfikowanie Źródła \"%s\":"
+msgid "Media: "
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Edit a source"
-msgstr "Modyfikuj Źródło"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "Pobieranie pakietu \"%s\" (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Proszę czekać, usuwanie nośnika..."
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Wybranych: %d MB / Miejsce na dysku: %d MB"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Type of source:"
-msgstr "Rodzaj źródła:"
+msgid "Media"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Dodawanie źródła:"
+msgid "Spain"
+msgstr "Hiszpania"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
-msgstr ""
-"Już istnieje nośnik o tej nazwie, czy naprawdę\n"
-"chcesz go zastąpić?"
+msgid "Normal updates"
+msgstr "Zwykłe aktualizacje"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Należy wypełnić co najmniej dwa pierwsze pola."
+msgid "by selection state"
+msgstr "według stanu zaznaczenia"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Name:"
-msgstr "Nazwa:"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "Proszę czekać, pobieranie adresów serwerów zwierciadlanych."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -978,146 +903,148 @@ msgid "Login:"
 msgstr "Login:"
 
 #: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Adding a media:"
+msgstr "Dodawanie źródła:"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr "Wybierz serwer zwierciadlany..."
+msgid "Austria"
+msgstr "Austria"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
-msgstr "PrzeglÄ…daj..."
+msgid "Fatal error"
+msgstr "Poważny błąd"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Path or mount point:"
-msgstr "Ścieżka lub punkt montowania:"
+msgid "Update..."
+msgstr "Aktualizuj..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "Napęd wymienny"
+msgid "Starting download of `%s'..."
+msgstr "Rozpoczynanie pobierania pakietu \"%s\"..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "Serwer HTTP"
+msgid "(none)"
+msgstr "(brak)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "FTP server"
-msgstr "Serwer FTP"
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
+"Niestety, usunięcie tych pakietów może spowodować uszkodzenie systemu:\n"
+"\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Path:"
-msgstr "Ścieżka:"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Instalowanie pakietu \"%s\" (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "Lokalne pliki"
+msgid "Currently installed version: "
+msgstr "Aktualnie zainstalowana wersja:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add a source"
-msgstr "Dodawanie źródła"
+msgid "Other"
+msgstr "Inne"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr ""
-"Nie można zaktualizować nośnika; zostanie automatycznie wyłączony.\n"
-"Błędy:\n"
-"%s"
+msgid "Reason for update: "
+msgstr "Przyczyna uaktualnienia:"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to create medium."
-msgstr "Nie można utworzyć nośnika."
+msgid "Please choose the desired mirror."
+msgstr "Wybierz serwer zwierciadlany."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "Aktualizuj"
+msgid "Edit"
+msgstr "Modyfikuj"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Wybierz źródła(-o) do aktualizacji:"
+msgid "Please wait, finding available packages..."
+msgstr "Proszę czekać, wyszukiwanie dostępnych pakietów..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Proszę czekać, aktualizacja nośnika..."
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Względna ścieżka do pliku syntezy/hdlist:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " failed!"
-msgstr " niepowodzenie!"
+msgid "Search results (none)"
+msgstr "Wyniki wyszukiwania (brak)"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid " done."
-msgstr " gotowe."
+msgid "Danmark"
+msgstr "Dania"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "Pobieranie pakietu \"%s\", szybkość:%s"
+msgid "China"
+msgstr "Chiny"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "Pobieranie pakietu \"%s\", czas zakończenia:%s, szybkość:%s"
+msgid "United States"
+msgstr "Stany Zjednoczone"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Starting download of `%s'..."
-msgstr "Rozpoczynanie pobierania pakietu \"%s\"..."
+msgid "changes:"
+msgstr "zmiany:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "Badanie odległego pliku źródła \"%s\"..."
+msgid "Some additional packages need to be removed"
+msgstr "Zostanie usuniętych kilka dodatkowych pakietów"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "Badanie pliku źródła \"%s\"..."
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "Kopiowanie pliku dla źródła \"%s\"..."
+msgid "No"
+msgstr "Nie"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure medias"
+msgstr "Konfiguracja źródeł"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a media"
+msgstr "Dodawanie źródła"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Please choose the desired mirror."
-msgstr "Wybierz serwer zwierciadlany."
+msgid "Summary: "
+msgstr "Podsumowanie: "
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
-msgstr ""
-"Nie można znaleźć odpowiedniego serwera zwierciadlanego.\n"
-"\n"
-"Może być kilka przyczyn tego problemu: najczęstszy jest przypadek\n"
-"gdy architektura tego procesora nie jest obsługiwana przez Oficjalne\n"
-"Aktualizacje Pakietów Mandrake."
+msgid "Canada"
+msgstr "Kanada"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No mirror"
-msgstr "Brak serwerów zwierciadlanych"
+msgid "Greece"
+msgstr "Grecja"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1134,179 +1061,252 @@ msgstr ""
 "Sieć lub strona www MandrakeSoft mogą być niedostępne.\n"
 "Spróbuj później ponownie."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
-msgstr "BÅ‚Ä…d podczas pobierania"
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Niestety, nie można pobrać pakietów źródłowych. %s"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr "Proszę czekać, pobieranie adresów serwerów zwierciadlanych."
+msgid "Path:"
+msgstr "Ścieżka:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Konieczne jest skontaktowanie siÄ™ ze stronÄ… MandrakeSoft w celu\n"
-"pobrania listy serwerów zwierciadlanych.\n"
-"Sprawdź, czy sieć jest aktualnie włączona.\n"
-"\n"
-"Czy chcesz kontynuować?"
+msgid "Problem during removal"
+msgstr "Problem podczas usuwania"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United States"
-msgstr "Stany Zjednoczone"
+msgid "Selected"
+msgstr "Wybrane"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "Chiny"
+msgid "Netherlands"
+msgstr "Holandia"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Wielka Brytania"
+msgid "Addable"
+msgstr "Dodawalne"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Tajwan"
+msgid "(Not available)"
+msgstr "(Niedostępne)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Sweden"
-msgstr "Szwecja"
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
+msgstr ""
+"Niestety, poniższe pakiety nie mogą zostać wybrane:\n"
+"\n"
+"%s\n"
+"\n"
+"Z następujących powodów:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Russia"
-msgstr "Rosja"
+msgid "Not selected"
+msgstr "Nie wybrane"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Portugal"
-msgstr "Portugalia"
+msgid "Software Packages Removal"
+msgstr "Usuwanie pakietów oprogramowania"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Poland"
-msgstr "Polska"
+msgid "Sweden"
+msgstr "Szwecja"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Norway"
-msgstr "Norwegia"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
+msgstr ""
+"\n"
+"\n"
+"Zgłoszono błąd(błędy):\n"
+"%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Netherlands"
-msgstr "Holandia"
+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 ""
+"Lista aktualizacji jest pusta. To oznacza, że albo brak jest\n"
+"dostępnych aktualizacji dla zainstalowanych pakietów lub też\n"
+"już zainstalowano wszystkie aktualizacje."
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Korea"
-msgstr "Korea"
+#, fuzzy, c-format
+msgid "Examining file of media `%s'..."
+msgstr "Badanie pliku źródła \"%s\"..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Japan"
-msgstr "Japonia"
+msgid "Download of `%s', speed:%s"
+msgstr "Pobieranie pakietu \"%s\", szybkość:%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Italy"
-msgstr "WÅ‚ochy"
+msgid "One of the following packages is needed:"
+msgstr "Wymagany jest jeden z poniższych pakietów:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Israel"
-msgstr "Izrael"
+msgid "Quit"
+msgstr "Zakończ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Greece"
-msgstr "Grecja"
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Konieczne jest skontaktowanie siÄ™ z serwerem zwierciadlanym\n"
+"w celu pobrania najnowszych pakietów aktualizacyjnych.\n"
+"Sprawdź, czy sieć jest aktualnie włączona.\n"
+"\n"
+"Czy chcesz kontynuować?"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update media(s)"
+msgstr "Aktualizacja nośnika(-ów)"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "France"
-msgstr "Francja"
+msgid "Ok"
+msgstr "Ok"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Finland"
-msgstr "Finlandia"
+msgid "Please wait, adding medium..."
+msgstr "Proszę czekać, dodawanie nośnika..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Spain"
-msgstr "Hiszpania"
+msgid "Unable to get source packages."
+msgstr "Nie można pobrać pakietów źródłowych."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Danmark"
-msgstr "Dania"
+msgid "Too many packages are selected"
+msgstr "Wybrano zbyt wiele pakietów"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"Witaj w edytorze źródeł pakietów!\n"
+"\n"
+"To narzędzie pomoże ci skonfigurować źródła pakietów, które mogą być\n"
+"używane na komputerze. Będą one dostępne w celu instalacji nowych pakietów\n"
+"oprogramowania lub przy przeprowadzaniu aktualizacji."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "Niemcy"
+msgid "%s conflicts with %s"
+msgstr "Pakiet %s koliduje z pakietem %s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Czechy"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Witaj w MandrakeUpdate!\n"
+"\n"
+"To narzędzie pomoże ci wybrać aktualizacje, które możesz chcieć\n"
+"zainstalować na tym komputerze."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Kostaryka"
+msgid "Mandrake choices"
+msgstr "Lista wyboru Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Canada"
-msgstr "Kanada"
+msgid "Changelog:\n"
+msgstr "Dziennik zmian:\n"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Brazil"
-msgstr "Brazylia"
+msgid "Korea"
+msgstr "Korea"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Removable device"
+msgstr "Napęd wymienny"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Belgia"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Australia"
+msgid "Change medium"
+msgstr "Zmień nośnik"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "Austria"
+msgid "Mandrake Update"
+msgstr "Aktualizacja Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
-msgstr "Info..."
+msgid "by size"
+msgstr "według rozmiaru"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "Nie"
+msgid "FTP server"
+msgstr "Serwer FTP"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "Plików:\n"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Yes"
-msgstr "Tak"
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr ""
+"Nie można zaktualizować nośnika; zostanie automatycznie wyłączony.\n"
+"Błędy:\n"
+"%s"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -1577,3 +1577,9 @@ msgstr "Usuwanie oprogramowania"
 #: data/rpmdrake-sources.desktop.in.h:1
 msgid "Software Sources Manager"
 msgstr "Menedżer źródeł oprogramowania"
+
+#~ msgid "Source: "
+#~ msgstr "Źródło: "
+
+#~ msgid "Source"
+#~ msgstr "Źródło"
diff --git a/po/pt.po b/po/pt.po
index 3a6f028e..a9b5d66d 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: 2003-02-14 08:31+0100\n"
 "Last-Translator: Fernando Ribeiro <fa.ribeiro(at)gmx.net>\n"
 "Language-Team: Portugal\n"
@@ -18,16 +18,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"Posso continuar?"
+msgid "Enabled?"
+msgstr "Activado?"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Caminho ou ponto de montagem:"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Portugal"
+msgstr "Portugal"
 
 #: ../rpmdrake:1
 #, c-format
@@ -46,104 +50,54 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"Seja bem-vindo ao MandrakeUpdate!\n"
-"\n"
-"Esta ferramenta vai ajudá-lo a escolher quais as actualizações que deseja\n"
-"instalar no seu computador."
+msgid "by group"
+msgstr "por grupo"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
-msgstr ""
-"Seja bem-vindo à ferramenta de remoção de programas!\n"
-"\n"
-"Esta ferramenta vai ajudá-lo a escolher quais os programas que deseja\n"
-"remover do seu computador."
+msgid "Name:"
+msgstr "Nome:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Ocorreu um erro durante a instalação dos pacotes:\n"
-"\n"
-"%s"
+msgid "Italy"
+msgstr "Instalar"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Problem during removal"
-msgstr "Problema durante a remoção"
+msgid "How to choose manually your mirror"
+msgstr "Como escolher manualmente o seu mirror"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "Por favor aguarde, a remover os pacotes..."
+msgid "URL:"
+msgstr "URL:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Por favor aguarde, a ler a base de dados dos pacotes..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Ocorreu um erro durante a instalação dos pacotes:\n"
-"\n"
-"%s"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Instalar tudo"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "A preparar o pacotes para a instalação..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "A preparar o pacotes para a instalação..."
+msgid "Some packages need to be removed"
+msgstr "Alguns pacotes necessitamser removidos"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Todos os pacotes pedidos foram instalados com sucesso."
+msgid "More information on package..."
+msgstr "Mais informação sobre o pacote..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Tudo se instalou com sucesso"
+msgid "Yes"
+msgstr "Sim"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
 msgstr ""
-"A instalação acabou; %s.\n"
+"Por forma a satisfazer as dependências,estes pacotes devem ser\n"
+"deseleccionados agora:\n"
 "\n"
-"Alguns ficheiros de configuração foram criados como `.rpmnew' ou\n"
-"`.rpmsave', pode agora verificá-los para agir em conformidade:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -151,459 +105,455 @@ msgid "everything was installed correctly"
 msgstr "Tudo se instalou com sucesso"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Ocorreram problemas durante a instalação"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "A instalar o pacote '%s' (%s/%s)..."
+msgid "%s KB"
+msgstr "%s KB"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "A preparar o pacotes para a instalação..."
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"Também pode escolher o servidor espelho desejado manualmente : para\n"
+"isso, lance o Gestor de Fontes de Programas, e adicione uma fonte\n"
+"de 'Actualizações de Segurança'.\n"
+"\n"
+"Depois, relance MandrakeUpdate."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
+"Welcome to the software removal tool!\n"
 "\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
 msgstr ""
+"Seja bem-vindo à ferramenta de remoção de programas!\n"
 "\n"
-"\n"
-"Erro(s) encontrados:\n"
-"%s"
+"Esta ferramenta vai ajudá-lo a escolher quais os programas que deseja\n"
+"remover do seu computador."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"A instalação falhou, falta alguns ficheiros.\n"
-"Talvez queira actualizar a base de dados das suas fontes."
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "Para gravar as mudanças, necessita inserir o média no leitor."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Gravar e sair"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
+"There was a problem during the removal of packages:\n"
 "\n"
-"Do you want to continue installation?"
+"%s"
 msgstr ""
-"Os pacotes seguintes têm de ser apagados para que os outros sejam "
-"actualizados:\n"
-"\n"
-"%s\n"
+"Ocorreu um erro durante a instalação dos pacotes:\n"
 "\n"
-"Posso continuar?"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "A descarregar o pacote '%s' (%s/%s)..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Cancel"
-msgstr "Cancelar"
+msgid "Size: "
+msgstr "Tamanho: "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid "Security updates"
+msgstr "Actualizações de segurança"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Por favor insira o média chamado \"%s\" no dispositivo [%s]"
+msgid "Already existing update medias"
+msgstr "Erro ao adicionar o média de actualização"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Change medium"
-msgstr "Mudar o média"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Initializing..."
-msgstr "A inicializar..."
+msgid "Maximum information"
+msgstr "Informações completas"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "A preparar o pacotes para a instalação..."
+msgid "Proxy..."
+msgstr "Erro..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Necessita ser root para instalar pacotes, lamento."
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Unable to get source packages."
-msgstr "Impossível descarregar os pacotes da fonte"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspect..."
-msgstr "Inspeccionar..."
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
+msgstr ""
+"A instalação falhou, falta alguns ficheiros.\n"
+"Talvez queira actualizar a base de dados das suas fontes."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Installation finished"
-msgstr "A instalação acabou"
+msgid "United Kingdom"
+msgstr "Reino Unido"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Não fazer nada"
+msgid "in names"
+msgstr "nos nomes"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Utilizar .%s como ficheiro principal"
+msgid ""
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
+msgstr ""
+"Não consigo encontrar nenhum servidor espelho que convenha.\n"
+"\n"
+"Há várias razoes para este problema ; a mais habitual é o caso\n"
+"em que a arquitectura do seu processador não é suportada pelas\n"
+"Actualizações Oficiais da Mandrake Linux."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Remove .%s"
 msgstr "Remover %s"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "changes:"
-msgstr "mudanças:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspecting %s"
-msgstr "A inspeccionar %s"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Por favor aguarde, a procurar os pacotes disponíveis..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "Por favor aguarde, a adicionar o média..."
+msgid "Finland"
+msgstr "Finlândia"
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
+"The following packages have bad signatures:\n"
 "\n"
-"Then, restart MandrakeUpdate."
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"Também pode escolher o servidor espelho desejado manualmente : para\n"
-"isso, lance o Gestor de Fontes de Programas, e adicione uma fonte\n"
-"de 'Actualizações de Segurança'.\n"
+"Os pacotes seguintes têm de ser apagados para que os outros sejam "
+"actualizados:\n"
 "\n"
-"Depois, relance MandrakeUpdate."
+"%s\n"
+"\n"
+"Posso continuar?"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "How to choose manually your mirror"
-msgstr "Como escolher manualmente o seu mirror"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Examining distant file of media `%s'..."
+msgstr "A examinar o ficheiro distante da fonte `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
+msgid "Verifying packages signatures..."
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Already existing update sources"
-msgstr ""
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "France"
+msgstr "Forçar"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "More info"
+msgstr "Mais informações"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
+"%s\n"
 "\n"
 "Is it ok to continue?"
 msgstr ""
-"Preciso contactar o servidor espelho para obter os últimos pacotes\n"
-"actualizados. Por favor verifique que a sua rede está a funcionar.\n"
+"%s\n"
 "\n"
 "Posso continuar?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Reload the packages list"
+msgstr "Recarregar a lista dos pacotes"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Escolha um mirror..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Erro de ficheiro"
+msgid "Some packages can't be installed"
+msgstr "O Pacote '%s' não pode ser instalado\n"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
+msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "A preparar o pacotes para a instalação..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Actualizações Mandrake"
+msgid "All packages,"
+msgstr "Todos os pacotes,"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Software Packages Removal"
-msgstr "Remover Pacotes de Programas"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Type of media:"
+msgstr "Tipo de fonte:"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Quit"
-msgstr "Sair"
+msgid "in files"
+msgstr "nos ficheiros"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Instalar"
+msgid "All requested packages were installed successfully."
+msgstr "Todos os pacotes pedidos foram instalados com sucesso."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove"
-msgstr "Remover"
+msgid "Proxy hostname:"
+msgstr "Nome do servidor proxy:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Help"
-msgstr "Ajuda"
+msgid "Local files"
+msgstr "Ficheiros Locais"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search"
-msgstr "Procurar"
+msgid "Inspecting %s"
+msgstr "A inspeccionar %s"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Find:"
-msgstr "Procurar:"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Israel"
+msgstr "Instalar"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Os pacotes seguintes têm de ser apagados para que os outros sejam "
-"actualizados:\n"
-"\n"
-"%s\n"
-"\n"
-"Posso continuar?"
+msgid "Help"
+msgstr "Ajuda"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Alguns pacotes necessitamser removidos"
+msgid "HTTP server"
+msgstr "Servidor HTTP"
 
 #: ../rpmdrake:1
-#, c-format
-msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
-"\n"
-"Do you really want to install all the selected packages?"
-msgstr ""
-"atenção : parece que está adicionando tantos pacotes que o\n"
-"seu sistema de ficheiros vai faltar de espaço, durante ou\n"
-"depois da instalação ; isto é muito perigoso e deveria ser\n"
-"considerado com atenção.\n"
-"\n"
-"Deseja mesmo assim instalar todos os pacotes seleccionados ?"
+#, fuzzy, c-format
+msgid "Installation failed"
+msgstr "Instalar tudo"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Demasiados pacotes seleccionados"
+msgid "Use .%s as main file"
+msgstr "Utilizar .%s como ficheiro principal"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "Informações completas"
+msgid "Search results"
+msgstr "Resultados da Pesquisa"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Normal information"
-msgstr "Informações normais"
+msgid " failed!"
+msgstr " falhou!"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Update source(s)"
-msgstr "Actualizar fonte(s)"
+msgid "Brazil"
+msgstr "Brasil"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Recarregar a lista dos pacotes"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"Já existe um média com este nome, quere\n"
+"substituir-lo mesmo?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "Inicializar a selecção"
+msgid "Find:"
+msgstr "Procurar:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "nos ficheiros"
+msgid "All packages, alphabetical"
+msgstr "Todos os pacotes, alfabeticamente"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "nas descrições"
+msgid "Please wait, searching..."
+msgstr "Por favor aguarde, a procurar..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "nos nomes"
+msgid "Please wait, reading packages database..."
+msgstr "Por favor aguarde, a ler a base de dados dos pacotes..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by update availability"
-msgstr "por disponibilidade de actualização"
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "Impossível abrir o pacote '%s'\n"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by source repository"
-msgstr "por fonte"
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Por favor insira o média chamado \"%s\" no dispositivo [%s]"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by selection state"
-msgstr "por estado de selecção"
+msgid "Reset the selection"
+msgstr "Inicializar a selecção"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by size"
-msgstr "por tamanho"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"Se precisa de um proxy, escreva o nome do servidor e em opção a porta "
+"(sintaxe <servidorproxy[:porta]>):"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-msgstr "por grupo"
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
+"Por forma a satisfazer as dependências,estes pacotes também\n"
+"necessitam ser removidos:\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "All packages,"
-msgstr "Todos os pacotes,"
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "All packages, alphabetical"
-msgstr "Todos os pacotes, alfabeticamente"
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Ocorreu um erro durante a instalação dos pacotes:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Selecção da Mandrake"
+msgid "Please wait, removing medium..."
+msgstr "Por favor aguarde, a remover o média..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
-msgstr "Actualizações normais"
+msgid "Password:"
+msgstr "Senha:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Actualizações de Correcção de Erros"
+msgid "Taiwan"
+msgstr "Taiwan"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Security updates"
-msgstr "Actualizações de segurança"
+msgid "User:"
+msgstr "Utilizador:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Description: "
-msgstr "Descrição: "
+msgid "Please wait, updating medium..."
+msgstr "Por favor aguarde, a actualizar o média..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Motivo de actualização: "
+msgid "Please wait, listing packages..."
+msgstr "Por favor aguarde, a listar os pacotes..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Summary: "
-msgstr "Resumo: "
+msgid "Information on packages"
+msgstr "Informação sobre os pacotes..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Importance: "
-msgstr "Importância: "
+msgid "Cancel"
+msgstr "Cancelar"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Everything installed successfully"
+msgstr "Tudo se instalou com sucesso"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Size: "
-msgstr "Tamanho: "
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Select the media(s) you wish to update:"
+msgstr "Seleccione as fontes que deseja actualizar:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Version: "
-msgstr "Versão: "
+msgid "Please wait, updating media..."
+msgstr "Por favor aguarde, a actualizar o média..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "Nome: "
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Versão actualmente instalada: "
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Os pacotes seguintes têm de ser apagados para que os outros sejam "
+"actualizados:\n"
+"\n"
+"%s\n"
+"\n"
+"Posso continuar?"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Source: "
-msgstr "Forçar"
+#, c-format
+msgid "in descriptions"
+msgstr "nas descrições"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(Not available)"
-msgstr "(Não disponível)"
+msgid "Configure proxies"
+msgstr "Configurar os proxies"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Evolução:\n"
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Preciso contactar o servidor MandrakeSoft para lhe pedir a lista dos\n"
+"servidores espelho. Por favor verifique que a sua rede está a funcionar.\n"
+"\n"
+"Posso continuar?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Files:\n"
-msgstr "Ficheiros:\n"
+msgid "Please choose"
+msgstr "Por favor escolha"
 
 #: ../rpmdrake:1
 #, c-format
@@ -612,43 +562,28 @@ msgstr "Tamanho da selecção: %d MB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Selecção: %d MB / Espaço disponível no disco: %d MB"
+msgid "Initializing..."
+msgstr "A inicializar..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
-msgstr ""
-"Por forma a satisfazer as dependências,estes pacotes devem ser\n"
-"deseleccionados agora:\n"
-"\n"
+msgid "Save changes"
+msgstr "Gravar alterações"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr ""
-"Lamento, os pacotes seguintes não podem ser seleccionados:\n"
-"\n"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "Erro ao descarregar"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "em conflito com"
+msgid "Package installation..."
+msgstr "A preparar o pacotes para a instalação..."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "O Pacote '%s' não pode ser instalado\n"
+#, c-format
+msgid "Importance: "
+msgstr "Importância: "
 
 #: ../rpmdrake:1
 #, c-format
@@ -661,311 +596,308 @@ msgstr ""
 "instalados:\n"
 "\n"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "Pacotes adicionais necessários"
+msgid "Add..."
+msgstr "Adicionar..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "O Pacote '%s' não pode ser instalado\n"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "Impossível criar o média."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Removing these packages would break your system, sorry:\n"
+"The installation is finished; %s.\n"
 "\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
 msgstr ""
-"Lamento, mas a remoção estes pacotes arruinará o seu sistema :\n"
+"A instalação acabou; %s.\n"
 "\n"
+"Alguns ficheiros de configuração foram criados como `.rpmnew' ou\n"
+"`.rpmsave', pode agora verificá-los para agir em conformidade:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"Por forma a satisfazer as dependências,estes pacotes também\n"
-"necessitam ser removidos:\n"
-"\n"
+msgid "Browse..."
+msgstr "Navegar..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "O Pacote '%s' não pode ser instalado\n"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Alguns pacotes adicionais necessitam ser apagados"
+msgid "Info..."
+msgstr "Informação..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "More information on package..."
-msgstr "Mais informação sobre o pacote..."
+msgid "You need to insert the medium to continue"
+msgstr "Necessita inserir o média para continuar"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Copying file for media `%s'..."
+msgstr "A copiar o ficheiro da fonte `%s'..."
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Information on packages"
-msgstr "Informação sobre os pacotes..."
+msgid "Remove"
+msgstr "Remover"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "More info"
-msgstr "Mais informações"
+msgid "Preparing packages installation..."
+msgstr "A preparar o pacotes para a instalação..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "by media repository"
+msgstr "por fonte"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "Instalar"
+msgid "No mirror"
+msgstr "Nenhum mirror"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Upgradable"
-msgstr "Actualizar"
+msgid "You need to fill up at least the two first entries."
+msgstr "Necessita preencher pelo menos as duas primeiras entradas."
 
 #: ../rpmdrake:1
 #, c-format
-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 ""
-"A lista das actualizações está vazia. Isto significa que ou\n"
-"não há actualizações para os pacotes instalados no seu\n"
-"computador, ou você já as instalou todas."
+msgid "Install"
+msgstr "Instalar"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "No update"
-msgstr "Nenhuma actualização"
+msgid "Japan"
+msgstr "Japão"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "(none)"
-msgstr "(nenhum)"
+msgid "Do nothing"
+msgstr "Não fazer nada"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Por favor aguarde, a listar os pacotes..."
+msgid "No update"
+msgstr "Nenhuma actualização"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "Impossível abrir o pacote '%s'\n"
+#, c-format
+msgid "Description: "
+msgstr "Descrição: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Um dos pacotes seguintes é preciso:"
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr ""
+"atenção : parece que está adicionando tantos pacotes que o\n"
+"seu sistema de ficheiros vai faltar de espaço, durante ou\n"
+"depois da instalação ; isto é muito perigoso e deveria ser\n"
+"considerado com atenção.\n"
+"\n"
+"Deseja mesmo assim instalar todos os pacotes seleccionados ?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Por favor escolha"
+msgid "Name: "
+msgstr "Nome: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Inspect..."
+msgstr "Inspeccionar..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Not selected"
-msgstr "Detectados conflitos"
+msgid "Editing media \"%s\":"
+msgstr "Edição da fonte \"%s\":"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Selected"
-msgstr "Selecionado"
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "A preparar o pacotes para a instalação..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results"
-msgstr "Resultados da Pesquisa"
+msgid "Australia"
+msgstr "Austrália"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Stop"
-msgstr "Parar"
+msgid "Installation finished"
+msgstr "A instalação acabou"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Por favor aguarde, a procurar..."
+msgid "by update availability"
+msgstr "por disponibilidade de actualização"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Resultados da Pesquisa (nenhum)"
+msgid "Poland"
+msgstr "Polónia"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Other"
-msgstr "Outro"
+msgid "Version: "
+msgstr "Versão: "
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the packages source editor!\n"
-"\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
-msgstr ""
-"Seja Bem-vindo ao editor de fontes de pacotes!\n"
-"\n"
-"Esta ferramenta vai ajudá-lo a escolher as fontes de pacotes que deseja\n"
-"utilizar no seu computador. Elas estarão então disponíveis para instalar\n"
-"novos programas ou para fazer actualizações."
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Pode indicar um utilizador/senha para a autenticação no proxy :"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
-msgstr "Gravar e sair"
+msgid "Upgradable"
+msgstr "Actualizar"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid " done."
+msgstr " feito."
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Erro..."
+msgid "Software Packages Installation"
+msgstr "A preparar o pacotes para a instalação..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Update..."
-msgstr "Actualizar..."
+msgid "Additional packages needed"
+msgstr "Pacotes adicionais necessários"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "Adicionar..."
+msgid "Bugfixes updates"
+msgstr "Actualizações de Correcção de Erros"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "Editar"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Source"
-msgstr "Forçar"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "Descarregamento de `%s', tempo restante: %s, velocidade: %s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Enabled?"
-msgstr "Activado?"
+msgid "Germany"
+msgstr "Alemanha"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Configure sources"
-msgstr "Configurar as fontes"
+msgid "Russia"
+msgstr "Rússia"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Password:"
-msgstr "Senha:"
+msgid "Norway"
+msgstr "Noruega"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "User:"
-msgstr "Utilizador:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during installation"
+msgstr "Ocorreram problemas durante a instalação"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "Pode indicar um utilizador/senha para a autenticação no proxy :"
+msgid "Search"
+msgstr "Procurar"
 
 #: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Edit a media"
+msgstr "Editar a fonte"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "Nome do servidor proxy:"
+msgid "Czech Republic"
+msgstr "Republica Checa"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"Se precisa de um proxy, escreva o nome do servidor e em opção a porta "
-"(sintaxe <servidorproxy[:porta]>):"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Configurar os proxies"
+msgid "Stop"
+msgstr "Parar"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Por favor aguarde, a actualizar o média..."
+msgid "Update"
+msgstr "Actualizar"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "Para gravar as mudanças, necessita inserir o média no leitor."
+msgid "Please wait, removing packages..."
+msgstr "Por favor aguarde, a remover os pacotes..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "Necessita inserir o média para continuar"
+msgid "Normal information"
+msgstr "Informações normais"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "Gravar alterações"
+msgid "Media: "
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Caminho relativo para síntese/hdlist:"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "A descarregar o pacote '%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "Edição da fonte \"%s\":"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Selecção: %d MB / Espaço disponível no disco: %d MB"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit a source"
-msgstr "Editar a fonte"
+msgid "Media"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Por favor aguarde, a remover o média..."
+msgid "Spain"
+msgstr "Espanha"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Type of source:"
-msgstr "Tipo de fonte:"
+msgid "Normal updates"
+msgstr "Actualizações normais"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Adding a source:"
-msgstr "A adicionar uma fonte:"
+msgid "by selection state"
+msgstr "por estado de selecção"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
-"Já existe um média com este nome, quere\n"
-"substituir-lo mesmo?"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Necessita preencher pelo menos as duas primeiras entradas."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Name:"
-msgstr "Nome:"
+"Por favor aguarde, estou a descarregar os endereços dos mirrors a partir da "
+"MandrakeSoft."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -973,143 +905,148 @@ msgid "Login:"
 msgstr "Login:"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Choose a mirror..."
-msgstr "Escolha um mirror..."
+#, fuzzy, c-format
+msgid "Adding a media:"
+msgstr "A adicionar uma fonte:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Browse..."
-msgstr "Navegar..."
+msgid "Austria"
+msgstr "Áustria"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Path or mount point:"
-msgstr "Caminho ou ponto de montagem:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Fatal error"
+msgstr "Erro de ficheiro"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Removable device"
-msgstr "Dispositivo amovível"
+msgid "Update..."
+msgstr "Actualizar..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "A verificar a assinatura de '%s'..."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "Servidor HTTP"
+msgid "(none)"
+msgstr "(nenhum)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "FTP server"
-msgstr "Servidor FTP"
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
+"Lamento, mas a remoção estes pacotes arruinará o seu sistema :\n"
+"\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Path:"
-msgstr "Caminho:"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "A instalar o pacote '%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "Ficheiros Locais"
+msgid "Currently installed version: "
+msgstr "Versão actualmente instalada: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add a source"
-msgstr "Adicionar uma fonte"
+msgid "Other"
+msgstr "Outro"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr "Impossível actualizar o média, irá ser automaticamente desactivado."
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "Motivo de actualização: "
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to create medium."
-msgstr "Impossível criar o média."
+msgid "Please choose the desired mirror."
+msgstr "Por favor escolha o mirror desejado."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "Actualizar"
+msgid "Edit"
+msgstr "Editar"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Seleccione as fontes que deseja actualizar:"
+msgid "Please wait, finding available packages..."
+msgstr "Por favor aguarde, a procurar os pacotes disponíveis..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Por favor aguarde, a actualizar o média..."
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Caminho relativo para síntese/hdlist:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " failed!"
-msgstr " falhou!"
+msgid "Search results (none)"
+msgstr "Resultados da Pesquisa (nenhum)"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid " done."
-msgstr " feito."
+msgid "Danmark"
+msgstr "Dinamarca"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "Descarregamento de `%s', velocidade:%s"
+msgid "China"
+msgstr "China"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "Descarregamento de `%s', tempo restante: %s, velocidade: %s"
+msgid "United States"
+msgstr "Estados Unidos"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "A verificar a assinatura de '%s'..."
+#: ../rpmdrake:1
+#, c-format
+msgid "changes:"
+msgstr "mudanças:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "A examinar o ficheiro distante da fonte `%s'..."
+msgid "Some additional packages need to be removed"
+msgstr "Alguns pacotes adicionais necessitam ser apagados"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "A examinar o ficheiro da fonte `%s'..."
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "A copiar o ficheiro da fonte `%s'..."
+msgid "No"
+msgstr "Não"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure medias"
+msgstr "Configurar as fontes"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a media"
+msgstr "Adicionar uma fonte"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Please choose the desired mirror."
-msgstr "Por favor escolha o mirror desejado."
+msgid "Summary: "
+msgstr "Resumo: "
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
-msgstr ""
-"Não consigo encontrar nenhum servidor espelho que convenha.\n"
-"\n"
-"Há várias razoes para este problema ; a mais habitual é o caso\n"
-"em que a arquitectura do seu processador não é suportada pelas\n"
-"Actualizações Oficiais da Mandrake Linux."
+msgid "Canada"
+msgstr "Canada"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No mirror"
-msgstr "Nenhum mirror"
+msgid "Greece"
+msgstr "Grécia"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1126,180 +1063,243 @@ msgstr ""
 "A rede, ou o servidor da MandrakeSoft, podem estar desligados.\n"
 "Por favor tente outra vez mais tarde."
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Error during download"
-msgstr "Erro ao descarregar"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Necessita ser root para instalar pacotes, lamento."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
-"Por favor aguarde, estou a descarregar os endereços dos mirrors a partir da "
-"MandrakeSoft."
+msgid "Path:"
+msgstr "Caminho:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Preciso contactar o servidor MandrakeSoft para lhe pedir a lista dos\n"
-"servidores espelho. Por favor verifique que a sua rede está a funcionar.\n"
-"\n"
-"Posso continuar?"
+msgid "Problem during removal"
+msgstr "Problema durante a remoção"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United States"
-msgstr "Estados Unidos"
+msgid "Selected"
+msgstr "Selecionado"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "China"
+msgid "Netherlands"
+msgstr "Holanda"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Reino Unido"
+msgid "Addable"
+msgstr "Instalar"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Taiwan"
+msgid "(Not available)"
+msgstr "(Não disponível)"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Sweden"
-msgstr "Suécia"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
+msgstr ""
+"Lamento, os pacotes seguintes não podem ser seleccionados:\n"
+"\n"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Russia"
-msgstr "Rússia"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Not selected"
+msgstr "Detectados conflitos"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Portugal"
-msgstr "Portugal"
+msgid "Software Packages Removal"
+msgstr "Remover Pacotes de Programas"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Poland"
-msgstr "Polónia"
+msgid "Sweden"
+msgstr "Suécia"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Norway"
-msgstr "Noruega"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
+msgstr ""
+"\n"
+"\n"
+"Erro(s) encontrados:\n"
+"%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Netherlands"
-msgstr "Holanda"
+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 ""
+"A lista das actualizações está vazia. Isto significa que ou\n"
+"não há actualizações para os pacotes instalados no seu\n"
+"computador, ou você já as instalou todas."
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Korea"
-msgstr "Forçar"
+msgid "Examining file of media `%s'..."
+msgstr "A examinar o ficheiro da fonte `%s'..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Japan"
-msgstr "Japão"
+msgid "Download of `%s', speed:%s"
+msgstr "Descarregamento de `%s', velocidade:%s"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Italy"
-msgstr "Instalar"
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Um dos pacotes seguintes é preciso:"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Israel"
-msgstr "Instalar"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Sair"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Greece"
-msgstr "Grécia"
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Preciso contactar o servidor espelho para obter os últimos pacotes\n"
+"actualizados. Por favor verifique que a sua rede está a funcionar.\n"
+"\n"
+"Posso continuar?"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "France"
-msgstr "Forçar"
+msgid "Update media(s)"
+msgstr "Actualizar fonte(s)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Finland"
-msgstr "Finlândia"
+msgid "Ok"
+msgstr "Ok"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Spain"
-msgstr "Espanha"
+msgid "Please wait, adding medium..."
+msgstr "Por favor aguarde, a adicionar o média..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Danmark"
-msgstr "Dinamarca"
+msgid "Unable to get source packages."
+msgstr "Impossível descarregar os pacotes da fonte"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "Alemanha"
+msgid "Too many packages are selected"
+msgstr "Demasiados pacotes seleccionados"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"Seja Bem-vindo ao editor de fontes de pacotes!\n"
+"\n"
+"Esta ferramenta vai ajudá-lo a escolher as fontes de pacotes que deseja\n"
+"utilizar no seu computador. Elas estarão então disponíveis para instalar\n"
+"novos programas ou para fazer actualizações."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
+msgstr "em conflito com"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Republica Checa"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Seja bem-vindo ao MandrakeUpdate!\n"
+"\n"
+"Esta ferramenta vai ajudá-lo a escolher quais as actualizações que deseja\n"
+"instalar no seu computador."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Costa Rica"
+msgid "Mandrake choices"
+msgstr "Selecção da Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Canada"
-msgstr "Canada"
+msgid "Changelog:\n"
+msgstr "Evolução:\n"
 
 #: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Korea"
+msgstr "Forçar"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Brazil"
-msgstr "Brasil"
+msgid "Removable device"
+msgstr "Dispositivo amovível"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Bélgica"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Austrália"
+msgid "Change medium"
+msgstr "Mudar o média"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "Áustria"
+msgid "Mandrake Update"
+msgstr "Actualizações Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
-msgstr "Informação..."
+msgid "by size"
+msgstr "por tamanho"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "Não"
+msgid "FTP server"
+msgstr "Servidor FTP"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "Sim"
+msgid "Files:\n"
+msgstr "Ficheiros:\n"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr "Impossível actualizar o média, irá ser automaticamente desactivado."
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -1573,6 +1573,14 @@ msgstr "Remover Programas"
 msgid "Software Sources Manager"
 msgstr "Gestor de Fontes de Programas"
 
+#, fuzzy
+#~ msgid "Source: "
+#~ msgstr "Forçar"
+
+#, fuzzy
+#~ msgid "Source"
+#~ msgstr "Forçar"
+
 #~ msgid ""
 #~ "some packages failed to install\n"
 #~ "correctly"
@@ -1611,9 +1619,6 @@ msgstr "Gestor de Fontes de Programas"
 #~ "\n"
 #~ "Deseja tentar com outro espelho?"
 
-#~ msgid "Error adding update medium"
-#~ msgstr "Erro ao adicionar o média de actualização"
-
 #~ msgid "Please wait, contacting mirror to initialize updates packages."
 #~ msgstr ""
 #~ "Por favor aguarde, a contactar o mirror para inicializar as actualizações "
diff --git a/po/pt_BR.po b/po/pt_BR.po
index f8fdb84a..3af3f4ec 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: 2003-02-19 18:04-0300\n"
 "Last-Translator: Andrei Bosco Bezerra Torres <andrei_bosco@yahoo.com.br>\n"
 "Language-Team: Português Brasileiro <linux_pt_BR@yahoogrupos.com.br>\n"
@@ -16,16 +16,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"Está pronto para continuar?"
+msgid "Enabled?"
+msgstr "Habilitar?"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Caminho ou ponto de montagem:"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Portugal"
+msgstr "Portugal"
 
 #: ../rpmdrake:1
 #, c-format
@@ -44,15 +48,80 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "by group"
+msgstr "por grupo"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "Nome:"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Italy"
+msgstr "Itália"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Como selecionar manualmente o seu servidor espelho"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "Alguns pacotes precisam ser removidos"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
+msgstr "Mais informações no pacote..."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Sim"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Welcome to MandrakeUpdate!\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
 msgstr ""
-"Bem vindo ao MandrakeUpdate!\n"
+"Devido às dependências, o(s) seguinte(s) pacote(s) precisam\n"
+"ser desselecionados:\n"
 "\n"
-"Esta ferramenta irá ajudar na atualização do seu sistema."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "Tudo foi instalado corretamente"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"Você também pode selecionar o servidor espelho manualmente: para fazer "
+"isso,\n"
+"inicie o Gerenciador de fontes de Software (Software Sources Manager),\n"
+"e então adicone uma fonte de 'Atualizações de segurança'.\n"
+"\n"
+"E por fim reinicie o MandrakeUpdate."
 
 #: ../rpmdrake:1
 #, c-format
@@ -67,6 +136,17 @@ msgstr ""
 "Esta ferramenta irá ajudar você quando precisar remover softwares\n"
 "do seu computador."
 
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "Para salvar as alterações, você precisa inserir a mídia no drive."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Salvar e sair"
+
 # c-format
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -81,106 +161,72 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Problem during removal"
-msgstr "Problema durante a remoção"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Please wait, removing packages..."
-msgstr "Aguarde, removendo pacotes..."
+msgid "Size: "
+msgstr "Tamanho: "
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Aguarde, lendo banco de dados de pacotes..."
+msgid "Security updates"
+msgstr "Atualizações de segurança"
 
-# c-format
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Houve um erro durante a instalação dos pacotes:\n"
-"\n"
-"%s"
+msgid "Already existing update medias"
+msgstr "Erro ao adicionar mídia de atualização"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation failed"
-msgstr "Instalação falhou"
+msgid "Maximum information"
+msgstr "Informação máxima"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Preparando pacotes para instalação..."
+msgid "Proxy..."
+msgstr "Erro..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Preparando pacotes para instalação..."
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
+msgstr ""
+"Instalação falhou, alguns arquivos estão faltando.\n"
+"Você pode atualizar a sua lista de fontes."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Todos os pacotes requisitados foram instalados com sucesso."
+msgid "United Kingdom"
+msgstr "Inglaterra"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Tudo foi instalado com sucesso"
+msgid "in names"
+msgstr "nos nomes"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"I can't find any suitable mirror.\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
-"A instalação foi concluída; %s.\n"
+"Não encontrei servidor apropriado.\n"
 "\n"
-"Alguns arquivos de configuração foram criados como `.rpmnew' ou `.rpmsave',\n"
-"você poderá verificar alguns agora:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "everything was installed correctly"
-msgstr "Tudo foi instalado corretamente"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Problemas ocorreram durante a instalação"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Instalando pacote `%s' (%s/%s)..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Preparando pacotes para instalação..."
+"Existem várias razões para este problema, a mais frequente é\n"
+"que a arquitetura do processador do seu computador não é suportada\n"
+"pelas Atualizações Oficiais do Mandrake Linux."
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
-msgstr ""
+msgid "Remove .%s"
+msgstr "Remover .%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"Instalação falhou, alguns arquivos estão faltando.\n"
-"Você pode atualizar a sua lista de fontes."
+msgid "Finland"
+msgstr "Finlândia"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -197,70 +243,112 @@ msgstr ""
 "\n"
 "Deseja continuar?"
 
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Examining distant file of media `%s'..."
+msgstr ""
+
 #: ../rpmdrake:1
 #, c-format
 msgid "Verifying packages signatures..."
 msgstr ""
 
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "France"
+msgstr "França"
+
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "More info"
+msgstr "Mais informações"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Fazendo download do pacote `%s' (%s/%s)..."
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Está pronto para continuar?"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "Cancelar"
+msgid "Reload the packages list"
+msgstr "Recarregue a lista de pacotes"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid "Choose a mirror..."
+msgstr "Escolha um servidor..."
 
 #: ../rpmdrake:1
 #, fuzzy, 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]"
+msgid "Some packages can't be installed"
+msgstr "O pacote `%s' não pode ser instalado\n"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Change medium"
-msgstr "Alterando mídia"
+#, fuzzy, c-format
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "Preparando pacotes para instalação..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "Inicializando..."
+msgid "All packages,"
+msgstr "Todos os pacotes,"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Preparando pacotes para instalação..."
+msgid "Type of media:"
+msgstr "Tipo de fonte:"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "É necessário ser administrador (root) para instalar pacotes."
+#, c-format
+msgid "in files"
+msgstr "nos arquivos"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Unable to get source packages."
-msgstr "Não foi possível obter fontes de pocotes."
+msgid "All requested packages were installed successfully."
+msgstr "Todos os pacotes requisitados foram instalados com sucesso."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "Servidor proxy:"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "Arquivos locais"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "Verificando..."
+msgid "Inspecting %s"
+msgstr "Verificando %s"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Israel"
+msgstr "Israel"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation finished"
-msgstr "Instalação concluída"
+msgid "Help"
+msgstr "Ajuda"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "HTTP server"
+msgstr "Servidor HTTP"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Ficar parado"
+msgid "Installation failed"
+msgstr "Instalação falhou"
 
 #: ../rpmdrake:1
 #, c-format
@@ -269,133 +357,159 @@ msgstr "Utilize .%s como arquivo principal"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Remover .%s"
+msgid "Search results"
+msgstr "Resultados da busca"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid " failed!"
+msgstr "nos arquivos"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "changes:"
-msgstr "mudanças:"
+msgid "Brazil"
+msgstr "Brasil"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Verificando %s"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"Já existe um meio com este nome, você\n"
+"realmente quer substituir?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Aguarde, procurando pacotes disponíveis..."
+msgid "Find:"
+msgstr "Localizar:"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "Aguarde, adicionando mídia..."
+msgid "All packages, alphabetical"
+msgstr "Todos os pacotes, alfabeticamente"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
-"\n"
-"Then, restart MandrakeUpdate."
-msgstr ""
-"Você também pode selecionar o servidor espelho manualmente: para fazer "
-"isso,\n"
-"inicie o Gerenciador de fontes de Software (Software Sources Manager),\n"
-"e então adicone uma fonte de 'Atualizações de segurança'.\n"
-"\n"
-"E por fim reinicie o MandrakeUpdate."
+msgid "Please wait, searching..."
+msgstr "Aguarde,  procurando..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "Como selecionar manualmente o seu servidor espelho"
+msgid "Please wait, reading packages database..."
+msgstr "Aguarde, lendo banco de dados de pacotes..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
-msgstr ""
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "Não foi possível abrir o pacote `%s'\n"
 
 #: ../rpmdrake:1
+#, fuzzy, 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:1
+#, c-format
+msgid "Reset the selection"
+msgstr "Reiniciando a seleção"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Already existing update sources"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
 msgstr ""
+"Se você precisar de um proxy, informe o hostname e com opcional a porta "
+"(sintaxe: <servidorproxy[:porta]>):"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
 "\n"
-"Is it ok to continue?"
 msgstr ""
-"Preciso contactar o servidor para buscar os pacotes atualizados.\n"
-"Certifique-se está atualmente conectado à Internet.\n"
+"Para satisfazer todas as dependências, o(s) seguinte(s) pacote(s) também\n"
+"precisam ser removidos:\n"
 "\n"
-"Deseja continuar?"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
+# c-format
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Erro de arquivo"
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Houve um erro durante a instalação dos pacotes:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Preparando pacotes para instalação..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr "Aguarde, removendo mídia..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Mandrake Update"
+msgid "Password:"
+msgstr "Senha:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Gerenciador de Softwares"
+msgid "Taiwan"
+msgstr "Taiwan"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Quit"
-msgstr "Sair"
+msgid "User:"
+msgstr "Usuário:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Install"
-msgstr "Instalar"
+msgid "Please wait, updating medium..."
+msgstr "Aguarde, atualizando mídia..."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "Remover"
+msgid "Please wait, listing packages..."
+msgstr "Aguarde, listando pacotes..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Help"
-msgstr "Ajuda"
+msgid "Information on packages"
+msgstr "Informação sobre os pacotes"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
+msgstr "Cancelar"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search"
-msgstr "Procurar"
+msgid "Everything installed successfully"
+msgstr "Tudo foi instalado com sucesso"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Select the media(s) you wish to update:"
+msgstr "Escolha a fonte(s) que deseja atualizar:"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, updating media..."
+msgstr "Aguarde, atualizando mídia"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Localizar:"
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -414,160 +528,188 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Alguns pacotes precisam ser removidos"
+msgid "in descriptions"
+msgstr "nas descrições"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "Configurar proxy"
+
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
 "\n"
-"Do you really want to install all the selected packages?"
+"Is it ok to continue?"
 msgstr ""
-"Cuidado: parece que você está tentando adicionar muitos\n"
-"pacotes. O seu sistema poderá rodar com falta de espaço,\n"
-"durante ou depois da instalação. Isto é perigoso e você \n"
-"precisa tomar cuidado.\n"
+"Eu preciso contactar o site da MandrakeSoft para pegar a lista de "
+"servidores.\n"
+"Certifique-se está atualmente conectado à Internet.\n"
 "\n"
-"Você realmente quer instalar todos os pacotes selecionados?"
+"Deseja continuar?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Muitos pacotes foram selecionados"
+msgid "Please choose"
+msgstr "Por favor escolha"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "Informação máxima"
+msgid "Selected size: %d MB"
+msgstr "Tamanho selecionado: %d MB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Normal information"
-msgstr "Informações normais"
+msgid "Initializing..."
+msgstr "Inicializando..."
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update source(s)"
-msgstr "Atualizar fonte(s)"
+msgid "Save changes"
+msgstr "Salvar alterações"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Recarregue a lista de pacotes"
+msgid "Error during download"
+msgstr "Erro durante o download"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reset the selection"
-msgstr "Reiniciando a seleção"
+#, fuzzy, c-format
+msgid "Package installation..."
+msgstr "Preparando pacotes para instalação..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "nos arquivos"
+msgid "Importance: "
+msgstr "Importância: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "nas descrições"
+msgid ""
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
+msgstr ""
+"Para satisfazer as dependências, o(s) seguinte(s) pacote(s) precisam\n"
+"ser instalados:\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "in names"
-msgstr "nos nomes"
+msgid "Add..."
+msgstr "Adicionar..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by update availability"
-msgstr "por disponibilidade de atualização"
+msgid "Unable to create medium."
+msgstr "Incapaz de criar a mídia."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by source repository"
-msgstr "por servidor"
+msgid ""
+"The installation is finished; %s.\n"
+"\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
+msgstr ""
+"A instalação foi concluída; %s.\n"
+"\n"
+"Alguns arquivos de configuração foram criados como `.rpmnew' ou `.rpmsave',\n"
+"você poderá verificar alguns agora:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by selection state"
-msgstr "por estado de seleção"
+msgid "Browse..."
+msgstr "Procurar..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by size"
-msgstr "por tamanho"
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "O pacote `%s' não pode ser instalado\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by group"
-msgstr "por grupo"
+msgid "Info..."
+msgstr "Informação..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "All packages,"
-msgstr "Todos os pacotes,"
+msgid "You need to insert the medium to continue"
+msgstr "Você precisa inserir a mídia para continuar"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Todos os pacotes, alfabeticamente"
+msgid "Copying file for media `%s'..."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Recomendação do Mandrake"
+msgid "Remove"
+msgstr "Remover"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Normal updates"
-msgstr "Atualizações normais"
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Preparando pacotes para instalação..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Bugfixes updates"
-msgstr "Atualizações para correção de erros"
+#, fuzzy, c-format
+msgid "by media repository"
+msgstr "por servidor"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Security updates"
-msgstr "Atualizações de segurança"
+msgid "No mirror"
+msgstr "Nenhum servidor"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Description: "
-msgstr "Descrição: "
+msgid "You need to fill up at least the two first entries."
+msgstr "Você precisa preencher pelo menos os dois primeiros campos"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Razão para atualização:"
+msgid "Install"
+msgstr "Instalar"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Summary: "
-msgstr "Resumo: "
+msgid "Japan"
+msgstr "Japão"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Importance: "
-msgstr "Importância: "
+msgid "Do nothing"
+msgstr "Ficar parado"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "No update"
+msgstr "Sem atualização"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Size: "
-msgstr "Tamanho: "
+msgid "Description: "
+msgstr "Descrição: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Version: "
-msgstr "Versão: "
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr ""
+"Cuidado: parece que você está tentando adicionar muitos\n"
+"pacotes. O seu sistema poderá rodar com falta de espaço,\n"
+"durante ou depois da instalação. Isto é perigoso e você \n"
+"precisa tomar cuidado.\n"
+"\n"
+"Você realmente quer instalar todos os pacotes selecionados?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -576,84 +718,63 @@ msgstr "Nome: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Versão instalada atualmente: "
+msgid "Inspect..."
+msgstr "Verificando..."
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing media \"%s\":"
+msgstr "Editando fonte \"%s\":"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "Preparando pacotes para instalação..."
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Source: "
-msgstr "Fonte: "
+msgid "Australia"
+msgstr "Austrália"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "(Not available)"
-msgstr "(Indisponível)"
+msgid "Installation finished"
+msgstr "Instalação concluída"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Histórico de atualizações:\n"
+msgid "by update availability"
+msgstr "por disponibilidade de atualização"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Files:\n"
-msgstr "Arquivos:\n"
+msgid "Poland"
+msgstr "Polônia"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "Tamanho selecionado: %d MB"
+msgid "Version: "
+msgstr "Versão: "
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Selecionado: %d MB / Espaço disponível: %d MB"
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Você pode especificar um usuário e senha para autenticação no proxy:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
-msgstr ""
-"Devido às dependências, o(s) seguinte(s) pacote(s) precisam\n"
-"ser desselecionados:\n"
-"\n"
+msgid "Upgradable"
+msgstr "Atualizável"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid " done."
 msgstr ""
-"Desculpe, o(s) seguinte(s) pacote(s) não podem ser selecionados:\n"
-"\n"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "conflitos com"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "O pacote `%s' não pode ser instalado\n"
-
-#: ../rpmdrake:1
-#, c-format
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
-msgstr ""
-"Para satisfazer as dependências, o(s) seguinte(s) pacote(s) precisam\n"
-"ser instalados:\n"
-"\n"
+msgid "Software Packages Installation"
+msgstr "Preparando pacotes para instalação..."
 
 #: ../rpmdrake:1
 #, c-format
@@ -661,253 +782,200 @@ msgid "Additional packages needed"
 msgstr "Pacotes adicionais são necessários"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "O pacote `%s' não pode ser instalado\n"
-
-#: ../rpmdrake:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
-"A remoção desses pacotes estragaria o seu sistema, desculpa:\n"
-"\n"
+msgid "Bugfixes updates"
+msgstr "Atualizações para correção de erros"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
+msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
-"Para satisfazer todas as dependências, o(s) seguinte(s) pacote(s) também\n"
-"precisam ser removidos:\n"
-"\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Alguns pacotes adicionais precisam ser removidos"
+msgid "Germany"
+msgstr "Alemanha"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "More information on package..."
-msgstr "Mais informações no pacote..."
+msgid "Russia"
+msgstr "Rússia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Information on packages"
-msgstr "Informação sobre os pacotes"
+msgid "Norway"
+msgstr "Noruega"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "More info"
-msgstr "Mais informações"
+msgid "Problem during installation"
+msgstr "Problemas ocorreram durante a instalação"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Addable"
-msgstr "instalável"
+msgid "Search"
+msgstr "Procurar"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Edit a media"
+msgstr "Editar fontes"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Upgradable"
-msgstr "Atualizável"
+msgid "Czech Republic"
+msgstr "República Checa"
 
 #: ../rpmdrake:1
 #, c-format
 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."
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"A lista de atualizações está vazia. Isto significa que não há\n"
-"atualização disponível para os pacotes instalados em seu computador,\n"
-"ou você já atualizou todos."
-
-#: ../rpmdrake:1
-#, c-format
-msgid "No update"
-msgstr "Sem atualização"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "(none)"
-msgstr "(nenhum)"
+msgid "Stop"
+msgstr "Parar"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Aguarde, listando pacotes..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "Não foi possível abrir o pacote `%s'\n"
+msgid "Update"
+msgstr "Atualizar"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Um dos seguintes pacotes é necessário"
+msgid "Please wait, removing packages..."
+msgstr "Aguarde, removendo pacotes..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Por favor escolha"
+msgid "Normal information"
+msgstr "Informações normais"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr "Conflitos detectados"
+msgid "Media: "
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected"
-msgstr "Selecionado"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "Fazendo download do pacote `%s' (%s/%s)..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results"
-msgstr "Resultados da busca"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Selecionado: %d MB / Espaço disponível: %d MB"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Stop"
-msgstr "Parar"
+msgid "Media"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Aguarde,  procurando..."
+msgid "Spain"
+msgstr "Espanha"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Resultados da busca (nenhum)"
+msgid "Normal updates"
+msgstr "Atualizações normais"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Other"
-msgstr "Outro"
+msgid "by selection state"
+msgstr "por estado de seleção"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Welcome to the packages source editor!\n"
-"\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
-"Bem vindo ao editor de fontes de pacotes\n"
-"\n"
-"Está ferramenta irá ajudar na configuração das fontes de pacotes que você "
-"irá utilizar\n"
-"em seu computador. Elas estarão disponíveis para instalação de novos pacotes "
-"de softwares\n"
-"ou para realizar atualizações."
+"Aguarde, fazendo download da lista de servidores do site da MandrakeSoft."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Save and quit"
-msgstr "Salvar e sair"
+msgid "Login:"
+msgstr "Login:"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Erro..."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Update..."
-msgstr "Atualizar..."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add..."
-msgstr "Adicionar..."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Edit"
-msgstr "Editar"
+msgid "Adding a media:"
+msgstr "Adicionando uma fonte:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Source"
-msgstr "Fonte"
+msgid "Austria"
+msgstr "Áustria"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "Habilitar?"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Fatal error"
+msgstr "Erro de arquivo"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Configure sources"
-msgstr "Configurar fontes"
+msgid "Update..."
+msgstr "Atualizar..."
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Password:"
-msgstr "Senha:"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "Verificando assinatura de `%s'..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "User:"
-msgstr "Usuário:"
+msgid "(none)"
+msgstr "(nenhum)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "Você pode especificar um usuário e senha para autenticação no proxy:"
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
+"A remoção desses pacotes estragaria o seu sistema, desculpa:\n"
+"\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "Servidor proxy:"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Instalando pacote `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
-msgstr ""
-"Se você precisar de um proxy, informe o hostname e com opcional a porta "
-"(sintaxe: <servidorproxy[:porta]>):"
+msgid "Currently installed version: "
+msgstr "Versão instalada atualmente: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Configurar proxy"
+msgid "Other"
+msgstr "Outro"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Aguarde, atualizando mídia..."
+msgid "Reason for update: "
+msgstr "Razão para atualização:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "Para salvar as alterações, você precisa inserir a mídia no drive."
+msgid "Please choose the desired mirror."
+msgstr "Escolha o servidor desejado."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "Você precisa inserir a mídia para continuar"
+msgid "Edit"
+msgstr "Editar"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "Salvar alterações"
+msgid "Please wait, finding available packages..."
+msgstr "Aguarde, procurando pacotes disponíveis..."
 
 # Translation needs reworking
 #: ../edit-urpm-sources.pl:1
@@ -915,389 +983,321 @@ msgstr "Salvar alterações"
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Caminho relativo para synthesis/hdlist: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "Editando fonte \"%s\":"
+msgid "Search results (none)"
+msgstr "Resultados da busca (nenhum)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit a source"
-msgstr "Editar fontes"
+msgid "Danmark"
+msgstr "Dinamarca"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Aguarde, removendo mídia..."
+msgid "China"
+msgstr "China"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "Tipo de fonte:"
+msgid "United States"
+msgstr "Estados Unidos"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Adicionando uma fonte:"
+msgid "changes:"
+msgstr "mudanças:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
-msgstr ""
-"Já existe um meio com este nome, você\n"
-"realmente quer substituir?"
+msgid "Some additional packages need to be removed"
+msgstr "Alguns pacotes adicionais precisam ser removidos"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Você precisa preencher pelo menos os dois primeiros campos"
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Name:"
-msgstr "Nome:"
+msgid "No"
+msgstr "Não"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Login:"
-msgstr "Login:"
+#, fuzzy, c-format
+msgid "Configure medias"
+msgstr "Configurar fontes"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Choose a mirror..."
-msgstr "Escolha um servidor..."
+#, fuzzy, c-format
+msgid "Add a media"
+msgstr "Adicione uma fonte:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
-msgstr "Procurar..."
+msgid "Summary: "
+msgstr "Resumo: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Path or mount point:"
-msgstr "Caminho ou ponto de montagem:"
+msgid "Canada"
+msgstr "Canadá"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "Dispositivo removível"
+msgid "Greece"
+msgstr "Grécia"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "HTTP server"
-msgstr "Servidor HTTP"
+msgid ""
+"There was an error downloading the mirrors list:\n"
+"\n"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
+msgstr ""
+"Ocorreu um erro durante o download da lista de servidores:\n"
+"\n"
+"%s\n"
+"A sua conexão com a internet ou o site da MandrakeSoft, podem estar "
+"indisponíveis no momento.\n"
+"Por favor tente mais tarde."
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "FTP server"
-msgstr "Servidor FTP"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr "É necessário ser administrador (root) para instalar pacotes."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Path:"
 msgstr "Caminho:"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Local files"
-msgstr "Arquivos locais"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add a source"
-msgstr "Adicione uma fonte:"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr "Incapaz de atualizar a mídia; Será automaticamente desabilitado"
+msgid "Problem during removal"
+msgstr "Problema durante a remoção"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Unable to create medium."
-msgstr "Incapaz de criar a mídia."
+msgid "Selected"
+msgstr "Selecionado"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Update"
-msgstr "Atualizar"
+msgid "Netherlands"
+msgstr "Países baixos"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Escolha a fonte(s) que deseja atualizar:"
+msgid "Addable"
+msgstr "instalável"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Aguarde, atualizando mídia"
+msgid "(Not available)"
+msgstr "(Indisponível)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid " failed!"
-msgstr "nos arquivos"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid " done."
-msgstr ""
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Download of `%s', speed:%s"
-msgstr ""
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
 msgstr ""
+"Desculpe, o(s) seguinte(s) pacote(s) não podem ser selecionados:\n"
+"\n"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "Verificando assinatura de `%s'..."
+msgid "Not selected"
+msgstr "Conflitos detectados"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr ""
+msgid "Software Packages Removal"
+msgstr "Gerenciador de Softwares"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr ""
+msgid "Sweden"
+msgstr "Suíça"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Copying file for source `%s'..."
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Please choose the desired mirror."
-msgstr "Escolha o servidor desejado."
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
+"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 ""
-"Não encontrei servidor apropriado.\n"
-"\n"
-"Existem várias razões para este problema, a mais frequente é\n"
-"que a arquitetura do processador do seu computador não é suportada\n"
-"pelas Atualizações Oficiais do Mandrake Linux."
+"A lista de atualizações está vazia. Isto significa que não há\n"
+"atualização disponível para os pacotes instalados em seu computador,\n"
+"ou você já atualizou todos."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No mirror"
-msgstr "Nenhum servidor"
+msgid "Examining file of media `%s'..."
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was an error downloading the mirrors list:\n"
-"\n"
-"%s\n"
-"The network, or MandrakeSoft website, are maybe unavailable.\n"
-"Please try again later."
+msgid "Download of `%s', speed:%s"
 msgstr ""
-"Ocorreu um erro durante o download da lista de servidores:\n"
-"\n"
-"%s\n"
-"A sua conexão com a internet ou o site da MandrakeSoft, podem estar "
-"indisponíveis no momento.\n"
-"Por favor tente mais tarde."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
-msgstr "Erro durante o download"
+msgid "One of the following packages is needed:"
+msgstr "Um dos seguintes pacotes é necessário"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
-"Aguarde, fazendo download da lista de servidores do site da MandrakeSoft."
+msgid "Quit"
+msgstr "Sair"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
 "\n"
 "Is it ok to continue?"
 msgstr ""
-"Eu preciso contactar o site da MandrakeSoft para pegar a lista de "
-"servidores.\n"
+"Preciso contactar o servidor para buscar os pacotes atualizados.\n"
 "Certifique-se está atualmente conectado à Internet.\n"
 "\n"
 "Deseja continuar?"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "United States"
-msgstr "Estados Unidos"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update media(s)"
+msgstr "Atualizar fonte(s)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "China"
+msgid "Ok"
+msgstr "Ok"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Inglaterra"
+msgid "Please wait, adding medium..."
+msgstr "Aguarde, adicionando mídia..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Taiwan"
+msgid "Unable to get source packages."
+msgstr "Não foi possível obter fontes de pocotes."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Sweden"
-msgstr "Suíça"
+msgid "Too many packages are selected"
+msgstr "Muitos pacotes foram selecionados"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Russia"
-msgstr "Rússia"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"Bem vindo ao editor de fontes de pacotes\n"
+"\n"
+"Está ferramenta irá ajudar na configuração das fontes de pacotes que você "
+"irá utilizar\n"
+"em seu computador. Elas estarão disponíveis para instalação de novos pacotes "
+"de softwares\n"
+"ou para realizar atualizações."
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Portugal"
-msgstr "Portugal"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
+msgstr "conflitos com"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
-msgstr "Polônia"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Bem vindo ao MandrakeUpdate!\n"
+"\n"
+"Esta ferramenta irá ajudar na atualização do seu sistema."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Norway"
-msgstr "Noruega"
+msgid "Mandrake choices"
+msgstr "Recomendação do Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Netherlands"
-msgstr "Países baixos"
+msgid "Changelog:\n"
+msgstr "Histórico de atualizações:\n"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Korea"
 msgstr "Coréia"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Japan"
-msgstr "Japão"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Italy"
-msgstr "Itália"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Israel"
-msgstr "Israel"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Greece"
-msgstr "Grécia"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "France"
-msgstr "França"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Finland"
-msgstr "Finlândia"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Spain"
-msgstr "Espanha"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Danmark"
-msgstr "Dinamarca"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Germany"
-msgstr "Alemanha"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Czech Republic"
-msgstr "República Checa"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Costa Rica"
-msgstr "Costa Rica"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Canada"
-msgstr "Canadá"
-
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Brazil"
-msgstr "Brasil"
+msgid "Removable device"
+msgstr "Dispositivo removível"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Bélgica"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Austrália"
+msgid "Change medium"
+msgstr "Alterando mídia"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "Áustria"
+msgid "Mandrake Update"
+msgstr "Mandrake Update"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
-msgstr "Informação..."
+msgid "by size"
+msgstr "por tamanho"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "Não"
+msgid "FTP server"
+msgstr "Servidor FTP"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "Sim"
+msgid "Files:\n"
+msgstr "Arquivos:\n"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr "Incapaz de atualizar a mídia; Será automaticamente desabilitado"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -1574,6 +1574,12 @@ msgstr "Remover software"
 msgid "Software Sources Manager"
 msgstr "Gerenciador de fontes de Software"
 
+#~ msgid "Source: "
+#~ msgstr "Fonte: "
+
+#~ msgid "Source"
+#~ msgstr "Fonte"
+
 #~ msgid ""
 #~ "some packages failed to install\n"
 #~ "correctly"
@@ -1610,9 +1616,6 @@ msgstr "Gerenciador de fontes de Software"
 #~ "\n"
 #~ "Você deseja tentar outro servidor?"
 
-#~ msgid "Error adding update medium"
-#~ msgstr "Erro ao adicionar mídia de atualização"
-
 #~ msgid "Please wait, contacting mirror to initialize updates packages."
 #~ msgstr ""
 #~ "Aguarde, conectando ao servidor para iniciar a atualização dos pacotes."
diff --git a/po/ro.po b/po/ro.po
index 1523e576..26ac7573 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: 2003-02-16 01:08+0200\n"
 "Last-Translator: Ovidiu Constantin <ovidiu.constantin@gmx.net>\n"
 "Language-Team: Romanian Translators for Free Software <rtfs-project@lists."
@@ -18,16 +18,20 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"Pot continua?"
+msgid "Enabled?"
+msgstr "Activat?"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Calea sau punctul de montare: "
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Portugal"
+msgstr "Portugalia"
 
 #: ../rpmdrake:1
 #, c-format
@@ -47,105 +51,54 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"Bun venit la MandrakeUpdate!\n"
-"\n"
-"Acest utilitar vã va ajuta sã alegeþi programele de pe calculatorul dvs pe "
-"care doriþi \n"
-"sã le actualizaþi ."
+msgid "by group"
+msgstr "dupã grup"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
-msgstr ""
-"Bun venit la utilitarul de ºtergere a programelor!\n"
-"\n"
-"Acest utilitar vã va ajuta sã alegeþi programele pe care doriþi \n"
-"sã le ºtergeþi de pe calculatorul dvs."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"A fost detectatã o eroare în timpul instalãrii pachetelor:\n"
-"\n"
-"%s"
+msgid "Name:"
+msgstr "Nume:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Problem during removal"
-msgstr "Problemã în timpul ºtergerii"
+msgid "Italy"
+msgstr "Italia"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "Vã rog sã aºteptaþi, ºterg pachetele..."
+msgid "How to choose manually your mirror"
+msgstr "Cum sã selectaþi manual serverul oglindã"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Vã rog sã aºteptaþi, citesc baza de date a pachetelelor..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"A fost detectatã o eroare în timpul instalãrii pachetelor:\n"
-"\n"
-"%s"
+msgid "URL:"
+msgstr "URL: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation failed"
-msgstr "Instalare eºuatã"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Pregãtesc pachetele pentru instalare..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Pregãtesc pachetele pentru instalare..."
+msgid "Some packages need to be removed"
+msgstr "Unele pachete trebuie ºterse"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Toate pachetele cerute au fost instalate cu succes."
+msgid "More information on package..."
+msgstr "Mai multe informaþii despre pachet..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Totul a fost instalat cu succes"
+msgid "Yes"
+msgstr "Da"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
 msgstr ""
-"Instalarea s-a terminat; %s.\n"
+"Datoritã dependenþelor lor, urmãtoarele pachete trebuie\n"
+"deselectate acum:\n"
 "\n"
-"Unele fiºiere de configurare au fost create ca `.rpmnew' sau `.rpmsave',\n"
-"le puteþi inspecta acum pentru a decide acþiunile ulterioare:"
 
 #: ../rpmdrake:1
 #, c-format
@@ -153,458 +106,454 @@ msgid "everything was installed correctly"
 msgstr "Totul a fost instalat cu succes"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Probleme apãrute în timpul instalãrii"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Instalez pachetul `%s' (%s/%s)..."
+msgid "%s KB"
+msgstr "%s KB"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Pregãtesc pachetele pentru instalare..."
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"De asemenea puteþi selecta manual serverul oglindã:\n"
+"pentru aceasta lansaþi Administratorul de surse de programe ºi adãugaþi o \n"
+"sursã tip 'Actualizãri ale sistemului de securitate'.\n"
+"\n"
+"Apoi reporniþi MandrakeUpdate."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
+"Welcome to the software removal tool!\n"
 "\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
 msgstr ""
+"Bun venit la utilitarul de ºtergere a programelor!\n"
 "\n"
-"\n"
-"Eroare(erori) raportatã(e):\n"
-"%s"
+"Acest utilitar vã va ajuta sã alegeþi programele pe care doriþi \n"
+"sã le ºtergeþi de pe calculatorul dvs."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"Instalare nereuºitã, unele fiºiere lipsesc.\n"
-"Probabil ar trebui sã actualizaþi baza de date a surselor."
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "Pentru a salva modificãrile, trebuie sã introduceþi mediul în unitate."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Salvare ºi ieºire"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
+"There was a problem during the removal of packages:\n"
 "\n"
-"Do you want to continue installation?"
+"%s"
 msgstr ""
-"Urmãtoarele pachete trebuie ºterse pentru ca altele sã fie actualizate:\n"
-"\n"
-"%s\n"
+"A fost detectatã o eroare în timpul instalãrii pachetelor:\n"
 "\n"
-"Doriþi sã continuaþi?"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Descarc pachetul `%s' (%s/%s)..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Cancel"
-msgstr "Renunþã"
+msgid "Size: "
+msgstr "Mãrime: "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Ok"
-msgstr "OK"
+msgid "Security updates"
+msgstr "Actualizãri ale sistemului de securitate"
 
 #: ../rpmdrake:1
 #, fuzzy, 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:1
-#, c-format
-msgid "Change medium"
-msgstr "Schimbã mediul"
+msgid "Already existing update medias"
+msgstr "Eroare la adãugarea mediului de actualizare"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "Iniþializez..."
+msgid "Maximum information"
+msgstr "Informaþii maximale"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Pregãtesc pachetele pentru instalare..."
+msgid "Proxy..."
+msgstr "Eroare..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Regret, trebuie sã fiþi root pentru a instala pachete."
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Unable to get source packages."
-msgstr "Nu pot prelua pachetele sursã."
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspect..."
-msgstr "Inspectez..."
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
+msgstr ""
+"Instalare nereuºitã, unele fiºiere lipsesc.\n"
+"Probabil ar trebui sã actualizaþi baza de date a surselor."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Installation finished"
-msgstr "Instalare terminatã"
+msgid "United Kingdom"
+msgstr "Marea Britanie"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Nu fã nimic"
+msgid "in names"
+msgstr "în nume"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Foloseºte .%s ca fiºier principal"
+msgid ""
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
+msgstr ""
+"Nu gãsesc un server oglindã acceptabil.\n"
+"\n"
+"Pot fi mai multe cauze pentru aceastã problemã; cea mai frecventã este\n"
+"cazul când arhitectura procesorului dvs. nu este suportatã\n"
+"de actualizãrile oficiale Mandrake Linux."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Remove .%s"
 msgstr "ªterg .%s"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "changes:"
-msgstr "schimbãri:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspecting %s"
-msgstr "Inspectez %s"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Vã rog sã aºteptaþi, caut pachetele disponibile..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "Vã rog sã aºteptaþi, adaug mediul..."
+msgid "Finland"
+msgstr "Finlanda"
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
+"The following packages have bad signatures:\n"
 "\n"
-"Then, restart MandrakeUpdate."
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"De asemenea puteþi selecta manual serverul oglindã:\n"
-"pentru aceasta lansaþi Administratorul de surse de programe ºi adãugaþi o \n"
-"sursã tip 'Actualizãri ale sistemului de securitate'.\n"
+"Urmãtoarele pachete trebuie ºterse pentru ca altele sã fie actualizate:\n"
 "\n"
-"Apoi reporniþi MandrakeUpdate."
+"%s\n"
+"\n"
+"Doriþi sã continuaþi?"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "How to choose manually your mirror"
-msgstr "Cum sã selectaþi manual serverul oglindã"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Examining distant file of media `%s'..."
+msgstr "Examinez fiºierul distant pentru sursa `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
+msgid "Verifying packages signatures..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Already existing update sources"
-msgstr ""
+msgid "France"
+msgstr "Franþa"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "More info"
+msgstr "Mai multe informaþii"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
+"%s\n"
 "\n"
 "Is it ok to continue?"
 msgstr ""
-"Trebuie sa contactez serverul oglindã pentru a obþine cele mai recente "
-"actualizãri.\n"
-"Vã rog sã ferificaþi dacã acum reþeaua funcþioneazã.\n"
+"%s\n"
 "\n"
-"Doriþi sã continuaþi?"
+"Pot continua?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Reload the packages list"
+msgstr "Reîncarcã lista pachetelor"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Selectare server oglindã..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Eroare fiºier"
+msgid "Some packages can't be installed"
+msgstr "Pachetul `%s' nu poate fi instalat\n"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
+msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Pregãtesc pachetele pentru instalare..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Actualizare Mandrake"
+msgid "All packages,"
+msgstr "Toate pachetele,"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Software Packages Removal"
-msgstr "ªtergere pachete Software"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Type of media:"
+msgstr "Tipul sursei:"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Quit"
-msgstr "Ieºire"
+msgid "in files"
+msgstr "în fiºiere "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Instaleazã"
+msgid "All requested packages were installed successfully."
+msgstr "Toate pachetele cerute au fost instalate cu succes."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove"
-msgstr "ªterge"
+msgid "Proxy hostname:"
+msgstr "Nume gazdã proxy:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Help"
-msgstr "Ajutor"
+msgid "Local files"
+msgstr "Fiºiere locale"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search"
-msgstr "Cãutare"
+msgid "Inspecting %s"
+msgstr "Inspectez %s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Find:"
-msgstr "Cautã:"
+msgid "Israel"
+msgstr "Israel"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Urmãtoarele pachete trebuie ºterse pentru ca altele sã fie actualizate:\n"
-"\n"
-"%s\n"
-"\n"
-"Doriþi sã continuaþi?"
+msgid "Help"
+msgstr "Ajutor"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Unele pachete trebuie ºterse"
+msgid "HTTP server"
+msgstr "Server HTTP"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
-"\n"
-"Do you really want to install all the selected packages?"
-msgstr ""
-"Avertisment: se pare cã încercaþi sã adãugaþi atât de multe\n"
-"pachete încât sistemul ar putea rãmâne fãrã spaþiu pe disc,\n"
-"în timpul sau dupã instalarea pachetelor;\n"
-"aceast lucru este periculos ºi trebuie sã aveþi grijã.\n"
-"\n"
-"Chiar doriþi sã instalaþi pachetele selectate?"
+msgid "Installation failed"
+msgstr "Instalare eºuatã"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Sunt selectate prea multe pachete"
+msgid "Use .%s as main file"
+msgstr "Foloseºte .%s ca fiºier principal"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "Informaþii maximale"
+msgid "Search results"
+msgstr "Rezultatele cãutãrii"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Normal information"
-msgstr "Informaþii normale"
+msgid " failed!"
+msgstr "eºuat!"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Update source(s)"
-msgstr "Actualizare surse"
+msgid "Brazil"
+msgstr "Brazilia"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Reîncarcã lista pachetelor"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"Existã deja un mediu cu acel nume,\n"
+"chiar doriþi sã îl înlocuiþi?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "Reseteazã selecþia"
+msgid "Find:"
+msgstr "Cautã:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "în fiºiere "
+msgid "All packages, alphabetical"
+msgstr "Toate pachetele, alfabetic"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "în descrieri"
+msgid "Please wait, searching..."
+msgstr "Vã rog sã aºteptaþi, caut..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "în nume"
+msgid "Please wait, reading packages database..."
+msgstr "Vã rog sã aºteptaþi, citesc baza de date a pachetelelor..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by update availability"
-msgstr "dupã disponibilitatea actualizãrii"
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "Nu pot deschide pachetul`%s'\n"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by source repository"
-msgstr "dupã sursã"
+#, fuzzy, 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:1
 #, c-format
-msgid "by selection state"
-msgstr "dupã stare selecþie"
+msgid "Reset the selection"
+msgstr "Reseteazã selecþia"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by size"
-msgstr "dupã mãrime"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"Dacã e nevoie de proxy, introduceþi numele gazdei ºi opþional un port "
+"(sintaxã: <gazdãproxy[:port]>):"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-msgstr "dupã grup"
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
+"Datoritã dependenþelor lor,\n"
+"urmãtoarele pachete trebuie de asemenea ºterse:\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "All packages,"
-msgstr "Toate pachetele,"
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "All packages, alphabetical"
-msgstr "Toate pachetele, alfabetic"
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"A fost detectatã o eroare în timpul instalãrii pachetelor:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Opþiuni Mandrake"
+msgid "Please wait, removing medium..."
+msgstr "Vã rog sã aºteptaþi, ºterg mediul..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
-msgstr "Actualizãri normale"
+msgid "Password:"
+msgstr "Parola:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Actualizãri pentru corectarea erorilor"
+msgid "Taiwan"
+msgstr "Taiwan"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Security updates"
-msgstr "Actualizãri ale sistemului de securitate"
+msgid "User:"
+msgstr "Utilizator:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Description: "
-msgstr "Descriere:"
+msgid "Please wait, updating medium..."
+msgstr "Vã rog sã aºteptaþi, actualizez mediul..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Motivul actualizãrii:"
+msgid "Please wait, listing packages..."
+msgstr "Vã rog sã aºteptaþi, listez pachetele..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Summary: "
-msgstr "Sumar: "
+msgid "Information on packages"
+msgstr "Informaþii despre pachete"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Importance: "
-msgstr "Importanþã: "
+msgid "Cancel"
+msgstr "Renunþã"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Everything installed successfully"
+msgstr "Totul a fost instalat cu succes"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Size: "
-msgstr "Mãrime: "
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Select the media(s) you wish to update:"
+msgstr "Selectaþi sursele de actualizat:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Version: "
-msgstr "Versiune: "
+msgid "Please wait, updating media..."
+msgstr "Vã rog sã aºteptaþi, actualizez mediul..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "Nume: "
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Versiunea instalatã curent:"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Urmãtoarele pachete trebuie ºterse pentru ca altele sã fie actualizate:\n"
+"\n"
+"%s\n"
+"\n"
+"Doriþi sã continuaþi?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Source: "
-msgstr "Sursã: "
+msgid "in descriptions"
+msgstr "în descrieri"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(Not available)"
-msgstr "(Indisponibil)"
+msgid "Configure proxies"
+msgstr "Configurare proxy-uri"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Jurnal schimbãri:\n"
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Trebuie sã contactez situl MandrakeSoft pentru a obþine lista serverelor "
+"oglindã.\n"
+"Vã rog sã verificaþi funcþionarea reþelei.\n"
+"\n"
+"Pot sã continui?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Files:\n"
-msgstr "Fiºiere:\n"
+msgid "Please choose"
+msgstr "Vã rog sã alegeþi"
 
 #: ../rpmdrake:1
 #, c-format
@@ -613,43 +562,28 @@ msgstr "Mãrime selecþie: %d MB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Selectat: %d MB / Spaþiu liber pe disc: %d MB"
+msgid "Initializing..."
+msgstr "Iniþializez..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
-msgstr ""
-"Datoritã dependenþelor lor, urmãtoarele pachete trebuie\n"
-"deselectate acum:\n"
-"\n"
+msgid "Save changes"
+msgstr "Salveazã schimbãrile"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr ""
-"Regret, urmãtoarele pachete nu pot fi selectate:\n"
-"\n"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "Eroare în timpul descãrcãrii."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "e în conflict cu"
+msgid "Package installation..."
+msgstr "Pregãtesc pachetele pentru instalare..."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Pachetul `%s' nu poate fi instalat\n"
+#, c-format
+msgid "Importance: "
+msgstr "Importanþã: "
 
 #: ../rpmdrake:1
 #, c-format
@@ -662,312 +596,308 @@ msgstr ""
 "trebuie de asemenea instalate\n"
 "\n"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "Pachete adiþionale necesare"
+msgid "Add..."
+msgstr "Adaugã..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "Pachetul `%s' nu poate fi instalat\n"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "Nu pot creea mediul."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Removing these packages would break your system, sorry:\n"
+"The installation is finished; %s.\n"
 "\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
 msgstr ""
-"ªtergerea acestor pachete ar corupe sistemul, îmi pare rãu:\n"
+"Instalarea s-a terminat; %s.\n"
 "\n"
+"Unele fiºiere de configurare au fost create ca `.rpmnew' sau `.rpmsave',\n"
+"le puteþi inspecta acum pentru a decide acþiunile ulterioare:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"Datoritã dependenþelor lor,\n"
-"urmãtoarele pachete trebuie de asemenea ºterse:\n"
-"\n"
+msgid "Browse..."
+msgstr "Rãsfoieºte..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "Pachetul `%s' nu poate fi instalat\n"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Trebuie ºterse unele pachete adiþionale"
+msgid "Info..."
+msgstr "Informaþii... "
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "More information on package..."
-msgstr "Mai multe informaþii despre pachet..."
+msgid "You need to insert the medium to continue"
+msgstr "Trebuie sã introduceþi mediul pentru a continua"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Copying file for media `%s'..."
+msgstr "Copiez fiºierul pentru sursa `%s'..."
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Information on packages"
-msgstr "Informaþii despre pachete"
+msgid "Remove"
+msgstr "ªterge"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "More info"
-msgstr "Mai multe informaþii"
+msgid "Preparing packages installation..."
+msgstr "Pregãtesc pachetele pentru instalare..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "by media repository"
+msgstr "dupã sursã"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "Disponibile pt. adãugare"
+msgid "No mirror"
+msgstr "Nu existã servere oglindã"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Upgradable"
-msgstr "Actualizabile"
+msgid "You need to fill up at least the two first entries."
+msgstr "Trebuie sã completaþi cel puþin primele douã intrãri."
 
 #: ../rpmdrake:1
 #, c-format
-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 ""
-"Lista actualizãrilor este goalã. Aceasta înseamnã cã nu existã\n"
-"actualizãri disponibile pentru pachetele instalate pe calculatorul dvs.,\n"
-"sau cã le-aþi instalat deja pe toate."
+msgid "Install"
+msgstr "Instaleazã"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "No update"
-msgstr "Nu sunt actualizãri"
+msgid "Japan"
+msgstr "Japonia"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "(none)"
-msgstr "(nimic)"
+msgid "Do nothing"
+msgstr "Nu fã nimic"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Vã rog sã aºteptaþi, listez pachetele..."
+msgid "No update"
+msgstr "Nu sunt actualizãri"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "Nu pot deschide pachetul`%s'\n"
+#, c-format
+msgid "Description: "
+msgstr "Descriere:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Unul din urmãtoarele pachete e necesar:"
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr ""
+"Avertisment: se pare cã încercaþi sã adãugaþi atât de multe\n"
+"pachete încât sistemul ar putea rãmâne fãrã spaþiu pe disc,\n"
+"în timpul sau dupã instalarea pachetelor;\n"
+"aceast lucru este periculos ºi trebuie sã aveþi grijã.\n"
+"\n"
+"Chiar doriþi sã instalaþi pachetele selectate?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Vã rog sã alegeþi"
+msgid "Name: "
+msgstr "Nume: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Inspect..."
+msgstr "Inspectez..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Not selected"
-msgstr "Conflicte detectate"
+msgid "Editing media \"%s\":"
+msgstr "Editez sursa \"%s\":"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Selected"
-msgstr "Selectate"
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "Pregãtesc pachetele pentru instalare..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results"
-msgstr "Rezultatele cãutãrii"
+msgid "Australia"
+msgstr "Australia"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Stop"
-msgstr "Opreºte"
+msgid "Installation finished"
+msgstr "Instalare terminatã"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Vã rog sã aºteptaþi, caut..."
+msgid "by update availability"
+msgstr "dupã disponibilitatea actualizãrii"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Rezultatele cãutãrii (nimic)"
+msgid "Poland"
+msgstr "Polonia"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Other"
-msgstr "Diverse"
+msgid "Version: "
+msgstr "Versiune: "
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the packages source editor!\n"
-"\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
-msgstr ""
-"Bun venit la editorul surselor de pachete!\n"
-"\n"
-"Acest utilitar vã a ajuta sã configuraþi sursele de pachete soft pe care\n"
-"doriþi sã le utilizaþi pe calculatorul dvs. Ele vor fi apoi disponibile "
-"pentru \n"
-"instalare de soft nou sau actualizare."
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Puteþi specifica un utilizator/parolã pentru autentificarea la proxy:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
-msgstr "Salvare ºi ieºire"
+msgid "Upgradable"
+msgstr "Actualizabile"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid " done."
+msgstr " terminat."
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Eroare..."
+msgid "Software Packages Installation"
+msgstr "Pregãtesc pachetele pentru instalare..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Update..."
-msgstr "Actualizeazã..."
+msgid "Additional packages needed"
+msgstr "Pachete adiþionale necesare"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "Adaugã..."
+msgid "Bugfixes updates"
+msgstr "Actualizãri pentru corectarea erorilor"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "Editeazã"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "Descarc `%s', timp rãmas: %s, vitezã: %s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Source"
-msgstr "Sursã"
+msgid "Germany"
+msgstr "Germania"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Enabled?"
-msgstr "Activat?"
+msgid "Russia"
+msgstr "Rusia"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Configure sources"
-msgstr "Configurare surse"
+msgid "Norway"
+msgstr "Norvegia"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Password:"
-msgstr "Parola:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during installation"
+msgstr "Probleme apãrute în timpul instalãrii"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "User:"
-msgstr "Utilizator:"
+msgid "Search"
+msgstr "Cãutare"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "Puteþi specifica un utilizator/parolã pentru autentificarea la proxy:"
+#, fuzzy, c-format
+msgid "Edit a media"
+msgstr "Editare surse"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "Nume gazdã proxy:"
+msgid "Czech Republic"
+msgstr "Cehia"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"Dacã e nevoie de proxy, introduceþi numele gazdei ºi opþional un port "
-"(sintaxã: <gazdãproxy[:port]>):"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Configurare proxy-uri"
+msgid "Stop"
+msgstr "Opreºte"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Vã rog sã aºteptaþi, actualizez mediul..."
+msgid "Update"
+msgstr "Actualizeazã"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "Pentru a salva modificãrile, trebuie sã introduceþi mediul în unitate."
+msgid "Please wait, removing packages..."
+msgstr "Vã rog sã aºteptaþi, ºterg pachetele..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "Trebuie sã introduceþi mediul pentru a continua"
+msgid "Normal information"
+msgstr "Informaþii normale"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "Salveazã schimbãrile"
+msgid "Media: "
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Calea relativã la synthesis sau hdlist:"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "Descarc pachetul `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL: "
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "Editez sursa \"%s\":"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Selectat: %d MB / Spaþiu liber pe disc: %d MB"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit a source"
-msgstr "Editare surse"
+msgid "Media"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Vã rog sã aºteptaþi, ºterg mediul..."
+msgid "Spain"
+msgstr "Spania"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Type of source:"
-msgstr "Tipul sursei:"
+msgid "Normal updates"
+msgstr "Actualizãri normale"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Adaug sursa:"
+msgid "by selection state"
+msgstr "dupã stare selecþie"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
-"Existã deja un mediu cu acel nume,\n"
-"chiar doriþi sã îl înlocuiþi?"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Trebuie sã completaþi cel puþin primele douã intrãri."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Name:"
-msgstr "Nume:"
+"Vã rog sã aºteptaþi, descarc adresele serverelor oglindã de pe situl "
+"MandrakeSoft."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -975,143 +905,148 @@ msgid "Login:"
 msgstr "Logare:"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Choose a mirror..."
-msgstr "Selectare server oglindã..."
+#, fuzzy, c-format
+msgid "Adding a media:"
+msgstr "Adaug sursa:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Browse..."
-msgstr "Rãsfoieºte..."
+msgid "Austria"
+msgstr "Austria"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Path or mount point:"
-msgstr "Calea sau punctul de montare: "
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Fatal error"
+msgstr "Eroare fiºier"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Removable device"
-msgstr "Dispozitiv detaºabil"
+msgid "Update..."
+msgstr "Actualizeazã..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "Verific semnãtura digitalã pt: `%s'..."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "Server HTTP"
+msgid "(none)"
+msgstr "(nimic)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "FTP server"
-msgstr "Server FTP"
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
+"ªtergerea acestor pachete ar corupe sistemul, îmi pare rãu:\n"
+"\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Path:"
-msgstr "Cale:"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Instalez pachetul `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "Fiºiere locale"
+msgid "Currently installed version: "
+msgstr "Versiunea instalatã curent:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add a source"
-msgstr "Adaugã o sursã"
+msgid "Other"
+msgstr "Diverse"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr "Nu pot actualiza mediul, el va fi dezactivat automat."
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "Motivul actualizãrii:"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to create medium."
-msgstr "Nu pot creea mediul."
+msgid "Please choose the desired mirror."
+msgstr "Vã rog sã selectaþi serverul oglindã dorit."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "Actualizeazã"
+msgid "Edit"
+msgstr "Editeazã"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Selectaþi sursele de actualizat:"
+msgid "Please wait, finding available packages..."
+msgstr "Vã rog sã aºteptaþi, caut pachetele disponibile..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Vã rog sã aºteptaþi, actualizez mediul..."
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Calea relativã la synthesis sau hdlist:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " failed!"
-msgstr "eºuat!"
+msgid "Search results (none)"
+msgstr "Rezultatele cãutãrii (nimic)"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid " done."
-msgstr " terminat."
+msgid "Danmark"
+msgstr "Danemarca"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "Descarc `%s', vitezã: %s"
+msgid "China"
+msgstr "China"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "Descarc `%s', timp rãmas: %s, vitezã: %s"
+msgid "United States"
+msgstr "Statele Unite"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "Verific semnãtura digitalã pt: `%s'..."
+#: ../rpmdrake:1
+#, c-format
+msgid "changes:"
+msgstr "schimbãri:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "Examinez fiºierul distant pentru sursa `%s'..."
+msgid "Some additional packages need to be removed"
+msgstr "Trebuie ºterse unele pachete adiþionale"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "Examinez fiºierul pentru sursa `%s'..."
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "Copiez fiºierul pentru sursa `%s'..."
+msgid "No"
+msgstr "Nu"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure medias"
+msgstr "Configurare surse"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a media"
+msgstr "Adaugã o sursã"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Please choose the desired mirror."
-msgstr "Vã rog sã selectaþi serverul oglindã dorit."
+msgid "Summary: "
+msgstr "Sumar: "
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
-msgstr ""
-"Nu gãsesc un server oglindã acceptabil.\n"
-"\n"
-"Pot fi mai multe cauze pentru aceastã problemã; cea mai frecventã este\n"
-"cazul când arhitectura procesorului dvs. nu este suportatã\n"
-"de actualizãrile oficiale Mandrake Linux."
+msgid "Canada"
+msgstr "Canada"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No mirror"
-msgstr "Nu existã servere oglindã"
+msgid "Greece"
+msgstr "Grecia"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1128,181 +1063,246 @@ 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:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Regret, trebuie sã fiþi root pentru a instala pachete."
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Error during download"
-msgstr "Eroare în timpul descãrcãrii."
+msgid "Path:"
+msgstr "Cale:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
-"Vã rog sã aºteptaþi, descarc adresele serverelor oglindã de pe situl "
-"MandrakeSoft."
+msgid "Problem during removal"
+msgstr "Problemã în timpul ºtergerii"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Trebuie sã contactez situl MandrakeSoft pentru a obþine lista serverelor "
-"oglindã.\n"
-"Vã rog sã verificaþi funcþionarea reþelei.\n"
-"\n"
-"Pot sã continui?"
+msgid "Selected"
+msgstr "Selectate"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United States"
-msgstr "Statele Unite"
+msgid "Netherlands"
+msgstr "Olanda"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "China"
-msgstr "China"
+msgid "Addable"
+msgstr "Disponibile pt. adãugare"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Marea Britanie"
+msgid "(Not available)"
+msgstr "(Indisponibil)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
+msgstr ""
+"Regret, urmãtoarele pachete nu pot fi selectate:\n"
+"\n"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Not selected"
+msgstr "Conflicte detectate"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Taiwan"
+msgid "Software Packages Removal"
+msgstr "ªtergere pachete Software"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Sweden"
 msgstr "Suedia"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Russia"
-msgstr "Rusia"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
+msgstr ""
+"\n"
+"\n"
+"Eroare(erori) raportatã(e):\n"
+"%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Portugal"
-msgstr "Portugalia"
+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 ""
+"Lista actualizãrilor este goalã. Aceasta înseamnã cã nu existã\n"
+"actualizãri disponibile pentru pachetele instalate pe calculatorul dvs.,\n"
+"sau cã le-aþi instalat deja pe toate."
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Poland"
-msgstr "Polonia"
+#, fuzzy, c-format
+msgid "Examining file of media `%s'..."
+msgstr "Examinez fiºierul pentru sursa `%s'..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Norway"
-msgstr "Norvegia"
+msgid "Download of `%s', speed:%s"
+msgstr "Descarc `%s', vitezã: %s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Netherlands"
-msgstr "Olanda"
+msgid "One of the following packages is needed:"
+msgstr "Unul din urmãtoarele pachete e necesar:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Korea"
-msgstr "Coreea"
+msgid "Quit"
+msgstr "Ieºire"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "Japonia"
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Trebuie sa contactez serverul oglindã pentru a obþine cele mai recente "
+"actualizãri.\n"
+"Vã rog sã ferificaþi dacã acum reþeaua funcþioneazã.\n"
+"\n"
+"Doriþi sã continuaþi?"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Italy"
-msgstr "Italia"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update media(s)"
+msgstr "Actualizare surse"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Israel"
-msgstr "Israel"
+msgid "Ok"
+msgstr "OK"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Greece"
-msgstr "Grecia"
+msgid "Please wait, adding medium..."
+msgstr "Vã rog sã aºteptaþi, adaug mediul..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "France"
-msgstr "Franþa"
+msgid "Unable to get source packages."
+msgstr "Nu pot prelua pachetele sursã."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "Finlanda"
+msgid "Too many packages are selected"
+msgstr "Sunt selectate prea multe pachete"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Spain"
-msgstr "Spania"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"Bun venit la editorul surselor de pachete!\n"
+"\n"
+"Acest utilitar vã a ajuta sã configuraþi sursele de pachete soft pe care\n"
+"doriþi sã le utilizaþi pe calculatorul dvs. Ele vor fi apoi disponibile "
+"pentru \n"
+"instalare de soft nou sau actualizare."
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Danmark"
-msgstr "Danemarca"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
+msgstr "e în conflict cu"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "Germania"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Bun venit la MandrakeUpdate!\n"
+"\n"
+"Acest utilitar vã va ajuta sã alegeþi programele de pe calculatorul dvs pe "
+"care doriþi \n"
+"sã le actualizaþi ."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Cehia"
+msgid "Mandrake choices"
+msgstr "Opþiuni Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Costa Rica"
+msgid "Changelog:\n"
+msgstr "Jurnal schimbãri:\n"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "Canada"
+msgid "Korea"
+msgstr "Coreea"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Brazil"
-msgstr "Brazilia"
+msgid "Removable device"
+msgstr "Dispozitiv detaºabil"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Belgia"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Australia"
+msgid "Change medium"
+msgstr "Schimbã mediul"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "Austria"
+msgid "Mandrake Update"
+msgstr "Actualizare Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
-msgstr "Informaþii... "
+msgid "by size"
+msgstr "dupã mãrime"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "Nu"
+msgid "FTP server"
+msgstr "Server FTP"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "Da"
+msgid "Files:\n"
+msgstr "Fiºiere:\n"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr "Nu pot actualiza mediul, el va fi dezactivat automat."
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -1575,6 +1575,12 @@ msgstr "ªtergere programe"
 msgid "Software Sources Manager"
 msgstr "Administrator surse de programe"
 
+#~ msgid "Source: "
+#~ msgstr "Sursã: "
+
+#~ msgid "Source"
+#~ msgstr "Sursã"
+
 #~ msgid ""
 #~ "some packages failed to install\n"
 #~ "correctly"
@@ -1615,9 +1621,6 @@ msgstr "Administrator surse de programe"
 #~ "\n"
 #~ "Doriþi sã încercaþi alt server oglindã?"
 
-#~ msgid "Error adding update medium"
-#~ msgstr "Eroare la adãugarea mediului de actualizare"
-
 #~ msgid "Please wait, contacting mirror to initialize updates packages."
 #~ msgstr ""
 #~ "Vã rog sã aºteptaþi, contactez serverul oglindã pentru iniþializarea "
diff --git a/po/rpmdrake.pot b/po/rpmdrake.pot
index e4a83fe8..135a8df2 100644
--- a/po/rpmdrake.pot
+++ b/po/rpmdrake.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,105 +14,77 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
+msgid "Enabled?"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
+msgid "Path or mount point:"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
+msgid "Portugal"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"Welcome to the software installation tool!\n"
 "\n"
-"%s"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Problem during removal"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing packages..."
+msgid "by group"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, reading packages database..."
+msgid "Name:"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
+msgid "Italy"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation failed"
+msgid "How to choose manually your mirror"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
+msgid "URL:"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "No package found for installation."
+msgid "Some packages need to be removed"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
+msgid "More information on package..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Everything installed successfully"
+msgid "Yes"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -122,218 +94,206 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Problem during installation"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Preparing packages installation..."
+msgid "%s KB"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
 "\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"Then, restart MandrakeUpdate."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"Welcome to the software removal tool!\n"
+"\n"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you want to continue installation?"
+"In order to save the changes, you need to insert the medium in the drive."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Verifying packages signatures..."
+msgid "Save and quit"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
+msgid "Size: "
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Ok"
+msgid "Security updates"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+msgid "Already existing update medias"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Change medium"
+msgid "Maximum information"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Initializing..."
+msgid "Proxy..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Package installation..."
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to get source packages, sorry. %s"
+msgid "United Kingdom"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Unable to get source packages."
+msgid "in names"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Inspect..."
+msgid ""
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation finished"
+msgid "Remove .%s"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Do nothing"
+msgid "Finland"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
+msgid ""
+"The following packages have bad signatures:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Remove .%s"
+msgid "Examining distant file of media `%s'..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "changes:"
+msgid "Verifying packages signatures..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Inspecting %s"
+msgid "France"
 msgstr ""
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, finding available packages..."
+msgid "More info"
 msgstr ""
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
+"%s\n"
 "\n"
-"Then, restart MandrakeUpdate."
+"Is it ok to continue?"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
+msgid "Reload the packages list"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
+msgid "Choose a mirror..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Already existing update sources"
+msgid "Some packages can't be installed"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
+msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
+msgid "All packages,"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Fatal error"
+msgid "Type of media:"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Software Packages Installation"
+msgid "in files"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Mandrake Update"
+msgid "All requested packages were installed successfully."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Software Packages Removal"
+msgid "Proxy hostname:"
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Quit"
+msgid "Local files"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
+msgid "Inspecting %s"
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Remove"
+msgid "Israel"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -341,258 +301,260 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search"
+msgid "HTTP server"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
+msgid "Installation failed"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
-"\n"
-"Is it ok to continue?"
+msgid "Use .%s as main file"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages need to be removed"
+msgid "Search results"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
-"\n"
-"Do you really want to install all the selected packages?"
+msgid " failed!"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Too many packages are selected"
+msgid "Brazil"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Maximum information"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Normal information"
+msgid "Find:"
 msgstr ""
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Update source(s)"
+msgid "All packages, alphabetical"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reload the packages list"
+msgid "Please wait, searching..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
+msgid "Please wait, reading packages database..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
+msgid "unknown package "
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
+msgid "Reset the selection"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by update availability"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by source repository"
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by selection state"
+msgid "Costa Rica"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by size"
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by group"
+msgid "Please wait, removing medium..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "All packages,"
+msgid "Password:"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "All packages, alphabetical"
+msgid "Taiwan"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Mandrake choices"
+msgid "User:"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
+msgid "Please wait, updating medium..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Bugfixes updates"
+msgid "Please wait, listing packages..."
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Security updates"
+msgid "Information on packages"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Description: "
+msgid "Cancel"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reason for update: "
+msgid "Everything installed successfully"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Summary: "
+msgid "Select the media(s) you wish to update:"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Importance: "
+msgid "Please wait, updating media..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
+msgid "A fatal error occurred: %s."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Size: "
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Version: "
+msgid "in descriptions"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Name: "
+msgid "Configure proxies"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Currently installed version: "
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Source: "
+msgid "Please choose"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "(Not available)"
+msgid "Selected size: %d MB"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Changelog:\n"
+msgid "Initializing..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Files:\n"
+msgid "Save changes"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Selected size: %d MB"
+msgid "Error during download"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
+msgid "Package installation..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
+msgid "Importance: "
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
 "\n"
-"%s"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "%s conflicts with %s"
+msgid "Add..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some packages can't be installed"
+msgid "Unable to create medium."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
+"The installation is finished; %s.\n"
 "\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
+msgid "Browse..."
 msgstr ""
 
 #: ../rpmdrake:1
@@ -600,422 +562,413 @@ msgstr ""
 msgid "Some packages can't be removed"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
+msgid "Info..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
+msgid "You need to insert the medium to continue"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
+msgid "Copying file for media `%s'..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "More information on package..."
+msgid "Remove"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Information on packages"
+msgid "Preparing packages installation..."
 msgstr ""
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "More info"
+msgid "by media repository"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
+msgid "No mirror"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Upgradable"
+msgid "You need to fill up at least the two first entries."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-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."
+msgid "Install"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "No update"
+msgid "Japan"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "(none)"
+msgid "Do nothing"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
+msgid "No update"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "unknown package "
+msgid "Description: "
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "One of the following packages is needed:"
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
+msgid "Name: "
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
+msgid "Inspect..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Not selected"
+msgid "Editing media \"%s\":"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected"
+msgid "No package found for installation."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results"
+msgid "Australia"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Stop"
+msgid "Installation finished"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
+msgid "by update availability"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results (none)"
+msgid "Poland"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Other"
+msgid "Version: "
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the packages source editor!\n"
-"\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
+msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
+msgid "Upgradable"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Proxy..."
+msgid " done."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Update..."
+msgid "Software Packages Installation"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
+msgid "Additional packages needed"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Edit"
+msgid "Bugfixes updates"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Source"
+msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Enabled?"
+msgid "Germany"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Configure sources"
+msgid "Russia"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Password:"
+msgid "Norway"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "User:"
+msgid "Problem during installation"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
+msgid "Search"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Proxy hostname:"
+msgid "Edit a media"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+msgid "Czech Republic"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
+msgid ""
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating medium..."
+msgid "Stop"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
+msgid "Update"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
+msgid "Please wait, removing packages..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
+msgid "Normal information"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
+msgid "Media: "
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
+msgid "Downloading package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Editing source \"%s\":"
+msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit a source"
+msgid "Media"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, removing medium..."
+msgid "Spain"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Type of source:"
+msgid "Normal updates"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Adding a source:"
+msgid "by selection state"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
+msgid "Login:"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Name:"
+msgid "Adding a media:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Login:"
+msgid "Austria"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
+msgid "Fatal error"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Browse..."
+msgid "Update..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Path or mount point:"
+msgid "Starting download of `%s'..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Removable device"
+msgid "(none)"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "FTP server"
+msgid "Installing package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Path:"
+msgid "Currently installed version: "
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
+msgid "Other"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add a source"
+msgid "Reason for update: "
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
+msgid "Please choose the desired mirror."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Unable to create medium."
+msgid "Edit"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Update"
+msgid "Please wait, finding available packages..."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
+msgid "Relative path to synthesis/hdlist:"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating media..."
+msgid "Search results (none)"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid " failed!"
+msgid "Danmark"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid " done."
+msgid "China"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
+msgid "United States"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
+msgid "changes:"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Starting download of `%s'..."
+msgid "Some additional packages need to be removed"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
+msgid "rpmdrake"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Examining file of source `%s'..."
+msgid "No"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Copying file for source `%s'..."
+msgid "Configure medias"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please choose the desired mirror."
+msgid "Add a media"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Summary: "
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
+msgid "Canada"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No mirror"
+msgid "Greece"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1028,43 +981,61 @@ msgid ""
 "Please try again later."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
+msgid "Unable to get source packages, sorry. %s"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgid "Path:"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
+msgid "Problem during removal"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United States"
+msgid "Selected"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
+msgid "Netherlands"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
+msgid "Addable"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
+msgid "(Not available)"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Not selected"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1072,99 +1043,119 @@ msgstr ""
 msgid "Sweden"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Russia"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Portugal"
+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.pm:1
 #, c-format
-msgid "Poland"
+msgid "Examining file of media `%s'..."
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Norway"
+msgid "Download of `%s', speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Netherlands"
+msgid "One of the following packages is needed:"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Korea"
+msgid "Quit"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Italy"
+msgid "Update media(s)"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Israel"
+msgid "Ok"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Greece"
+msgid "Please wait, adding medium..."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "France"
+msgid "Unable to get source packages."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
+msgid "Too many packages are selected"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Spain"
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Danmark"
+msgid "%s conflicts with %s"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
+msgid "Mandrake choices"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
+msgid "Changelog:\n"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
+msgid "Korea"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Brazil"
+msgid "Removable device"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1172,29 +1163,38 @@ msgstr ""
 msgid "Belgium"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
+msgid "Change medium"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
+msgid "Mandrake Update"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
+msgid "by size"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
+msgid "FTP server"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Yes"
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
 msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:86
diff --git a/po/ru.po b/po/ru.po
index eed8843c..4e1fd6db 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: 2003-04-17 11:18+0200\n"
 "Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
 "Language-Team: Russian <cooker-i18n@linux-mandrake.com >\n"
@@ -15,16 +15,20 @@ msgstr ""
 "Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"÷ÓÅ × ÐÏÒÑÄËÅ? íÏÖÎÏ ÐÒÏÄÏÌÖÁÔØ?"
+msgid "Enabled?"
+msgstr "÷ËÌÀÞÅÎ?"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "ðÕÔØ ÉÌÉ ÔÏÞËÁ ÍÏÎÔÉÒÏ×ÁÎÉÑ:"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Portugal"
+msgstr "ðÏÒÔÕÇÁÌÉÑ"
 
 #: ../rpmdrake:1
 #, c-format
@@ -43,104 +47,54 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"äÏÂÒÏ ÐÏÖÁÌÏ×ÁÔØ × MandrakeUpdate!\n"
-"\n"
-"üÔÏÔ ÉÎÓÔÒÕÍÅÎÔ ÐÏÍÏÖÅÔ ×ÁÍ ×ÙÂÒÁÔØ ÏÂÎÏ×ÌÅÎÉÑ ÄÌÑ ÕÓÔÁÎÏ×ËÉ ÎÁ ×ÁÛ\n"
-"ËÏÍÐØÀÔÅÒ."
+msgid "by group"
+msgstr "ÐÏ ÇÒÕÐÐÅ"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
-msgstr ""
-"äÏÂÒÏ ÐÏÖÁÌÏ×ÁÔØ × ÉÎÓÔÒÕÍÅÎÔ ÕÄÁÌÅÎÉÑ ÐÒÏÇÒÁÍÍÎÏÇÏ ÏÂÅÓÐÅÞÅÎÉÑ!\n"
-"\n"
-"üÔÏÔ ÉÎÓÔÒÕÍÅÎÔ ÐÏÍÏÖÅÔ ×ÁÍ ×ÙÂÒÁÔØ ÐÁËÅÔÙ ÄÌÑ ÕÄÁÌÅÎÉÑ Ó ×ÁÛÅÇÏ\n"
-"ËÏÍÐØÀÔÅÒÁ."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"÷Ï ×ÒÅÍÑ ÕÓÔÁÎÏ×ËÉ ÐÁËÅÔÏ× ×ÏÚÎÉËÌÁ ÏÛÉÂËÁ:\n"
-"\n"
-"%s"
+msgid "Name:"
+msgstr "éÍÑ:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Problem during removal"
-msgstr "ðÒÏÂÌÅÍÁ ×Ï ×ÒÅÍÑ ÕÄÁÌÅÎÉÑ"
+msgid "Italy"
+msgstr "éÔÁÌÉÑ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÏÖÄÉÔÅ, ÕÄÁÌÑÀÔÓÑ ÐÁËÅÔÙ..."
+msgid "How to choose manually your mirror"
+msgstr "ëÁË ×ÒÕÞÎÕÀ ×ÙÂÒÁÔØ Ó×ÏÅ ÚÅÒËÁÌÏ"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÏÖÄÉÔÅ, ÞÉÔÁÅÔÓÑ ÂÁÚÁ ÐÁËÅÔÏ×..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"÷Ï ×ÒÅÍÑ ÕÓÔÁÎÏ×ËÉ ÐÁËÅÔÏ× ×ÏÚÎÉËÌÁ ÏÛÉÂËÁ:\n"
-"\n"
-"%s"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "ïÐÅÒÁÃÉÑ HTTP Interface ÚÁ×ÅÒÛÉÌÁÓØ ÎÅÕÄÁÞÅÊ\n"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "ðÏÄÇÏÔÏ×ËÁ ÐÁËÅÔÏ× Ë ÕÓÔÁÎÏ×ËÅ..."
+msgid "URL:"
+msgstr "URL:"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "ðÏÄÇÏÔÏ×ËÁ ÐÁËÅÔÏ× Ë ÕÓÔÁÎÏ×ËÅ..."
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "îÅËÏÔÏÒÙÅ ÐÁËÅÔÙ ÄÏÌÖÎÙ ÂÙÔØ ÕÄÁÌÅÎÙ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "÷ÓÅ ÚÁÐÒÏÛÅÎÎÙÅ ÐÁËÅÔÙ ÂÙÌÉ ÕÓÐÅÛÎÏ ÕÓÔÁÎÏ×ÌÅÎÙ."
+msgid "More information on package..."
+msgstr "äÏÐÏÌÎÉÔÅÌØÎÁÑ ÉÎÆÏÒÍÁÃÉÑ Ï ÐÁËÅÔÅ..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "÷ÓÅ ÕÓÔÁÎÏ×ÌÅÎÏ ÕÓÐÅÛÎÏ."
+msgid "Yes"
+msgstr "äÁ"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
 msgstr ""
-"õÓÔÁÎÏ×ËÁ ÚÁ×ÅÒÛÅÎÁ; %s.\n"
+"óÌÅÄÕÀÝÉÅ ÐÁËÅÔÙ ÎÅ ÍÏÇÕÔ ÂÙÔØ ×ÙÂÒÁÎÙ ÐÏ ÐÒÉÞÉÎÅ Ó×ÏÉÈ\n"
+"ÚÁ×ÉÓÉÍÏÓÔÅÊ:\n"
 "\n"
-"îÅËÏÔÏÒÙÅ ÆÁÊÌÙ ÎÁÓÔÒÏÊËÉ ÂÙÌÉ ÓÏÚÄÁÎÙ ËÁË `.rpmnew' ÉÌÉ `.rpmsave',\n"
-"ÔÅÐÅÒØ ×Ù ÍÏÖÅÔÅ ÐÒÏÓÍÏÔÒÅÔØ ÉÈ ÞÔÏÂÙ ÐÒÉÎÑÔØ ÍÅÒÙ:"
 
 #: ../rpmdrake:1
 #, c-format
@@ -148,464 +102,453 @@ msgid "everything was installed correctly"
 msgstr "×ÓÅ ÂÙÌÏ ÕÓÔÁÎÏ×ÌÅÎÏ ÐÒÁ×ÉÌØÎÏ"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "÷Ï ×ÒÅÍÑ ÕÓÔÁÎÏ×ËÉ ×ÏÚÎÉËÌÉ ÐÒÏÂÌÅÍÙ"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "õÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ ÐÁËÅÔ `%s' (%s/%s)..."
+msgid "%s KB"
+msgstr "%s ëâ"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "ðÏÄÇÏÔÏ×ËÁ ÐÁËÅÔÏ× Ë ÕÓÔÁÎÏ×ËÅ..."
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"÷Ù ÔÁËÖÅ ÍÏÖÅÔÅ ×ÙÂÒÁÔØ ÐÏÄÈÏÄÑÝÅÅ ÚÅÒËÁÌÏ ×ÒÕÞÎÕÀ: ÄÌÑ ÜÔÏÇÏ\n"
+"ÚÁÐÕÓÔÉÔÅ íÅÎÅÄÖÅÒ ÉÓÔÏÞÎÉËÏ× ÐÒÏÇÒÁÍÍÎÏÇÏ ÏÂÅÓÐÅÞÅÎÉÑ, Á ÚÁÔÅÍ\n"
+"ÄÏÂÁ×ØÔÅ ÉÓÔÏÞÎÉË `ïÂÎÏ×ÌÅÎÉÑ ÐÏ ÂÅÚÏÐÁÓÎÏÓÔÉ'.\n"
+"\n"
+"úÁÔÅÍ ÐÅÒÅÚÁÐÕÓÔÉÔÅ MandrakeUpdate."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
+"Welcome to the software removal tool!\n"
 "\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
 msgstr ""
+"äÏÂÒÏ ÐÏÖÁÌÏ×ÁÔØ × ÉÎÓÔÒÕÍÅÎÔ ÕÄÁÌÅÎÉÑ ÐÒÏÇÒÁÍÍÎÏÇÏ ÏÂÅÓÐÅÞÅÎÉÑ!\n"
 "\n"
-"\n"
-"ï ÏÛÉÂËÅ(ÁÈ) ÓÏÏÂÝÅÎÏ:\n"
-"%s"
+"üÔÏÔ ÉÎÓÔÒÕÍÅÎÔ ÐÏÍÏÖÅÔ ×ÁÍ ×ÙÂÒÁÔØ ÐÁËÅÔÙ ÄÌÑ ÕÄÁÌÅÎÉÑ Ó ×ÁÛÅÇÏ\n"
+"ËÏÍÐØÀÔÅÒÁ."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"In order to save the changes, you need to insert the medium in the drive."
 msgstr ""
-"õÓÔÁÎÏ×ËÁ ÂÙÌÁ ÐÒÅÒ×ÁÎÁ, ÏÔÓÕÔÓÔ×ÕÀÔ ÎÅËÏÔÏÒÙÅ ÆÁÊÌÙ.\n"
-"÷ÁÍ ÍÏÖÅÔ ÐÏÎÁÄÏÂÉÔØÓÑ ÏÂÎÏ×ÉÔØ ×ÁÛÕ ÂÁÚÕ ÄÁÎÎÙÈ ÉÓÔÏÞÎÉËÏ×."
+"þÔÏÂÙ ÓÏÈÒÁÎÉÔØ ÉÚÍÅÎÅÎÉÑ, ×ÁÍ ÎÅÏÂÈÏÄÉÍÏ ×ÓÔÁ×ÉÔØ ÎÏÓÉÔÅÌØ × ÕÓÔÒÏÊÓÔ×Ï."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "óÏÈÒÁÎÉÔØ É ×ÙÊÔÉ"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
+"There was a problem during the removal of packages:\n"
 "\n"
-"Do you want to continue installation?"
+"%s"
 msgstr ""
-"óÌÅÄÕÀÝÉÅ ÐÁËÅÔÙ ÄÏÌÖÎÙ ÂÙÔØ ÕÄÁÌÅÎÙ ÞÔÏÂÙ ÐÏÚ×ÏÌÉÔØ ÏÂÎÏ×ÌÑÔØÓÑ ÏÓÔÁÌØÎÙÍ:\n"
-"\n"
-"%s\n"
+"÷Ï ×ÒÅÍÑ ÕÓÔÁÎÏ×ËÉ ÐÁËÅÔÏ× ×ÏÚÎÉËÌÁ ÏÛÉÂËÁ:\n"
 "\n"
-"÷ÓÅ × ÐÏÒÑÄËÅ? íÏÖÎÏ ÐÒÏÄÏÌÖÁÔØ?"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "óËÁÞÉ×ÁÅÔÓÑ ÐÁËÅÔ `%s' (%s/%s)..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Cancel"
-msgstr "ïÔÍÅÎÁ"
+msgid "Size: "
+msgstr "òÁÚÍÅÒ: "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Ok"
-msgstr "ïë"
+msgid "Security updates"
+msgstr "ïÂÎÏ×ÌÅÎÉÑ ÐÏ ÂÅÚÏÐÁÓÎÏÓÔÉ"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "ðÏÖÁÌÕÊÓÔÁ, ×ÓÔÁ×ØÔÅ ÎÏÓÉÔÅÌØ Ó ÉÍÅÎÅÍ \"%s\" × ÕÓÔÒÏÊÓÔ×Ï [%s]"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Change medium"
-msgstr "éÚÍÅÎÉÔØ ÎÏÓÉÔÅÌØ"
+msgid "Already existing update medias"
+msgstr "õÖÅ ÓÕÝÅÓÔ×ÕÀÝÉÅ ÉÓÔÏÞÎÉËÉ ÏÂÎÏ×ÌÅÎÉÑ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "éÎÉÃÉÁÌÉÚÁÃÉÑ..."
+msgid "Maximum information"
+msgstr "íÁËÓÉÍÕÍ ÉÎÆÏÒÍÁÃÉÉ"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "ðÏÄÇÏÔÏ×ËÁ ÐÁËÅÔÏ× Ë ÕÓÔÁÎÏ×ËÅ..."
+msgid "Proxy..."
+msgstr "ïÛÉÂËÁ..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "÷Ù ÄÏÌÖÎÙ ÉÍÅÔØ ÐÒÁ×Á root'Á ÄÌÑ ÕÓÔÁÎÏ×ËÉ ÐÁËÅÔÏ×, ÉÚ×ÉÎÉÔÅ."
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Unable to get source packages."
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÉÓÈÏÄÎÙÅ ÐÁËÅÔÙ."
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspect..."
-msgstr "éÚÕÞÅÎÉÅ..."
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
+msgstr ""
+"õÓÔÁÎÏ×ËÁ ÂÙÌÁ ÐÒÅÒ×ÁÎÁ, ÏÔÓÕÔÓÔ×ÕÀÔ ÎÅËÏÔÏÒÙÅ ÆÁÊÌÙ.\n"
+"÷ÁÍ ÍÏÖÅÔ ÐÏÎÁÄÏÂÉÔØÓÑ ÏÂÎÏ×ÉÔØ ×ÁÛÕ ÂÁÚÕ ÄÁÎÎÙÈ ÉÓÔÏÞÎÉËÏ×."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Installation finished"
-msgstr "õÓÔÁÎÏ×ËÁ ÚÁ×ÅÒÛÅÎÁ"
+msgid "United Kingdom"
+msgstr "ïÂßÅÄÉÎÅÎÎÏÅ ëÏÒÏÌÅ×ÓÔ×Ï"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "îÉÞÅÇÏ ÎÅ ÄÅÌÁÔØ"
+msgid "in names"
+msgstr "× ÉÍÅÎÁÈ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "éÓÐÏÌØÚÏ×ÁÔØ .%s × ËÁÞÅÓÔ×Å ÇÌÁ×ÎÏÇÏ ÆÁÊÌÁ"
+msgid ""
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
+msgstr ""
+"îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ËÁËÏÅ-ÌÉÂÏ ÐÏÄÈÏÄÑÝÅÅ ÚÅÒËÁÌÏ.\n"
+"\n"
+"ðÒÉÞÉÎ, ×ÙÚ×Á×ÛÉÈ ÜÔÕ ÐÒÏÂÌÅÍÕ, ÍÏÖÅÔ ÂÙÔØ ÎÅÓËÏÌØËÏ; ÎÁÉÂÏÌÅÅ\n"
+"ÞÁÓÔÙÍ Ñ×ÌÑÅÔÓÑ ÓÌÕÞÁÊ, ËÏÇÄÁ ÁÒÈÉÔÅËÔÕÒÁ ×ÁÛÅÇÏ ÐÒÏÃÅÓÓÏÒÁ ÎÅ\n"
+"ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ ïÆÉÃÉÁÌØÎÙÍÉ ïÂÎÏ×ÌÅÎÉÑÍÉ Mandrake Linux."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Remove .%s"
 msgstr "õÄÁÌÉÔØ .%s"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "changes:"
-msgstr "ÉÚÍÅÎÅÎÉÑ:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspecting %s"
-msgstr "éÚÕÞÁÅÔÓÑ %s"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Please wait, finding available packages..."
-msgstr "ðÏÄÏÖÄÉÔÅ, ÐÏÖÁÌÕÊÓÔÁ, ×ÙÐÏÌÎÑÅÔÓÑ ÐÏÉÓË ÄÏÓÔÕÐÎÙÈ ÐÁËÅÔÏ×..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÏÖÄÉÔÅ, ÄÏÂÁ×ÌÑÅÔÓÑ ÎÏÓÉÔÅÌØ..."
+msgid "Finland"
+msgstr "æÉÎÌÑÎÄÉÑ"
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
+"The following packages have bad signatures:\n"
 "\n"
-"Then, restart MandrakeUpdate."
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"÷Ù ÔÁËÖÅ ÍÏÖÅÔÅ ×ÙÂÒÁÔØ ÐÏÄÈÏÄÑÝÅÅ ÚÅÒËÁÌÏ ×ÒÕÞÎÕÀ: ÄÌÑ ÜÔÏÇÏ\n"
-"ÚÁÐÕÓÔÉÔÅ íÅÎÅÄÖÅÒ ÉÓÔÏÞÎÉËÏ× ÐÒÏÇÒÁÍÍÎÏÇÏ ÏÂÅÓÐÅÞÅÎÉÑ, Á ÚÁÔÅÍ\n"
-"ÄÏÂÁ×ØÔÅ ÉÓÔÏÞÎÉË `ïÂÎÏ×ÌÅÎÉÑ ÐÏ ÂÅÚÏÐÁÓÎÏÓÔÉ'.\n"
+"óÌÅÄÕÀÝÉÅ ÐÁËÅÔÙ ÄÏÌÖÎÙ ÂÙÔØ ÕÄÁÌÅÎÙ ÞÔÏÂÙ ÐÏÚ×ÏÌÉÔØ ÏÂÎÏ×ÌÑÔØÓÑ ÏÓÔÁÌØÎÙÍ:\n"
 "\n"
-"úÁÔÅÍ ÐÅÒÅÚÁÐÕÓÔÉÔÅ MandrakeUpdate."
+"%s\n"
+"\n"
+"÷ÓÅ × ÐÏÒÑÄËÅ? íÏÖÎÏ ÐÒÏÄÏÌÖÁÔØ?"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "How to choose manually your mirror"
-msgstr "ëÁË ×ÒÕÞÎÕÀ ×ÙÂÒÁÔØ Ó×ÏÅ ÚÅÒËÁÌÏ"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Examining distant file of media `%s'..."
+msgstr "ðÒÏ×ÅÒÑÅÔÓÑ ÄÁÌØÎÉÊ ÆÁÊÌ ÉÓÔÏÞÎÉËÁ `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
+msgid "Verifying packages signatures..."
 msgstr ""
-"õ ×ÁÓ ÕÖÅ ÅÓÔØ ÐÏ ËÒÁÊÎÅÊ ÍÅÒÅ ÏÄÉÎ ÎÁÓÔÒÏÅÎÎÙÊ\n"
-"ÉÓÔÏÞÎÉË ÏÂÎÏ×ÌÅÎÉÊ, ÎÏ ×ÓÅ ÏÎÉ ÎÁ ÄÁÎÎÙÊ ÍÏÍÅÎÔ\n"
-"ÏÔËÌÀÞÅÎÙ. ÷Ù ÄÏÌÖÎÙ ÚÁÐÕÓÔÉÔØ íÅÎÅÄÖÅÒ ÉÓÔÏÞÎÉËÏ×\n"
-"ÐÒÏÇÒÁÍÍÎÏÇÏ ÏÂÅÓÐÅÞÅÎÉÑ, ÞÔÏÂÙ ×ËÌÀÞÉÔØ ÐÏ ËÒÁÊÎÅÊ\n"
-"ÍÅÒÅ ÏÄÉÎ ÉÚ ÎÉÈ (ÐÒÏ×ÅÒØÔÅ ÜÔÏ × ËÏÌÏÎËÅ '÷ËÌÀÞÅÎ?')\n"
-"\n"
-"úÁÔÅÍ ÐÅÒÅÚÁÐÕÓÔÉÔÅ MandrakeUpdate."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Already existing update sources"
-msgstr "õÖÅ ÓÕÝÅÓÔ×ÕÀÝÉÅ ÉÓÔÏÞÎÉËÉ ÏÂÎÏ×ÌÅÎÉÑ"
+msgid "France"
+msgstr "æÒÁÎÃÉÑ"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
+msgid "More info"
+msgstr "äÏÐÏÌÎÉÔÅÌØÎÏ"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
+"%s\n"
 "\n"
 "Is it ok to continue?"
 msgstr ""
-"íÎÅ ÎÅÏÂÈÏÄÉÍÏ Ó×ÑÚÁÔØÓÑ Ó ÚÅÒËÁÌÏÍ, ÞÔÏÂÙ ÐÏÌÕÞÉÔØ ÓÁÍÙÅ\n"
-"ÐÏÓÌÅÄÎÉÅ ÐÁËÅÔÙ ÏÂÎÏ×ÌÅÎÉÊ. ðÏÖÁÌÕÊÓÔÁ, ÕÂÅÄÉÔÅÓØ,\n"
-"ÞÔÏ ×ÁÛÁ ÓÅÔØ × ÄÁÎÎÙÊ ÍÏÍÅÎÔ ÒÁÂÏÔÁÅÔ.\n"
+"%s\n"
+"\n"
 "÷ÓÅ × ÐÏÒÑÄËÅ? íÏÖÎÏ ÐÒÏÄÏÌÖÁÔØ?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr "ðÒÏÉÚÏÛÌÁ ËÒÉÔÉÞÅÓËÁÑ ÏÛÉÂËÁ: %s."
+msgid "Reload the packages list"
+msgstr "ðÅÒÅÚÁÇÒÕÚÉÔØ ÓÐÉÓÏË ÐÁËÅÔÏ×"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "÷ÙÂÅÒÉÔÅ ÚÅÒËÁÌÏ..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Fatal error"
-msgstr "ïÛÉÂËÁ ÆÁÊÌÁ"
+msgid "Some packages can't be installed"
+msgstr "ðÁËÅÔ `%s' ÎÅ ÍÏÖÅÔ ÂÙÔØ ÕÓÔÁÎÏ×ÌÅÎ\n"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
+msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "ðÏÄÇÏÔÏ×ËÁ ÐÁËÅÔÏ× Ë ÕÓÔÁÎÏ×ËÅ..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "ïÂÎÏ×ÌÅÎÉÅ Mandrake"
+msgid "All packages,"
+msgstr "÷ÓÅ ÐÁËÅÔÙ,"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Software Packages Removal"
-msgstr "õÄÁÌÅÎÉÅ ÐÁËÅÔÏ× ÐÒÏÇÒÁÍÍÎÏÇÏ ÏÂÅÓÐÅÞÅÎÉÑ"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Type of media:"
+msgstr "ôÉÐ ÉÓÔÏÞÎÉËÁ:"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Quit"
-msgstr "÷ÙÊÔÉ"
+msgid "in files"
+msgstr "× ÆÁÊÌÁÈ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "õÓÔÁÎÏ×ÉÔØ"
+msgid "All requested packages were installed successfully."
+msgstr "÷ÓÅ ÚÁÐÒÏÛÅÎÎÙÅ ÐÁËÅÔÙ ÂÙÌÉ ÕÓÐÅÛÎÏ ÕÓÔÁÎÏ×ÌÅÎÙ."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove"
-msgstr "õÄÁÌÉÔØ"
+msgid "Proxy hostname:"
+msgstr "éÍÑ ÈÏÓÔÁ ÐÒÏËÓÉ:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Help"
-msgstr "óÐÒÁ×ËÁ"
+msgid "Local files"
+msgstr "ìÏËÁÌØÎÙÅ ÆÁÊÌÙ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search"
-msgstr "ðÏÉÓË"
+msgid "Inspecting %s"
+msgstr "éÚÕÞÁÅÔÓÑ %s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Find:"
-msgstr "îÁÊÔÉ:"
+msgid "Israel"
+msgstr "éÚÒÁÉÌØ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"óÌÅÄÕÀÝÉÅ ÐÁËÅÔÙ ÄÏÌÖÎÙ ÂÙÔØ ÕÄÁÌÅÎÙ ÞÔÏÂÙ ÐÏÚ×ÏÌÉÔØ ÏÂÎÏ×ÌÑÔØÓÑ ÏÓÔÁÌØÎÙÍ:\n"
-"\n"
-"%s\n"
-"\n"
-"÷ÓÅ × ÐÏÒÑÄËÅ? íÏÖÎÏ ÐÒÏÄÏÌÖÁÔØ?"
+msgid "Help"
+msgstr "óÐÒÁ×ËÁ"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "îÅËÏÔÏÒÙÅ ÐÁËÅÔÙ ÄÏÌÖÎÙ ÂÙÔØ ÕÄÁÌÅÎÙ"
+msgid "HTTP server"
+msgstr "HTTP ÓÅÒ×ÅÒ"
 
 #: ../rpmdrake:1
-#, c-format
-msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
-"\n"
-"Do you really want to install all the selected packages?"
-msgstr ""
-"ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÐÏÈÏÖÅ, ÞÔÏ ×Ù ÐÙÔÁÅÔÅÓØ ÄÏÂÁ×ÉÔØ ÓÌÉÛËÏÍ\n"
-"ÍÎÏÇÏ ÐÁËÅÔÏ×, ÉÚ-ÚÁ ÞÅÇÏ ×ÁÛÅÊ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÅ ÎÅ È×ÁÔÉÔ\n"
-"Ó×ÏÂÏÄÎÏÇÏ ÍÅÓÔÁ ×Ï ×ÒÅÍÑ ÉÌÉ ÐÏÓÌÅ ÕÓÔÁÎÏ×ËÉ ÐÁËÅÔÏ×; ÜÔÏ\n"
-"ÞÒÅÚ×ÙÞÁÊÎÏ ÏÐÁÓÎÏ É ÄÏÌÖÎÏ ÂÙÔØ ÕÞÔÅÎÏ Ó ÏÓÔÏÒÏÖÎÏÓÔØÀ.\n"
-"\n"
-"÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ÕÓÔÁÎÏ×ÉÔØ ×ÓÅ ×ÙÂÒÁÎÎÙÅ ÐÁËÅÔÙ?"
+#, fuzzy, c-format
+msgid "Installation failed"
+msgstr "ïÐÅÒÁÃÉÑ HTTP Interface ÚÁ×ÅÒÛÉÌÁÓØ ÎÅÕÄÁÞÅÊ\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "÷ÙÂÒÁÎÏ ÓÌÉÛËÏÍ ÍÎÏÇÏ ÐÁËÅÔÏ×"
+msgid "Use .%s as main file"
+msgstr "éÓÐÏÌØÚÏ×ÁÔØ .%s × ËÁÞÅÓÔ×Å ÇÌÁ×ÎÏÇÏ ÆÁÊÌÁ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "íÁËÓÉÍÕÍ ÉÎÆÏÒÍÁÃÉÉ"
+msgid "Search results"
+msgstr "òÅÚÕÌØÔÁÔÙ ÐÏÉÓËÁ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Normal information"
-msgstr "óÔÁÎÄÁÒÔÎÁÑ ÉÎÆÏÒÍÁÃÉÑ"
+msgid " failed!"
+msgstr " ÎÅ ÕÄÁÌÏÓØ!"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Update source(s)"
-msgstr "ïÂÎÏ×ÉÔØ ÉÓÔÏÞÎÉË(É)"
+msgid "Brazil"
+msgstr "âÒÁÚÉÌÉÑ"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "ðÅÒÅÚÁÇÒÕÚÉÔØ ÓÐÉÓÏË ÐÁËÅÔÏ×"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"îÏÓÉÔÅÌØ Ó ÔÁËÉÍ ÎÁÚ×ÁÎÉÅÍ ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ,\n"
+"×Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ÅÇÏ ÚÁÍÅÎÉÔØ?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "óÂÒÏÓÉÔØ ×ÙÂÏÒ"
+msgid "Find:"
+msgstr "îÁÊÔÉ:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "× ÆÁÊÌÁÈ"
+msgid "All packages, alphabetical"
+msgstr "÷ÓÅ ÐÁËÅÔÙ, ÐÏ ÁÌÆÁ×ÉÔÕ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "× ÏÐÉÓÁÎÉÑÈ"
+msgid "Please wait, searching..."
+msgstr "ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÏÖÄÉÔÅ, ×ÙÐÏÌÎÑÅÔÓÑ ÐÏÉÓË..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "× ÉÍÅÎÁÈ"
+msgid "Please wait, reading packages database..."
+msgstr "ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÏÖÄÉÔÅ, ÞÉÔÁÅÔÓÑ ÂÁÚÁ ÐÁËÅÔÏ×..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by update availability"
-msgstr "ÐÏ ÄÏÓÔÕÐÎÏÓÔÉ ÏÂÎÏ×ÌÅÎÉÊ"
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÐÁËÅÔ `%s'\n"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by source repository"
-msgstr "ÐÏ ÉÓÔÏÞÎÉËÕ"
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "ðÏÖÁÌÕÊÓÔÁ, ×ÓÔÁ×ØÔÅ ÎÏÓÉÔÅÌØ Ó ÉÍÅÎÅÍ \"%s\" × ÕÓÔÒÏÊÓÔ×Ï [%s]"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by selection state"
-msgstr "ÐÏ ÓÏÓÔÏÑÎÉÀ ×ÙÂÏÒÁ"
+msgid "Reset the selection"
+msgstr "óÂÒÏÓÉÔØ ×ÙÂÏÒ"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by size"
-msgstr "ÐÏ ÒÁÚÍÅÒÕ"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"åÓÌÉ ×ÁÍ ÎÕÖÅÎ ÐÒÏËÓÉ, ××ÅÄÉÔÅ ÉÍÑ ÈÏÓÔÁ É ÐÒÉ ÎÅÏÂÈÏÄÉÍÏÓÔÉ ÐÏÒÔ "
+"(ÓÉÎÔÁËÓÉÓ: <ÈÏÓÔ_ÐÒÏËÓÉ[:ÐÏÒÔ]>):"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-msgstr "ÐÏ ÇÒÕÐÐÅ"
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
+"ðÏ ÐÒÉÞÉÎÅ Ó×ÏÉÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ, ÓÌÅÄÕÀÝÉÅ ÐÁËÅÔÙ ÔÁËÖÅ ÄÏÌÖÎÙ ÂÙÔØ ÕÄÁÌÅÎÙ\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "All packages,"
-msgstr "÷ÓÅ ÐÁËÅÔÙ,"
+msgid "Costa Rica"
+msgstr "ëÏÓÔÁ-òÉËÁ"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "All packages, alphabetical"
-msgstr "÷ÓÅ ÐÁËÅÔÙ, ÐÏ ÁÌÆÁ×ÉÔÕ"
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"÷Ï ×ÒÅÍÑ ÕÓÔÁÎÏ×ËÉ ÐÁËÅÔÏ× ×ÏÚÎÉËÌÁ ÏÛÉÂËÁ:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "÷ÙÂÏÒ Mandrake"
+msgid "Please wait, removing medium..."
+msgstr "ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÏÖÄÉÔÅ, ÕÄÁÌÑÅÔÓÑ ÎÏÓÉÔÅÌØ..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
-msgstr "îÏÒÍÁÌØÎÙÅ ÏÂÎÏ×ÌÅÎÉÑ"
+msgid "Password:"
+msgstr "ðÁÒÏÌØ:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "ïÂÎÏ×ÌÅÎÉÑ ÂÁÇ-ÆÉËÓÏ×"
+msgid "Taiwan"
+msgstr "ôÁÊ×ÁÎØ"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Security updates"
-msgstr "ïÂÎÏ×ÌÅÎÉÑ ÐÏ ÂÅÚÏÐÁÓÎÏÓÔÉ"
+msgid "User:"
+msgstr "ðÏÌØÚÏ×ÁÔÅÌØ:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Description: "
-msgstr "ïÐÉÓÁÎÉÅ:"
+msgid "Please wait, updating medium..."
+msgstr "ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÏÖÄÉÔÅ, ÏÂÎÏ×ÌÑÅÔÓÑ ÎÏÓÉÔÅÌØ..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reason for update: "
-msgstr "ðÒÉÞÉÎÁ ÏÂÎÏ×ÌÅÎÉÑ:"
+msgid "Please wait, listing packages..."
+msgstr "ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÏÖÄÉÔÅ, ÓÏÓÔÁ×ÌÑÅÔÓÑ ÓÐÉÓÏË ÐÁËÅÔÏ×..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Summary: "
-msgstr "ó×ÏÄËÁ: "
+msgid "Information on packages"
+msgstr "éÎÆÏÒÍÁÃÉÑ Ï ÐÁËÅÔÁÈ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Importance: "
-msgstr "÷ÁÖÎÏÓÔØ: "
+msgid "Cancel"
+msgstr "ïÔÍÅÎÁ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s ëâ"
+msgid "Everything installed successfully"
+msgstr "÷ÓÅ ÕÓÔÁÎÏ×ÌÅÎÏ ÕÓÐÅÛÎÏ."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Size: "
-msgstr "òÁÚÍÅÒ: "
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Select the media(s) you wish to update:"
+msgstr "÷ÙÂÅÒÉÔÅ ÉÓÔÏÞÎÉË(É) ÄÌÑ ÏÂÎÏ×ÌÅÎÉÑ:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Version: "
-msgstr "÷ÅÒÓÉÑ:"
+msgid "Please wait, updating media..."
+msgstr "ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÏÖÄÉÔÅ, ÏÂÎÏ×ÌÑÅÔÓÑ ÎÏÓÉÔÅÌØ..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "îÁÚ×ÁÎÉÅ: "
+msgid "A fatal error occurred: %s."
+msgstr "ðÒÏÉÚÏÛÌÁ ËÒÉÔÉÞÅÓËÁÑ ÏÛÉÂËÁ: %s."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "õÓÔÁÎÏ×ÌÅÎÎÁÑ ×ÅÒÓÉÑ:"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"óÌÅÄÕÀÝÉÅ ÐÁËÅÔÙ ÄÏÌÖÎÙ ÂÙÔØ ÕÄÁÌÅÎÙ ÞÔÏÂÙ ÐÏÚ×ÏÌÉÔØ ÏÂÎÏ×ÌÑÔØÓÑ ÏÓÔÁÌØÎÙÍ:\n"
+"\n"
+"%s\n"
+"\n"
+"÷ÓÅ × ÐÏÒÑÄËÅ? íÏÖÎÏ ÐÒÏÄÏÌÖÁÔØ?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Source: "
-msgstr "éÓÔÏÞÎÉË: "
+msgid "in descriptions"
+msgstr "× ÏÐÉÓÁÎÉÑÈ"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(Not available)"
-msgstr "(îÅÄÏÓÔÕÐÅÎ)"
+msgid "Configure proxies"
+msgstr "îÁÓÔÒÏÉÔØ ÐÒÏËÓÉ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Changelog:\n"
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"íÎÅ ÎÅÏÂÈÏÄÉÍÏ Ó×ÑÚÁÔØÓÑ Ó ×ÅÂ-ÓÁÊÔÏÍ MandrakeSoft, ÞÔÏÂÙ ÐÏÌÕÞÉÔØ\n"
+" ÓÐÉÓÏË ÚÅÒËÁÌ. ðÏÖÁÌÕÊÓÔÁ, ÕÂÅÄÉÔÅÓØ, ÞÔÏ ×ÁÛÁ ÓÅÔØ × ÎÁÓÔÏÑÝÉÊ\n"
+"ÍÏÍÅÎÔ ÒÁÂÏÔÁÅÔ.\n"
+"÷ÓÅ × ÐÏÒÑÄËÅ? íÏÖÎÏ ÐÒÏÄÏÌÖÁÔØ?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Files:\n"
-msgstr "æÁÊÌÙ:\n"
+msgid "Please choose"
+msgstr "ðÏÖÁÌÕÊÓÔÁ, ×ÙÂÅÒÉÔÅ"
 
 #: ../rpmdrake:1
 #, c-format
@@ -614,48 +557,28 @@ msgstr "÷ÙÂÒÁÎÎÙÊ ÒÁÚÍÅÒ: %d íâ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "÷ÙÂÒÁÎÏ: %d íâ / ó×ÏÂÏÄÎÏ ÎÁ ÄÉÓËÅ: %d íâ"
+msgid "Initializing..."
+msgstr "éÎÉÃÉÁÌÉÚÁÃÉÑ..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
-msgstr ""
-"óÌÅÄÕÀÝÉÅ ÐÁËÅÔÙ ÎÅ ÍÏÇÕÔ ÂÙÔØ ×ÙÂÒÁÎÙ ÐÏ ÐÒÉÞÉÎÅ Ó×ÏÉÈ\n"
-"ÚÁ×ÉÓÉÍÏÓÔÅÊ:\n"
-"\n"
+msgid "Save changes"
+msgstr "óÏÈÒÁÎÉÔØ ÉÚÍÅÎÅÎÉÑ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr ""
-"éÚ×ÉÎÉÔÅ, ÎÏ ÓÌÅÄÕÀÝÉÅ ÐÁËÅÔÙ ÎÅ ÍÏÇÕÔ ÂÙÔØ ×ÙÂÒÁÎÙ:\n"
-"\n"
-"%s\n"
-"\n"
-"ðÒÉÞÉÎÙ:\n"
-"\n"
-"%s"
+msgid "Error during download"
+msgstr "ïÛÉÂËÁ ÐÒÉ ÓËÁÞÉ×ÁÎÉÉ"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "ËÏÎÆÌÉËÔÕÅÔ Ó"
+msgid "Package installation..."
+msgstr "ðÏÄÇÏÔÏ×ËÁ ÐÁËÅÔÏ× Ë ÕÓÔÁÎÏ×ËÅ..."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "ðÁËÅÔ `%s' ÎÅ ÍÏÖÅÔ ÂÙÔØ ÕÓÔÁÎÏ×ÌÅÎ\n"
+#, c-format
+msgid "Importance: "
+msgstr "÷ÁÖÎÏÓÔØ: "
 
 #: ../rpmdrake:1
 #, c-format
@@ -668,312 +591,315 @@ msgstr ""
 "ÓÌÅÄÕÀÝÉÅ ÐÁËÅÔÙ:\n"
 "\n"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "ôÒÅÂÕÀÔÓÑ ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÐÁËÅÔÙ"
+msgid "Add..."
+msgstr "äÏÂÁ×ÉÔØ..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "ðÁËÅÔ `%s' ÎÅ ÍÏÖÅÔ ÂÙÔØ ÕÓÔÁÎÏ×ÌÅÎ\n"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÎÏÓÉÔÅÌØ."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Removing these packages would break your system, sorry:\n"
+"The installation is finished; %s.\n"
 "\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
 msgstr ""
-"ë ÓÏÖÁÌÅÎÉÀ ÕÄÁÌÅÎÉÅ ÜÔÉÈ ÐÁËÅÔÏ× ÎÁÒÕÛÉÔ ÒÁÂÏÔÕ ÓÉÓÔÅÍÙ:\n"
+"õÓÔÁÎÏ×ËÁ ÚÁ×ÅÒÛÅÎÁ; %s.\n"
 "\n"
+"îÅËÏÔÏÒÙÅ ÆÁÊÌÙ ÎÁÓÔÒÏÊËÉ ÂÙÌÉ ÓÏÚÄÁÎÙ ËÁË `.rpmnew' ÉÌÉ `.rpmsave',\n"
+"ÔÅÐÅÒØ ×Ù ÍÏÖÅÔÅ ÐÒÏÓÍÏÔÒÅÔØ ÉÈ ÞÔÏÂÙ ÐÒÉÎÑÔØ ÍÅÒÙ:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"ðÏ ÐÒÉÞÉÎÅ Ó×ÏÉÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ, ÓÌÅÄÕÀÝÉÅ ÐÁËÅÔÙ ÔÁËÖÅ ÄÏÌÖÎÙ ÂÙÔØ ÕÄÁÌÅÎÙ\n"
-"\n"
+msgid "Browse..."
+msgstr "ðÒÏÓÍÏÔÒÅÔØ..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "ðÁËÅÔ `%s' ÎÅ ÍÏÖÅÔ ÂÙÔØ ÕÓÔÁÎÏ×ÌÅÎ\n"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "îÅËÏÔÏÒÙÅ ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÐÁËÅÔÙ ÄÏÌÖÎÙ ÂÙÔØ ÕÄÁÌÅÎÙ"
+msgid "Info..."
+msgstr "éÎÆÏÒÍÁÃÉÑ..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "More information on package..."
-msgstr "äÏÐÏÌÎÉÔÅÌØÎÁÑ ÉÎÆÏÒÍÁÃÉÑ Ï ÐÁËÅÔÅ..."
+msgid "You need to insert the medium to continue"
+msgstr "÷ÁÍ ÎÅÏÂÈÏÄÉÍÏ ×ÓÔÁ×ÉÔØ ÎÏÓÉÔÅÌØ ÄÌÑ ÐÒÏÄÏÌÖÅÎÉÑ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Copying file for media `%s'..."
+msgstr "ëÏÐÉÒÕÅÔÓÑ ÆÁÊÌ ÄÌÑ ÉÓÔÏÞÎÉËÁ `%s'..."
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Information on packages"
-msgstr "éÎÆÏÒÍÁÃÉÑ Ï ÐÁËÅÔÁÈ"
+msgid "Remove"
+msgstr "õÄÁÌÉÔØ"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
-#, c-format
-msgid "More info"
-msgstr "äÏÐÏÌÎÉÔÅÌØÎÏ"
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "ðÏÄÇÏÔÏ×ËÁ ÐÁËÅÔÏ× Ë ÕÓÔÁÎÏ×ËÅ..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "by media repository"
+msgstr "ÐÏ ÉÓÔÏÞÎÉËÕ"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "íÏÖÎÏ ÄÏÂÁ×ÉÔØ"
+msgid "No mirror"
+msgstr "îÅÔ ÚÅÒËÁÌÁ"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Upgradable"
-msgstr "íÏÖÎÏ ÏÂÎÏ×ÉÔØ"
+msgid "You need to fill up at least the two first entries."
+msgstr "÷ÁÍ ÎÅÏÂÈÏÄÉÍÏ ÚÁÐÏÌÎÉÔØ ÐÏ ËÒÁÊÎÅÊ ÍÅÒÅ Ä×Á ÐÅÒ×ÙÈ ÐÕÎËÔÁ."
 
 #: ../rpmdrake:1
 #, c-format
-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 ""
-"óÐÉÓÏË ÐÁËÅÔÏ× ÐÕÓÔ. üÔÏ ÏÚÎÁÞÁÅÔ, ÞÔÏ ÌÉÂÏ ÎÅÔ ÏÂÎÏ×ÌÅÎÉÊ ÄÌÑ\n"
-"ÐÁËÅÔÏ×, ÕÓÔÁÎÏ×ÌÅÎÎÙÈ ÎÁ ×ÁÛÅÍ ËÏÍÐØÀÔÅÒÅ, ÌÉÂÏ ÏÎÉ ÕÖÅ ×ÓÅ\n"
-"ÕÓÔÁÎÏ×ÌÅÎÙ."
+msgid "Install"
+msgstr "õÓÔÁÎÏ×ÉÔØ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "No update"
-msgstr "ïÂÎÏ×ÌÅÎÉÊ ÎÅÔ"
+msgid "Japan"
+msgstr "ñÐÏÎÉÑ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "(none)"
-msgstr "(ÎÅÔ)"
+msgid "Do nothing"
+msgstr "îÉÞÅÇÏ ÎÅ ÄÅÌÁÔØ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÏÖÄÉÔÅ, ÓÏÓÔÁ×ÌÑÅÔÓÑ ÓÐÉÓÏË ÐÁËÅÔÏ×..."
+msgid "No update"
+msgstr "ïÂÎÏ×ÌÅÎÉÊ ÎÅÔ"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÐÁËÅÔ `%s'\n"
+#, c-format
+msgid "Description: "
+msgstr "ïÐÉÓÁÎÉÅ:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "îÕÖÅÎ ÏÄÉÎ ÉÚ ÓÌÅÄÕÀÝÉÈ ÐÁËÅÔÏ×:"
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr ""
+"ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÐÏÈÏÖÅ, ÞÔÏ ×Ù ÐÙÔÁÅÔÅÓØ ÄÏÂÁ×ÉÔØ ÓÌÉÛËÏÍ\n"
+"ÍÎÏÇÏ ÐÁËÅÔÏ×, ÉÚ-ÚÁ ÞÅÇÏ ×ÁÛÅÊ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÅ ÎÅ È×ÁÔÉÔ\n"
+"Ó×ÏÂÏÄÎÏÇÏ ÍÅÓÔÁ ×Ï ×ÒÅÍÑ ÉÌÉ ÐÏÓÌÅ ÕÓÔÁÎÏ×ËÉ ÐÁËÅÔÏ×; ÜÔÏ\n"
+"ÞÒÅÚ×ÙÞÁÊÎÏ ÏÐÁÓÎÏ É ÄÏÌÖÎÏ ÂÙÔØ ÕÞÔÅÎÏ Ó ÏÓÔÏÒÏÖÎÏÓÔØÀ.\n"
+"\n"
+"÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ÕÓÔÁÎÏ×ÉÔØ ×ÓÅ ×ÙÂÒÁÎÎÙÅ ÐÁËÅÔÙ?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "ðÏÖÁÌÕÊÓÔÁ, ×ÙÂÅÒÉÔÅ"
+msgid "Name: "
+msgstr "îÁÚ×ÁÎÉÅ: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Inspect..."
+msgstr "éÚÕÞÅÎÉÅ..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Not selected"
-msgstr "ïÂÎÁÒÕÖÅÎÙ ËÏÎÆÌÉËÔÙ"
+msgid "Editing media \"%s\":"
+msgstr "òÅÄÁËÔÉÒÏ×ÁÎÉÅ ÉÓÔÏÞÎÉËÁ \"%s\":"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Selected"
-msgstr "÷ÙÂÒÁÎÎÙÅ"
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "ðÏÄÇÏÔÏ×ËÁ ÐÁËÅÔÏ× Ë ÕÓÔÁÎÏ×ËÅ..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results"
-msgstr "òÅÚÕÌØÔÁÔÙ ÐÏÉÓËÁ"
+msgid "Australia"
+msgstr "á×ÓÔÒÁÌÉÑ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Stop"
-msgstr "ïÓÔÁÎÏ×ÉÔØ"
+msgid "Installation finished"
+msgstr "õÓÔÁÎÏ×ËÁ ÚÁ×ÅÒÛÅÎÁ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÏÖÄÉÔÅ, ×ÙÐÏÌÎÑÅÔÓÑ ÐÏÉÓË..."
+msgid "by update availability"
+msgstr "ÐÏ ÄÏÓÔÕÐÎÏÓÔÉ ÏÂÎÏ×ÌÅÎÉÊ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results (none)"
-msgstr "òÅÚÕÌØÔÁÔÙ ÐÏÉÓËÁ (ÎÅÔ)"
+msgid "Poland"
+msgstr "ðÏÌØÛÁ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Other"
-msgstr "äÒÕÇÏÅ"
+msgid "Version: "
+msgstr "÷ÅÒÓÉÑ:"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the packages source editor!\n"
-"\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
-msgstr ""
-"äÏÂÒÏ ÐÏÖÁÌÏ×ÁÔØ × ÒÅÄÁËÔÏÒ ÉÓÔÏÞÎÉËÏ× ÐÁËÅÔÏ×!\n"
-"\n"
-"üÔÏÔ ÉÎÓÔÒÕÍÅÎÔ ÐÏÍÏÖÅÔ ×ÁÍ ÎÁÓÔÒÏÉÔØ ÉÓÔÏÞÎÉËÉ ÐÁËÅÔÏ×, ËÏÔÏÒÙÅ ×Ù\n"
-"ÖÅÌÁÅÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÎÁ Ó×ÏÅÍ ËÏÍÐØÀÔÅÒÅ. úÁÔÅÍ ÏÎÉ ÂÕÄÕÔ ÄÏÓÔÕÐÎÙ ÄÌÑ\n"
-"ÕÓÔÁÎÏ×ËÉ ÎÏ×ÙÈ ÐÁËÅÔÏ× Ó ÐÒÏÇÒÁÍÍÎÙÍ ÏÂÅÓÐÅÞÅÎÉÅÍ ÉÌÉ ÄÌÑ ×ÙÐÏÌÎÅÎÉÑ\n"
-"ÏÂÎÏ×ÌÅÎÉÊ."
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "÷Ù ÍÏÖÅÔÅ ÕËÁÚÁÔØ ÐÏÌØÚÏ×ÁÔÅÌÑ/ÐÁÒÏÌØ ÄÌÑ ÁÕÔÅÎÔÉÆÉËÁÃÉÉ ÎÁ ÐÒÏËÓÉ:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
-msgstr "óÏÈÒÁÎÉÔØ É ×ÙÊÔÉ"
+msgid "Upgradable"
+msgstr "íÏÖÎÏ ÏÂÎÏ×ÉÔØ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid " done."
+msgstr " ÇÏÔÏ×Ï."
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "ïÛÉÂËÁ..."
+msgid "Software Packages Installation"
+msgstr "ðÏÄÇÏÔÏ×ËÁ ÐÁËÅÔÏ× Ë ÕÓÔÁÎÏ×ËÅ..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Update..."
-msgstr "ïÂÎÏ×ÉÔØ..."
+msgid "Additional packages needed"
+msgstr "ôÒÅÂÕÀÔÓÑ ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÐÁËÅÔÙ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "äÏÂÁ×ÉÔØ..."
+msgid "Bugfixes updates"
+msgstr "ïÂÎÏ×ÌÅÎÉÑ ÂÁÇ-ÆÉËÓÏ×"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "òÅÄÁËÔÉÒÏ×ÁÔØ"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "úÁÇÒÕÚËÁ `%s', ÏÓÔÁÌÏÓØ ×ÒÅÍÅÎÉ:%s, ÓËÏÒÏÓÔØ:%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Source"
-msgstr "éÓÔÏÞÎÉË"
+msgid "Germany"
+msgstr "çÅÒÍÁÎÉÑ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Enabled?"
-msgstr "÷ËÌÀÞÅÎ?"
+msgid "Russia"
+msgstr "òÏÓÓÉÑ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Configure sources"
-msgstr "îÁÓÔÒÏÉÔØ ÉÓÔÏÞÎÉËÉ"
+msgid "Norway"
+msgstr "îÏÒ×ÅÇÉÑ"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Password:"
-msgstr "ðÁÒÏÌØ:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during installation"
+msgstr "÷Ï ×ÒÅÍÑ ÕÓÔÁÎÏ×ËÉ ×ÏÚÎÉËÌÉ ÐÒÏÂÌÅÍÙ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "User:"
-msgstr "ðÏÌØÚÏ×ÁÔÅÌØ:"
+msgid "Search"
+msgstr "ðÏÉÓË"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "÷Ù ÍÏÖÅÔÅ ÕËÁÚÁÔØ ÐÏÌØÚÏ×ÁÔÅÌÑ/ÐÁÒÏÌØ ÄÌÑ ÁÕÔÅÎÔÉÆÉËÁÃÉÉ ÎÁ ÐÒÏËÓÉ:"
+#, fuzzy, c-format
+msgid "Edit a media"
+msgstr "òÅÄÁËÔÉÒÏ×ÁÔØ ÉÓÔÏÞÎÉË"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "éÍÑ ÈÏÓÔÁ ÐÒÏËÓÉ:"
+msgid "Czech Republic"
+msgstr "þÅÛÓËÁÑ òÅÓÐÕÂÌÉËÁ"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
+#: ../rpmdrake:1
+#, fuzzy, c-format
 msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"åÓÌÉ ×ÁÍ ÎÕÖÅÎ ÐÒÏËÓÉ, ××ÅÄÉÔÅ ÉÍÑ ÈÏÓÔÁ É ÐÒÉ ÎÅÏÂÈÏÄÉÍÏÓÔÉ ÐÏÒÔ "
-"(ÓÉÎÔÁËÓÉÓ: <ÈÏÓÔ_ÐÒÏËÓÉ[:ÐÏÒÔ]>):"
+"õ ×ÁÓ ÕÖÅ ÅÓÔØ ÐÏ ËÒÁÊÎÅÊ ÍÅÒÅ ÏÄÉÎ ÎÁÓÔÒÏÅÎÎÙÊ\n"
+"ÉÓÔÏÞÎÉË ÏÂÎÏ×ÌÅÎÉÊ, ÎÏ ×ÓÅ ÏÎÉ ÎÁ ÄÁÎÎÙÊ ÍÏÍÅÎÔ\n"
+"ÏÔËÌÀÞÅÎÙ. ÷Ù ÄÏÌÖÎÙ ÚÁÐÕÓÔÉÔØ íÅÎÅÄÖÅÒ ÉÓÔÏÞÎÉËÏ×\n"
+"ÐÒÏÇÒÁÍÍÎÏÇÏ ÏÂÅÓÐÅÞÅÎÉÑ, ÞÔÏÂÙ ×ËÌÀÞÉÔØ ÐÏ ËÒÁÊÎÅÊ\n"
+"ÍÅÒÅ ÏÄÉÎ ÉÚ ÎÉÈ (ÐÒÏ×ÅÒØÔÅ ÜÔÏ × ËÏÌÏÎËÅ '÷ËÌÀÞÅÎ?')\n"
+"\n"
+"úÁÔÅÍ ÐÅÒÅÚÁÐÕÓÔÉÔÅ MandrakeUpdate."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "îÁÓÔÒÏÉÔØ ÐÒÏËÓÉ"
+msgid "Stop"
+msgstr "ïÓÔÁÎÏ×ÉÔØ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÏÖÄÉÔÅ, ÏÂÎÏ×ÌÑÅÔÓÑ ÎÏÓÉÔÅÌØ..."
+msgid "Update"
+msgstr "ïÂÎÏ×ÉÔØ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr ""
-"þÔÏÂÙ ÓÏÈÒÁÎÉÔØ ÉÚÍÅÎÅÎÉÑ, ×ÁÍ ÎÅÏÂÈÏÄÉÍÏ ×ÓÔÁ×ÉÔØ ÎÏÓÉÔÅÌØ × ÕÓÔÒÏÊÓÔ×Ï."
+msgid "Please wait, removing packages..."
+msgstr "ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÏÖÄÉÔÅ, ÕÄÁÌÑÀÔÓÑ ÐÁËÅÔÙ..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "÷ÁÍ ÎÅÏÂÈÏÄÉÍÏ ×ÓÔÁ×ÉÔØ ÎÏÓÉÔÅÌØ ÄÌÑ ÐÒÏÄÏÌÖÅÎÉÑ"
+msgid "Normal information"
+msgstr "óÔÁÎÄÁÒÔÎÁÑ ÉÎÆÏÒÍÁÃÉÑ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "óÏÈÒÁÎÉÔØ ÉÚÍÅÎÅÎÉÑ"
+msgid "Media: "
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "ïÔÎÏÓÉÔÅÌØÎÙÊ ÐÕÔØ Ë synthesis/hdlist: "
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "óËÁÞÉ×ÁÅÔÓÑ ÐÁËÅÔ `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "òÅÄÁËÔÉÒÏ×ÁÎÉÅ ÉÓÔÏÞÎÉËÁ \"%s\":"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "÷ÙÂÒÁÎÏ: %d íâ / ó×ÏÂÏÄÎÏ ÎÁ ÄÉÓËÅ: %d íâ"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit a source"
-msgstr "òÅÄÁËÔÉÒÏ×ÁÔØ ÉÓÔÏÞÎÉË"
+msgid "Media"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÏÖÄÉÔÅ, ÕÄÁÌÑÅÔÓÑ ÎÏÓÉÔÅÌØ..."
+msgid "Spain"
+msgstr "éÓÐÁÎÉÑ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Type of source:"
-msgstr "ôÉÐ ÉÓÔÏÞÎÉËÁ:"
+msgid "Normal updates"
+msgstr "îÏÒÍÁÌØÎÙÅ ÏÂÎÏ×ÌÅÎÉÑ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Adding a source:"
-msgstr "äÏÂÁ×ÌÅÎÉÅ ÉÓÔÏÞÎÉËÁ:"
+msgid "by selection state"
+msgstr "ÐÏ ÓÏÓÔÏÑÎÉÀ ×ÙÂÏÒÁ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
-"îÏÓÉÔÅÌØ Ó ÔÁËÉÍ ÎÁÚ×ÁÎÉÅÍ ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ,\n"
-"×Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ÅÇÏ ÚÁÍÅÎÉÔØ?"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "÷ÁÍ ÎÅÏÂÈÏÄÉÍÏ ÚÁÐÏÌÎÉÔØ ÐÏ ËÒÁÊÎÅÊ ÍÅÒÅ Ä×Á ÐÅÒ×ÙÈ ÐÕÎËÔÁ."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Name:"
-msgstr "éÍÑ:"
+"ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÏÖÄÉÔÅ, ÚÁÇÒÕÖÁÀÔÓÑ ÁÄÒÅÓÁ ÚÅÒËÁÌ Ó ×ÅÂ-ÓÁÊÔÁ\n"
+"MandrakeSoft"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -981,147 +907,148 @@ msgid "Login:"
 msgstr "ìÏÇÉÎ:"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Choose a mirror..."
-msgstr "÷ÙÂÅÒÉÔÅ ÚÅÒËÁÌÏ..."
+#, fuzzy, c-format
+msgid "Adding a media:"
+msgstr "äÏÂÁ×ÌÅÎÉÅ ÉÓÔÏÞÎÉËÁ:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Browse..."
-msgstr "ðÒÏÓÍÏÔÒÅÔØ..."
+msgid "Austria"
+msgstr "á×ÓÔÒÉÑ"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Path or mount point:"
-msgstr "ðÕÔØ ÉÌÉ ÔÏÞËÁ ÍÏÎÔÉÒÏ×ÁÎÉÑ:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Fatal error"
+msgstr "ïÛÉÂËÁ ÆÁÊÌÁ"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Removable device"
-msgstr "óßÅÍÎÏÅ ÕÓÔÒÏÊÓÔ×Ï"
+msgid "Update..."
+msgstr "ïÂÎÏ×ÉÔØ..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "ðÒÏ×ÅÒÑÅÔÓÑ ÐÏÄÐÉÓØ `%s'..."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "HTTP ÓÅÒ×ÅÒ"
+msgid "(none)"
+msgstr "(ÎÅÔ)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "FTP server"
-msgstr "FTP ÓÅÒ×ÅÒ"
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
+"ë ÓÏÖÁÌÅÎÉÀ ÕÄÁÌÅÎÉÅ ÜÔÉÈ ÐÁËÅÔÏ× ÎÁÒÕÛÉÔ ÒÁÂÏÔÕ ÓÉÓÔÅÍÙ:\n"
+"\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Path:"
-msgstr "ðÕÔØ:"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "õÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ ÐÁËÅÔ `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "ìÏËÁÌØÎÙÅ ÆÁÊÌÙ"
+msgid "Currently installed version: "
+msgstr "õÓÔÁÎÏ×ÌÅÎÎÁÑ ×ÅÒÓÉÑ:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add a source"
-msgstr "äÏÂÁ×ÉÔØ ÉÓÔÏÞÎÉË"
+msgid "Other"
+msgstr "äÒÕÇÏÅ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr ""
-"îÅ×ÏÚÍÏÖÎÏ ÏÂÎÏ×ÉÔØ ÎÏÓÉÔÅÌØ, ÏÎ ÂÕÄÅÔ Á×ÔÏÍÁÔÉÞÅÓËÉ ÏÔËÌÀÞÅÎ.\n"
-"\n"
-"ïÛÉÂËÉ:\n"
-"%s"
+msgid "Reason for update: "
+msgstr "ðÒÉÞÉÎÁ ÏÂÎÏ×ÌÅÎÉÑ:"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to create medium."
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÎÏÓÉÔÅÌØ."
+msgid "Please choose the desired mirror."
+msgstr "ðÏÖÁÌÕÊÓÔÁ, ×ÙÂÅÒÉÔÅ ÖÅÌÁÅÍÏÅ ÚÅÒËÁÌÏ."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "ïÂÎÏ×ÉÔØ"
+msgid "Edit"
+msgstr "òÅÄÁËÔÉÒÏ×ÁÔØ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "÷ÙÂÅÒÉÔÅ ÉÓÔÏÞÎÉË(É) ÄÌÑ ÏÂÎÏ×ÌÅÎÉÑ:"
+msgid "Please wait, finding available packages..."
+msgstr "ðÏÄÏÖÄÉÔÅ, ÐÏÖÁÌÕÊÓÔÁ, ×ÙÐÏÌÎÑÅÔÓÑ ÐÏÉÓË ÄÏÓÔÕÐÎÙÈ ÐÁËÅÔÏ×..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÏÖÄÉÔÅ, ÏÂÎÏ×ÌÑÅÔÓÑ ÎÏÓÉÔÅÌØ..."
+msgid "Relative path to synthesis/hdlist:"
+msgstr "ïÔÎÏÓÉÔÅÌØÎÙÊ ÐÕÔØ Ë synthesis/hdlist: "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " failed!"
-msgstr " ÎÅ ÕÄÁÌÏÓØ!"
+msgid "Search results (none)"
+msgstr "òÅÚÕÌØÔÁÔÙ ÐÏÉÓËÁ (ÎÅÔ)"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid " done."
-msgstr " ÇÏÔÏ×Ï."
+msgid "Danmark"
+msgstr "äÁÎÉÑ"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "úÁÇÒÕÚËÁ `%s', ÓËÏÒÏÓÔØ:%s"
+msgid "China"
+msgstr "ëÉÔÁÊ"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "úÁÇÒÕÚËÁ `%s', ÏÓÔÁÌÏÓØ ×ÒÅÍÅÎÉ:%s, ÓËÏÒÏÓÔØ:%s"
+msgid "United States"
+msgstr "óÏÅÄÉÎÅÎÎÙÅ ûÔÁÔÙ"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "ðÒÏ×ÅÒÑÅÔÓÑ ÐÏÄÐÉÓØ `%s'..."
+#: ../rpmdrake:1
+#, c-format
+msgid "changes:"
+msgstr "ÉÚÍÅÎÅÎÉÑ:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "ðÒÏ×ÅÒÑÅÔÓÑ ÄÁÌØÎÉÊ ÆÁÊÌ ÉÓÔÏÞÎÉËÁ `%s'..."
+msgid "Some additional packages need to be removed"
+msgstr "îÅËÏÔÏÒÙÅ ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÐÁËÅÔÙ ÄÏÌÖÎÙ ÂÙÔØ ÕÄÁÌÅÎÙ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "ðÒÏ×ÅÒÑÅÔÓÑ ÆÁÊÌ ÉÓÔÏÞÎÉËÁ `%s'..."
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "ëÏÐÉÒÕÅÔÓÑ ÆÁÊÌ ÄÌÑ ÉÓÔÏÞÎÉËÁ `%s'..."
+msgid "No"
+msgstr "îÅÔ"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure medias"
+msgstr "îÁÓÔÒÏÉÔØ ÉÓÔÏÞÎÉËÉ"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a media"
+msgstr "äÏÂÁ×ÉÔØ ÉÓÔÏÞÎÉË"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Please choose the desired mirror."
-msgstr "ðÏÖÁÌÕÊÓÔÁ, ×ÙÂÅÒÉÔÅ ÖÅÌÁÅÍÏÅ ÚÅÒËÁÌÏ."
+msgid "Summary: "
+msgstr "ó×ÏÄËÁ: "
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
-msgstr ""
-"îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ËÁËÏÅ-ÌÉÂÏ ÐÏÄÈÏÄÑÝÅÅ ÚÅÒËÁÌÏ.\n"
-"\n"
-"ðÒÉÞÉÎ, ×ÙÚ×Á×ÛÉÈ ÜÔÕ ÐÒÏÂÌÅÍÕ, ÍÏÖÅÔ ÂÙÔØ ÎÅÓËÏÌØËÏ; ÎÁÉÂÏÌÅÅ\n"
-"ÞÁÓÔÙÍ Ñ×ÌÑÅÔÓÑ ÓÌÕÞÁÊ, ËÏÇÄÁ ÁÒÈÉÔÅËÔÕÒÁ ×ÁÛÅÇÏ ÐÒÏÃÅÓÓÏÒÁ ÎÅ\n"
-"ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ ïÆÉÃÉÁÌØÎÙÍÉ ïÂÎÏ×ÌÅÎÉÑÍÉ Mandrake Linux."
+msgid "Canada"
+msgstr "ëÁÎÁÄÁ"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No mirror"
-msgstr "îÅÔ ÚÅÒËÁÌÁ"
+msgid "Greece"
+msgstr "çÒÅÃÉÑ"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1138,180 +1065,253 @@ msgstr ""
 "÷ÏÚÍÏÖÎÏ ÓÅÔØ ÉÌÉ ×ÅÂ-ÓÁÊÔ MandrakeSoft ÎÅÄÏÓÔÕÐÎÙ.\n"
 "ðÏÖÁÌÕÊÓÔÁ, ÐÏÐÙÔÁÊÔÅÓØ ÓÎÏ×Á ÞÕÔØ ÐÏÚÖÅ."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr "÷Ù ÄÏÌÖÎÙ ÉÍÅÔØ ÐÒÁ×Á root'Á ÄÌÑ ÕÓÔÁÎÏ×ËÉ ÐÁËÅÔÏ×, ÉÚ×ÉÎÉÔÅ."
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Error during download"
-msgstr "ïÛÉÂËÁ ÐÒÉ ÓËÁÞÉ×ÁÎÉÉ"
+msgid "Path:"
+msgstr "ðÕÔØ:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
-"ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÏÖÄÉÔÅ, ÚÁÇÒÕÖÁÀÔÓÑ ÁÄÒÅÓÁ ÚÅÒËÁÌ Ó ×ÅÂ-ÓÁÊÔÁ\n"
-"MandrakeSoft"
+msgid "Problem during removal"
+msgstr "ðÒÏÂÌÅÍÁ ×Ï ×ÒÅÍÑ ÕÄÁÌÅÎÉÑ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"íÎÅ ÎÅÏÂÈÏÄÉÍÏ Ó×ÑÚÁÔØÓÑ Ó ×ÅÂ-ÓÁÊÔÏÍ MandrakeSoft, ÞÔÏÂÙ ÐÏÌÕÞÉÔØ\n"
-" ÓÐÉÓÏË ÚÅÒËÁÌ. ðÏÖÁÌÕÊÓÔÁ, ÕÂÅÄÉÔÅÓØ, ÞÔÏ ×ÁÛÁ ÓÅÔØ × ÎÁÓÔÏÑÝÉÊ\n"
-"ÍÏÍÅÎÔ ÒÁÂÏÔÁÅÔ.\n"
-"÷ÓÅ × ÐÏÒÑÄËÅ? íÏÖÎÏ ÐÒÏÄÏÌÖÁÔØ?"
+msgid "Selected"
+msgstr "÷ÙÂÒÁÎÎÙÅ"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United States"
-msgstr "óÏÅÄÉÎÅÎÎÙÅ ûÔÁÔÙ"
+msgid "Netherlands"
+msgstr "îÉÄÅÒÌÁÎÄÙ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "China"
-msgstr "ëÉÔÁÊ"
+msgid "Addable"
+msgstr "íÏÖÎÏ ÄÏÂÁ×ÉÔØ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "ïÂßÅÄÉÎÅÎÎÏÅ ëÏÒÏÌÅ×ÓÔ×Ï"
+msgid "(Not available)"
+msgstr "(îÅÄÏÓÔÕÐÅÎ)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "ôÁÊ×ÁÎØ"
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
+msgstr ""
+"éÚ×ÉÎÉÔÅ, ÎÏ ÓÌÅÄÕÀÝÉÅ ÐÁËÅÔÙ ÎÅ ÍÏÇÕÔ ÂÙÔØ ×ÙÂÒÁÎÙ:\n"
+"\n"
+"%s\n"
+"\n"
+"ðÒÉÞÉÎÙ:\n"
+"\n"
+"%s"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Not selected"
+msgstr "ïÂÎÁÒÕÖÅÎÙ ËÏÎÆÌÉËÔÙ"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
+msgstr "õÄÁÌÅÎÉÅ ÐÁËÅÔÏ× ÐÒÏÇÒÁÍÍÎÏÇÏ ÏÂÅÓÐÅÞÅÎÉÑ"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Sweden"
 msgstr "û×ÅÃÉÑ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Russia"
-msgstr "òÏÓÓÉÑ"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
+msgstr ""
+"\n"
+"\n"
+"ï ÏÛÉÂËÅ(ÁÈ) ÓÏÏÂÝÅÎÏ:\n"
+"%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Portugal"
-msgstr "ðÏÒÔÕÇÁÌÉÑ"
+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 ""
+"óÐÉÓÏË ÐÁËÅÔÏ× ÐÕÓÔ. üÔÏ ÏÚÎÁÞÁÅÔ, ÞÔÏ ÌÉÂÏ ÎÅÔ ÏÂÎÏ×ÌÅÎÉÊ ÄÌÑ\n"
+"ÐÁËÅÔÏ×, ÕÓÔÁÎÏ×ÌÅÎÎÙÈ ÎÁ ×ÁÛÅÍ ËÏÍÐØÀÔÅÒÅ, ÌÉÂÏ ÏÎÉ ÕÖÅ ×ÓÅ\n"
+"ÕÓÔÁÎÏ×ÌÅÎÙ."
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Poland"
-msgstr "ðÏÌØÛÁ"
+#, fuzzy, c-format
+msgid "Examining file of media `%s'..."
+msgstr "ðÒÏ×ÅÒÑÅÔÓÑ ÆÁÊÌ ÉÓÔÏÞÎÉËÁ `%s'..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Norway"
-msgstr "îÏÒ×ÅÇÉÑ"
+msgid "Download of `%s', speed:%s"
+msgstr "úÁÇÒÕÚËÁ `%s', ÓËÏÒÏÓÔØ:%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Netherlands"
-msgstr "îÉÄÅÒÌÁÎÄÙ"
+msgid "One of the following packages is needed:"
+msgstr "îÕÖÅÎ ÏÄÉÎ ÉÚ ÓÌÅÄÕÀÝÉÈ ÐÁËÅÔÏ×:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Korea"
-msgstr "ëÏÒÅÑ"
+msgid "Quit"
+msgstr "÷ÙÊÔÉ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "ñÐÏÎÉÑ"
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"íÎÅ ÎÅÏÂÈÏÄÉÍÏ Ó×ÑÚÁÔØÓÑ Ó ÚÅÒËÁÌÏÍ, ÞÔÏÂÙ ÐÏÌÕÞÉÔØ ÓÁÍÙÅ\n"
+"ÐÏÓÌÅÄÎÉÅ ÐÁËÅÔÙ ÏÂÎÏ×ÌÅÎÉÊ. ðÏÖÁÌÕÊÓÔÁ, ÕÂÅÄÉÔÅÓØ,\n"
+"ÞÔÏ ×ÁÛÁ ÓÅÔØ × ÄÁÎÎÙÊ ÍÏÍÅÎÔ ÒÁÂÏÔÁÅÔ.\n"
+"÷ÓÅ × ÐÏÒÑÄËÅ? íÏÖÎÏ ÐÒÏÄÏÌÖÁÔØ?"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Italy"
-msgstr "éÔÁÌÉÑ"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update media(s)"
+msgstr "ïÂÎÏ×ÉÔØ ÉÓÔÏÞÎÉË(É)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Israel"
-msgstr "éÚÒÁÉÌØ"
+msgid "Ok"
+msgstr "ïë"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Greece"
-msgstr "çÒÅÃÉÑ"
+msgid "Please wait, adding medium..."
+msgstr "ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÏÖÄÉÔÅ, ÄÏÂÁ×ÌÑÅÔÓÑ ÎÏÓÉÔÅÌØ..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "France"
-msgstr "æÒÁÎÃÉÑ"
+msgid "Unable to get source packages."
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÉÓÈÏÄÎÙÅ ÐÁËÅÔÙ."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "æÉÎÌÑÎÄÉÑ"
+msgid "Too many packages are selected"
+msgstr "÷ÙÂÒÁÎÏ ÓÌÉÛËÏÍ ÍÎÏÇÏ ÐÁËÅÔÏ×"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Spain"
-msgstr "éÓÐÁÎÉÑ"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"äÏÂÒÏ ÐÏÖÁÌÏ×ÁÔØ × ÒÅÄÁËÔÏÒ ÉÓÔÏÞÎÉËÏ× ÐÁËÅÔÏ×!\n"
+"\n"
+"üÔÏÔ ÉÎÓÔÒÕÍÅÎÔ ÐÏÍÏÖÅÔ ×ÁÍ ÎÁÓÔÒÏÉÔØ ÉÓÔÏÞÎÉËÉ ÐÁËÅÔÏ×, ËÏÔÏÒÙÅ ×Ù\n"
+"ÖÅÌÁÅÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÎÁ Ó×ÏÅÍ ËÏÍÐØÀÔÅÒÅ. úÁÔÅÍ ÏÎÉ ÂÕÄÕÔ ÄÏÓÔÕÐÎÙ ÄÌÑ\n"
+"ÕÓÔÁÎÏ×ËÉ ÎÏ×ÙÈ ÐÁËÅÔÏ× Ó ÐÒÏÇÒÁÍÍÎÙÍ ÏÂÅÓÐÅÞÅÎÉÅÍ ÉÌÉ ÄÌÑ ×ÙÐÏÌÎÅÎÉÑ\n"
+"ÏÂÎÏ×ÌÅÎÉÊ."
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Danmark"
-msgstr "äÁÎÉÑ"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
+msgstr "ËÏÎÆÌÉËÔÕÅÔ Ó"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "çÅÒÍÁÎÉÑ"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"äÏÂÒÏ ÐÏÖÁÌÏ×ÁÔØ × MandrakeUpdate!\n"
+"\n"
+"üÔÏÔ ÉÎÓÔÒÕÍÅÎÔ ÐÏÍÏÖÅÔ ×ÁÍ ×ÙÂÒÁÔØ ÏÂÎÏ×ÌÅÎÉÑ ÄÌÑ ÕÓÔÁÎÏ×ËÉ ÎÁ ×ÁÛ\n"
+"ËÏÍÐØÀÔÅÒ."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
-msgstr "þÅÛÓËÁÑ òÅÓÐÕÂÌÉËÁ"
+msgid "Mandrake choices"
+msgstr "÷ÙÂÏÒ Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "ëÏÓÔÁ-òÉËÁ"
+msgid "Changelog:\n"
+msgstr "Changelog:\n"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "ëÁÎÁÄÁ"
+msgid "Korea"
+msgstr "ëÏÒÅÑ"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Brazil"
-msgstr "âÒÁÚÉÌÉÑ"
+msgid "Removable device"
+msgstr "óßÅÍÎÏÅ ÕÓÔÒÏÊÓÔ×Ï"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "âÅÌØÇÉÑ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "á×ÓÔÒÁÌÉÑ"
+msgid "Change medium"
+msgstr "éÚÍÅÎÉÔØ ÎÏÓÉÔÅÌØ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "á×ÓÔÒÉÑ"
+msgid "Mandrake Update"
+msgstr "ïÂÎÏ×ÌÅÎÉÅ Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
-msgstr "éÎÆÏÒÍÁÃÉÑ..."
+msgid "by size"
+msgstr "ÐÏ ÒÁÚÍÅÒÕ"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "îÅÔ"
+msgid "FTP server"
+msgstr "FTP ÓÅÒ×ÅÒ"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "æÁÊÌÙ:\n"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Yes"
-msgstr "äÁ"
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr ""
+"îÅ×ÏÚÍÏÖÎÏ ÏÂÎÏ×ÉÔØ ÎÏÓÉÔÅÌØ, ÏÎ ÂÕÄÅÔ Á×ÔÏÍÁÔÉÞÅÓËÉ ÏÔËÌÀÞÅÎ.\n"
+"\n"
+"ïÛÉÂËÉ:\n"
+"%s"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -1584,6 +1584,12 @@ msgstr "õÄÁÌÉÔØ ÐÒÏÇÒÁÍÍÎÏÅ ÏÂÅÓÐÅÞÅÎÉÅ"
 msgid "Software Sources Manager"
 msgstr "íÅÎÅÄÖÅÒ ÉÓÔÏÞÎÉËÏ× ÐÒÏÇÒÁÍÍÎÏÇÏ ÏÂÅÓÐÅÞÅÎÉÑ"
 
+#~ msgid "Source: "
+#~ msgstr "éÓÔÏÞÎÉË: "
+
+#~ msgid "Source"
+#~ msgstr "éÓÔÏÞÎÉË"
+
 #~ msgid ""
 #~ "some packages failed to install\n"
 #~ "correctly"
diff --git a/po/sk.po b/po/sk.po
index 80b052c6..ebf2a6bb 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: 2003-03-11 19:46--100\n"
 "Last-Translator: Tibor Pittich <Tibor.Pittich@phuture.sk>\n"
 "Language-Team: Slovak <i18n@mandrake.sk>\n"
@@ -14,16 +14,20 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"Je možné pokra�ovať?"
+msgid "Enabled?"
+msgstr "Povolené?"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Cesta alebo bod pripojenia:"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Portugal"
+msgstr "Portugalsko"
 
 #: ../rpmdrake:1
 #, c-format
@@ -43,105 +47,53 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"Vítajte v MandrakeUpdate!\n"
-"\n"
-"Tento nástroj Vám pomôže vybrať aktualizácie ktoré chcete nainštalovať do "
-"Vášho\n"
-"po�íta�a."
+msgid "by group"
+msgstr "podľa skupiny"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
-msgstr ""
-"Vítajte v nástroji pre odstraňovanie softvéru!\n"
-"\n"
-"Tento nástroj Vám pomôže si zvoliť softvér ktorý chcete odstrániť\n"
-"z Vášho po�íta�a."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Vyskytol sa problém po�as inštalácie balí�kov:\n"
-"\n"
-"%s"
+msgid "Name:"
+msgstr "Meno:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Problem during removal"
-msgstr "Problém po�as odstraňovania"
+msgid "Italy"
+msgstr "Taliansko"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "Prosím �akajte, odstraňujú balí�ky..."
+msgid "How to choose manually your mirror"
+msgstr "Ako si zvoliť miror manuálne"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Prosím �akajte, na�ítavam databázu balí�kov..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Vyskytol sa problém po�as inštalácie balí�kov:\n"
-"\n"
-"%s"
+msgid "URL:"
+msgstr "URL:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation failed"
-msgstr "Inštalácia neúspešná"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Príprava balí�kov na inštaláciu..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Príprava balí�kov na inštaláciu..."
+msgid "Some packages need to be removed"
+msgstr "Je potrebné odstrániť niektoré balí�ky"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Všetky požadované balí�ky boli úspešne nainštalované."
+msgid "More information on package..."
+msgstr "Viac informácii o balí�ku..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Všetko bolo úspešne nainštalované"
+msgid "Yes"
+msgstr "Ano"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
 msgstr ""
-"Inštalácia bola ukon�ená; %s.\n"
+"Kvôli závislostiam musia byť nasledujúce balí�ky teraz odzna�ené:\n"
 "\n"
-"Niektoré konfigura�né súbory boli vytvorené ako `.rpmnew' alebo `.rpmsave',\n"
-"mali by ste ich prezrieš:"
 
 #: ../rpmdrake:1
 #, c-format
@@ -149,457 +101,452 @@ msgid "everything was installed correctly"
 msgstr "všetko bolo úspešne nainštalované"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Vyskytol sa problém po�as inštalácie"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Inštalácia balí�ka `%s' (%s/%s)..."
+msgid "%s KB"
+msgstr "%s KB"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Príprava balí�kov na inštaláciu..."
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"Je možné vybrať si Váš obľúbený mirror manuálne: a to tak,\n"
+"že spustíte Software Sources Manager a pridáte zdroje pre\n"
+"'Bezpe�nostné aktualizácie'.\n"
+"\n"
+"Potom je potrebné reštartovať MandrakeUpdate."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
+"Welcome to the software removal tool!\n"
 "\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
 msgstr ""
+"Vítajte v nástroji pre odstraňovanie softvéru!\n"
 "\n"
-"\n"
-"Ohlásená chyba:\n"
-"%s"
+"Tento nástroj Vám pomôže si zvoliť softvér ktorý chcete odstrániť\n"
+"z Vášho po�íta�a."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"Inštalácia neúspešná, niektoré súbory chýbajú.\n"
-"Možno bude potrebné aktualizovať databázu zdrojov."
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "Pre uloženie zmien je potrebné aby ste vložili médium do mechaniky."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Uložiť a ukon�iť"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
+"There was a problem during the removal of packages:\n"
 "\n"
-"Do you want to continue installation?"
+"%s"
 msgstr ""
-"Nasledovné balíky budú odstránené aby bolo možné iné aktualizovať:\n"
-"\n"
-"%s\n"
+"Vyskytol sa problém po�as inštalácie balí�kov:\n"
 "\n"
-"Je možné pokra�ovať?"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Sťahovanie balí�ka `%s' (%s/%s)..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Cancel"
-msgstr "Zrušiť"
+msgid "Size: "
+msgstr "Veľkosť: "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid "Security updates"
+msgstr "Bezpe�nostné aktualizácie"
 
 #: ../rpmdrake:1
 #, fuzzy, 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]"
+msgid "Already existing update medias"
+msgstr "Chyba pri pridávaní média"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Change medium"
-msgstr "Vymeniť médium"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Initializing..."
-msgstr "Inicializácia..."
+msgid "Maximum information"
+msgstr "Maximálne informácie"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Príprava balí�kov na inštaláciu..."
+msgid "Proxy..."
+msgstr "Chyba..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Na inštaláciu balí�kov musíte byť root, prepá�te."
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Unable to get source packages."
-msgstr "Nie je možné prebrať zdrojové balí�ky."
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspect..."
-msgstr "Preveriť.."
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
+msgstr ""
+"Inštalácia neúspešná, niektoré súbory chýbajú.\n"
+"Možno bude potrebné aktualizovať databázu zdrojov."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Installation finished"
-msgstr "Inštalácia ukon�ená"
+msgid "United Kingdom"
+msgstr "Veľká Británia"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Neurobiť ni�"
+msgid "in names"
+msgstr "v menách"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Použite .%s ako hlavný súbor"
+msgid ""
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
+msgstr ""
+"Nie je možné nájsť žiaden použiteľný mirror.\n"
+"\n"
+"Je veľa možných dôvodov pre tento problém; naj�astejší je ten,\n"
+"že architektúra Vášho procesora nie je podpororovaná oficiálnymi\n"
+"aktualizáciami Mandrake Linux."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Remove .%s"
 msgstr "Odstrániť .%s"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "changes:"
-msgstr "zmeny:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspecting %s"
-msgstr "Preverujem %s"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Prosím �akajte, hľadám dostupné balí�ky..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "Prosím �akajte, pridávam médium..."
+msgid "Finland"
+msgstr "Fínsko"
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
+"The following packages have bad signatures:\n"
 "\n"
-"Then, restart MandrakeUpdate."
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"Je možné vybrať si Váš obľúbený mirror manuálne: a to tak,\n"
-"že spustíte Software Sources Manager a pridáte zdroje pre\n"
-"'Bezpe�nostné aktualizácie'.\n"
+"Nasledovné balíky budú odstránené aby bolo možné iné aktualizovať:\n"
 "\n"
-"Potom je potrebné reštartovať MandrakeUpdate."
+"%s\n"
+"\n"
+"Je možné pokra�ovať?"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "How to choose manually your mirror"
-msgstr "Ako si zvoliť miror manuálne"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Examining distant file of media `%s'..."
+msgstr "Zisťujem vzdialenosť súboru od zdroja '%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
+msgid "Verifying packages signatures..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Already existing update sources"
-msgstr ""
+msgid "France"
+msgstr "Francúzsko"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "More info"
+msgstr "Viac informácií"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
+"%s\n"
 "\n"
 "Is it ok to continue?"
 msgstr ""
-"Je potrebné kontaktovať mirror pre získanie najnovších aktualizácií.\n"
-"Skontrolujte prosím, �i je sieť funk�ná.\n"
+"%s\n"
 "\n"
 "Je možné pokra�ovať?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Reload the packages list"
+msgstr "Znovu na�íta� zoznam balí�kov"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Zvoľte si miror..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Chyba súboru"
+msgid "Some packages can't be installed"
+msgstr "Balí�ek `%s' nie je možné nainštalovať\n"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
+msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Príprava balí�kov na inštaláciu..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Mandrake Update"
+msgid "All packages,"
+msgstr "Všetky balí�ky,"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Software Packages Removal"
-msgstr "Odstránenie softvérových balí�kov"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Type of media:"
+msgstr "Typ zdroja:"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Quit"
-msgstr "Ukon�iť"
+msgid "in files"
+msgstr "v súboroch"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Inštaluj"
+msgid "All requested packages were installed successfully."
+msgstr "Všetky požadované balí�ky boli úspešne nainštalované."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove"
-msgstr "Odstrániť"
+msgid "Proxy hostname:"
+msgstr "Hostiteľ proxy:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Help"
-msgstr "Pomoc"
+msgid "Local files"
+msgstr "Lokálne súbory"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search"
-msgstr "Hľadať"
+msgid "Inspecting %s"
+msgstr "Preverujem %s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Find:"
-msgstr "Hľadaj:"
+msgid "Israel"
+msgstr "Izrael"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Nasledovné balíky budú odstránené aby bolo možné iné aktualizovať:\n"
-"\n"
-"%s\n"
-"\n"
-"Je možné pokra�ovať?"
+msgid "Help"
+msgstr "Pomoc"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Je potrebné odstrániť niektoré balí�ky"
+msgid "HTTP server"
+msgstr "HTTP server"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
-"\n"
-"Do you really want to install all the selected packages?"
-msgstr ""
-"Varovanie: zdá sa, že sa pokúšate pridať príliš veľa balí�kov,\n"
-"�o môže spôsobiť, že Váš súborový systém bude zaplnený\n"
-"po�as alebo po inštalácii balí�kov ; toto je veľmi nebezpe�né\n"
-"a mali by ste byť opatrní.\n"
-"\n"
-"Skuto�ne si želáte nainštalovať všetky zvolené balí�ky?"
+msgid "Installation failed"
+msgstr "Inštalácia neúspešná"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Vybrali ste príliš veľa balí�kov"
+msgid "Use .%s as main file"
+msgstr "Použite .%s ako hlavný súbor"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "Maximálne informácie"
+msgid "Search results"
+msgstr "Výsledky vyhľadávania"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Normal information"
-msgstr "Normálne informácie"
+msgid " failed!"
+msgstr " chyba!"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Update source(s)"
-msgstr "Aktualizácia zdrojov"
+msgid "Brazil"
+msgstr "Brazília"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Znovu na�íta� zoznam balí�kov"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"Už existuje zdroj s takýmto menom, chcete ho\n"
+"skuto�ne prepísať?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "Zrušiť výber"
+msgid "Find:"
+msgstr "Hľadaj:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "v súboroch"
+msgid "All packages, alphabetical"
+msgstr "Všetky balí�ky, abecedne"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "v popisoch"
+msgid "Please wait, searching..."
+msgstr "Prosím �akajte, vyhľadávam..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "v menách"
+msgid "Please wait, reading packages database..."
+msgstr "Prosím �akajte, na�ítavam databázu balí�kov..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by update availability"
-msgstr "podľa dostupnosti zdroja"
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "Nieje možné otvoriť balí�ek `%s'\n"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by source repository"
-msgstr "podľa zdroja"
+#, fuzzy, 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:1
 #, c-format
-msgid "by selection state"
-msgstr "podľa stavu výberu"
+msgid "Reset the selection"
+msgstr "Zrušiť výber"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by size"
-msgstr "podľa veľkosti"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"Ak potrebujete proxy, zadajte meno hostiteľa a voliteľne aj port (syntax: "
+"<proxyhost[:port]>):"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-msgstr "podľa skupiny"
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
+"Kvôli závislostiam budú tieto balí�ky odstránené:\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "All packages,"
-msgstr "Všetky balí�ky,"
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "All packages, alphabetical"
-msgstr "Všetky balí�ky, abecedne"
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Vyskytol sa problém po�as inštalácie balí�kov:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Voľby Mandrake"
+msgid "Please wait, removing medium..."
+msgstr "Prosím �akajte, odstraňujem médium..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
-msgstr "Normálne aktualizácie"
+msgid "Password:"
+msgstr "Heslo:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Aktualizácie opravujúce chyby"
+msgid "Taiwan"
+msgstr "Taiwan"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Security updates"
-msgstr "Bezpe�nostné aktualizácie"
+msgid "User:"
+msgstr "Užívateľ:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Description: "
-msgstr "Popis:"
+msgid "Please wait, updating medium..."
+msgstr "Prosím �akajte, aktualizujem médium..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Dôvod pre aktualizáciu:"
+msgid "Please wait, listing packages..."
+msgstr "Prosím �akajte, vypisujem balí�ky..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Summary: "
-msgstr "Stru�ný obsah: "
+msgid "Information on packages"
+msgstr "Informácie o balí�koch"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Importance: "
-msgstr "Dôležitosť: "
+msgid "Cancel"
+msgstr "Zrušiť"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Everything installed successfully"
+msgstr "Všetko bolo úspešne nainštalované"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Size: "
-msgstr "Veľkosť: "
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Select the media(s) you wish to update:"
+msgstr "Prosím zvoľte zdroj ktorý chcete aktualizovať:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Version: "
-msgstr "Verzia: "
+msgid "Please wait, updating media..."
+msgstr "Prosím �akajte, aktualizujem média..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "Názov: "
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Aktuálne nainštalovaná verzia:"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Nasledovné balíky budú odstránené aby bolo možné iné aktualizovať:\n"
+"\n"
+"%s\n"
+"\n"
+"Je možné pokra�ovať?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Source: "
-msgstr "Zdroj: "
+msgid "in descriptions"
+msgstr "v popisoch"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(Not available)"
-msgstr "(Nedostupné)"
+msgid "Configure proxies"
+msgstr "Nastaviť proxy"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Záznam zmien:\n"
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Je potrebné kontaktovať websajt MandrakeSoft pre získanie\n"
+"zoznamu mirrorov. Skontrolujte �i je Vaše sieťové pripojenie funk�né.\n"
+"\n"
+"Je možné pokra�ovať?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Files:\n"
-msgstr "Súbory:\n"
+msgid "Please choose"
+msgstr "Prosím zvoľte"
 
 #: ../rpmdrake:1
 #, c-format
@@ -608,42 +555,28 @@ msgstr "Vybraná veľkosť: %d Mb"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Vybrané: %d MB / Dostupné: %d MB"
+msgid "Initializing..."
+msgstr "Inicializácia..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
-msgstr ""
-"Kvôli závislostiam musia byť nasledujúce balí�ky teraz odzna�ené:\n"
-"\n"
+msgid "Save changes"
+msgstr "Uložiť zmeny"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr ""
-"Prepá�te, tieto balí�ky nie je možné vybrať:\n"
-"\n"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "Chyba po�as sťahovania"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "konfliktuje s"
+msgid "Package installation..."
+msgstr "Príprava balí�kov na inštaláciu..."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Balí�ek `%s' nie je možné nainštalovať\n"
+#, c-format
+msgid "Importance: "
+msgstr "Dôležitosť: "
 
 #: ../rpmdrake:1
 #, c-format
@@ -655,454 +588,455 @@ msgstr ""
 "Pre vyriešenie závislosti, sú potrebné nainštalovať tieto balí�ky:\n"
 "\n"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "Sú potrebné �alšie balí�ky"
+msgid "Add..."
+msgstr "Pridať..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "Balí�ek `%s' nie je možné nainštalovať\n"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "Nemôžem vytvoriť médium."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Removing these packages would break your system, sorry:\n"
+"The installation is finished; %s.\n"
 "\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
 msgstr ""
-"Odstránenie týchto balí�kov naruší váš systém, prepá�te:\n"
+"Inštalácia bola ukon�ená; %s.\n"
 "\n"
+"Niektoré konfigura�né súbory boli vytvorené ako `.rpmnew' alebo `.rpmsave',\n"
+"mali by ste ich prezrieš:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"Kvôli závislostiam budú tieto balí�ky odstránené:\n"
-"\n"
+msgid "Browse..."
+msgstr "Prechádzať..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "Balí�ek `%s' nie je možné nainštalovať\n"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Je potrebné odstrániť niektoré balí�ky"
+msgid "Info..."
+msgstr "Info..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "More information on package..."
-msgstr "Viac informácii o balí�ku..."
+msgid "You need to insert the medium to continue"
+msgstr "Vložte médium ak chcete pokra�ovať"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Copying file for media `%s'..."
+msgstr "Kopírujem súbor pre zdroj '%s'..."
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Information on packages"
-msgstr "Informácie o balí�koch"
+msgid "Remove"
+msgstr "Odstrániť"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "More info"
-msgstr "Viac informácií"
+msgid "Preparing packages installation..."
+msgstr "Príprava balí�kov na inštaláciu..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "by media repository"
+msgstr "podľa zdroja"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "Pridateľné"
+msgid "No mirror"
+msgstr "Žiaden miror"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Upgradable"
-msgstr "Aktualizovateľné"
+msgid "You need to fill up at least the two first entries."
+msgstr "Je potrebné vyplniť najmenej prvé dve položky."
 
 #: ../rpmdrake:1
 #, c-format
-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 ""
-"Zoznam aktualizácií je prázdny. To znamená, že bu� nie sú\n"
-"dostupné žiadne aktualizácie pre balí�ky nainštalované vo Vašom\n"
-"systéme alebo už máte všetky nainštalované."
+msgid "Install"
+msgstr "Inštaluj"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "No update"
-msgstr "Žiadna aktualizácia"
+msgid "Japan"
+msgstr "Japonsko"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "(none)"
-msgstr "(žiaden)"
+msgid "Do nothing"
+msgstr "Neurobiť ni�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Prosím �akajte, vypisujem balí�ky..."
+msgid "No update"
+msgstr "Žiadna aktualizácia"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "Nieje možné otvoriť balí�ek `%s'\n"
+#, c-format
+msgid "Description: "
+msgstr "Popis:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Jeden z nasledujúcich balí�kov je potrebný:"
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr ""
+"Varovanie: zdá sa, že sa pokúšate pridať príliš veľa balí�kov,\n"
+"�o môže spôsobiť, že Váš súborový systém bude zaplnený\n"
+"po�as alebo po inštalácii balí�kov ; toto je veľmi nebezpe�né\n"
+"a mali by ste byť opatrní.\n"
+"\n"
+"Skuto�ne si želáte nainštalovať všetky zvolené balí�ky?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Prosím zvoľte"
+msgid "Name: "
+msgstr "Názov: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Inspect..."
+msgstr "Preveriť.."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Not selected"
-msgstr "Nájdené konflikty"
+msgid "Editing media \"%s\":"
+msgstr "Zmena zdroja \"%s\":"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Selected"
-msgstr "Vybrané"
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "Príprava balí�kov na inštaláciu..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results"
-msgstr "Výsledky vyhľadávania"
+msgid "Australia"
+msgstr "Austrália"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Stop"
-msgstr "Stop"
+msgid "Installation finished"
+msgstr "Inštalácia ukon�ená"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Prosím �akajte, vyhľadávam..."
+msgid "by update availability"
+msgstr "podľa dostupnosti zdroja"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Výsledky vyhľadávania (žiadne)"
+msgid "Poland"
+msgstr "Poľsko"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Other"
-msgstr "Iné"
+msgid "Version: "
+msgstr "Verzia: "
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the packages source editor!\n"
-"\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
-msgstr ""
-"Vitajte v editore zdrojov pre balí�ky!\n"
-"\n"
-"Tento nástroj Vám pomôže pri nastavení zdrojov pre balí�ky, ktoré môžete\n"
-"použiť pre Váš po�íta�. Tieto budú dostupné pre inštaláciu nových balí�kov\n"
-"alebo pre vykonanie aktualizácií."
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Môžete zadať užívateľské meno/heslo pre proxy autentifikáciu:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
-msgstr "Uložiť a ukon�iť"
+msgid "Upgradable"
+msgstr "Aktualizovateľné"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid " done."
+msgstr " hotovo."
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Chyba..."
+msgid "Software Packages Installation"
+msgstr "Príprava balí�kov na inštaláciu..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Update..."
-msgstr "Aktualizácia..."
+msgid "Additional packages needed"
+msgstr "Sú potrebné �alšie balí�ky"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "Pridať..."
+msgid "Bugfixes updates"
+msgstr "Aktualizácie opravujúce chyby"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "Zmeň"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "Získavanie '%s', �as do konca: %s, rýchlosť: %s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Source"
-msgstr "Zdroj"
+msgid "Germany"
+msgstr "Nemecko"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Enabled?"
-msgstr "Povolené?"
+msgid "Russia"
+msgstr "Rusko"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Configure sources"
-msgstr "Nastaviť zdroje"
+msgid "Norway"
+msgstr "Nórsko"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Password:"
-msgstr "Heslo:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during installation"
+msgstr "Vyskytol sa problém po�as inštalácie"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "User:"
-msgstr "Užívateľ:"
+msgid "Search"
+msgstr "Hľadať"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "Môžete zadať užívateľské meno/heslo pre proxy autentifikáciu:"
+#, fuzzy, c-format
+msgid "Edit a media"
+msgstr "Zmeniť zdroj"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "Hostiteľ proxy:"
+msgid "Czech Republic"
+msgstr "Česká Republika"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"Ak potrebujete proxy, zadajte meno hostiteľa a voliteľne aj port (syntax: "
-"<proxyhost[:port]>):"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Nastaviť proxy"
+msgid "Stop"
+msgstr "Stop"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Prosím �akajte, aktualizujem médium..."
+msgid "Update"
+msgstr "Aktualizácia"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "Pre uloženie zmien je potrebné aby ste vložili médium do mechaniky."
+msgid "Please wait, removing packages..."
+msgstr "Prosím �akajte, odstraňujú balí�ky..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "Vložte médium ak chcete pokra�ovať"
+msgid "Normal information"
+msgstr "Normálne informácie"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "Uložiť zmeny"
+msgid "Media: "
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Relatívna cesta k synthesis/hdlist: "
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "Sťahovanie balí�ka `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Vybrané: %d MB / Dostupné: %d MB"
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "Zmena zdroja \"%s\":"
+#, c-format
+msgid "Media"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit a source"
-msgstr "Zmeniť zdroj"
+msgid "Spain"
+msgstr "Å panielsko"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Prosím �akajte, odstraňujem médium..."
+msgid "Normal updates"
+msgstr "Normálne aktualizácie"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Type of source:"
-msgstr "Typ zdroja:"
+msgid "by selection state"
+msgstr "podľa stavu výberu"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Pridávam zdroj:"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "Prosím �akajte, sťahujem adresy mirorov z web stránky MandrakeSoft."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
-msgstr ""
-"Už existuje zdroj s takýmto menom, chcete ho\n"
-"skuto�ne prepísať?"
+msgid "Login:"
+msgstr "Login:"
 
 #: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Adding a media:"
+msgstr "Pridávam zdroj:"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Je potrebné vyplniť najmenej prvé dve položky."
+msgid "Austria"
+msgstr "Rakúsko"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Fatal error"
+msgstr "Chyba súboru"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Name:"
-msgstr "Meno:"
+msgid "Update..."
+msgstr "Aktualizácia..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "Overovanie signatúry `%s'..."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Login:"
-msgstr "Login:"
+msgid "(none)"
+msgstr "(žiaden)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr "Zvoľte si miror..."
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
+"Odstránenie týchto balí�kov naruší váš systém, prepá�te:\n"
+"\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
-msgstr "Prechádzať..."
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Inštalácia balí�ka `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Path or mount point:"
-msgstr "Cesta alebo bod pripojenia:"
+msgid "Currently installed version: "
+msgstr "Aktuálne nainštalovaná verzia:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Removable device"
-msgstr "Vymeniteľné zariadenie"
+msgid "Other"
+msgstr "Iné"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "HTTP server"
+msgid "Reason for update: "
+msgstr "Dôvod pre aktualizáciu:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "FTP server"
+msgid "Please choose the desired mirror."
+msgstr "Prosím zvoľte si jeden z mirorov."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Path:"
-msgstr "Cesta:"
+msgid "Edit"
+msgstr "Zmeň"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "Lokálne súbory"
+msgid "Please wait, finding available packages..."
+msgstr "Prosím �akajte, hľadám dostupné balí�ky..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Add a source"
-msgstr "Pridať zdroj"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr "Nemôžem aktualizovať médium; bude automaticky zakázané."
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Relatívna cesta k synthesis/hdlist: "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Unable to create medium."
-msgstr "Nemôžem vytvoriť médium."
+msgid "Search results (none)"
+msgstr "Výsledky vyhľadávania (žiadne)"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Update"
-msgstr "Aktualizácia"
+msgid "Danmark"
+msgstr "Dánsko"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Prosím zvoľte zdroj ktorý chcete aktualizovať:"
+msgid "China"
+msgstr "Čína"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Prosím �akajte, aktualizujem média..."
+msgid "United States"
+msgstr "Spojené Štáty"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " failed!"
-msgstr " chyba!"
+msgid "changes:"
+msgstr "zmeny:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " done."
-msgstr " hotovo."
+msgid "Some additional packages need to be removed"
+msgstr "Je potrebné odstrániť niektoré balí�ky"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "Získavanie '%s', rýchlosťou: %s"
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "Získavanie '%s', �as do konca: %s, rýchlosť: %s"
+msgid "No"
+msgstr "Nie"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "Overovanie signatúry `%s'..."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "Zisťujem vzdialenosť súboru od zdroja '%s'..."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Examining file of source `%s'..."
-msgstr "Preverujem súbory zo zdroja '%s'..."
+msgid "Configure medias"
+msgstr "Nastaviť zdroje"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Copying file for source `%s'..."
-msgstr "Kopírujem súbor pre zdroj '%s'..."
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a media"
+msgstr "Pridať zdroj"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please choose the desired mirror."
-msgstr "Prosím zvoľte si jeden z mirorov."
+msgid "Summary: "
+msgstr "Stru�ný obsah: "
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
-msgstr ""
-"Nie je možné nájsť žiaden použiteľný mirror.\n"
-"\n"
-"Je veľa možných dôvodov pre tento problém; naj�astejší je ten,\n"
-"že architektúra Vášho procesora nie je podpororovaná oficiálnymi\n"
-"aktualizáciami Mandrake Linux."
+msgid "Canada"
+msgstr "Kanada"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No mirror"
-msgstr "Žiaden miror"
+msgid "Greece"
+msgstr "Grécko"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1119,178 +1053,244 @@ msgstr ""
 "Sieť, alebo websajt MandrakeSoft sú zrejme nedostupné.\n"
 "Prosím, skúste neskôr"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Na inštaláciu balí�kov musíte byť root, prepá�te."
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Error during download"
-msgstr "Chyba po�as sťahovania"
+msgid "Path:"
+msgstr "Cesta:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr "Prosím �akajte, sťahujem adresy mirorov z web stránky MandrakeSoft."
+msgid "Problem during removal"
+msgstr "Problém po�as odstraňovania"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Je potrebné kontaktovať websajt MandrakeSoft pre získanie\n"
-"zoznamu mirrorov. Skontrolujte �i je Vaše sieťové pripojenie funk�né.\n"
-"\n"
-"Je možné pokra�ovať?"
+msgid "Selected"
+msgstr "Vybrané"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United States"
-msgstr "Spojené Štáty"
+msgid "Netherlands"
+msgstr "Holandsko"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "China"
-msgstr "Čína"
+msgid "Addable"
+msgstr "Pridateľné"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Veľká Británia"
+msgid "(Not available)"
+msgstr "(Nedostupné)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
+msgstr ""
+"Prepá�te, tieto balí�ky nie je možné vybrať:\n"
+"\n"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Not selected"
+msgstr "Nájdené konflikty"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Taiwan"
+msgid "Software Packages Removal"
+msgstr "Odstránenie softvérových balí�kov"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Sweden"
 msgstr "Švédsko"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Russia"
-msgstr "Rusko"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
+msgstr ""
+"\n"
+"\n"
+"Ohlásená chyba:\n"
+"%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Portugal"
-msgstr "Portugalsko"
+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 ""
+"Zoznam aktualizácií je prázdny. To znamená, že bu� nie sú\n"
+"dostupné žiadne aktualizácie pre balí�ky nainštalované vo Vašom\n"
+"systéme alebo už máte všetky nainštalované."
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Poland"
-msgstr "Poľsko"
+#, fuzzy, c-format
+msgid "Examining file of media `%s'..."
+msgstr "Preverujem súbory zo zdroja '%s'..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Norway"
-msgstr "Nórsko"
+msgid "Download of `%s', speed:%s"
+msgstr "Získavanie '%s', rýchlosťou: %s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Netherlands"
-msgstr "Holandsko"
+msgid "One of the following packages is needed:"
+msgstr "Jeden z nasledujúcich balí�kov je potrebný:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Korea"
-msgstr "Korea"
+msgid "Quit"
+msgstr "Ukon�iť"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "Japonsko"
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Je potrebné kontaktovať mirror pre získanie najnovších aktualizácií.\n"
+"Skontrolujte prosím, �i je sieť funk�ná.\n"
+"\n"
+"Je možné pokra�ovať?"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Italy"
-msgstr "Taliansko"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update media(s)"
+msgstr "Aktualizácia zdrojov"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Israel"
-msgstr "Izrael"
+msgid "Ok"
+msgstr "Ok"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Greece"
-msgstr "Grécko"
+msgid "Please wait, adding medium..."
+msgstr "Prosím �akajte, pridávam médium..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "France"
-msgstr "Francúzsko"
+msgid "Unable to get source packages."
+msgstr "Nie je možné prebrať zdrojové balí�ky."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "Fínsko"
+msgid "Too many packages are selected"
+msgstr "Vybrali ste príliš veľa balí�kov"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Spain"
-msgstr "Å panielsko"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"Vitajte v editore zdrojov pre balí�ky!\n"
+"\n"
+"Tento nástroj Vám pomôže pri nastavení zdrojov pre balí�ky, ktoré môžete\n"
+"použiť pre Váš po�íta�. Tieto budú dostupné pre inštaláciu nových balí�kov\n"
+"alebo pre vykonanie aktualizácií."
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Danmark"
-msgstr "Dánsko"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
+msgstr "konfliktuje s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "Nemecko"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Vítajte v MandrakeUpdate!\n"
+"\n"
+"Tento nástroj Vám pomôže vybrať aktualizácie ktoré chcete nainštalovať do "
+"Vášho\n"
+"po�íta�a."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Česká Republika"
+msgid "Mandrake choices"
+msgstr "Voľby Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Costa Rica"
+msgid "Changelog:\n"
+msgstr "Záznam zmien:\n"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "Kanada"
+msgid "Korea"
+msgstr "Korea"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Brazil"
-msgstr "Brazília"
+msgid "Removable device"
+msgstr "Vymeniteľné zariadenie"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Belgicko"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Austrália"
+msgid "Change medium"
+msgstr "Vymeniť médium"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "Rakúsko"
+msgid "Mandrake Update"
+msgstr "Mandrake Update"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
-msgstr "Info..."
+msgid "by size"
+msgstr "podľa veľkosti"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "Nie"
+msgid "FTP server"
+msgstr "FTP server"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "Ano"
+msgid "Files:\n"
+msgstr "Súbory:\n"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr "Nemôžem aktualizovať médium; bude automaticky zakázané."
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -1563,6 +1563,12 @@ msgstr "Odstrániť softvér"
 msgid "Software Sources Manager"
 msgstr "Manažér zdrojov softvéru"
 
+#~ msgid "Source: "
+#~ msgstr "Zdroj: "
+
+#~ msgid "Source"
+#~ msgstr "Zdroj"
+
 #~ msgid ""
 #~ "some packages failed to install\n"
 #~ "correctly"
@@ -1600,9 +1606,6 @@ msgstr "Manažér zdrojov softvéru"
 #~ "\n"
 #~ "Želáte si vyskúšať iný mirror?"
 
-#~ msgid "Error adding update medium"
-#~ msgstr "Chyba pri pridávaní média"
-
 #~ msgid "Please wait, contacting mirror to initialize updates packages."
 #~ msgstr ""
 #~ "Prosím �akajte, kontaktujem miror pre inicializáciu aktualizácie balí�kov."
diff --git a/po/sl.po b/po/sl.po
index 9c787b10..415c6e17 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: 2003-03-01 12:27+0100\n"
 "Last-Translator: Gregor Pirnaver <gregor.pirnaver@email.si>\n"
 "Language-Team: Sloven¹èina <lugos-slo@lugos.si>\n"
@@ -14,16 +14,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"Lahko nadaljujem?"
+msgid "Enabled?"
+msgstr "Omogoèen?"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Pot do priklopne toèke:"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Portugal"
+msgstr "Portugalska"
 
 #: ../rpmdrake:1
 #, c-format
@@ -42,104 +46,54 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"Dobrodo¹li v MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
+msgid "by group"
+msgstr "po skupini"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
-msgstr ""
-"Dobrodo¹li v orodju za odstranjevanje programske opreme!\n"
-"\n"
-"To orodje vam bo pomagalo izbrati programsko opremo, ki jo ¾elite\n"
-"odstraniti z va¹ega raèunalnika."
+msgid "Name:"
+msgstr "Ime:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Med namestitvijo paketov se je pojavila napaka:\n"
-"\n"
-"%s"
+msgid "Italy"
+msgstr "Namesti"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Problem during removal"
-msgstr "Te¾ave med odstranjevanjem"
+msgid "How to choose manually your mirror"
+msgstr "Kako roèno izbrati zrcalni stre¾nik"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "Prosim poèakajte, paketi se odstranjujejo..."
+msgid "URL:"
+msgstr "URL:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Prosim poèakajte, paketi se berejo iz baze..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Med namestitvijo paketov se je pojavila napaka:\n"
-"\n"
-"%s"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "namesti vse"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Pripravljam pakete za namestitev..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Pripravljam pakete za namestitev..."
+msgid "Some packages need to be removed"
+msgstr "Nekaj paketov je potrebno odstraniti"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Vsi zahtevani paketi so bil uspe¹no name¹èeni."
+msgid "More information on package..."
+msgstr "Ve¹ informacij o paketu..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Vse je bilo uspe¹no name¹èeno"
+msgid "Yes"
+msgstr "Da"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
 msgstr ""
-"Namestitev je konèana; %s.\n"
+"Zaradi njihovih odvisnosti naslednji paketi ne morejo\n"
+"biti izbrani:\n"
 "\n"
-"Ustvarjene so bile nekatere nastavitvene datoteke .rpmnew ali .rpmsave,\n"
-"lahko jih pregledate in se odloèite za nadaljna dejanja:"
 
 #: ../rpmdrake:1
 #, c-format
@@ -147,457 +101,454 @@ msgid "everything was installed correctly"
 msgstr "vse je bilo pravilno name¹èeno"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Problem se je pojavil med namestitvijo"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Name¹èam pakete `%s' (%s/%s)..."
+msgid "%s KB"
+msgstr "%s KB"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Pripravljam pakete za namestitev..."
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"Zrcalni stre¾nik lahko izberete tudi roèno:\n"
+"po¾enite Upravnika virov programske opreme in dodajte\n"
+"vir varnostnih nadgradenj (Security).\n"
+"\n"
+"Potem ponovno za¾enite MandrakeUpdate."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
+"Welcome to the software removal tool!\n"
 "\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
 msgstr ""
+"Dobrodo¹li v orodju za odstranjevanje programske opreme!\n"
 "\n"
-"\n"
-"Javljene napake:\n"
-"%s"
+"To orodje vam bo pomagalo izbrati programsko opremo, ki jo ¾elite\n"
+"odstraniti z va¹ega raèunalnika."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"Namestitev ni uspela, nekatere datoteke manjkajo.\n"
-"Lahko razmislite o obnovitvi baze virov."
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "Da bi shranili spremembe, morate vstaviti medij v pogon."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Shrani in konèaj"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
+"There was a problem during the removal of packages:\n"
 "\n"
-"Do you want to continue installation?"
+"%s"
 msgstr ""
-"Naslednje pakete je potrebno odstraniti, da bo mo¾no nadgraditi druge:\n"
-"\n"
-"%s\n"
+"Med namestitvijo paketov se je pojavila napaka:\n"
 "\n"
-"Lahko nadaljujem?"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Prena¹am paket `%s' (%s/%s)..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Cancel"
-msgstr "Preklièi"
+msgid "Size: "
+msgstr "Velikost: "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Ok"
-msgstr "V redu"
+msgid "Security updates"
+msgstr "Varnostna nadgradnje"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Prosim vstavite medij imenovan \"%s\" v napravo [%s]"
+msgid "Already existing update medias"
+msgstr "Napaka pri dodajanju medija za nadgradnje (update)"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Change medium"
-msgstr "Zamenjajte medij"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Initializing..."
-msgstr "Nastavljam zaèetne nastavitve..."
+msgid "Maximum information"
+msgstr "Maksimalne informacije"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Pripravljam pakete za namestitev..."
+msgid "Proxy..."
+msgstr "Napaka..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Za name¹èane paketov morate biti root."
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Unable to get source packages."
-msgstr "Dostop do paketov vira ni mogoè."
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspect..."
-msgstr "Preverjam..."
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
+msgstr ""
+"Namestitev ni uspela, nekatere datoteke manjkajo.\n"
+"Lahko razmislite o obnovitvi baze virov."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Installation finished"
-msgstr "Namestitev je konèana"
+msgid "United Kingdom"
+msgstr "Zdru¾eno kraljestvo"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Ne naredi niè"
+msgid "in names"
+msgstr "v imenih"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Uporabi .%s kot glavno datoteko"
+msgid ""
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
+msgstr ""
+"Ni primernega stre¾nika.\n"
+"\n"
+"Ta problem ima veè mo¾nih vzrokov, najbolj pogosto je\n"
+"problem v tem, da arhitektura va¹ega procesorja ni podprta\n"
+"v uradnih nadgradnjah (Mandrake Linux Official Updates)."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Remove .%s"
 msgstr "Odstrani .%s"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "changes:"
-msgstr "spremembe:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspecting %s"
-msgstr "Preverjam %s"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Prosim poèakajte, i¹èem dostopne pakete..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "Pro"
+msgid "Finland"
+msgstr "Finska"
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
+"The following packages have bad signatures:\n"
 "\n"
-"Then, restart MandrakeUpdate."
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"Zrcalni stre¾nik lahko izberete tudi roèno:\n"
-"po¾enite Upravnika virov programske opreme in dodajte\n"
-"vir varnostnih nadgradenj (Security).\n"
+"Naslednje pakete je potrebno odstraniti, da bo mo¾no nadgraditi druge:\n"
 "\n"
-"Potem ponovno za¾enite MandrakeUpdate."
+"%s\n"
+"\n"
+"Lahko nadaljujem?"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "How to choose manually your mirror"
-msgstr "Kako roèno izbrati zrcalni stre¾nik"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Examining distant file of media `%s'..."
+msgstr "Pregled oddaljene datotke vira `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
+msgid "Verifying packages signatures..."
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Already existing update sources"
-msgstr ""
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "France"
+msgstr "Prisili"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "More info"
+msgstr "Veè informacij"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
+"%s\n"
 "\n"
 "Is it ok to continue?"
 msgstr ""
-"Za dostop do najnovej¹ih paketov za nadgradnjo se je potrebno povezati z "
-"zrcalnim stre¾nikom.\n"
-"Prosim preverite, da ste povezani v Internet.\n"
+"%s\n"
 "\n"
 "Lahko nadaljujem?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Reload the packages list"
+msgstr "Ponovno nalo¾i spisek paketov"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Izberite zrcalni stre¾nik:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Datoteèna napaka"
+msgid "Some packages can't be installed"
+msgstr "Paketa `%s' ni mogoèe namestiti\n"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
+msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Pripravljam pakete za namestitev..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Mandrake nadgradnja"
+msgid "All packages,"
+msgstr "Vsi paketi,"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Software Packages Removal"
-msgstr "Odstranjevanje paketov programske opreme"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Type of media:"
+msgstr "Vrsta vira:"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Quit"
-msgstr "Konèaj"
+msgid "in files"
+msgstr "v datotekah"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Namesti"
+msgid "All requested packages were installed successfully."
+msgstr "Vsi zahtevani paketi so bil uspe¹no name¹èeni."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove"
-msgstr "Odstrani"
+msgid "Proxy hostname:"
+msgstr "Proksi ime gostitelja (hostname):"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Help"
-msgstr "Pomoè"
+msgid "Local files"
+msgstr "Lokalne datoteke"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search"
-msgstr "Iskanje"
+msgid "Inspecting %s"
+msgstr "Preverjam %s"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Find:"
-msgstr "Najdi:"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Israel"
+msgstr "Namesti"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Naslednje pakete je potrebno odstraniti, da bo mo¾no nadgraditi druge:\n"
-"\n"
-"%s\n"
-"\n"
-"Lahko nadaljujem?"
+msgid "Help"
+msgstr "Pomoè"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Nekaj paketov je potrebno odstraniti"
+msgid "HTTP server"
+msgstr "HTTP stre¾nik"
 
 #: ../rpmdrake:1
-#, c-format
-msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
-"\n"
-"Do you really want to install all the selected packages?"
-msgstr ""
-"Opozorilo: izgleda, da posku¹ate dodati toliko paketov,\n"
-"da bi lahko v datoteènem sistemu zmanjkalo prostega prostora\n"
-"med ali po namestitvi paketov, to je ¹e posebej nevarno\n"
-"in bi moralo biti skrbno premi¹ljeno.\n"
-"Ali resnièno ¾elite namestiti vse izbrane pakete?"
+#, fuzzy, c-format
+msgid "Installation failed"
+msgstr "namesti vse"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Preveè paketov je izbranih"
+msgid "Use .%s as main file"
+msgstr "Uporabi .%s kot glavno datoteko"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "Maksimalne informacije"
+msgid "Search results"
+msgstr "Rezultati iskanja"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Normal information"
-msgstr "Normalne informacije"
+msgid " failed!"
+msgstr " neuspeh!"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Update source(s)"
-msgstr "Obnovi vir(e)"
+msgid "Brazil"
+msgstr "Brazilija"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Ponovno nalo¾i spisek paketov"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"Medij s tem imenom ¾e obstaja, ali ga\n"
+"¾elite zamenjati?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "Ponastavi izbiro"
+msgid "Find:"
+msgstr "Najdi:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "v datotekah"
+msgid "All packages, alphabetical"
+msgstr "Vsi paketi, po abecedi"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "v opisih"
+msgid "Please wait, searching..."
+msgstr "Prosim poèakajte, iskanje v teku..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "v imenih"
+msgid "Please wait, reading packages database..."
+msgstr "Prosim poèakajte, paketi se berejo iz baze..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by update availability"
-msgstr "po dostopnih nadgradnjah"
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "Ni mogoèe odpreti paketa `%s'\n"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by source repository"
-msgstr "po skladi¹èih virov"
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Prosim vstavite medij imenovan \"%s\" v napravo [%s]"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by selection state"
-msgstr "po stanju izbire"
+msgid "Reset the selection"
+msgstr "Ponastavi izbiro"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by size"
-msgstr "po velikosti"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"Èe potrebujete proksi, vpi¹ite ime gostitelja in izbirno port (sintaksa: "
+"<ime gostitelja[:port]>):"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-msgstr "po skupini"
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
+"Zaradi njihovih odvisnosti je potrebno odstraniti tudi \n"
+"naslednje pakete:\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "All packages,"
-msgstr "Vsi paketi,"
+msgid "Costa Rica"
+msgstr "Kosta Rika"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "All packages, alphabetical"
-msgstr "Vsi paketi, po abecedi"
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Med namestitvijo paketov se je pojavila napaka:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Mandrake izbire"
+msgid "Please wait, removing medium..."
+msgstr "Prosim poèakajte, odstranjevanje medija..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
-msgstr "Normalna nadgradnje"
+msgid "Password:"
+msgstr "Geslo:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Popravki napak"
+msgid "Taiwan"
+msgstr "Tajvan"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Security updates"
-msgstr "Varnostna nadgradnje"
+msgid "User:"
+msgstr "Uporabnik:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Description: "
-msgstr "Opis:"
+msgid "Please wait, updating medium..."
+msgstr "Prosim poèakajte, medij se obnavlja..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Razlog za nadgradnjo: "
+msgid "Please wait, listing packages..."
+msgstr "Prosim poèakajte, paketi se izpisujejo..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Summary: "
-msgstr "Povzetek:"
+msgid "Information on packages"
+msgstr "Informacije o paketih"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Importance: "
-msgstr "Pomembnost:"
+msgid "Cancel"
+msgstr "Preklièi"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Everything installed successfully"
+msgstr "Vse je bilo uspe¹no name¹èeno"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Size: "
-msgstr "Velikost: "
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Select the media(s) you wish to update:"
+msgstr "Prosimo izberite vir, ki ga ¾elite obnoviti:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Version: "
-msgstr "Razlièica: "
+msgid "Please wait, updating media..."
+msgstr "Prosim poèakajte, medij se obnavlja..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "Ime: "
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Trenutno name¹èena razlièica: "
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Naslednje pakete je potrebno odstraniti, da bo mo¾no nadgraditi druge:\n"
+"\n"
+"%s\n"
+"\n"
+"Lahko nadaljujem?"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Source: "
-msgstr "Prisili"
+#, c-format
+msgid "in descriptions"
+msgstr "v opisih"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(Not available)"
-msgstr "(Ni na voljo)"
+msgid "Configure proxies"
+msgstr "Nastavite proksije"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Seznam sprememb:\n"
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Da bi dobili spisek zrcalnih stre¾nikov, se je potrebno povezati z "
+"MandrakeSoft.\n"
+"Prosim preverite, da ste povezani v Internet.\n"
+"\n"
+"Lahko nadaljujem?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Files:\n"
-msgstr "Datoteke:\n"
+msgid "Please choose"
+msgstr "Prosim izberite"
 
 #: ../rpmdrake:1
 #, c-format
@@ -606,43 +557,28 @@ msgstr "Izbrana velikost: %d MB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Izbrano: %d MB / Prosti disk: %d MB"
+msgid "Initializing..."
+msgstr "Nastavljam zaèetne nastavitve..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
-msgstr ""
-"Zaradi njihovih odvisnosti naslednji paketi ne morejo\n"
-"biti izbrani:\n"
-"\n"
+msgid "Save changes"
+msgstr "Shrani spremembe"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr ""
-"Oprostite, nalsednjih paketov ni mogoèe izbrati:\n"
-"\n"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "Napaka pri prenosu"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "je v sporu z"
+msgid "Package installation..."
+msgstr "Pripravljam pakete za namestitev..."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Paketa `%s' ni mogoèe namestiti\n"
+#, c-format
+msgid "Importance: "
+msgstr "Pomembnost:"
 
 #: ../rpmdrake:1
 #, c-format
@@ -655,311 +591,307 @@ msgstr ""
 "naslednje pakete:\n"
 "\n"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "Potrebni so dodatni paketi"
+msgid "Add..."
+msgstr "Dodaj..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "Paketa `%s' ni mogoèe namestiti\n"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "Medija ni mogoèe ustvariti"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Removing these packages would break your system, sorry:\n"
+"The installation is finished; %s.\n"
 "\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
 msgstr ""
-"Odstranitev teh paketov bi onesposobila va¹ sistem:\n"
+"Namestitev je konèana; %s.\n"
 "\n"
+"Ustvarjene so bile nekatere nastavitvene datoteke .rpmnew ali .rpmsave,\n"
+"lahko jih pregledate in se odloèite za nadaljna dejanja:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"Zaradi njihovih odvisnosti je potrebno odstraniti tudi \n"
-"naslednje pakete:\n"
-"\n"
+msgid "Browse..."
+msgstr "Brskaj..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "Paketa `%s' ni mogoèe namestiti\n"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Nekaj dodatnih paketov je potrebno odstraniti"
+msgid "Info..."
+msgstr "Info..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "More information on package..."
-msgstr "Ve¹ informacij o paketu..."
+msgid "You need to insert the medium to continue"
+msgstr "Za nadaljevanje morate vstaviti medij"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Copying file for media `%s'..."
+msgstr "Prepisovanje datoteke za vir `%s'..."
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Information on packages"
-msgstr "Informacije o paketih"
+msgid "Remove"
+msgstr "Odstrani"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "More info"
-msgstr "Veè informacij"
+msgid "Preparing packages installation..."
+msgstr "Pripravljam pakete za namestitev..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "by media repository"
+msgstr "po skladi¹èih virov"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "Za dodajanje"
+msgid "No mirror"
+msgstr "Ni zrcalnega stre¾nika"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Upgradable"
-msgstr "Za nadgradnjo"
+msgid "You need to fill up at least the two first entries."
+msgstr "Izpolniti morate najmanj prvi dve polji."
 
 #: ../rpmdrake:1
 #, c-format
-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 ""
-"Seznam nadgradenj je prazen. To pomeni, da ni nadgradenj\n"
-"za pakete, ki ste jih namestili na raèunalnik,\n"
-"ali pa ste ¾e namestili vse."
+msgid "Install"
+msgstr "Namesti"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "No update"
-msgstr "Brez nadgradnje"
+msgid "Japan"
+msgstr "Japonska"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "(none)"
-msgstr "(noben)"
+msgid "Do nothing"
+msgstr "Ne naredi niè"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Prosim poèakajte, paketi se izpisujejo..."
+msgid "No update"
+msgstr "Brez nadgradnje"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "Ni mogoèe odpreti paketa `%s'\n"
+#, c-format
+msgid "Description: "
+msgstr "Opis:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Potrebujete enega od naslednjih paketov:"
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr ""
+"Opozorilo: izgleda, da posku¹ate dodati toliko paketov,\n"
+"da bi lahko v datoteènem sistemu zmanjkalo prostega prostora\n"
+"med ali po namestitvi paketov, to je ¹e posebej nevarno\n"
+"in bi moralo biti skrbno premi¹ljeno.\n"
+"Ali resnièno ¾elite namestiti vse izbrane pakete?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Prosim izberite"
+msgid "Name: "
+msgstr "Ime: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Inspect..."
+msgstr "Preverjam..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Not selected"
-msgstr "Zaznani so spori"
+msgid "Editing media \"%s\":"
+msgstr "Uredi vir \"%s\":"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Selected"
-msgstr "Izbran"
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "Pripravljam pakete za namestitev..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results"
-msgstr "Rezultati iskanja"
+msgid "Australia"
+msgstr "Avstralija"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Stop"
-msgstr "Ustavi"
+msgid "Installation finished"
+msgstr "Namestitev je konèana"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Prosim poèakajte, iskanje v teku..."
+msgid "by update availability"
+msgstr "po dostopnih nadgradnjah"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Rezultati iskanja (brez)"
+msgid "Poland"
+msgstr "Poljska"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Other"
-msgstr "Drugo"
+msgid "Version: "
+msgstr "Razlièica: "
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the packages source editor!\n"
-"\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
-msgstr ""
-"Dobrodo¹li v upravnika virov paketov!\n"
-"\n"
-"To orodje vam bo pomagalo nastaviti vire paketov, ki jih ¾elite uporabljati\n"
-"na raèunalniku. Viri bodo na voljo za name¹èanje nove programske opreme\n"
-"ali za opravljanje nadgradenj."
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Lahko doloèite uporabnika/geslo za proksi overitev (authentication):"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
-msgstr "Shrani in konèaj"
+msgid "Upgradable"
+msgstr "Za nadgradnjo"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid " done."
+msgstr " opravljeno."
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Napaka..."
+msgid "Software Packages Installation"
+msgstr "Pripravljam pakete za namestitev..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Update..."
-msgstr "Nadgradnja..."
+msgid "Additional packages needed"
+msgstr "Potrebni so dodatni paketi"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "Dodaj..."
+msgid "Bugfixes updates"
+msgstr "Popravki napak"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "Uredi"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Source"
-msgstr "Prisili"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "Prenos `%s', preostanek èasa:%s, hitrost:%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Enabled?"
-msgstr "Omogoèen?"
+msgid "Germany"
+msgstr "Nem¹ija"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Configure sources"
-msgstr "Nastavite vire"
+msgid "Russia"
+msgstr "Rusija"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Password:"
-msgstr "Geslo:"
+msgid "Norway"
+msgstr "Norve¹ka"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "User:"
-msgstr "Uporabnik:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during installation"
+msgstr "Problem se je pojavil med namestitvijo"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "Lahko doloèite uporabnika/geslo za proksi overitev (authentication):"
+msgid "Search"
+msgstr "Iskanje"
 
 #: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Edit a media"
+msgstr "Uredi vir"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "Proksi ime gostitelja (hostname):"
+msgid "Czech Republic"
+msgstr "Èe¹ka"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"Èe potrebujete proksi, vpi¹ite ime gostitelja in izbirno port (sintaksa: "
-"<ime gostitelja[:port]>):"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Nastavite proksije"
+msgid "Stop"
+msgstr "Ustavi"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Prosim poèakajte, medij se obnavlja..."
+msgid "Update"
+msgstr "Obnova"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "Da bi shranili spremembe, morate vstaviti medij v pogon."
+msgid "Please wait, removing packages..."
+msgstr "Prosim poèakajte, paketi se odstranjujejo..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "Za nadaljevanje morate vstaviti medij"
+msgid "Normal information"
+msgstr "Normalne informacije"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "Shrani spremembe"
+msgid "Media: "
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Relativna pot do synthesis/hdlist:"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "Prena¹am paket `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "Uredi vir \"%s\":"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Izbrano: %d MB / Prosti disk: %d MB"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit a source"
-msgstr "Uredi vir"
+msgid "Media"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Prosim poèakajte, odstranjevanje medija..."
+msgid "Spain"
+msgstr "©panija"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Type of source:"
-msgstr "Vrsta vira:"
+msgid "Normal updates"
+msgstr "Normalna nadgradnje"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Dodajam vir:"
+msgid "by selection state"
+msgstr "po stanju izbire"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
-"Medij s tem imenom ¾e obstaja, ali ga\n"
-"¾elite zamenjati?"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Izpolniti morate najmanj prvi dve polji."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Name:"
-msgstr "Ime:"
+"Poèakajte prosim, prenos naslovov zrcalnih stre¾nikov z MandrakeSoft spletne "
+"strani"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -967,143 +899,148 @@ msgid "Login:"
 msgstr "Uporabni¹ko ime:"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Choose a mirror..."
-msgstr "Izberite zrcalni stre¾nik:"
+#, fuzzy, c-format
+msgid "Adding a media:"
+msgstr "Dodajam vir:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Browse..."
-msgstr "Brskaj..."
+msgid "Austria"
+msgstr "Avstrija"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Path or mount point:"
-msgstr "Pot do priklopne toèke:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Fatal error"
+msgstr "Datoteèna napaka"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Removable device"
-msgstr "Naprava oz. pogon"
+msgid "Update..."
+msgstr "Nadgradnja..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "Preverjanje podpisa `%s'..."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "HTTP stre¾nik"
+msgid "(none)"
+msgstr "(noben)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "FTP server"
-msgstr "FTP stre¾nik"
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
+"Odstranitev teh paketov bi onesposobila va¹ sistem:\n"
+"\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Path:"
-msgstr "Pot:"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Name¹èam pakete `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "Lokalne datoteke"
+msgid "Currently installed version: "
+msgstr "Trenutno name¹èena razlièica: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add a source"
-msgstr "Dodaj vir"
+msgid "Other"
+msgstr "Drugo"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr "Ni mo¾no obnoviti medija, zato bo samodejno onemogoèen"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "Razlog za nadgradnjo: "
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to create medium."
-msgstr "Medija ni mogoèe ustvariti"
+msgid "Please choose the desired mirror."
+msgstr "Prosim izberite ¾eljen zrcalni stre¾nik"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "Obnova"
+msgid "Edit"
+msgstr "Uredi"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Prosimo izberite vir, ki ga ¾elite obnoviti:"
+msgid "Please wait, finding available packages..."
+msgstr "Prosim poèakajte, i¹èem dostopne pakete..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Prosim poèakajte, medij se obnavlja..."
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Relativna pot do synthesis/hdlist:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " failed!"
-msgstr " neuspeh!"
+msgid "Search results (none)"
+msgstr "Rezultati iskanja (brez)"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid " done."
-msgstr " opravljeno."
+msgid "Danmark"
+msgstr "Danska"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "Prenos `%s', hitrost:%s"
+msgid "China"
+msgstr "Kitajska"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "Prenos `%s', preostanek èasa:%s, hitrost:%s"
+msgid "United States"
+msgstr "Zdru¾ene dr¾ave"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "Preverjanje podpisa `%s'..."
+#: ../rpmdrake:1
+#, c-format
+msgid "changes:"
+msgstr "spremembe:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "Pregled oddaljene datotke vira `%s'..."
+msgid "Some additional packages need to be removed"
+msgstr "Nekaj dodatnih paketov je potrebno odstraniti"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "Pregled datoteke vira `%s'..."
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "Prepisovanje datoteke za vir `%s'..."
+msgid "No"
+msgstr "Ne"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure medias"
+msgstr "Nastavite vire"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a media"
+msgstr "Dodaj vir"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Please choose the desired mirror."
-msgstr "Prosim izberite ¾eljen zrcalni stre¾nik"
+msgid "Summary: "
+msgstr "Povzetek:"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
-msgstr ""
-"Ni primernega stre¾nika.\n"
-"\n"
-"Ta problem ima veè mo¾nih vzrokov, najbolj pogosto je\n"
-"problem v tem, da arhitektura va¹ega procesorja ni podprta\n"
-"v uradnih nadgradnjah (Mandrake Linux Official Updates)."
+msgid "Canada"
+msgstr "Kanada"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No mirror"
-msgstr "Ni zrcalnega stre¾nika"
+msgid "Greece"
+msgstr "Grèija"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1120,181 +1057,244 @@ msgstr ""
 "Mre¾a oz. MandrakeSoft spletna stran sta mogoèe nedostopni.\n"
 "Prosim poskusite znova pozneje."
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Error during download"
-msgstr "Napaka pri prenosu"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Za name¹èane paketov morate biti root."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
-"Poèakajte prosim, prenos naslovov zrcalnih stre¾nikov z MandrakeSoft spletne "
-"strani"
+msgid "Path:"
+msgstr "Pot:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Da bi dobili spisek zrcalnih stre¾nikov, se je potrebno povezati z "
-"MandrakeSoft.\n"
-"Prosim preverite, da ste povezani v Internet.\n"
-"\n"
-"Lahko nadaljujem?"
+msgid "Problem during removal"
+msgstr "Te¾ave med odstranjevanjem"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United States"
-msgstr "Zdru¾ene dr¾ave"
+msgid "Selected"
+msgstr "Izbran"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "Kitajska"
+msgid "Netherlands"
+msgstr "Nizozemska"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Zdru¾eno kraljestvo"
+msgid "Addable"
+msgstr "Za dodajanje"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Tajvan"
+msgid "(Not available)"
+msgstr "(Ni na voljo)"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Sweden"
-msgstr "©vedska"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
+msgstr ""
+"Oprostite, nalsednjih paketov ni mogoèe izbrati:\n"
+"\n"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Russia"
-msgstr "Rusija"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Not selected"
+msgstr "Zaznani so spori"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Portugal"
-msgstr "Portugalska"
+msgid "Software Packages Removal"
+msgstr "Odstranjevanje paketov programske opreme"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Poland"
-msgstr "Poljska"
+msgid "Sweden"
+msgstr "©vedska"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Norway"
-msgstr "Norve¹ka"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
+msgstr ""
+"\n"
+"\n"
+"Javljene napake:\n"
+"%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Netherlands"
-msgstr "Nizozemska"
+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 ""
+"Seznam nadgradenj je prazen. To pomeni, da ni nadgradenj\n"
+"za pakete, ki ste jih namestili na raèunalnik,\n"
+"ali pa ste ¾e namestili vse."
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Korea"
-msgstr "Prisili"
+msgid "Examining file of media `%s'..."
+msgstr "Pregled datoteke vira `%s'..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Japan"
-msgstr "Japonska"
+msgid "Download of `%s', speed:%s"
+msgstr "Prenos `%s', hitrost:%s"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Italy"
-msgstr "Namesti"
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Potrebujete enega od naslednjih paketov:"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Israel"
-msgstr "Namesti"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Konèaj"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Greece"
-msgstr "Grèija"
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Za dostop do najnovej¹ih paketov za nadgradnjo se je potrebno povezati z "
+"zrcalnim stre¾nikom.\n"
+"Prosim preverite, da ste povezani v Internet.\n"
+"\n"
+"Lahko nadaljujem?"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "France"
-msgstr "Prisili"
+msgid "Update media(s)"
+msgstr "Obnovi vir(e)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Finland"
-msgstr "Finska"
+msgid "Ok"
+msgstr "V redu"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Spain"
-msgstr "©panija"
+msgid "Please wait, adding medium..."
+msgstr "Pro"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Danmark"
-msgstr "Danska"
+msgid "Unable to get source packages."
+msgstr "Dostop do paketov vira ni mogoè."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "Nem¹ija"
+msgid "Too many packages are selected"
+msgstr "Preveè paketov je izbranih"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"Dobrodo¹li v upravnika virov paketov!\n"
+"\n"
+"To orodje vam bo pomagalo nastaviti vire paketov, ki jih ¾elite uporabljati\n"
+"na raèunalniku. Viri bodo na voljo za name¹èanje nove programske opreme\n"
+"ali za opravljanje nadgradenj."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
+msgstr "je v sporu z"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Èe¹ka"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Dobrodo¹li v MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Kosta Rika"
+msgid "Mandrake choices"
+msgstr "Mandrake izbire"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Canada"
-msgstr "Kanada"
+msgid "Changelog:\n"
+msgstr "Seznam sprememb:\n"
 
 #: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Korea"
+msgstr "Prisili"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Brazil"
-msgstr "Brazilija"
+msgid "Removable device"
+msgstr "Naprava oz. pogon"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Belgija"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Avstralija"
+msgid "Change medium"
+msgstr "Zamenjajte medij"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "Avstrija"
+msgid "Mandrake Update"
+msgstr "Mandrake nadgradnja"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
-msgstr "Info..."
+msgid "by size"
+msgstr "po velikosti"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "Ne"
+msgid "FTP server"
+msgstr "FTP stre¾nik"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "Da"
+msgid "Files:\n"
+msgstr "Datoteke:\n"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr "Ni mo¾no obnoviti medija, zato bo samodejno onemogoèen"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -1568,6 +1568,14 @@ msgstr "Odstrani programsko opremo"
 msgid "Software Sources Manager"
 msgstr "Upravnik virov programske opreme"
 
+#, fuzzy
+#~ msgid "Source: "
+#~ msgstr "Prisili"
+
+#, fuzzy
+#~ msgid "Source"
+#~ msgstr "Prisili"
+
 #~ msgid ""
 #~ "some packages failed to install\n"
 #~ "correctly"
@@ -1607,9 +1615,6 @@ msgstr "Upravnik virov programske opreme"
 #~ "\n"
 #~ "®elite poskusiti drug zrcalni stre¾nik?"
 
-#~ msgid "Error adding update medium"
-#~ msgstr "Napaka pri dodajanju medija za nadgradnje (update)"
-
 #~ msgid "Please wait, contacting mirror to initialize updates packages."
 #~ msgstr ""
 #~ "Prosim poèakajte, v teku je povezovanje z zrcalnim stre¾nikom glede "
diff --git a/po/sq.po b/po/sq.po
index fa693437..58884457 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: 2002-11-27 21:45:+0100\n"
 "Last-Translator: Naim Daka <naim70@freesurf>\n"
 "Language-Team: Albanian <LL@li.org>\n"
@@ -14,16 +14,20 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-15\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"A pajtoheni për të vazhduar?"
+msgid "Enabled?"
+msgstr "Aktiv?"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Shtegu apo pika montuese:"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Portugal"
+msgstr "Portugalia"
 
 #: ../rpmdrake:1
 #, c-format
@@ -43,16 +47,79 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "by group"
+msgstr "simbas grupit"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "Emri:"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Italy"
+msgstr "Italia"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Si ta zgjedhni pasqyrën tuaj vetë"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "Disa pako duhet të zhduken"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
+msgstr "Më shumë informacione mbi pakon..."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Po"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Welcome to MandrakeUpdate!\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
 msgstr ""
-"Mirësevini në MandrakeUpdate!\n"
+"Me rastin e mbushjes së mvarësisë, pako(t) e radhitura nuk duhet të zgjidhen "
+"tani:\n"
 "\n"
-"Kjo vegël do të ju ndihmojë për intalimin e azhurnimeve të zgjedhura në\n"
-"kompjuterit tuaj."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "gjdo gjë është instaluar si duhet"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"Ju mund ta zgjedhni cilën do pasqyrë nga ana juaj: për t'ia arritur,\n"
+"nisni Software Sources Manager, dhe shtoni një burim 'Azhurnimi\n"
+"të sigurisë'.\n"
+"\n"
+"Dhe, riniseni MandrakeUpdate."
 
 #: ../rpmdrake:1
 #, c-format
@@ -67,122 +134,98 @@ msgstr ""
 "Kjo vegël do të ju ndihmojë në zhdukjen e softverëve të dëshiruar nga "
 "kompjuteri juaj."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
+"In order to save the changes, you need to insert the medium in the drive."
 msgstr ""
-"Një problem është paraqitur gjatë zhdukjes së pakove:\n"
-"\n"
-"%s"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Problem during removal"
-msgstr "Një problem është paraqitur gjatë zhdukjes"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Please wait, removing packages..."
-msgstr "Një moment ju lutemi, zhdukja pakove..."
+"Më në fund për ti regjistruar ndryshimet, ju duhet ta futni burimin në "
+"lexues."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Një moment ju lutemi, lexim i pakove në bazën e të dhënave..."
+msgid "Save and quit"
+msgstr "Shpëtoje dhe braktise"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"There was a problem during the installation:\n"
+"There was a problem during the removal of packages:\n"
 "\n"
 "%s"
 msgstr ""
-"Një problem është paraqitur gjatë instalimit:\n"
+"Një problem është paraqitur gjatë zhdukjes së pakove:\n"
 "\n"
 "%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation failed"
-msgstr "Instalimi dështoi"
+msgid "Size: "
+msgstr "Madhësia: "
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Gabim i pa mbuluar: asnjë pako e gjetur për instalim, kemi ndjesë."
+msgid "Security updates"
+msgstr "Azhurnimi i sigurisë"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "No package found for installation."
-msgstr "Asnjë pako s'është gjetur për Instalim"
+#, fuzzy, c-format
+msgid "Already existing update medias"
+msgstr "Burimet azhurnuese ekzistojnë më parë"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Të gjitha pakot e zgjedhura janë instaluar si duhet."
+msgid "Maximum information"
+msgstr "Infomacione maksimale"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Gjdo gjë është instaluar si duhet"
+msgid "Proxy..."
+msgstr "Proxy..."
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The installation is finished; %s.\n"
-"\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
 msgstr ""
-"Instalimi përfundoi; %s.\n"
-"\n"
-"Disa konfigurime të skedareve janë krijuar si `.rpmnew' ose `.rpmsave',\n"
-"ju mund ti verifikoni ato, që në fund të vendosni çfarë dëshironi të bëni: "
-
-#: ../rpmdrake:1
-#, c-format
-msgid "everything was installed correctly"
-msgstr "gjdo gjë është instaluar si duhet"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Problem during installation"
-msgstr "Një problem është paraqitur gjatë instalimit"
+"instalimi dështoi, disa skedare mungojnë.\n"
+"A dëshironi ti azhurnoni burimet tuaja të bazës e të dhënave."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Instalimi i pakos `%s' (%s/%s)..."
+msgid "United Kingdom"
+msgstr "Britania e Madhe"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Preparing packages installation..."
-msgstr "Pregatitje për instalimin e pakove..."
+msgid "in names"
+msgstr "mes emrave"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
+"I can't find any suitable mirror.\n"
 "\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
+"E pa mundur gjetja e një pasqyre.\n"
 "\n"
-"\n"
-"Gabim(et) i(e) raportuar(a):\n"
-"%s"
+"Mund të jenë shumë arësye; më e shpeshta është\n"
+"mbi të gjitha, arkitektura e procesorit tuaj nuk mundë të\n"
+"përkrahet nga Azhurnimi i Mandrake Linux Zyrëtar"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"instalimi dështoi, disa skedare mungojnë.\n"
-"A dëshironi ti azhurnoni burimet tuaja të bazës e të dhënave."
+msgid "Remove .%s"
+msgstr "Zhduke .%s"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "Finlanda"
 
 #: ../rpmdrake:1
 #, c-format
@@ -199,362 +242,340 @@ msgstr ""
 "\n"
 "A dëshironi të vazhdoni?"
 
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Examining distant file of media `%s'..."
+msgstr "Verifikimi i distancës së burimit të skedares `%s'..."
+
 #: ../rpmdrake:1
 #, c-format
 msgid "Verifying packages signatures..."
 msgstr "Verifikimi i nënshkrimeve të pakove..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Shkarkimi i pakos `%s' (%s/%s)..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Cancel"
-msgstr "Anulo"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid "France"
+msgstr "Franca"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Ju lutemi futni emrin e burimit \"%s\" në mjetin [%s]"
+msgid "More info"
+msgstr "Më shumë informacione"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Change medium"
-msgstr "Ndrryshim i burimit"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"A pajtoheni për të vazhduar?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "Inicializimi..."
+msgid "Reload the packages list"
+msgstr "Ringarkoje listën e pakove"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Package installation..."
-msgstr "Instalimi i pakos..."
+msgid "Choose a mirror..."
+msgstr "Zgjedheni një pasqyre..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "E pa mundur marrja e burimeve mbi pakot, kemi ndjesë. %s"
+msgid "Some packages can't be installed"
+msgstr "Disa nga pakot nuk mund të instalohen"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Unable to get source packages."
-msgstr "E pa mundur marrja e burimeve mbi pakot."
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "Gabim i pa mbuluar: asnjë pako e gjetur për instalim, kemi ndjesë."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "Inspektim..."
+msgid "All packages,"
+msgstr "Gjitha pakot,"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Installation finished"
-msgstr "Instalimi përfundoi"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Type of media:"
+msgstr "Tip i burimit:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Asnjë veprim"
+msgid "in files"
+msgstr "mes skedareve"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Përdore .%s si skedare kryesore"
+msgid "All requested packages were installed successfully."
+msgstr "Të gjitha pakot e zgjedhura janë instaluar si duhet."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Zhduke .%s"
+msgid "Proxy hostname:"
+msgstr "Emri i serverit proxy:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "changes:"
-msgstr "ndryshimet:"
+msgid "Local files"
+msgstr "Skedaret lokale"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspecting %s"
 msgstr "Inspektimi i %s"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Një moment ju lutemi, gjetja e pakove të lira..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "Një moment ju lutemi, shtimi i burimit..."
+msgid "Israel"
+msgstr "Izraeli"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
-"\n"
-"Then, restart MandrakeUpdate."
-msgstr ""
-"Ju mund ta zgjedhni cilën do pasqyrë nga ana juaj: për t'ia arritur,\n"
-"nisni Software Sources Manager, dhe shtoni një burim 'Azhurnimi\n"
-"të sigurisë'.\n"
-"\n"
-"Dhe, riniseni MandrakeUpdate."
+msgid "Help"
+msgstr "Ndihmë"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "Si ta zgjedhni pasqyrën tuaj vetë"
+msgid "HTTP server"
+msgstr "Serveri HTTP"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
-msgstr ""
-"Ju posedoni më së paku një burim azhurnues të konfiguruar, mirëpo\n"
-"ato janë momentalisht të dezaktivizuara. Ju duhet ta nisni\n"
-"Software Sources Manager që t'aktivizoni më së paku një (kuti në\n"
-"kolonën e shënuar Aktivizoje?\n"
-"\n"
-"Dhe, riniseni MandrakeUpdate."
+msgid "Installation failed"
+msgstr "Instalimi dështoi"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Already existing update sources"
-msgstr "Burimet azhurnuese ekzistojnë më parë"
+msgid "Use .%s as main file"
+msgstr "Përdore .%s si skedare kryesore"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Kamë nevojë që ta kontaktoj pasqyrën, dhe të pranojë infomacione të \n"
-"reja mbi azhurnimin. Verifikoni rrjetin dhe funksionimin e tij.\n"
-"\n"
-"A dëshironi të vazhdoni?"
+msgid "Search results"
+msgstr "Kërkues i rezultateve"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr "Një gabim fatal është paraqitur: %s."
+msgid " failed!"
+msgstr " dështim!"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Fatal error"
-msgstr "Gabim fatal"
+msgid "Brazil"
+msgstr "Brazili"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Software Packages Installation"
-msgstr "Instalimi i Pakove Software"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"Një burim tjetër ekziston me të njëjtin emër, a dëshironi\n"
+"me të vërtetë ta zëvendësoni atë?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Azhurnimi Mandrake"
+msgid "Find:"
+msgstr "Gjetja:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Zhdukja e Pakove Software"
+msgid "All packages, alphabetical"
+msgstr "Gjitha pakot, të radhitura simbas alfabetit"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Quit"
-msgstr "Braktise"
+msgid "Please wait, searching..."
+msgstr "Një moment, hetimet në vazhdim e sipër..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Instaloje"
+msgid "Please wait, reading packages database..."
+msgstr "Një moment ju lutemi, lexim i pakove në bazën e të dhënave..."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "Zhduke"
+msgid "unknown package "
+msgstr "pako a pa njoftur"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Help"
-msgstr "Ndihmë"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Ju lutemi futni emrin e burimit \"%s\" në mjetin [%s]"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search"
-msgstr "Hulumtim"
+msgid "Reset the selection"
+msgstr "Vërja e zgjedhjeve në fillim"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Find:"
-msgstr "Gjetja:"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"Nëse keni nevojë për proxy, hyni emrin e makinës dhe të portës zgjedhëse"
+"(sintaksa është:<emri-i-makinës[:porta]>):"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
 "\n"
-"Is it ok to continue?"
 msgstr ""
-"Pakot e radhitura, duhet të zhduken që të tjerat të azhurnohen:\n"
-"\n"
-"%s\n"
+"Me rastin e mbushjes së mvarësisë, pako(t) e radhitura duhet të zhduken:\n"
 "\n"
-"A dëshironi të vazhdoni?"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Disa pako duhet të zhduken"
+msgid "Costa Rica"
+msgstr "Kosta Rika"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
+"There was a problem during the installation:\n"
 "\n"
-"Do you really want to install all the selected packages?"
+"%s"
 msgstr ""
-"Kujdes: me sa duket ju jeni duke u munduar të instaloni një numër të\n"
-"madhë të pakove, është e mundur që disku i juaj të mos ketë vendë të\n"
-"mjaftueshëm për to, mbasandej apo gjatë instalimit; kjo metodë është\n"
-"tejet e rrezikshme, e cila duhet të shqyrtohet me kujdes të madhë.\n"
+"Një problem është paraqitur gjatë instalimit:\n"
 "\n"
-"A me të vërtetë dëshironi t'instaloni të gjitha pakot e zgjedhura?"
+"%s"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Numër shumë i madhë i pakove të zgjedhura"
+msgid "Please wait, removing medium..."
+msgstr "Një moment ju lutemi, zhdukja e burimit..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Maximum information"
-msgstr "Infomacione maksimale"
+msgid "Password:"
+msgstr "Parulla:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Normal information"
-msgstr "Infomacion normale"
+msgid "Taiwan"
+msgstr "Taivani"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update source(s)"
-msgstr "Azhurnimi i burimeve"
+msgid "User:"
+msgstr "Përdoruesi:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Ringarkoje listën e pakove"
+msgid "Please wait, updating medium..."
+msgstr "Ju lutemi një moment, azhurnimi i burimit..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "Vërja e zgjedhjeve në fillim"
+msgid "Please wait, listing packages..."
+msgstr "Një moment ju lutemi, numërimi i pakove..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "mes skedareve"
+msgid "Information on packages"
+msgstr "Informacion mbi pakon"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "in descriptions"
-msgstr "mes përshkrimeve"
+msgid "Cancel"
+msgstr "Anulo"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "mes emrave"
+msgid "Everything installed successfully"
+msgstr "Gjdo gjë është instaluar si duhet"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "by update availability"
-msgstr "i lirë simbas azhurnimit"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Select the media(s) you wish to update:"
+msgstr "Zgjedheni burimin të cilin dëshironi t'azhurnoni:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by source repository"
-msgstr "depo simbas burimit"
+msgid "Please wait, updating media..."
+msgstr "Një moment ju lutemi, azhurnimi i burimeve..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by selection state"
-msgstr "gjendje simbas zgjedhjes"
+msgid "A fatal error occurred: %s."
+msgstr "Një gabim fatal është paraqitur: %s."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by size"
-msgstr "simbas madhësisë"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Pakot e radhitura, duhet të zhduken që të tjerat të azhurnohen:\n"
+"\n"
+"%s\n"
+"\n"
+"A dëshironi të vazhdoni?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-msgstr "simbas grupit"
+msgid "in descriptions"
+msgstr "mes përshkrimeve"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "All packages,"
-msgstr "Gjitha pakot,"
+msgid "Configure proxies"
+msgstr "Konfigurimi i proxies"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Gjitha pakot, të radhitura simbas alfabetit"
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Më duhet të kontaktoj adresën web të MandrakeSoft, për të pranuar listën e "
+"pasqyreve.\n"
+"Ju lutemi verifikone rrjetin, nëse ai punon si duhet.\n"
+"\n"
+"A pajtoheni për të vazhduar?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Mundësit Mandrake"
+msgid "Please choose"
+msgstr "Ju lutemi zgjedheni"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Normal updates"
-msgstr "Azhurnimet normale"
+msgid "Selected size: %d MB"
+msgstr "Madhësia e zgjedhur: %d MB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Korigjim i bug(it) azhurnues"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Security updates"
-msgstr "Azhurnimi i sigurisë"
+msgid "Initializing..."
+msgstr "Inicializimi..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Description: "
-msgstr "Përshkrim: "
+msgid "Save changes"
+msgstr "Shpëtoi ndryshimet"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Arësyja për azhurnim: "
+msgid "Error during download"
+msgstr "Gabim gjatë shkarkimit"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Summary: "
-msgstr "Titulli: "
+msgid "Package installation..."
+msgstr "Instalimi i pakos..."
 
 #: ../rpmdrake:1
 #, c-format
@@ -563,566 +584,474 @@ msgstr "Rëndësia: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid ""
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
+msgstr ""
+"Me rastin e mbushjes së mvarësisë, pako(t) e radhitura duhet të\n"
+"instalohen:\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Size: "
-msgstr "Madhësia: "
+msgid "Add..."
+msgstr "Shto..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Version: "
-msgstr "Versioni: "
+msgid "Unable to create medium."
+msgstr "I pa mundur krijimi i burimit."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "Emri: "
+msgid ""
+"The installation is finished; %s.\n"
+"\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
+msgstr ""
+"Instalimi përfundoi; %s.\n"
+"\n"
+"Disa konfigurime të skedareve janë krijuar si `.rpmnew' ose `.rpmsave',\n"
+"ju mund ti verifikoni ato, që në fund të vendosni çfarë dëshironi të bëni: "
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Versioni i tanishëm i instaluar: "
+msgid "Browse..."
+msgstr "Shfletues..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Source: "
-msgstr "Burimi: "
+msgid "Some packages can't be removed"
+msgstr "Disa nga pakot nuk mund të zhduken"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
-msgstr "(I nxënë)"
+msgid "Info..."
+msgstr "Infomacion..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Changelog:\n"
+msgid "You need to insert the medium to continue"
+msgstr "Ju duhet të futni burimin për të vazhduar më tutje"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Files:\n"
-msgstr "Skedaret:\n"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Copying file for media `%s'..."
+msgstr "Kopjim i skedares për burimin `%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "Madhësia e zgjedhur: %d MB"
+msgid "Remove"
+msgstr "Zhduke"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Zgjedhni: %d MB / Hapësire të lirë në disk: %d MB"
+msgid "Preparing packages installation..."
+msgstr "Pregatitje për instalimin e pakove..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
-msgstr ""
-"Me rastin e mbushjes së mvarësisë, pako(t) e radhitura nuk duhet të zgjidhen "
-"tani:\n"
-"\n"
+#, fuzzy, c-format
+msgid "by media repository"
+msgstr "depo simbas burimit"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr ""
-"Kemi ndjesë, pako(t) e radhitur(a) nuk mundë të zgjedhe(n):\n"
-"\n"
-"%s\n"
-"\n"
-"Arësyet vijuese janë:\n"
-"\n"
-"%s"
+msgid "No mirror"
+msgstr "Asnjë pasqyre"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "%s conflicts with %s"
-msgstr "%s është në konflikt me %s"
+msgid "You need to fill up at least the two first entries."
+msgstr "Ju duhet ti mbushni më së paku dy hyrje të para."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages can't be installed"
-msgstr "Disa nga pakot nuk mund të instalohen"
+msgid "Install"
+msgstr "Instaloje"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
-msgstr ""
-"Me rastin e mbushjes së mvarësisë, pako(t) e radhitura duhet të\n"
-"instalohen:\n"
-"\n"
+msgid "Japan"
+msgstr "Japonia"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "Keni nevojë për pakot shtuese"
+msgid "Do nothing"
+msgstr "Asnjë veprim"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages can't be removed"
-msgstr "Disa nga pakot nuk mund të zhduken"
+msgid "No update"
+msgstr "Asnjë azhurnim"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
-"Zhdukja e këtyre pakove do të dëmtojë sistemin tuaj, kemi ndjesë:\n"
-"\n"
+msgid "Description: "
+msgstr "Përshkrim: "
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
 "\n"
+"Do you really want to install all the selected packages?"
 msgstr ""
-"Me rastin e mbushjes së mvarësisë, pako(t) e radhitura duhet të zhduken:\n"
+"Kujdes: me sa duket ju jeni duke u munduar të instaloni një numër të\n"
+"madhë të pakove, është e mundur që disku i juaj të mos ketë vendë të\n"
+"mjaftueshëm për to, mbasandej apo gjatë instalimit; kjo metodë është\n"
+"tejet e rrezikshme, e cila duhet të shqyrtohet me kujdes të madhë.\n"
 "\n"
+"A me të vërtetë dëshironi t'instaloni të gjitha pakot e zgjedhura?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Disa nga pakot e mbledhura duhet të zhduken"
+msgid "Name: "
+msgstr "Emri: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "More information on package..."
-msgstr "Më shumë informacione mbi pakon..."
+msgid "Inspect..."
+msgstr "Inspektim..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Information on packages"
-msgstr "Informacion mbi pakon"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing media \"%s\":"
+msgstr "Botimi i burimit \"%s\":"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "More info"
-msgstr "Më shumë informacione"
+msgid "No package found for installation."
+msgstr "Asnjë pako s'është gjetur për Instalim"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "Të reja"
+msgid "Australia"
+msgstr "Australia"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Upgradable"
-msgstr "Azhurnuar"
+msgid "Installation finished"
+msgstr "Instalimi përfundoi"
 
 #: ../rpmdrake:1
 #, c-format
-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 ""
-"Lista e azhurnimeve, është e zbrazët. Që d.m.th. se\n"
-"asnjë nga pakot e instaluara, nuk janë azhurnuar në kompjuterin tuaj\n"
-"ose ju i keni instaluar më heret ato."
+msgid "by update availability"
+msgstr "i lirë simbas azhurnimit"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "No update"
-msgstr "Asnjë azhurnim"
+msgid "Poland"
+msgstr "Polonia"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "(none)"
-msgstr "(asnjë)"
+msgid "Version: "
+msgstr "Versioni: "
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Një moment ju lutemi, numërimi i pakove..."
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+"Ju keni mundësi të përdorni një emër të përdoruesit/parullën për tu\n"
+"lidhur në serverin proxy"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "unknown package "
-msgstr "pako a pa njoftur"
+msgid "Upgradable"
+msgstr "Azhurnuar"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Një nga pakot vijuese është e nevojshme:"
+msgid " done."
+msgstr " bërë."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Ju lutemi zgjedheni"
+msgid "Software Packages Installation"
+msgstr "Instalimi i Pakove Software"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Additional packages needed"
+msgstr "Keni nevojë për pakot shtuese"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Not selected"
-msgstr "I pa zgjedhur"
+msgid "Bugfixes updates"
+msgstr "Korigjim i bug(it) azhurnues"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Selected"
-msgstr "Zgjedhur"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "Shkarkimi i `%s', koha e kaluar:%s, shpejtësia:%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results"
-msgstr "Kërkues i rezultateve"
+msgid "Germany"
+msgstr "Gjermania"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Stop"
-msgstr "Ndale"
+msgid "Russia"
+msgstr "Rusia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Një moment, hetimet në vazhdim e sipër..."
+msgid "Norway"
+msgstr "Norvegjia"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Rezultatet e hetimeve (asnjë)"
+msgid "Problem during installation"
+msgstr "Një problem është paraqitur gjatë instalimit"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Other"
-msgstr "Tjetri"
+msgid "Search"
+msgstr "Hulumtim"
 
 #: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Edit a media"
+msgstr "Boto një burim"
+
+#: ../rpmdrake.pm:1
 #, c-format
+msgid "Czech Republic"
+msgstr "Republika Çeke"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
 msgid ""
-"Welcome to the packages source editor!\n"
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
 "\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
+"Then, restart MandrakeUpdate."
 msgstr ""
-"Mirësevini në botuesin e burimet të pakove!\n"
+"Ju posedoni më së paku një burim azhurnues të konfiguruar, mirëpo\n"
+"ato janë momentalisht të dezaktivizuara. Ju duhet ta nisni\n"
+"Software Sources Manager që t'aktivizoni më së paku një (kuti në\n"
+"kolonën e shënuar Aktivizoje?\n"
 "\n"
-"Kjo vegël do të ju ndihmojë në konfigurimin e pakove në burime, të cilat\n"
-"ju dëshironi ti përdorni në kompjuterin tuaj. Ato do të ju mundësojnë "
-"instalimin e pakove të reja softver ose azhurnimin e tyre."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Save and quit"
-msgstr "Shpëtoje dhe braktise"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Proxy..."
-msgstr "Proxy..."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Update..."
-msgstr "Azhurnimi..."
+"Dhe, riniseni MandrakeUpdate."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "Shto..."
+msgid "Stop"
+msgstr "Ndale"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "Botues"
+msgid "Update"
+msgstr "Azhurnimi"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Source"
-msgstr "Burimi"
+msgid "Please wait, removing packages..."
+msgstr "Një moment ju lutemi, zhdukja pakove..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Enabled?"
-msgstr "Aktiv?"
+msgid "Normal information"
+msgstr "Infomacion normale"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure sources"
-msgstr "Konfigurim i burimeve"
+msgid "Media: "
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "Parulla:"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "Shkarkimi i pakos `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "User:"
-msgstr "Përdoruesi:"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Zgjedhni: %d MB / Hapësire të lirë në disk: %d MB"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
+msgid "Media"
 msgstr ""
-"Ju keni mundësi të përdorni një emër të përdoruesit/parullën për tu\n"
-"lidhur në serverin proxy"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Proxy hostname:"
-msgstr "Emri i serverit proxy:"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
-msgstr ""
-"Nëse keni nevojë për proxy, hyni emrin e makinës dhe të portës zgjedhëse"
-"(sintaksa është:<emri-i-makinës[:porta]>):"
+msgid "Spain"
+msgstr "Spanja"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Konfigurimi i proxies"
+msgid "Normal updates"
+msgstr "Azhurnimet normale"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Ju lutemi një moment, azhurnimi i burimit..."
+msgid "by selection state"
+msgstr "gjendje simbas zgjedhjes"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
-"Më në fund për ti regjistruar ndryshimet, ju duhet ta futni burimin në "
-"lexues."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to insert the medium to continue"
-msgstr "Ju duhet të futni burimin për të vazhduar më tutje"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Save changes"
-msgstr "Shpëtoi ndryshimet"
+"Një moment ju lutemi, shkarkimi i adresave të pasqyreve nga web siti "
+"MandrakeSoft."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Shtegu që ka të bëjë me synthesis/hdlist:"
+msgid "Login:"
+msgstr "Login:"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "URL:"
-msgstr "URL:"
+#, fuzzy, c-format
+msgid "Adding a media:"
+msgstr "Shtimi i burimit:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Editing source \"%s\":"
-msgstr "Botimi i burimit \"%s\":"
+msgid "Austria"
+msgstr "Austria"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Edit a source"
-msgstr "Boto një burim"
+msgid "Fatal error"
+msgstr "Gabim fatal"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Një moment ju lutemi, zhdukja e burimit..."
+msgid "Update..."
+msgstr "Azhurnimi..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "Tip i burimit:"
+msgid "Starting download of `%s'..."
+msgstr "Nisja e shkarkimit të `%s'..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Shtimi i burimit:"
+msgid "(none)"
+msgstr "(asnjë)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
+"Removing these packages would break your system, sorry:\n"
+"\n"
 msgstr ""
-"Një burim tjetër ekziston me të njëjtin emër, a dëshironi\n"
-"me të vërtetë ta zëvendësoni atë?"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Ju duhet ti mbushni më së paku dy hyrje të para."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Name:"
-msgstr "Emri:"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Login:"
-msgstr "Login:"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Choose a mirror..."
-msgstr "Zgjedheni një pasqyre..."
+"Zhdukja e këtyre pakove do të dëmtojë sistemin tuaj, kemi ndjesë:\n"
+"\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
-msgstr "Shfletues..."
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Instalimi i pakos `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Path or mount point:"
-msgstr "Shtegu apo pika montuese:"
+msgid "Currently installed version: "
+msgstr "Versioni i tanishëm i instaluar: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Removable device"
-msgstr "Mjet i lëvizshëm"
+msgid "Other"
+msgstr "Tjetri"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "Serveri HTTP"
+msgid "Reason for update: "
+msgstr "Arësyja për azhurnim: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "Serveri FTP"
+msgid "Please choose the desired mirror."
+msgstr "Zgjedheni pasqyrën tuaj."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Path:"
-msgstr "Shtegu:"
+msgid "Edit"
+msgstr "Botues"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "Skedaret lokale"
+msgid "Please wait, finding available packages..."
+msgstr "Një moment ju lutemi, gjetja e pakove të lira..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Add a source"
-msgstr "Shto një burim:"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr ""
-"I pa mundur azhurnimi i burimit; do të shkëputet automatikisht.\n"
-"\n"
-"Gabimet:\n"
-"%s"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Unable to create medium."
-msgstr "I pa mundur krijimi i burimit."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Update"
-msgstr "Azhurnimi"
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Shtegu që ka të bëjë me synthesis/hdlist:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Zgjedheni burimin të cilin dëshironi t'azhurnoni:"
+msgid "Search results (none)"
+msgstr "Rezultatet e hetimeve (asnjë)"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Një moment ju lutemi, azhurnimi i burimeve..."
+msgid "Danmark"
+msgstr "Danimarka"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid " failed!"
-msgstr " dështim!"
+msgid "China"
+msgstr "Kina"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid " done."
-msgstr " bërë."
+msgid "United States"
+msgstr "Shtetet e Bashkuara"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "Shkarkimi i `%s', shpejtësia:%s"
+msgid "changes:"
+msgstr "ndryshimet:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "Shkarkimi i `%s', koha e kaluar:%s, shpejtësia:%s"
+msgid "Some additional packages need to be removed"
+msgstr "Disa nga pakot e mbledhura duhet të zhduken"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Starting download of `%s'..."
-msgstr "Nisja e shkarkimit të `%s'..."
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "Verifikimi i distancës së burimit të skedares `%s'..."
+msgid "No"
+msgstr "Jo"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Examining file of source `%s'..."
-msgstr "Verifikimi i burimit të skedares `%s'..."
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure medias"
+msgstr "Konfigurim i burimeve"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Copying file for source `%s'..."
-msgstr "Kopjim i skedares për burimin `%s'..."
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a media"
+msgstr "Shto një burim:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please choose the desired mirror."
-msgstr "Zgjedheni pasqyrën tuaj."
+msgid "Summary: "
+msgstr "Titulli: "
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
-msgstr ""
-"E pa mundur gjetja e një pasqyre.\n"
-"\n"
-"Mund të jenë shumë arësye; më e shpeshta është\n"
-"mbi të gjitha, arkitektura e procesorit tuaj nuk mundë të\n"
-"përkrahet nga Azhurnimi i Mandrake Linux Zyrëtar"
+msgid "Canada"
+msgstr "Kanada"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No mirror"
-msgstr "Asnjë pasqyre"
+msgid "Greece"
+msgstr "Greqia"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1139,181 +1068,252 @@ msgstr ""
 "Rrjeti apo adresa web e MandrakeSoft, e mundur të jenë të nxënë\n"
 "Ju lutemi provoni më vonë."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
-msgstr "Gabim gjatë shkarkimit"
+msgid "Unable to get source packages, sorry. %s"
+msgstr "E pa mundur marrja e burimeve mbi pakot, kemi ndjesë. %s"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
-"Një moment ju lutemi, shkarkimi i adresave të pasqyreve nga web siti "
-"MandrakeSoft."
+msgid "Path:"
+msgstr "Shtegu:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Më duhet të kontaktoj adresën web të MandrakeSoft, për të pranuar listën e "
-"pasqyreve.\n"
-"Ju lutemi verifikone rrjetin, nëse ai punon si duhet.\n"
-"\n"
-"A pajtoheni për të vazhduar?"
+msgid "Problem during removal"
+msgstr "Një problem është paraqitur gjatë zhdukjes"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United States"
-msgstr "Shtetet e Bashkuara"
+msgid "Selected"
+msgstr "Zgjedhur"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "Kina"
+msgid "Netherlands"
+msgstr "Holanda"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Britania e Madhe"
+msgid "Addable"
+msgstr "Të reja"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Taivani"
+msgid "(Not available)"
+msgstr "(I nxënë)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Sweden"
-msgstr "Suedia"
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
+msgstr ""
+"Kemi ndjesë, pako(t) e radhitur(a) nuk mundë të zgjedhe(n):\n"
+"\n"
+"%s\n"
+"\n"
+"Arësyet vijuese janë:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Russia"
-msgstr "Rusia"
+msgid "Not selected"
+msgstr "I pa zgjedhur"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Portugal"
-msgstr "Portugalia"
+msgid "Software Packages Removal"
+msgstr "Zhdukja e Pakove Software"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Poland"
-msgstr "Polonia"
+msgid "Sweden"
+msgstr "Suedia"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Norway"
-msgstr "Norvegjia"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
+msgstr ""
+"\n"
+"\n"
+"Gabim(et) i(e) raportuar(a):\n"
+"%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Netherlands"
-msgstr "Holanda"
+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 ""
+"Lista e azhurnimeve, është e zbrazët. Që d.m.th. se\n"
+"asnjë nga pakot e instaluara, nuk janë azhurnuar në kompjuterin tuaj\n"
+"ose ju i keni instaluar më heret ato."
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Korea"
-msgstr "Korea"
+#, fuzzy, c-format
+msgid "Examining file of media `%s'..."
+msgstr "Verifikimi i burimit të skedares `%s'..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Japan"
-msgstr "Japonia"
+msgid "Download of `%s', speed:%s"
+msgstr "Shkarkimi i `%s', shpejtësia:%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Italy"
-msgstr "Italia"
+msgid "One of the following packages is needed:"
+msgstr "Një nga pakot vijuese është e nevojshme:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Israel"
-msgstr "Izraeli"
+msgid "Quit"
+msgstr "Braktise"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Greece"
-msgstr "Greqia"
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Kamë nevojë që ta kontaktoj pasqyrën, dhe të pranojë infomacione të \n"
+"reja mbi azhurnimin. Verifikoni rrjetin dhe funksionimin e tij.\n"
+"\n"
+"A dëshironi të vazhdoni?"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update media(s)"
+msgstr "Azhurnimi i burimeve"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "France"
-msgstr "Franca"
+msgid "Ok"
+msgstr "Ok"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Finland"
-msgstr "Finlanda"
+msgid "Please wait, adding medium..."
+msgstr "Një moment ju lutemi, shtimi i burimit..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Spain"
-msgstr "Spanja"
+msgid "Unable to get source packages."
+msgstr "E pa mundur marrja e burimeve mbi pakot."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Danmark"
-msgstr "Danimarka"
+msgid "Too many packages are selected"
+msgstr "Numër shumë i madhë i pakove të zgjedhura"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"Mirësevini në botuesin e burimet të pakove!\n"
+"\n"
+"Kjo vegël do të ju ndihmojë në konfigurimin e pakove në burime, të cilat\n"
+"ju dëshironi ti përdorni në kompjuterin tuaj. Ato do të ju mundësojnë "
+"instalimin e pakove të reja softver ose azhurnimin e tyre."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "Gjermania"
+msgid "%s conflicts with %s"
+msgstr "%s është në konflikt me %s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Republika Çeke"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Mirësevini në MandrakeUpdate!\n"
+"\n"
+"Kjo vegël do të ju ndihmojë për intalimin e azhurnimeve të zgjedhura në\n"
+"kompjuterit tuaj."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Kosta Rika"
+msgid "Mandrake choices"
+msgstr "Mundësit Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Canada"
-msgstr "Kanada"
+msgid "Changelog:\n"
+msgstr "Changelog:\n"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Brazil"
-msgstr "Brazili"
+msgid "Korea"
+msgstr "Korea"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Removable device"
+msgstr "Mjet i lëvizshëm"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Belgjika"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Australia"
+msgid "Change medium"
+msgstr "Ndrryshim i burimit"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "Austria"
+msgid "Mandrake Update"
+msgstr "Azhurnimi Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
-msgstr "Infomacion..."
+msgid "by size"
+msgstr "simbas madhësisë"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "Jo"
+msgid "FTP server"
+msgstr "Serveri FTP"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "Skedaret:\n"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Yes"
-msgstr "Po"
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr ""
+"I pa mundur azhurnimi i burimit; do të shkëputet automatikisht.\n"
+"\n"
+"Gabimet:\n"
+"%s"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -1585,6 +1585,12 @@ msgstr "Zhduke Softverin"
 msgid "Software Sources Manager"
 msgstr "Administrues i Burimeve Softver"
 
+#~ msgid "Source: "
+#~ msgstr "Burimi: "
+
+#~ msgid "Source"
+#~ msgstr "Burimi"
+
 #~ msgid ""
 #~ "some packages failed to install\n"
 #~ "correctly"
diff --git a/po/sr.po b/po/sr.po
index 961b7a95..3b9046ff 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: 2003-02-17 20:53+0100\n"
 "Last-Translator: Toma Jankovic <tomaja@net.yu>\n"
 "Language-Team: Serbian <i18n@mandrake.co.yu>\n"
@@ -14,16 +14,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"´Ð ÛØ øÕ Ã àÕÔã ÔÐ ÝÐáâÐÒØÜ?"
+msgid "Enabled?"
+msgstr "ÃÚùãçØ?"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "¿ãâÐúÐ ØÛØ âaçÚÐ ÜÞÝâØàÐúÐ:"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Portugal"
+msgstr "¿ÞàâãÓÐÛ"
 
 #: ../rpmdrake:1
 #, c-format
@@ -42,105 +46,54 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"´ÞÑàÞÔÞèÛØ ã MandrakeUpdate!\n"
-"\n"
-"¾ÒÐø ÐÛÐâ ÒÐÜ ÜÞÖÕ ßÞÜÞûØ ÔÐ Ø×ÐÑÕâÕ ÝÞÒÕ ÒÕà×ØøÕ ßÐÚÕâÐ ÚÞøÕ ÖÕÛØâÕ ÔÐ "
-"ØÝáâÐÛØàÐâÕ ÝÐ\n"
-"ÒÐè àÐçãÝÐà."
-
-#: ../rpmdrake:1
-#, c-format
-msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
-msgstr ""
-"´ÞÑàÞÔÞèÛØ ã ßàÞÓàÐÜ ×Ð ãÚÛÐúÐúÕ áÞäâÒÕàÐ!\n"
-"\n"
-"¾ÒÐø ÐÛÐâ ÒÐÜ ÜÞÖÕ ßÞÜÞûØ ÔÐ Ø×ÐÑÕàÕâÕ áÞäâÒÕà ÖÕÛØâÕ ÔÐ ãÚÛÞÝØâÕ áÐ\n"
-"ÒÐèÕÓ àÐçãÝÐàÐ."
-
-#: ../rpmdrake:1
-#, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"½ÐØèÐÞ áÐÜ ÝÐ ßàÞÑÛÕÜ ßàØÛØÚÞÜ ãÚÛÐúÐúÐ ßÐÚÕâÐ:\n"
-"\n"
-"%s"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Problem during removal"
-msgstr "¿àÞÑÛÕÜ ßàØÛØÚÞÜ ãÚÛÐúÐúÐ"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Please wait, removing packages..."
-msgstr "¼ÞÛØÜ ²Ðá áÐçÕÚÐøâÕ, ãÚÛÐúÐÜ ßÐÚÕâÕ..."
+msgid "by group"
+msgstr "ßÞ ÓàãßØ"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "¼ÞÛØÜ ÒÐá áÐçÕÚÐøâÕ, ãçØâÐÒÐÜ ÑÐ×ã ßÞÔÐâÐÚÐ Þ ßÐÚÕâØÜÐ..."
+msgid "Name:"
+msgstr "¸Üe:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"½ÐØèÐÞ áÐÜ ÝÐ ßàÞÑÛÕÜ âÞÚÞÜ ØÝáâÐÛØàÐúÐ:\n"
-"\n"
-"%s"
+msgid "Italy"
+msgstr "¸âÐÛØøÐ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation failed"
-msgstr "¸ÝáâÐÛÐæØøÐ ÝÕãáßÕÛÐ"
+msgid "How to choose manually your mirror"
+msgstr "ºÐÚÞ àãçÝÞ Ø×ÐÑàÐâØ áÒÞø ÜØàÞà áÐøâ"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "½ÕßÞßàÐÒùØÒÐ ÓàÕèÚÐ: ÝØøÕ ßàÞÝÐòÕÝ ßÐÚÕâ ×Ð ØÝáâÐÛÐæØøã."
+msgid "URL:"
+msgstr "URL:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "No package found for installation."
-msgstr "½ØøÕ ßàÞÝÐòÕÝ ßÐÚÕâ ×Ð ØÝáâÐÛÐæØøã."
+msgid "Some packages need to be removed"
+msgstr "½ÕÚØ ßÐÚÕâØ ÜÞàÐøã ÔÐ áÕ ãÚÛÞÝÕ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "ÁÒØ ßÐÚÕâØ, ÚÞøØ áâÕ ×ÐåâÕÒÐÛØ, áã ãáßÕèÝÞ ØÝáâÐÛØàÐÝØ."
+msgid "More information on package..."
+msgstr "´ÞÔÐâÝÕ ØÝäÞàÜÐæØøÕ Þ ßÐÚÕâã..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "ÁÒÕ øÕ ÔÞÑàÞ ØÝáâÐÛØàÐÝÞ"
+msgid "Yes"
+msgstr "´Ð"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
 msgstr ""
-"¸ÝáâÐÛÐæØøÐ øÕ ÓÞâÞÒÐ, %s.\n"
+"·ÑÞÓ ÜÕòã×ÐÒØáÝÞáâØ, áÛÕÔÕûØ ßÐÚÕâ(Ø) ÜÞàÐøã\n"
+"ÔÐ ÑãÔã ÝÕØ×ÐÑàÐÝØ:\n"
 "\n"
-"½ÐßàÐÒØÞ áÐÜ ÝÕÚÕ äÐøÛÞÒÕ áÐ ßÞÔÕèÐÒÐúØÜÐ, ßàØÜÕà `.rpmnew' ØÛØ `.rpmsave',\n"
-"ÜÞÖÕâÕ ÔÐ Øå ßàÞÒÕàØâÕ ÚÐÚÞ ÑØ áâÕ ÝÕèâÞ ßàÕÔã×ÕÛØ:"
 
 #: ../rpmdrake:1
 #, c-format
@@ -149,456 +102,452 @@ msgstr "áÒØ ßÐÚÕâØ áã ÔÞÑàÞ ØÝáâÐÛØàÐÝØ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Problem during installation"
-msgstr "¿àÞÑÛÕÜ ×Ð ÒàÕÜÕ ØÝáâÐÛØàÐúÐ"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "¸ÝáâÐÛØàÐÜ ßÐÚÕâ `%s' (%s/%s)..."
+msgid "%s KB"
+msgstr "%s KB"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "¸ÝáâÐÛÐæØøÐ ßÐÚÕâÐ"
-
-#: ../rpmdrake:1
-#, c-format
 msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
 "\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"Then, restart MandrakeUpdate."
 msgstr ""
+"¼ÞÖÕâÕ Ø×ÐÑàÐâØ ÖÕùÕÝØ ÜØàÞà áÐøâ Ø àãçÝÞ: ÔÐ ÑØ âÞ ãàÐÔØÛØ,\n"
+"ßÞÚàÕÝØâÕ ¼ÕÝÐÿÕà ÁÞäâÒÕàÐ, Ð ×ÐâØÜ ÔÞÔÐøâÕ `Security\n"
+"updates' Ø×ÒÞà.\n"
 "\n"
-"\n"
-"¿àØøÐÒùÕÝÐ ³àÕèÚÐ(Õ):\n"
-"%s"
+"·ÐâØÜ, àÕáâÐàãøâÕ MandrakeUpdate."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"¸ÝáâÐÛÐæØøÐ ÝØøÕ ãáßÕÛÐ, ÝÕÚØ äÐøÛÞÒØ ÝÕÔÞáâÐøã.\n"
-"¼ÞÖÔÐ ÑØ âàÕÑÐÛÞ ÔÐ ÐÖãàØàÐâÕ ÑÐ×ã ßÐÚÕâÐ."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
+"Welcome to the software removal tool!\n"
 "\n"
-"Do you want to continue installation?"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
 msgstr ""
-"ÁÛÕÔÕüØ ßÐÚÕâØ âàÕÑÐ ÔÐ ÑãÔã ãÚÛÞúÕÝØ ÔÐ ÑØ áÕ ÔàãÓØ ØÝáâÐÛØàÐÛØ:\n"
-"\n"
-"%s\n"
+"´ÞÑàÞÔÞèÛØ ã ßàÞÓàÐÜ ×Ð ãÚÛÐúÐúÕ áÞäâÒÕàÐ!\n"
 "\n"
-"ÔÐ ÛØ øÕ Ã àÕÔã ÔÐ ÝÐáâÐÒØÜ?"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "´ÞwÝÛÞÐÔ-ãøÕÜ ßÐÚÕâÕ `%s' (%s/%s)..."
+"¾ÒÐø ÐÛÐâ ÒÐÜ ÜÞÖÕ ßÞÜÞûØ ÔÐ Ø×ÐÑÕàÕâÕ áÞäâÒÕà ÖÕÛØâÕ ÔÐ ãÚÛÞÝØâÕ áÐ\n"
+"ÒÐèÕÓ àÐçãÝÐàÐ."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Cancel"
-msgstr "¾ÔãáâÐÝØ"
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "´Ð ÑØ áâÕ áÐçãÒÐÛØ Ø×ÜÕÝÕ, ÜÞàÐâÕ ÔÐ ãÑÐæØâÕ ÜÕÔØøãÜ ã ãàÕòÐø."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Ok"
-msgstr "Ã àÕÔã"
+msgid "Save and quit"
+msgstr "ÁÐçãÒÐø Ø Ø×ÐòØ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "ÃÑÐæØâÕ ÜÕÔØøãÜ áÐ ØÜÕÝÞÜ \"%s\" ã ãàÕòÐø [%s]"
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"½ÐØèÐÞ áÐÜ ÝÐ ßàÞÑÛÕÜ ßàØÛØÚÞÜ ãÚÛÐúÐúÐ ßÐÚÕâÐ:\n"
+"\n"
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Change medium"
-msgstr "¿àÞÜÕÝØ ÜÕÔØøãÜ"
+msgid "Size: "
+msgstr "²ÕÛØçØÝÐ: "
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Initializing..."
-msgstr "¸ÝØæØïÛØ×ÐæØï..."
+msgid "Security updates"
+msgstr "ÁØÓãàÝÞáÝÕ ÝÐÔÞÓàÐÔúÕ"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "¸ÝáâÐÛÐæØøÐ ßÐÚÕâÐ"
+msgid "Already existing update medias"
+msgstr "¼ÞÛØÜ ²Ðá áÐçÕÚÐøâÕ, ÐÖãàØàÐÜ ÜÕÔØøãÜ..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "½Õ ÜÞÓã ÔÐ ÔÞÑÐÒØÜ Ø×ÒÞàÝÕ ßÐÚÕâÕ, ÖÐÞ ÜØ øÕ. %s"
+msgid "Maximum information"
+msgstr "¿ÞâßãÝÐ ØÝäÞàÜÐæØøÐ"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Unable to get source packages."
-msgstr "½Õ ÜÞÓã ÔÐ ÔÞÑÐÒØÜ Ø×ÒÞàÝÕ ßÐÚÕâÕ."
+msgid "Proxy..."
+msgstr "¿àÞÚáØ..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Inspect..."
-msgstr "¿àÞÒÕàØ..."
+#, fuzzy, c-format
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
+msgstr ""
+"¸ÝáâÐÛÐæØøÐ ÝØøÕ ãáßÕÛÐ, ÝÕÚØ äÐøÛÞÒØ ÝÕÔÞáâÐøã.\n"
+"¼ÞÖÔÐ ÑØ âàÕÑÐÛÞ ÔÐ ÐÖãàØàÐâÕ ÑÐ×ã ßÐÚÕâÐ."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Installation finished"
-msgstr "¸ÝáâÐÛÐæØøÐ ÓÞâÞÒÐ"
+msgid "United Kingdom"
+msgstr "ÃøÕÔØúÕÝÞ ºàÐùÕÒáâÒÞ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "½Õ àÐÔØ ÝØèâÐ"
+msgid "in names"
+msgstr "ã ØÜÕÝØÜÐ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "ºÞàØáâØ %s ÚÐÞ ÓÛÐÒÝØ äÐøÛ"
+msgid ""
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
+msgstr ""
+"½Õ ÜÞÓã ÔÐ ßàÞÝÐóÕÜ ÝØøÕÔÐÝ ÞÔÓÞÒÐàÐøãóØ ÜØàÞà.\n"
+"\n"
+"¼ÞÖÕ ßÞáâÞøÐâØ ÝÕÚÞÛØÚÞ àÐ×ÛÞÓÐ ×Ð ÞÒÐø ßàÞÑÛÕÜ; ÝÐøçÕèüØ øÕ\n"
+"áÛãçÐø ÔÐ ÐàåØâÕÚâãàÐ ÒÐèÕÓ ßàÞæÕáÞàÐ ÝØøÕ ßÞÔàÖÐÝÐ\n"
+"ÞÔ áâàÐÝÕ Mandrake Linux Official Updates."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Remove .%s"
 msgstr "ÃÚÛÞÝØ: %s"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "changes:"
-msgstr "Ø×ÜÕÝÕ:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspecting %s"
-msgstr "¿àÞÒÕàÐÒÐÜ %s"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Please wait, finding available packages..."
-msgstr "¼ÞÛØÜ ²Ðá áÐçÕÚÐøâÕ, ßàÞÝÐÛÐ×ØÜ ÔÞáâãßÝÕ ßÐÚÕâÕ..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "¼ÞÛØÜÞ ²Ðá ÔÐ áÐçÕÚÐâÕ, ÔÞÔÐøÕÜ ÜÕÔØøãÜ..."
+msgid "Finland"
+msgstr "ÄØÝáÚÐ"
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
+"The following packages have bad signatures:\n"
 "\n"
-"Then, restart MandrakeUpdate."
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"¼ÞÖÕâÕ Ø×ÐÑàÐâØ ÖÕùÕÝØ ÜØàÞà áÐøâ Ø àãçÝÞ: ÔÐ ÑØ âÞ ãàÐÔØÛØ,\n"
-"ßÞÚàÕÝØâÕ ¼ÕÝÐÿÕà ÁÞäâÒÕàÐ, Ð ×ÐâØÜ ÔÞÔÐøâÕ `Security\n"
-"updates' Ø×ÒÞà.\n"
+"ÁÛÕÔÕüØ ßÐÚÕâØ âàÕÑÐ ÔÐ ÑãÔã ãÚÛÞúÕÝØ ÔÐ ÑØ áÕ ÔàãÓØ ØÝáâÐÛØàÐÛØ:\n"
 "\n"
-"·ÐâØÜ, àÕáâÐàãøâÕ MandrakeUpdate."
+"%s\n"
+"\n"
+"ÔÐ ÛØ øÕ Ã àÕÔã ÔÐ ÝÐáâÐÒØÜ?"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "How to choose manually your mirror"
-msgstr "ºÐÚÞ àãçÝÞ Ø×ÐÑàÐâØ áÒÞø ÜØàÞà áÐøâ"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Examining distant file of media `%s'..."
+msgstr "¸áßØâãøÕÜ ãÔÐùàÝØ äÐøÛ ×Ð Ø×ÒÞà `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
+msgid "Verifying packages signatures..."
 msgstr ""
 
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "France"
+msgstr "ÄàÐÝæãáÚÐ"
+
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "Already existing update sources"
+msgid "More info"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
+"%s\n"
 "\n"
 "Is it ok to continue?"
 msgstr ""
-"¨Ð ÖÕÛØÜ ÔÐ ßÞáÕâØÜ ÜØàÞà àÐÔØ ÔÞÑÐÒùÐúÐ ÝÐøÝÞÒØøØå ÒÕà×ØøÐ ßÐÚÕâÐ.\n"
-"¿àÞÒÕàØâÕ ÔÐ ÛØ øÕ ÒÐèÐ ÚÞÝÕÚæØøÐ äãÝÚæØÞÝÐÛÝÐ Ø ãáßÞáâÐÒùÕÝÐ.\n"
+"%s\n"
 "\n"
 "´Ð ÛØ øÕ Ã àÕÔã ÔÐ ÝÐáâÐÒØÜ?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Reload the packages list"
+msgstr "¿ÞÝÞÒÞ ãçØâÐø ÛØáâã ßÐÚÕâÐ"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Fatal error"
-msgstr "³àÕèÚÐ ßàØ çØâÐúã\n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "¸×ÐÑÕàØâÕ áÒÞj ÜØàÞà áÐjâ..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Software Packages Installation"
-msgstr "¸ÝáâÐÛÐæØøÐ ßÐÚÕâÐ"
+msgid "Some packages can't be installed"
+msgstr "½ÕÚØ ßÐÚÕâØ ÝÕ ÜÞÓã ÔÐ áÕ ØÝáâÐÛØàÐøã"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Mandrake Update"
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "½ÕßÞßàÐÒùØÒÐ ÓàÕèÚÐ: ÝØøÕ ßàÞÝÐòÕÝ ßÐÚÕâ ×Ð ØÝáâÐÛÐæØøã."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "ÃÚÛÐúÐúÕ ßÐÚÕâÐ"
+msgid "All packages,"
+msgstr "ÁÒØ ßÐÚÕâØ,"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Quit"
-msgstr "ºàÐj"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Type of media:"
+msgstr "ÂØß Ø×ÒÞàa:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "¸ÝáâÐÛØàÐj"
+msgid "in files"
+msgstr "ã äÐøÛÞÒØÜÐ"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "ÃÚÛÞÝØ"
+msgid "All requested packages were installed successfully."
+msgstr "ÁÒØ ßÐÚÕâØ, ÚÞøØ áâÕ ×ÐåâÕÒÐÛØ, áã ãáßÕèÝÞ ØÝáâÐÛØàÐÝØ."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Help"
-msgstr "¿ÞÜÞû"
+msgid "Proxy hostname:"
+msgstr "¸ÜÕ ßàÞÚáØ ÔÞÜÐûØÝÐ(hostname):"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search"
-msgstr "ÂàÐÖØ"
+msgid "Local files"
+msgstr "»ÞÚÐÛÝØ äÐøÛÞÒØ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "¿àÞÝaòØ: "
+msgid "Inspecting %s"
+msgstr "¿àÞÒÕàÐÒÐÜ %s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"ÁÛÕÔÕüØ ßÐÚÕâØ âàÕÑÐ ÔÐ ÑãÔã ãÚÛÞúÕÝØ ÔÐ ÑØ áÕ ÔàãÓØ ØÝáâÐÛØàÐÛØ:\n"
-"\n"
-"%s\n"
-"\n"
-"ÔÐ ÛØ øÕ Ã àÕÔã ÔÐ ÝÐáâÐÒØÜ?"
+msgid "Israel"
+msgstr "¸×àÐÕÛ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "½ÕÚØ ßÐÚÕâØ ÜÞàÐøã ÔÐ áÕ ãÚÛÞÝÕ"
+msgid "Help"
+msgstr "¿ÞÜÞû"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
-"\n"
-"Do you really want to install all the selected packages?"
-msgstr ""
-"ÃßÞ×ÞàÕúÕ: Ø×ÓÛÕÔÐ ÔÐ ßÞÚãèÐÒÐâÕ ÔÐ ÔÞÔÐâÕ âÞÛØÚÞ\n"
-"ßÐÚÕâÐ ÔÐ ÒÐè äÐøÛ áØáâÕÜ ÜÞÖÕ ÞáâÐâØ ÑÕ× áÛÞÑÞÔÝÞÓ ßàÞáâÞàÐ,\n"
-"âÞÚÞÜ ØÛØ ÝÐÚÞÝ ØÝáâÐÛÐæØøÕ ßÐÚÕâÐ ; ÞÒÞ øÕ ßÞáÕÑÝÞ\n"
-"ÞßÐáÝÞ Ø âàÕÑÐ ÞÑàÐâØâØ ÔÞÔÐâÝã ßÐÖúã.\n"
-"\n"
-"´Ð ÛØ ×ÐØáâÐ ÖÕÛØâÕ ÔÐ ØÝáâÐÛØàÐâÕ Ø×ÐÑàÐÝÕ ßÐÚÕâÕ?"
+msgid "HTTP server"
+msgstr "HTTP áÕàÒÕà"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "¸×ÐÑàÐÛØ áâÕ ßàÕÒØèÕ ßÐÚÕâÐ"
+msgid "Installation failed"
+msgstr "¸ÝáâÐÛÐæØøÐ ÝÕãáßÕÛÐ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "¿ÞâßãÝÐ ØÝäÞàÜÐæØøÐ"
+msgid "Use .%s as main file"
+msgstr "ºÞàØáâØ %s ÚÐÞ ÓÛÐÒÝØ äÐøÛ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Normal information"
-msgstr "½ÞàÜÐÛÐÝÐ ØÝäÞàÜÐæØøÐ"
+msgid "Search results"
+msgstr "ÀÕ×ãÛâÐâØ ßàÕâàÐÓe"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Update source(s)"
-msgstr "°ÖãàØàÐúÕ Ø×ÒÞàÐ"
+msgid " failed!"
+msgstr " ÝÕãáßÕÛÞ!"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "¿ÞÝÞÒÞ ãçØâÐø ÛØáâã ßÐÚÕâÐ"
+msgid "Brazil"
+msgstr "±àÐ×ØÛ"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reset the selection"
-msgstr "¿ÞÝÞÒÞ Ø×ÐÑÕàØ"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"²Õü ßÞáâÞøØ ÜÕÔØø áÐ âØÜ ØÜÕÝÞÜ, ÔÐ ÛØ\n"
+"×ÐØáâÐ ÖÕÛØâÕ ÔÐ øÕ ×ÐÜÕÝØâÕ?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "ã äÐøÛÞÒØÜÐ"
+msgid "Find:"
+msgstr "¿àÞÝaòØ: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "ã ÞßØáØÜÐ"
+msgid "All packages, alphabetical"
+msgstr "ÁÒØ ßÐÚÕâØ, ßÞ ÐÑÕæÕÔØ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "ã ØÜÕÝØÜÐ"
+msgid "Please wait, searching..."
+msgstr "¼ÞÛØÜ ²Ðá áÐçÕÚÐøâÕ, âàÐÖØÜ..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
-msgstr "ßÞ ÔÞáâãßÝÞáâØ"
+msgid "Please wait, reading packages database..."
+msgstr "¼ÞÛØÜ ÒÐá áÐçÕÚÐøâÕ, ãçØâÐÒÐÜ ÑÐ×ã ßÞÔÐâÐÚÐ Þ ßÐÚÕâØÜÐ..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by source repository"
-msgstr "ßÞ áâÐúã Ø×ÒÞàÝÞÓ ÚÞÔÐ"
+msgid "unknown package "
+msgstr "ÝÕßÞ×ÝÐâØ ßÐÚÕâ "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by selection state"
-msgstr "ßÞ Ø×ÐÑàÐÝÞáâØ"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "ÃÑÐæØâÕ ÜÕÔØøãÜ áÐ ØÜÕÝÞÜ \"%s\" ã ãàÕòÐø [%s]"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by size"
-msgstr "ßÞ ÒÕÛØçØÝØ"
+msgid "Reset the selection"
+msgstr "¿ÞÝÞÒÞ Ø×ÐÑÕàØ"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by group"
-msgstr "ßÞ ÓàãßØ"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"°ÚÞ ²ÐÜ øÕ ßÞâàÕÑÝÐ ßàÞÚáØ, ãÝÕáØâÕ ØÜÕ ÔÞÜÐûØÝÐ Ø ÝÕÞÑÐÒÕ×ÝØ ßÞàâ "
+"(áØÝâÐÚáÐ: <proksi-domacin[:port]>):"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages,"
-msgstr "ÁÒØ ßÐÚÕâØ,"
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
+"´Ð ÑØ ×ÐÔÞÒÞùØÛØ áÒÕ ×ÐÒØáÝÞáâØ,áÛÕÔÕûØ ßÐÚÕâ(Ø) ÑØ âÐÚÞòÕ\n"
+"âàÕÑÐÛÞ ÔÐ áÕ ãÚÛÞÝÕ:\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "ÁÒØ ßÐÚÕâØ, ßÞ ÐÑÕæÕÔØ"
+msgid "Costa Rica"
+msgstr "ºÞáâÐàØÚÐ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Mandrake-ÞÒ Ø×ÑÞà"
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"½ÐØèÐÞ áÐÜ ÝÐ ßàÞÑÛÕÜ âÞÚÞÜ ØÝáâÐÛØàÐúÐ:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
-msgstr "¾ÑØçÝÕ ÝÐÔÞÓàÐÔúÕ"
+msgid "Please wait, removing medium..."
+msgstr "¼ÞÛØÜÞ ²Ðá ÔÐ áÐçÕÚÐâÕ, ãÚÛÐúÐÜ ÜÕÔØøãÜ..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "½ÐÔÞÓàÐÔúÕ áÐ ØáßàÐÒÚÐÜÐ"
+msgid "Password:"
+msgstr "»Þ×ØÝÚÐ:"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Security updates"
-msgstr "ÁØÓãàÝÞáÝÕ ÝÐÔÞÓàÐÔúÕ"
+msgid "Taiwan"
+msgstr "ÂÐøÒÐÝ"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Description: "
-msgstr "¾ßØá:"
+msgid "User:"
+msgstr "ºÞàØáÝØÚ:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reason for update: "
-msgstr "ÀÐ×ÛÞÓ ÐÖãàØàÐúÐ:"
+msgid "Please wait, updating medium..."
+msgstr "¼ÞÛØÜ ²Ðá áÐçÕÚÐøâÕ, ÐÖãàØàÐÜ ÜÕÔØøãÜ..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Summary: "
-msgstr "ÁÐÖÕâÐÚ: "
+msgid "Please wait, listing packages..."
+msgstr "¼ÞÛØÜ ²Ðá áaçÕÚÐjâÕ, ßàØÚÐ×ãøÕÜ ßÐÚÕâÕ..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Importance: "
-msgstr "²ÐÖÝÞáâ: "
+msgid "Information on packages"
+msgstr "¸ÝäÞàÜÐæØøÕ Þ ßÐÚÕâØÜÐ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Cancel"
+msgstr "¾ÔãáâÐÝØ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Size: "
-msgstr "²ÕÛØçØÝÐ: "
+msgid "Everything installed successfully"
+msgstr "ÁÒÕ øÕ ÔÞÑàÞ ØÝáâÐÛØàÐÝÞ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Select the media(s) you wish to update:"
+msgstr "¸×ÐÑÕàØâÕ ÚÞøÕ ßÐÚÕâ(Õ) ÖÕÛØâÕ ÔÐ ÐÖãàØàÐâÕ:"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Version: "
-msgstr "²Õà×ØøÐ: "
+msgid "Please wait, updating media..."
+msgstr "¼ÞÛØÜ ²Ðá áÐçÕÚÐøâÕ, ÐÖãàØàÐÜ ÜÕÔØøãÜ..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "¸ÜÕ: "
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "ÂàÕÝãâÝÞ ØÝáâÐÛØàÐÝÐ ÒÕà×ØøÐ: "
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"ÁÛÕÔÕüØ ßÐÚÕâØ âàÕÑÐ ÔÐ ÑãÔã ãÚÛÞúÕÝØ ÔÐ ÑØ áÕ ÔàãÓØ ØÝáâÐÛØàÐÛØ:\n"
+"\n"
+"%s\n"
+"\n"
+"ÔÐ ÛØ øÕ Ã àÕÔã ÔÐ ÝÐáâÐÒØÜ?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Source: "
-msgstr "¸×ÒÞà: "
+msgid "in descriptions"
+msgstr "ã ÞßØáØÜÐ"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(Not available)"
-msgstr "(½ØøÕ ÔÞáâãßÝÞ)"
+msgid "Configure proxies"
+msgstr "¿ÞÔÕèÐÒÐúÕ ßàÞÚáØøÐ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "¸×ÜÕÝÕ:\n"
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"¶ÕÛØÜ ÔÐ ßÞáÕâØÜ MandrakeSoft ÒÕÑ áÐøâ ÔÐ ÑØ ÔÞÑÐÒØÞ ÛØáâã ÜØàÞàÐ.\n"
+"¿àÞÒÕàØâÕ ÔÐ ÛØ øÕ ÒÐèÐ ÚÞÝÕÚæØøÐ äãÚæØÞÝÐÛÝÐ.\n"
+"\n"
+"´Ð ÛØ øÕ Ã àÕÔã ÔÐ ÝÐáâÐÒØÜ?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Files:\n"
-msgstr "ÄÐøÛÞÒØ:\n"
+msgid "Please choose"
+msgstr "¸×ÐÑÕàØâÕ"
 
 #: ../rpmdrake:1
 #, c-format
@@ -607,44 +556,28 @@ msgstr "²ÕÛØçØÝÐ Ø×ÐÑàÐÝÞÓ: %d MB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "¸×ÐÑàÐÝÞ: %d MB / ÁÛÞÑÞÔÐÝ ßàÞáâÞà ÝÐ ÔØáÚã: %d MB"
+msgid "Initializing..."
+msgstr "¸ÝØæØïÛØ×ÐæØï..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
-msgstr ""
-"·ÑÞÓ ÜÕòã×ÐÒØáÝÞáâØ, áÛÕÔÕûØ ßÐÚÕâ(Ø) ÜÞàÐøã\n"
-"ÔÐ ÑãÔã ÝÕØ×ÐÑàÐÝØ:\n"
-"\n"
+msgid "Save changes"
+msgstr "ÁÐçãÒÐø Ø×ÜÕÝÕ"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr ""
-"·ÑÞÓ ÜÕòã×ÐÒØáÝÞáâØ, áÛÕÔÕûØ ßÐÚÕâ(Ø) ÜÞàÐøã\n"
-"ÔÐ ÑãÔã ÝÕØ×ÐÑàÐÝØ:\n"
-"\n"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "³àÕèÚÐ âÞÚÞÜ ßàÕã×ØÜÐúÐ áÐ ØÝâÕàÝÕâÐ"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "%s conflicts with %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Package installation..."
+msgstr "¸ÝáâÐÛÐæØøÐ ßÐÚÕâÐ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages can't be installed"
-msgstr "½ÕÚØ ßÐÚÕâØ ÝÕ ÜÞÓã ÔÐ áÕ ØÝáâÐÛØàÐøã"
+msgid "Importance: "
+msgstr "²ÐÖÝÞáâ: "
 
 #: ../rpmdrake:1
 #, c-format
@@ -657,313 +590,308 @@ msgstr ""
 "ÔÐ áÕ ØÝáâÐÛØàÐøã:\n"
 "\n"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "¿ÞâàÕÑÝØ áã ÔÞÔÐâÝØ ßÐÚÕâØ"
+msgid "Add..."
+msgstr "´ÞÔÐø..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some packages can't be removed"
-msgstr "½ÕÚØ ßÐÚÕâØ áÕ ÝÕ ÜÞÓã ãÚÛÞÝØâØ"
+msgid "Unable to create medium."
+msgstr "½Õ ÜÞÓã ÔÐ ÝÐßàÐÒØÜ ÜÕÔØøãÜ."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Removing these packages would break your system, sorry:\n"
+"The installation is finished; %s.\n"
 "\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
 msgstr ""
-"¶ÐÛØÜ, ÐÛØ ãÚÛÐúÐúÕÜ ÞÒØå ßÐÚÕâÐ ÑØ áâÕ ÞèâÕâØâØ áØáâÕÜ:\n"
+"¸ÝáâÐÛÐæØøÐ øÕ ÓÞâÞÒÐ, %s.\n"
 "\n"
+"½ÐßàÐÒØÞ áÐÜ ÝÕÚÕ äÐøÛÞÒÕ áÐ ßÞÔÕèÐÒÐúØÜÐ, ßàØÜÕà `.rpmnew' ØÛØ `.rpmsave',\n"
+"ÜÞÖÕâÕ ÔÐ Øå ßàÞÒÕàØâÕ ÚÐÚÞ ÑØ áâÕ ÝÕèâÞ ßàÕÔã×ÕÛØ:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"´Ð ÑØ ×ÐÔÞÒÞùØÛØ áÒÕ ×ÐÒØáÝÞáâØ,áÛÕÔÕûØ ßÐÚÕâ(Ø) ÑØ âÐÚÞòÕ\n"
-"âàÕÑÐÛÞ ÔÐ áÕ ãÚÛÞÝÕ:\n"
-"\n"
+msgid "Browse..."
+msgstr "ÂàÐÖØ..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "¨Þè ÝÕÚØ ßÐÚÕâØ ÜÞàÐøã ÑØâØ ãÚÛÞúÕÝØ"
+msgid "Some packages can't be removed"
+msgstr "½ÕÚØ ßÐÚÕâØ áÕ ÝÕ ÜÞÓã ãÚÛÞÝØâØ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "More information on package..."
-msgstr "´ÞÔÐâÝÕ ØÝäÞàÜÐæØøÕ Þ ßÐÚÕâã..."
+msgid "Info..."
+msgstr "¸ÝäÞàÜÐæØøÕ..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Information on packages"
-msgstr "¸ÝäÞàÜÐæØøÕ Þ ßÐÚÕâØÜÐ"
+msgid "You need to insert the medium to continue"
+msgstr "¼ÞàÐâÕ ÔÐ ãÑÐæØâÕ ÜÕÔØøãÜ ÚÐÚÞ ÑØ áâÕ ÝÐáâÐÒØÛØ"
 
-#. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:1
-#, c-format
-msgid "More info"
-msgstr ""
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Copying file for media `%s'..."
+msgstr "ºÞßØàÐÜ äÐøÛ ×Ð Ø×ÒÞà `%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Addable"
-msgstr "¼ÞÓã áÕ ÔÞÔÐâØ"
+msgid "Remove"
+msgstr "ÃÚÛÞÝØ"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Upgradable"
-msgstr "¼ÞÓã áÕ ÐÖãàØàÐâØ"
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "¸ÝáâÐÛÐæØøÐ ßÐÚÕâÐ"
 
 #: ../rpmdrake:1
-#, c-format
-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 ""
-"»ØáâÐ ßÐÚÕâÐ ×Ð ÐÖãàØàÐúÕ ÝØøÕ ÚàÕØàÐÝÐ. ¾ÒÞ ØÛØ ×ÝÐçØ ØÛØ ÔÐ ÝÕÜÐ "
-"ÔÞáâãßÝØå\n"
-"ßÐÚÕâÐ ×Ð ÐÖãàØàÐúÕ ×Ð ÒÐè àÐçãÝÐà,\n"
-"ØÛØ áã ÞÝØ ÒÕü ØÝáâÐÛØàÐÝØ."
+#, fuzzy, c-format
+msgid "by media repository"
+msgstr "ßÞ áâÐúã Ø×ÒÞàÝÞÓ ÚÞÔÐ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "No update"
-msgstr "±Õ× ÐÖãàØàaúÐ"
+msgid "No mirror"
+msgstr "½ÕÜÐ ÜØàÞàÐ"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
-msgstr "(ÝØjÕÔÐÝ)"
+msgid "You need to fill up at least the two first entries."
+msgstr "¼ÞàÐâÕ ÔÐ ßÞßãÝØâÕ ÝÐøÜÐúÕ ßàÒÐ ÔÒÐ ßÞùÐ."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "¼ÞÛØÜ ²Ðá áaçÕÚÐjâÕ, ßàØÚÐ×ãøÕÜ ßÐÚÕâÕ..."
+msgid "Install"
+msgstr "¸ÝáâÐÛØàÐj"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "unknown package "
-msgstr "ÝÕßÞ×ÝÐâØ ßÐÚÕâ "
+msgid "Japan"
+msgstr "¨ÐßÐÝ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "¨ÕÔÐÝ ÞÔ áÛÕÔÕûØå ßÐÚÕâÐ øÕ ßÞâàÕÑÐÝ:"
+msgid "Do nothing"
+msgstr "½Õ àÐÔØ ÝØèâÐ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "¸×ÐÑÕàØâÕ"
+msgid "No update"
+msgstr "±Õ× ÐÖãàØàaúÐ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Description: "
+msgstr "¾ßØá:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Not selected"
-msgstr "½Øáã Ø×ÐÑàÐÝØ"
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr ""
+"ÃßÞ×ÞàÕúÕ: Ø×ÓÛÕÔÐ ÔÐ ßÞÚãèÐÒÐâÕ ÔÐ ÔÞÔÐâÕ âÞÛØÚÞ\n"
+"ßÐÚÕâÐ ÔÐ ÒÐè äÐøÛ áØáâÕÜ ÜÞÖÕ ÞáâÐâØ ÑÕ× áÛÞÑÞÔÝÞÓ ßàÞáâÞàÐ,\n"
+"âÞÚÞÜ ØÛØ ÝÐÚÞÝ ØÝáâÐÛÐæØøÕ ßÐÚÕâÐ ; ÞÒÞ øÕ ßÞáÕÑÝÞ\n"
+"ÞßÐáÝÞ Ø âàÕÑÐ ÞÑàÐâØâØ ÔÞÔÐâÝã ßÐÖúã.\n"
+"\n"
+"´Ð ÛØ ×ÐØáâÐ ÖÕÛØâÕ ÔÐ ØÝáâÐÛØàÐâÕ Ø×ÐÑàÐÝÕ ßÐÚÕâÕ?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected"
-msgstr "¸×ÐÑàÐÝØ"
+msgid "Name: "
+msgstr "¸ÜÕ: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results"
-msgstr "ÀÕ×ãÛâÐâØ ßàÕâàÐÓe"
+msgid "Inspect..."
+msgstr "¿àÞÒÕàØ..."
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing media \"%s\":"
+msgstr "¼ÕúÐÜ Ø×ÒÞà \"%s\":"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Stop"
-msgstr "ÁâÞß"
+msgid "No package found for installation."
+msgstr "½ØøÕ ßàÞÝÐòÕÝ ßÐÚÕâ ×Ð ØÝáâÐÛÐæØøã."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "¼ÞÛØÜ ²Ðá áÐçÕÚÐøâÕ, âàÐÖØÜ..."
+msgid "Australia"
+msgstr "°ãáâàÐÛØøÐ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results (none)"
-msgstr "ÀÕ×ãÛâÐâ ßàÕâàÐÓe (ÝÕÜÐ)"
+msgid "Installation finished"
+msgstr "¸ÝáâÐÛÐæØøÐ ÓÞâÞÒÐ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Other"
-msgstr "¾áâÐÛÞ"
+msgid "by update availability"
+msgstr "ßÞ ÔÞáâãßÝÞáâØ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Welcome to the packages source editor!\n"
-"\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
-msgstr ""
-"´ÞÑàÞÔÞèÛØ ã µÔØâÞà Ø×ÒÞàÝÞÓ ÚÞÔÐ ã ¿ÐÚÕâØÜÐ!\n"
-"\n"
-"¾ÒÐø ÐÛÐâ ÒÐÜ ÜÞÖÕ ßÞÜÞüØ ÔÐ ßÞÔÕáØâÕ ÚÞÔ ã ßÐÚÕâØÜÐ ÚÞøÕ ÖÕÛØâÕ ÔÐ "
-"ÚÞàØáâØâÕ\n"
-"ÝÐ ÒÐèÕÜ àÐçãÝÐàã. ½ÐÚÞÝ âÞÓÐ üÕ ÑØâØ áßàÕÜØ ×Ð ØÝáâÐÛÐæØøã ÚÐÞ ÝÞÒØ ßÐÚÕâØ\n"
-"ØÛØ ×Ð ÐÖãàØàÐúÕ áâÐàØå."
+msgid "Poland"
+msgstr "¿ÞùáÚÐ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
-msgstr "ÁÐçãÒÐø Ø Ø×ÐòØ"
+msgid "Version: "
+msgstr "²Õà×ØøÐ: "
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Proxy..."
-msgstr "¿àÞÚáØ..."
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "¼ÞÖÕâÕ ÔÐ ßÞÔÕáØâÕ ÚÞàØáÝØÚÐ/ÛÞ×ØÝÚã ×Ð ØÔÕÝâØäØÚÐæØøã ßàÞÚáØøÐ:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Update..."
-msgstr "°ÖãàØàÐø..."
+msgid "Upgradable"
+msgstr "¼ÞÓã áÕ ÐÖãàØàÐâØ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Add..."
-msgstr "´ÞÔÐø..."
+msgid " done."
+msgstr " ãàÐòÕÝÞ."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Edit"
-msgstr "¸×ÜÕÝØ"
+msgid "Software Packages Installation"
+msgstr "¸ÝáâÐÛÐæØøÐ ßÐÚÕâÐ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Source"
-msgstr "¸×ÒÞà"
+msgid "Additional packages needed"
+msgstr "¿ÞâàÕÑÝØ áã ÔÞÔÐâÝØ ßÐÚÕâØ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Enabled?"
-msgstr "ÃÚùãçØ?"
+msgid "Bugfixes updates"
+msgstr "½ÐÔÞÓàÐÔúÕ áÐ ØáßàÐÒÚÐÜÐ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Configure sources"
-msgstr "¿ÞÔÕèÐÒÐúÕ Ø×ÒÞàÐ"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "Download áÐ `%s', ÒàÕÜÕ ÔÞ ÚàÐøÐ:%s, Ñà×ØÝÐ:%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Password:"
-msgstr "»Þ×ØÝÚÐ:"
+msgid "Germany"
+msgstr "½ÕÜÐçÚÐ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "User:"
-msgstr "ºÞàØáÝØÚ:"
+msgid "Russia"
+msgstr "ÀãáØøÐ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "¼ÞÖÕâÕ ÔÐ ßÞÔÕáØâÕ ÚÞàØáÝØÚÐ/ÛÞ×ØÝÚã ×Ð ØÔÕÝâØäØÚÐæØøã ßàÞÚáØøÐ:"
+msgid "Norway"
+msgstr "½ÞàÒÕèÚÐ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "¸ÜÕ ßàÞÚáØ ÔÞÜÐûØÝÐ(hostname):"
+msgid "Problem during installation"
+msgstr "¿àÞÑÛÕÜ ×Ð ÒàÕÜÕ ØÝáâÐÛØàÐúÐ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
-msgstr ""
-"°ÚÞ ²ÐÜ øÕ ßÞâàÕÑÝÐ ßàÞÚáØ, ãÝÕáØâÕ ØÜÕ ÔÞÜÐûØÝÐ Ø ÝÕÞÑÐÒÕ×ÝØ ßÞàâ "
-"(áØÝâÐÚáÐ: <proksi-domacin[:port]>):"
+msgid "Search"
+msgstr "ÂàÐÖØ"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure proxies"
-msgstr "¿ÞÔÕèÐÒÐúÕ ßàÞÚáØøÐ"
+#, fuzzy, c-format
+msgid "Edit a media"
+msgstr "¸×ÜÕÝØ Ø×ÒÞà"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "¼ÞÛØÜ ²Ðá áÐçÕÚÐøâÕ, ÐÖãàØàÐÜ ÜÕÔØøãÜ..."
+msgid "Czech Republic"
+msgstr "ÇÕèÚÐ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "´Ð ÑØ áâÕ áÐçãÒÐÛØ Ø×ÜÕÝÕ, ÜÞàÐâÕ ÔÐ ãÑÐæØâÕ ÜÕÔØøãÜ ã ãàÕòÐø."
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "¼ÞàÐâÕ ÔÐ ãÑÐæØâÕ ÜÕÔØøãÜ ÚÐÚÞ ÑØ áâÕ ÝÐáâÐÒØÛØ"
+msgid "Stop"
+msgstr "ÁâÞß"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Save changes"
-msgstr "ÁÐçãÒÐø Ø×ÜÕÝÕ"
+msgid "Update"
+msgstr "AÖãàØàaúe"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "ÀÕÛÐâØÒÝÐ ßãâaúÐ ÚÐ synthesis/hdlist:"
+msgid "Please wait, removing packages..."
+msgstr "¼ÞÛØÜ ²Ðá áÐçÕÚÐøâÕ, ãÚÛÐúÐÜ ßÐÚÕâÕ..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "Normal information"
+msgstr "½ÞàÜÐÛÐÝÐ ØÝäÞàÜÐæØøÐ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Editing source \"%s\":"
-msgstr "¼ÕúÐÜ Ø×ÒÞà \"%s\":"
+msgid "Media: "
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Edit a source"
-msgstr "¸×ÜÕÝØ Ø×ÒÞà"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "´ÞwÝÛÞÐÔ-ãøÕÜ ßÐÚÕâÕ `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "¼ÞÛØÜÞ ²Ðá ÔÐ áÐçÕÚÐâÕ, ãÚÛÐúÐÜ ÜÕÔØøãÜ..."
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "¸×ÐÑàÐÝÞ: %d MB / ÁÛÞÑÞÔÐÝ ßàÞáâÞà ÝÐ ÔØáÚã: %d MB"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Type of source:"
-msgstr "ÂØß Ø×ÒÞàa:"
+msgid "Media"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Adding a source:"
-msgstr "´ÞÔÐjÕÜ Ø×ÒÞà:"
+msgid "Spain"
+msgstr "ÈßÐÝØøÐ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
-msgstr ""
-"²Õü ßÞáâÞøØ ÜÕÔØø áÐ âØÜ ØÜÕÝÞÜ, ÔÐ ÛØ\n"
-"×ÐØáâÐ ÖÕÛØâÕ ÔÐ øÕ ×ÐÜÕÝØâÕ?"
+msgid "Normal updates"
+msgstr "¾ÑØçÝÕ ÝÐÔÞÓàÐÔúÕ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "¼ÞàÐâÕ ÔÐ ßÞßãÝØâÕ ÝÐøÜÐúÕ ßàÒÐ ÔÒÐ ßÞùÐ."
+msgid "by selection state"
+msgstr "ßÞ Ø×ÐÑàÐÝÞáâØ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Name:"
-msgstr "¸Üe:"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
+"¼ÞÛØÜ ²Ðá áÐçÕÚÐøâÕ, áÚØÔÐÜ ÛØáâã ÔÞÔÐâÝØå ÐÔàÕáÐ áÐ MandrakeSoft-ÞÒÞÓ ÒÕÑ "
+"áÐøâÐ."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -971,143 +899,148 @@ msgid "Login:"
 msgstr "¿àØøÐÒÐ:"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Choose a mirror..."
-msgstr "¸×ÐÑÕàØâÕ áÒÞj ÜØàÞà áÐjâ..."
+#, fuzzy, c-format
+msgid "Adding a media:"
+msgstr "´ÞÔÐjÕÜ Ø×ÒÞà:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Browse..."
-msgstr "ÂàÐÖØ..."
+msgid "Austria"
+msgstr "°ãáâàØøÐ"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Fatal error"
+msgstr "³àÕèÚÐ ßàØ çØâÐúã\n"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Path or mount point:"
-msgstr "¿ãâÐúÐ ØÛØ âaçÚÐ ÜÞÝâØàÐúÐ:"
+msgid "Update..."
+msgstr "°ÖãàØàÐø..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "¿àÕÝÞáÝØ ãàÕòÐø"
+msgid "Starting download of `%s'..."
+msgstr "¿ÞÚàÕûÕÜ download áÐ `%s'..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "HTTP áÕàÒÕà"
+msgid "(none)"
+msgstr "(ÝØjÕÔÐÝ)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "FTP server"
-msgstr "FTP áÕàÒÕà"
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
+"¶ÐÛØÜ, ÐÛØ ãÚÛÐúÐúÕÜ ÞÒØå ßÐÚÕâÐ ÑØ áâÕ ÞèâÕâØâØ áØáâÕÜ:\n"
+"\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Path:"
-msgstr "¿ãâaúÐ:"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "¸ÝáâÐÛØàÐÜ ßÐÚÕâ `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "»ÞÚÐÛÝØ äÐøÛÞÒØ"
+msgid "Currently installed version: "
+msgstr "ÂàÕÝãâÝÞ ØÝáâÐÛØàÐÝÐ ÒÕà×ØøÐ: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add a source"
-msgstr "´ÞÔÐø Ø×ÒÞà"
+msgid "Other"
+msgstr "¾áâÐÛÞ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr ""
+msgid "Reason for update: "
+msgstr "ÀÐ×ÛÞÓ ÐÖãàØàÐúÐ:"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to create medium."
-msgstr "½Õ ÜÞÓã ÔÐ ÝÐßàÐÒØÜ ÜÕÔØøãÜ."
+msgid "Please choose the desired mirror."
+msgstr "¸×ÐÑÕàØâÕ áÐøâ ßÞ ÖÕùØ."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "AÖãàØàaúe"
+msgid "Edit"
+msgstr "¸×ÜÕÝØ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "¸×ÐÑÕàØâÕ ÚÞøÕ ßÐÚÕâ(Õ) ÖÕÛØâÕ ÔÐ ÐÖãàØàÐâÕ:"
+msgid "Please wait, finding available packages..."
+msgstr "¼ÞÛØÜ ²Ðá áÐçÕÚÐøâÕ, ßàÞÝÐÛÐ×ØÜ ÔÞáâãßÝÕ ßÐÚÕâÕ..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "¼ÞÛØÜ ²Ðá áÐçÕÚÐøâÕ, ÐÖãàØàÐÜ ÜÕÔØøãÜ..."
+msgid "Relative path to synthesis/hdlist:"
+msgstr "ÀÕÛÐâØÒÝÐ ßãâaúÐ ÚÐ synthesis/hdlist:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " failed!"
-msgstr " ÝÕãáßÕÛÞ!"
+msgid "Search results (none)"
+msgstr "ÀÕ×ãÛâÐâ ßàÕâàÐÓe (ÝÕÜÐ)"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid " done."
-msgstr " ãàÐòÕÝÞ."
+msgid "Danmark"
+msgstr "´ÐÝáÚÐ"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "Download áÐ `%s', Ñà×ØÝÐ:%s"
+msgid "China"
+msgstr "ºØÝÐ"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "Download áÐ `%s', ÒàÕÜÕ ÔÞ ÚàÐøÐ:%s, Ñà×ØÝÐ:%s"
+msgid "United States"
+msgstr "ÁøÕÔØúÕÝÕ °ÜÕàØçÚÕ ´àÖÐÒÕ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Starting download of `%s'..."
-msgstr "¿ÞÚàÕûÕÜ download áÐ `%s'..."
+msgid "changes:"
+msgstr "Ø×ÜÕÝÕ:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "¸áßØâãøÕÜ ãÔÐùàÝØ äÐøÛ ×Ð Ø×ÒÞà `%s'..."
+msgid "Some additional packages need to be removed"
+msgstr "¨Þè ÝÕÚØ ßÐÚÕâØ ÜÞàÐøã ÑØâØ ãÚÛÞúÕÝØ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "¸áßØâãøÕÜ äÐøÛ ×Ð Ø×ÒÞà `%s'..."
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "ºÞßØàÐÜ äÐøÛ ×Ð Ø×ÒÞà `%s'..."
+msgid "No"
+msgstr "½Õ"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure medias"
+msgstr "¿ÞÔÕèÐÒÐúÕ Ø×ÒÞàÐ"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a media"
+msgstr "´ÞÔÐø Ø×ÒÞà"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Please choose the desired mirror."
-msgstr "¸×ÐÑÕàØâÕ áÐøâ ßÞ ÖÕùØ."
+msgid "Summary: "
+msgstr "ÁÐÖÕâÐÚ: "
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
-msgstr ""
-"½Õ ÜÞÓã ÔÐ ßàÞÝÐóÕÜ ÝØøÕÔÐÝ ÞÔÓÞÒÐàÐøãóØ ÜØàÞà.\n"
-"\n"
-"¼ÞÖÕ ßÞáâÞøÐâØ ÝÕÚÞÛØÚÞ àÐ×ÛÞÓÐ ×Ð ÞÒÐø ßàÞÑÛÕÜ; ÝÐøçÕèüØ øÕ\n"
-"áÛãçÐø ÔÐ ÐàåØâÕÚâãàÐ ÒÐèÕÓ ßàÞæÕáÞàÐ ÝØøÕ ßÞÔàÖÐÝÐ\n"
-"ÞÔ áâàÐÝÕ Mandrake Linux Official Updates."
+msgid "Canada"
+msgstr "ºÐÝÐÔÐ"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No mirror"
-msgstr "½ÕÜÐ ÜØàÞàÐ"
+msgid "Greece"
+msgstr "³àçÚÐ"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1124,180 +1057,247 @@ msgstr ""
 "¸ÝâÕàÝÕâ, ØÛØ MandrakeSoft-ÞÒ ÒÕÑ áÐøâ ÜÞÖÔÐ ÝØáã âàÕÝãâÝÞ ÔÞáâãßÝØ.\n"
 "¿ÞÚãèÐøâÕ ÚÐáÝØøÕ ßÞÝÞÒÞ."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
-msgstr "³àÕèÚÐ âÞÚÞÜ ßàÕã×ØÜÐúÐ áÐ ØÝâÕàÝÕâÐ"
+msgid "Unable to get source packages, sorry. %s"
+msgstr "½Õ ÜÞÓã ÔÐ ÔÞÑÐÒØÜ Ø×ÒÞàÝÕ ßÐÚÕâÕ, ÖÐÞ ÜØ øÕ. %s"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
-"¼ÞÛØÜ ²Ðá áÐçÕÚÐøâÕ, áÚØÔÐÜ ÛØáâã ÔÞÔÐâÝØå ÐÔàÕáÐ áÐ MandrakeSoft-ÞÒÞÓ ÒÕÑ "
-"áÐøâÐ."
+msgid "Path:"
+msgstr "¿ãâaúÐ:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"¶ÕÛØÜ ÔÐ ßÞáÕâØÜ MandrakeSoft ÒÕÑ áÐøâ ÔÐ ÑØ ÔÞÑÐÒØÞ ÛØáâã ÜØàÞàÐ.\n"
-"¿àÞÒÕàØâÕ ÔÐ ÛØ øÕ ÒÐèÐ ÚÞÝÕÚæØøÐ äãÚæØÞÝÐÛÝÐ.\n"
-"\n"
-"´Ð ÛØ øÕ Ã àÕÔã ÔÐ ÝÐáâÐÒØÜ?"
+msgid "Problem during removal"
+msgstr "¿àÞÑÛÕÜ ßàØÛØÚÞÜ ãÚÛÐúÐúÐ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United States"
-msgstr "ÁøÕÔØúÕÝÕ °ÜÕàØçÚÕ ´àÖÐÒÕ"
+msgid "Selected"
+msgstr "¸×ÐÑàÐÝØ"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "ºØÝÐ"
+msgid "Netherlands"
+msgstr "ÅÞÛÐÝÔØøÐ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "ÃøÕÔØúÕÝÞ ºàÐùÕÒáâÒÞ"
+msgid "Addable"
+msgstr "¼ÞÓã áÕ ÔÞÔÐâØ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "ÂÐøÒÐÝ"
+msgid "(Not available)"
+msgstr "(½ØøÕ ÔÞáâãßÝÞ)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
+msgstr ""
+"·ÑÞÓ ÜÕòã×ÐÒØáÝÞáâØ, áÛÕÔÕûØ ßÐÚÕâ(Ø) ÜÞàÐøã\n"
+"ÔÐ ÑãÔã ÝÕØ×ÐÑàÐÝØ:\n"
+"\n"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Sweden"
-msgstr "ÈÒÕÔáÚÐ"
+msgid "Not selected"
+msgstr "½Øáã Ø×ÐÑàÐÝØ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Russia"
-msgstr "ÀãáØøÐ"
+msgid "Software Packages Removal"
+msgstr "ÃÚÛÐúÐúÕ ßÐÚÕâÐ"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Portugal"
-msgstr "¿ÞàâãÓÐÛ"
+msgid "Sweden"
+msgstr "ÈÒÕÔáÚÐ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
-msgstr "¿ÞùáÚÐ"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
+msgstr ""
+"\n"
+"\n"
+"¿àØøÐÒùÕÝÐ ³àÕèÚÐ(Õ):\n"
+"%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Norway"
-msgstr "½ÞàÒÕèÚÐ"
+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 ""
+"»ØáâÐ ßÐÚÕâÐ ×Ð ÐÖãàØàÐúÕ ÝØøÕ ÚàÕØàÐÝÐ. ¾ÒÞ ØÛØ ×ÝÐçØ ØÛØ ÔÐ ÝÕÜÐ "
+"ÔÞáâãßÝØå\n"
+"ßÐÚÕâÐ ×Ð ÐÖãàØàÐúÕ ×Ð ÒÐè àÐçãÝÐà,\n"
+"ØÛØ áã ÞÝØ ÒÕü ØÝáâÐÛØàÐÝØ."
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Netherlands"
-msgstr "ÅÞÛÐÝÔØøÐ"
+#, fuzzy, c-format
+msgid "Examining file of media `%s'..."
+msgstr "¸áßØâãøÕÜ äÐøÛ ×Ð Ø×ÒÞà `%s'..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Korea"
-msgstr "ºÞàÕøÐ"
+msgid "Download of `%s', speed:%s"
+msgstr "Download áÐ `%s', Ñà×ØÝÐ:%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "¨ÐßÐÝ"
+msgid "One of the following packages is needed:"
+msgstr "¨ÕÔÐÝ ÞÔ áÛÕÔÕûØå ßÐÚÕâÐ øÕ ßÞâàÕÑÐÝ:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Italy"
-msgstr "¸âÐÛØøÐ"
+msgid "Quit"
+msgstr "ºàÐj"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Israel"
-msgstr "¸×àÐÕÛ"
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"¨Ð ÖÕÛØÜ ÔÐ ßÞáÕâØÜ ÜØàÞà àÐÔØ ÔÞÑÐÒùÐúÐ ÝÐøÝÞÒØøØå ÒÕà×ØøÐ ßÐÚÕâÐ.\n"
+"¿àÞÒÕàØâÕ ÔÐ ÛØ øÕ ÒÐèÐ ÚÞÝÕÚæØøÐ äãÝÚæØÞÝÐÛÝÐ Ø ãáßÞáâÐÒùÕÝÐ.\n"
+"\n"
+"´Ð ÛØ øÕ Ã àÕÔã ÔÐ ÝÐáâÐÒØÜ?"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update media(s)"
+msgstr "°ÖãàØàÐúÕ Ø×ÒÞàÐ"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Greece"
-msgstr "³àçÚÐ"
+msgid "Ok"
+msgstr "Ã àÕÔã"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "France"
-msgstr "ÄàÐÝæãáÚÐ"
+msgid "Please wait, adding medium..."
+msgstr "¼ÞÛØÜÞ ²Ðá ÔÐ áÐçÕÚÐâÕ, ÔÞÔÐøÕÜ ÜÕÔØøãÜ..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "ÄØÝáÚÐ"
+msgid "Unable to get source packages."
+msgstr "½Õ ÜÞÓã ÔÐ ÔÞÑÐÒØÜ Ø×ÒÞàÝÕ ßÐÚÕâÕ."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Spain"
-msgstr "ÈßÐÝØøÐ"
+msgid "Too many packages are selected"
+msgstr "¸×ÐÑàÐÛØ áâÕ ßàÕÒØèÕ ßÐÚÕâÐ"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"´ÞÑàÞÔÞèÛØ ã µÔØâÞà Ø×ÒÞàÝÞÓ ÚÞÔÐ ã ¿ÐÚÕâØÜÐ!\n"
+"\n"
+"¾ÒÐø ÐÛÐâ ÒÐÜ ÜÞÖÕ ßÞÜÞüØ ÔÐ ßÞÔÕáØâÕ ÚÞÔ ã ßÐÚÕâØÜÐ ÚÞøÕ ÖÕÛØâÕ ÔÐ "
+"ÚÞàØáâØâÕ\n"
+"ÝÐ ÒÐèÕÜ àÐçãÝÐàã. ½ÐÚÞÝ âÞÓÐ üÕ ÑØâØ áßàÕÜØ ×Ð ØÝáâÐÛÐæØøã ÚÐÞ ÝÞÒØ ßÐÚÕâØ\n"
+"ØÛØ ×Ð ÐÖãàØàÐúÕ áâÐàØå."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Danmark"
-msgstr "´ÐÝáÚÐ"
+msgid "%s conflicts with %s"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "½ÕÜÐçÚÐ"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"´ÞÑàÞÔÞèÛØ ã MandrakeUpdate!\n"
+"\n"
+"¾ÒÐø ÐÛÐâ ÒÐÜ ÜÞÖÕ ßÞÜÞûØ ÔÐ Ø×ÐÑÕâÕ ÝÞÒÕ ÒÕà×ØøÕ ßÐÚÕâÐ ÚÞøÕ ÖÕÛØâÕ ÔÐ "
+"ØÝáâÐÛØàÐâÕ ÝÐ\n"
+"ÒÐè àÐçãÝÐà."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
-msgstr "ÇÕèÚÐ"
+msgid "Mandrake choices"
+msgstr "Mandrake-ÞÒ Ø×ÑÞà"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "ºÞáâÐàØÚÐ"
+msgid "Changelog:\n"
+msgstr "¸×ÜÕÝÕ:\n"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "ºÐÝÐÔÐ"
+msgid "Korea"
+msgstr "ºÞàÕøÐ"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Brazil"
-msgstr "±àÐ×ØÛ"
+msgid "Removable device"
+msgstr "¿àÕÝÞáÝØ ãàÕòÐø"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "±ÕÛÓØøÐ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "°ãáâàÐÛØøÐ"
+msgid "Change medium"
+msgstr "¿àÞÜÕÝØ ÜÕÔØøãÜ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "°ãáâàØøÐ"
+msgid "Mandrake Update"
+msgstr "Mandrake Update"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
-msgstr "¸ÝäÞàÜÐæØøÕ..."
+msgid "by size"
+msgstr "ßÞ ÒÕÛØçØÝØ"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "½Õ"
+msgid "FTP server"
+msgstr "FTP áÕàÒÕà"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "ÄÐøÛÞÒØ:\n"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Yes"
-msgstr "´Ð"
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -1571,6 +1571,12 @@ msgstr "ÃÚÛÞÝØ áÞäâÒÕà"
 msgid "Software Sources Manager"
 msgstr "¼ÕÝÐÿÕà ÁÞäâÒÕàáÚÞÓ ºÞÔÐ"
 
+#~ msgid "Source: "
+#~ msgstr "¸×ÒÞà: "
+
+#~ msgid "Source"
+#~ msgstr "¸×ÒÞà"
+
 #~ msgid "A required program is missing (grpmi). Check your installation."
 #~ msgstr "½ÕÔÞáâÐøÕ ßÞâàÕÑÝØ ßàÞÓàÐÜ (grpmi). ¿àÞÒÕàØâÕ áÒÞøã ØÝáâÐÛÐæØøã."
 
diff --git a/po/sr.pom b/po/sr.pom
index 49d88b09..d4045301 100644
--- a/po/sr.pom
+++ b/po/sr.pom
@@ -1,6 +1,6 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 msgid "Server"
-msgstr "Server"
+msgstr "ÁÕàÒÕà"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 msgid "Development"
@@ -9,7 +9,7 @@ msgstr "ÀÐ×ÒÞøÝÐ"
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Office Workstation"
-msgstr "ÀÐÔÝÐ(¾ääØæÕ) áâÐÝØæÐ"
+msgstr "ÀÐÔÝÐ(Office) áâÐÝØæa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -17,8 +17,8 @@ msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
 msgstr ""
-"¾ääØæÕ ßàÞÓàÐÜØ: âÕÚáâ ßàÞæÕáÞàØ (ÚwÞàÔ, ÐÑØwÞàÔ), âÐÑÕÛÕ (ÚáßàÕÐÔ, "
-"ÓÝãÜÕàØæ), ßÔä ßàÕÓÛÕÔÝØæØ, ØâÔ"
+"Office ßàÞÓàÐÜØ: âÕÚáâ ßàÞæÕáÞàØ (kword, abiword), âÐÑÕÛe (kspread, "
+"gnumeric), pdf ßàÕÓÛÕÔÝØæØ, ØâÔ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -28,22 +28,22 @@ msgstr "ÁâÐÝØæÐ ×Ð ØÓàã"
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "·ÐÑÐÒÝØ ßàÞÓàÐÜØ: ÐàÚÐÔÕ, ØÓÕ ÝÐ âÐÑÛØ, áâàÐâÕÓØøÕ, ØâÔ"
+msgstr "·ÐÑÐÒÝØ ßàÞÓàÐÜØ: ÐàÚÐÔÕ, ØÓÕ ÝÐ âÐÑÛØ, áâàÐâÕÓØjÕ, ØâÔ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Multimedia station"
-msgstr "¼ãÛâØÜÕÔØïÛÝÐ áâÐÝØæÐ"
+msgstr "¼ãÛâØÜÕÔØjÐÛÝÐ áâÐÝØæa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Sound and video playing/editing programs"
-msgstr "¿àÞÓàÐÜØ ×Ð ßãèâÐúÕ ×ÒãÚÐ Ø ÒØÔÕÐ"
+msgstr "¿àÞÓàÐÜØ ×Ð ßãèâaúÕ ×ÒãÚa Ø ÒØÔÕa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Internet station"
-msgstr "¸ÝâÕàÝÕâ áâÐÝØæÐ"
+msgstr "¸ÝâÕàÝÕâ áâÐÝØæa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -51,38 +51,38 @@ msgid ""
 "Set of tools to read and send mail and news (pine, mutt, tin..) and to "
 "browse the Web"
 msgstr ""
-"ÁÚãß ÐÛÐâÐ ×Ð çØâÐúÕ Ø áÛÐúÕ ÕÛ.ßÞèâÕ Ø ÒÕáâØ (ßØÝÕ, Üãââ, âØÝ..) Ø ×Ð "
-"ßàÕâàÐÖØÒÐúÕ ¸ÝâÕàÝÕâÐ"
+"ÁÚãß ÐÛÐâÐ ×Ð çØâaúÕ Ø áÛaúÕ ÕÛ.ßÞèâÕ Ø ÒÕáâØ (pine, mutt, tin..) Ø ×Ð "
+"ßàÕâàaÖØÒaúe ¸ÝâÕàÝÕâa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Network Computer (client)"
-msgstr "¼àÕÖÝØ ÚÞÜßøãâÕà, (ÚÛØøÕÝâ)"
+msgstr "¼àeÖÝØ ÚÞÜßjãâÕà, (ÚÛØjÕÝâ)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Clients for different protocols including ssh"
-msgstr "ºÛØøÕÝâØ ×Ð àÐ×ÛØçØâÕ ßàÞâÞÚÞÛÕ ãÚùãçãøãûØ Ø áè"
+msgstr "ºÛØjÕÝâØ ×Ð àÐ×ÛØçØâÕ ßàÞâÞÚÞÛÕ ãÚùãçãjãûØ Ø ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Configuration"
-msgstr "ºÞÝäØÓãàÐæØï"
+msgstr "ºÞÝäØÓãàÐæØøa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Tools to ease the configuration of your computer"
-msgstr "°ÛÐâØ ×Ð ÛÐÚÞ ÚÞÝäØÓãàØáÐúÕ ÚÞÜßøãâÕàÐ"
+msgstr "°ÛÐâØ ×Ð ÛÐÚÞ ÚÞÝäØÓãàØáaúÕ ÚÞÜßjãâÕàa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Scientific Workstation"
-msgstr "½ÐãçÝÐ àÐÔÝÐ áâÐÝØæÐ"
+msgstr "½ÐãçÝa àÐÔÝÐ áâÐÝØæa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Scientific applications such as gnuplot"
-msgstr "½ÐãçÝÕ ÐßÛØÚÐæØøÕ ÚÐÞ èâÞ øÕ ÓÝãßÛÞâ"
+msgstr "½ÐãçÝÕ ÐßÛØÚÐæØøÕ ÚÐÞ èâÞ øÕ gnuplot"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -97,7 +97,7 @@ msgstr "ÕÔØâÞàØ,èÕÛÞÒØ, ÐÛÐâØ ×Ð ÔÐâÞâÕÚÕ, âÕàÜØÝÐÛØ"
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "KDE Workstation"
-msgstr "º´µ ßÐÔÝÐ áâÐÝØæÐ"
+msgstr "KDE ßÐÔÝÐ áâÐÝØæa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -105,12 +105,12 @@ msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr ""
-"º ´ÕáÚâÞß ÞÚàãÖÕúÕ, ÞáÝÞÒÝÞ ÓàÐäØçÚÞ ÞÚàãÖÕúÕ áÐ ÚÞÛÕÚæØøÞÜ ßàÐâÕûØå ÐÛÐâÐ"
+"K ´ÕáÚâÞß ÞÚàãÖeúÕ, ÞáÝÞÒÝÞ ÓàÐäØçÚÞ ÞÚàãÖeúÕ áa ÚÞÛÕÚæØjÞÜ ßàÐâeûØå ÐÛÐâa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Gnome Workstation"
-msgstr "³ÝÞÜÕ àÐÔÝÐ áâÐÝØæÐ"
+msgstr "Gnome àÐÔÝa áâÐÝØæa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -118,8 +118,8 @@ msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr ""
-"³àÐäØçÚÐ ÞÚàãÖÕúÐ ×Ð áÕâÞÜ ÚÞàØáÝØçÚ½ÄÁ áÕàÒÕà, Á¼± áÕàÒÕà, ¿àÞxy áÕàÒÕà½ÄÁ "
-"áÕàÒÕà, Á¼± áÕàÒÕà, ¿àÞxy áÕàÒÕàØå ÐßÛØÚÐæØï Ø ÔÕáÚâÞßÐÛÐâÐ"
+"³àÐäØçÚÐ ÞÚàãÖeúÐ ×Ð áÕâÞÜ ÚÞàØáÝØçÚNFS server, SMB server, Proxy serverNFS "
+"server, SMB server, Proxy serverØå ÐßÛØÚÐæØjÐ Ø ÔÕáÚâÞßÐÛÐâa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -129,42 +129,42 @@ msgstr "´àãÓØ ÓàÐäØçÚØ ÔÕáÚâÞßÞÒØ"
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "¸æÕwÜ, WØÝÔÞw ¼ÐÚÕà, µÝÛØÓåâÕÝÜÕÝâ, ÄÒwÜ, ØâÔ"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, ØâÔ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "C and C++ development libraries, programs and include files"
-msgstr "Æ Ø Æ++ àÐ×ÒÞøÝÕ ÑØÑÛØÞâÕÚÕ, ßàÞÓàÐÜØ  Ø ßàÞßàÐâÝÕ ÔÐâÞâÕÚÕ"
+msgstr "C Ø C++ àÐ×ÒÞjÝÕ ÑØÑÛØÞâÕÚe, ßàÞÓàÐÜØ  Ø ßàÞßàÐâÝÕ ÔÐâÞâÕÚe"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Documentation"
-msgstr "´ÞÚãÜÕÝâÐæØï"
+msgstr "´ÞÚãÜÕÝâÐæØja"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Books and Howto's on Linux and Free Software"
-msgstr "ºúØÓÕ Ø ºÐÚÞ? (ÅÞwâÞ'á) ×Ð »ØÝãx Ø ±ÕáßÛÐâÝØ ÁÞäâÒÕà"
+msgstr "KúØÓÕ Ø ºÐÚÞ? (Howto's) ×Ð Linux Ø ±ÕáßÛÐâÝØ ÁÞäâÒÕà"
 
 # 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
 msgid "Linux Standard Base. Third party applications support"
-msgstr "»ØÝãx-ÞÒÐ ÁâÐÝÔÐàÔÝÐ ±Ð×Ð. ¿ÞÔàèÚÐ ×Ð ÂåØàÔ ßÐàây ÐßÛØÚÐØæøÕ"
+msgstr "»ØÝãÚáÞÒÐ ÁâÐÝÔÐàÔÝÐ ±Ð×Ð. ¿ÞÔàèÚÐ ×Ð Third party ÐßÛØÚÐØæøÕ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Web/FTP"
-msgstr "ÁÕàÒÕà, WÕÑ/Ä¿"
+msgstr "ÁÕàÒÕà, Web/FTP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Apache, Pro-ftpd"
-msgstr "°ßÐçÕ, ¿àÞ-äâßÔ"
+msgstr "Apache, Pro-ftpd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -174,32 +174,32 @@ msgstr "¿ÞèâÐ"
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Postfix mail server"
-msgstr "¿ÞáâäØx ÜÐØÛ áÕàÒÕà"
+msgstr "Postfix mail áÕàÒÕà"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Database"
-msgstr "ÁÕàÒÕà,±Ð×Õ ßÞÔÐâÐÚÐ"
+msgstr "ÁÕàÒÕà,±Ð×Õ ßÞÔÐâÐÚa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "PostgreSQL or MySQL database server"
-msgstr "¿ÞáâÓàÕÁQ» ØÛØ ¼yÁQ» áÕàÒÕà ×Ð ÑÐ×ã ßÞÔÐâÐÚÐ"
+msgstr "PostgreSQL ØÛØ MySQL áÕàÒÕà ×Ð ÑÐ×ã ßÞÔÐâÐÚÐ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Firewall/Router"
-msgstr "ÁÕàÒÕà, ÄØàÕwÐÛÛ/ÀÞãâÕà"
+msgstr "ÁÕàÒÕà, Firewall/Router"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Internet gateway"
-msgstr "¸ÝâÕàÝÕâ ÓÐâÕwÐy"
+msgstr "¸ÝâÕàÝÕâ gateway"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "DNS/NIS "
-msgstr "´½Á/½¸Á "
+msgstr "DNS/NIS "
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -214,13 +214,13 @@ msgstr "¼àÕÖÝØ ÁÕàÒÕà"
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "½ÄÁ áÕàÒÕà, Á¼± áÕàÒÕà, ¿àÞxy áÕàÒÕà, ÁÈ áÕàÒÕà"
+msgstr "NFS áÕàÒÕà, SMB áÕàÒÕà, Proxy áÕàÒÕà, SSH áÕàÒÕà"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 #, fuzzy
 msgid "Set of tools to read and send mail and news and to browse the Web"
 msgstr ""
-"ÁÚãß ÐÛÐâÐ ×Ð çØâÐúÕ Ø áÛÐúÕ ÕÛ.ßÞèâÕ Ø ÒÕáâØ (ßØÝÕ, Üãââ, âØÝ..) Ø ×Ð "
-"ßàÕâàÐÖØÒÐúÕ ¸ÝâÕàÝÕâÐ"
+"ÁÚãß ÐÛÐâÐ ×Ð çØâaúÕ Ø áÛaúÕ ÕÛ.ßÞèâÕ Ø ÒÕáâØ (pine, mutt, tin..) Ø ×Ð "
+"ßàÕâàaÖØÒaúe ¸ÝâÕàÝÕâa"
 
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index dee9a100..5c077b03 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: 2003-02-28 22:12+0100\n"
 "Last-Translator: Toma Jankovic_<tomaja@net.yu>\n"
 "Language-Team: Serbian <i18n@mandrake.co.yu>\n"
@@ -15,16 +15,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"Da li je U redu da nastavim?"
+msgid "Enabled?"
+msgstr "Ukljuèi?"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Putanja ili taèka montiranja:"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Portugal"
+msgstr "Portugal"
 
 #: ../rpmdrake:1
 #, c-format
@@ -43,106 +47,54 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"Dobrodo¹li u MandrakeUpdate!\n"
-"\n"
-"Ovaj alat vam mo¾e pomoæi da izabete nove verzije paketa koje ¾elite da "
-"instalirate na\n"
-"va¹ raèunar."
-
-#: ../rpmdrake:1
-#, c-format
-msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
-msgstr ""
-"Dobrodo¹li u program za uklanjanje softvera!\n"
-"\n"
-"Ovaj alat vam mo¾e pomoæi da izaberete softver ¾elite da uklonite sa\n"
-"va¹eg raèunara."
-
-#: ../rpmdrake:1
-#, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Nai¹ao sam na problem prilikom uklanjanja paketa:\n"
-"\n"
-"%s"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Problem during removal"
-msgstr "Problem prilikom uklanjanja"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Please wait, removing packages..."
-msgstr "Molim Vas saèekajte, uklanjam pakete..."
+msgid "by group"
+msgstr "po grupi"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Molim vas saèekajte, uèitavam bazu podataka o paketima..."
+msgid "Name:"
+msgstr "Ime:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Nai¹ao sam na problem tokom instaliranja:\n"
-"\n"
-"%s"
+msgid "Italy"
+msgstr "Italija"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation failed"
-msgstr "Instalacija neuspela"
+msgid "How to choose manually your mirror"
+msgstr "Kako ruèno izabrati svoj miror sajt"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Nepopravljiva gre¹ka: nije pronaðen paket za instalaciju."
+msgid "URL:"
+msgstr "URL:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "No package found for installation."
-msgstr "Nije pronaðen paket za instalaciju."
+msgid "Some packages need to be removed"
+msgstr "Neki paketi moraju da se uklone"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Svi paketi, koji ste zahtevali, su uspe¹no instalirani."
+msgid "More information on package..."
+msgstr "Dodatne informacije o paketu..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Sve je dobro instalirano"
+msgid "Yes"
+msgstr "Da"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
 msgstr ""
-"Instalacija je gotova, %s.\n"
+"Zbog meðuzavisnosti, sledeæi paket(i) moraju\n"
+"da budu neizabrani:\n"
 "\n"
-"Napravio sam neke fajlove sa pode¹avanjima, primer `.rpmnew' ili `."
-"rpmsave',\n"
-"mo¾ete da ih proverite kako bi ste ne¹to preduzeli:"
 
 #: ../rpmdrake:1
 #, c-format
@@ -151,456 +103,452 @@ msgstr "svi paketi su dobro instalirani"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Problem during installation"
-msgstr "Problem za vreme instaliranja"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Instaliram paket `%s' (%s/%s)..."
+msgid "%s KB"
+msgstr "%s KB"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Instalacija paketa"
-
-#: ../rpmdrake:1
-#, c-format
 msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
 "\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"Then, restart MandrakeUpdate."
 msgstr ""
+"Mo¾ete izabrati ¾eljeni miror sajt i ruèno: da bi to uradili,\n"
+"pokrenite Menad¾er Softvera, a zatim dodajte `Security\n"
+"updates' izvor.\n"
 "\n"
-"\n"
-"Prijavljena Gre¹ka(e):\n"
-"%s"
+"Zatim, restarujte MandrakeUpdate."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"Instalacija nije uspela, neki fajlovi nedostaju.\n"
-"Mo¾da bi trebalo da a¾urirate bazu paketa."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
+"Welcome to the software removal tool!\n"
 "\n"
-"Do you want to continue installation?"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
 msgstr ""
-"SledeKji paketi treba da budu uklonjeni da bi se drugi instalirali:\n"
-"\n"
-"%s\n"
+"Dobrodo¹li u program za uklanjanje softvera!\n"
 "\n"
-"da li je U redu da nastavim?"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Download-ujem pakete `%s' (%s/%s)..."
+"Ovaj alat vam mo¾e pomoæi da izaberete softver ¾elite da uklonite sa\n"
+"va¹eg raèunara."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Cancel"
-msgstr "Odustani"
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "Da bi ste saèuvali izmene, morate da ubacite medijum u ureðaj."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Ok"
-msgstr "U redu"
+msgid "Save and quit"
+msgstr "Saèuvaj i izaði"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Ubacite medijum sa imenom \"%s\" u ureðaj [%s]"
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"Nai¹ao sam na problem prilikom uklanjanja paketa:\n"
+"\n"
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Change medium"
-msgstr "Promeni medijum"
+msgid "Size: "
+msgstr "Velièina: "
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Initializing..."
-msgstr "Inicijalizacija..."
+msgid "Security updates"
+msgstr "Sigurnosne nadogradnje"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Instalacija paketa"
+msgid "Already existing update medias"
+msgstr "Gre¹ka prilikom dodavanja medijuma sa nadogradnjom"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Ne mogu da dobavim izvorne pakete, ¾ao mi je. %s"
+msgid "Maximum information"
+msgstr "Potpuna informacija"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Unable to get source packages."
-msgstr "Ne mogu da dobavim izvorne pakete."
+msgid "Proxy..."
+msgstr "Proksi..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Inspect..."
-msgstr "Proveri..."
+#, fuzzy, c-format
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
+msgstr ""
+"Instalacija nije uspela, neki fajlovi nedostaju.\n"
+"Mo¾da bi trebalo da a¾urirate bazu paketa."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Installation finished"
-msgstr "Instalacija gotova"
+msgid "United Kingdom"
+msgstr "Ujedinjeno Kraljevstvo"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Ne radi ni¹ta"
+msgid "in names"
+msgstr "u imenima"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Koristi %s kao glavni fajl"
+msgid ""
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
+msgstr ""
+"Ne mogu da pronagjem nijedan odgovarajugji miror.\n"
+"\n"
+"Mo¾e postojati nekoliko razloga za ovaj problem; najèe¹Kji je\n"
+"sluèaj da arhitektura va¹eg procesora nije podr¾ana\n"
+"od strane Mandrake Linux Official Updates."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Remove .%s"
 msgstr "Ukloni: %s"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "changes:"
-msgstr "izmene:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspecting %s"
-msgstr "Proveravam %s"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Molim Vas saèekajte, pronalazim dostupne pakete..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "Molimo Vas da saèekate, dodajem medijum..."
+msgid "Finland"
+msgstr "Finska"
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
+"The following packages have bad signatures:\n"
 "\n"
-"Then, restart MandrakeUpdate."
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"Mo¾ete izabrati ¾eljeni miror sajt i ruèno: da bi to uradili,\n"
-"pokrenite Menad¾er Softvera, a zatim dodajte `Security\n"
-"updates' izvor.\n"
+"SledeKji paketi treba da budu uklonjeni da bi se drugi instalirali:\n"
 "\n"
-"Zatim, restarujte MandrakeUpdate."
+"%s\n"
+"\n"
+"da li je U redu da nastavim?"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "How to choose manually your mirror"
-msgstr "Kako ruèno izabrati svoj miror sajt"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Examining distant file of media `%s'..."
+msgstr "Ispitujem udaljrni fajl za izvor `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
+msgid "Verifying packages signatures..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Already existing update sources"
-msgstr ""
+msgid "France"
+msgstr "Francuska"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "More info"
+msgstr "Vi¹e informacija"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
+"%s\n"
 "\n"
 "Is it ok to continue?"
 msgstr ""
-"Ja ¾elim da posetim miror radi dobavljanja najnovijih verzija paketa.\n"
-"Proverite da li je va¹a konekcija funkcionalna i uspostavljena.\n"
+"%s\n"
 "\n"
 "Da li je U redu da nastavim?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Reload the packages list"
+msgstr "Ponovo uèitaj listu paketa"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Gre¹ka pri èitanju\n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Izaberite svoj miror sajt..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Software Packages Installation"
-msgstr "Instalacija paketa"
+msgid "Some packages can't be installed"
+msgstr "Neki paketi ne mogu da se instaliraju"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Mandrake Update"
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "Nepopravljiva gre¹ka: nije pronaðen paket za instalaciju."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Uklanjanje paketa"
+msgid "All packages,"
+msgstr "Svi paketi,"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Quit"
-msgstr "Kraj"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Type of media:"
+msgstr "Tip izvora:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Instaliraj"
+msgid "in files"
+msgstr "u fajlovima"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "Ukloni"
+msgid "All requested packages were installed successfully."
+msgstr "Svi paketi, koji ste zahtevali, su uspe¹no instalirani."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Help"
-msgstr "Pomoæ"
+msgid "Proxy hostname:"
+msgstr "Ime proksi domaæina(hostname):"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search"
-msgstr "Tra¾i"
+msgid "Local files"
+msgstr "Lokalni fajlovi"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Pronaði: "
+msgid "Inspecting %s"
+msgstr "Proveravam %s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"SledeKji paketi treba da budu uklonjeni da bi se drugi instalirali:\n"
-"\n"
-"%s\n"
-"\n"
-"da li je U redu da nastavim?"
+msgid "Israel"
+msgstr "Izrael"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Neki paketi moraju da se uklone"
+msgid "Help"
+msgstr "Pomoæ"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
-"\n"
-"Do you really want to install all the selected packages?"
-msgstr ""
-"Upozorenje: izgleda da poku¹avate da dodate toliko\n"
-"paketa da va¹ fajl sistem mo¾e ostati bez slobodnog prostora,\n"
-"tokom ili nakon instalacije paketa ; ovo je posebno\n"
-"opasno i treba obratiti dodatnu pa¾nju.\n"
-"\n"
-"Da li zaista ¾elite da instalirate izabrane pakete?"
+msgid "HTTP server"
+msgstr "HTTP server"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Izabrali ste previ¹e paketa"
+msgid "Installation failed"
+msgstr "Instalacija neuspela"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "Potpuna informacija"
+msgid "Use .%s as main file"
+msgstr "Koristi %s kao glavni fajl"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Normal information"
-msgstr "Normalana informacija"
+msgid "Search results"
+msgstr "Rezultati pretrage"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Update source(s)"
-msgstr "A¾uriranje izvora"
+msgid " failed!"
+msgstr " neuspelo!"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Ponovo uèitaj listu paketa"
+msgid "Brazil"
+msgstr "Brazil"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reset the selection"
-msgstr "Ponovo izaberi"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"VeKj postoji medij sa tim imenom, da li\n"
+"zaista ¾elite da je zamenite?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "u fajlovima"
+msgid "Find:"
+msgstr "Pronaði: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "u opisima"
+msgid "All packages, alphabetical"
+msgstr "Svi paketi, po abecedi"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "u imenima"
+msgid "Please wait, searching..."
+msgstr "Molim Vas saèekajte, tra¾im..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
-msgstr "po dostupnosti"
+msgid "Please wait, reading packages database..."
+msgstr "Molim vas saèekajte, uèitavam bazu podataka o paketima..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by source repository"
-msgstr "po stanju izvornog koda"
+msgid "unknown package "
+msgstr "nepoznati paket "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by selection state"
-msgstr "po izabranosti"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Ubacite medijum sa imenom \"%s\" u ureðaj [%s]"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by size"
-msgstr "po velièini"
+msgid "Reset the selection"
+msgstr "Ponovo izaberi"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by group"
-msgstr "po grupi"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"Ako Vam je potrebna proksi, unesite ime domaæina i neobavezni port "
+"(sintaksa: <proksi-domacin[:port]>):"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages,"
-msgstr "Svi paketi,"
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
+"Da bi zadovoljili sve zavisnosti,sledeæi paket(i) bi takoðe\n"
+"trebalo da se uklone:\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Svi paketi, po abecedi"
+msgid "Costa Rica"
+msgstr "Kostarika"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Mandrake-ov izbor"
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Nai¹ao sam na problem tokom instaliranja:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
-msgstr "Obiène nadogradnje"
+msgid "Please wait, removing medium..."
+msgstr "Molimo Vas da saèekate, uklanjam medijum..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Nadogradnje sa ispravkama"
+msgid "Password:"
+msgstr "Lozinka:"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Security updates"
-msgstr "Sigurnosne nadogradnje"
+msgid "Taiwan"
+msgstr "Tajvan"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Description: "
-msgstr "Opis:"
+msgid "User:"
+msgstr "Korisnik:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Razlog a¾uriranja:"
+msgid "Please wait, updating medium..."
+msgstr "Molim Vas saèekajte, a¾uriram medijum..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Summary: "
-msgstr "Sa¾etak: "
+msgid "Please wait, listing packages..."
+msgstr "Molim Vas saèekajte, prikazujem pakete..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Importance: "
-msgstr "Va¾nost: "
+msgid "Information on packages"
+msgstr "Informacije o paketima"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Cancel"
+msgstr "Odustani"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Size: "
-msgstr "Velièina: "
+msgid "Everything installed successfully"
+msgstr "Sve je dobro instalirano"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Select the media(s) you wish to update:"
+msgstr "Izaberite koje paket(e) ¾elite da a¾urirate:"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Version: "
-msgstr "Verzija: "
+msgid "Please wait, updating media..."
+msgstr "Molim Vas saèekajte, a¾uriram medijum..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "Ime: "
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Trenutno instalirana verzija: "
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"SledeKji paketi treba da budu uklonjeni da bi se drugi instalirali:\n"
+"\n"
+"%s\n"
+"\n"
+"da li je U redu da nastavim?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Source: "
-msgstr "Izvor: "
+msgid "in descriptions"
+msgstr "u opisima"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(Not available)"
-msgstr "(Nije dostupno)"
+msgid "Configure proxies"
+msgstr "Pode¹avanje proksija"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Izmene:\n"
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"®elim da posetim MandrakeSoft veb sajt da bi dobavio listu mirora.\n"
+"Proverite da li je va¹a konekcija fukcionalna.\n"
+"\n"
+"Da li je U redu da nastavim?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Files:\n"
-msgstr "Fajlovi:\n"
+msgid "Please choose"
+msgstr "Izaberite"
 
 #: ../rpmdrake:1
 #, c-format
@@ -609,43 +557,28 @@ msgstr "Velièina izabranog: %d MB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Izabrano: %d MB / Slobodan prostor na disku: %d MB"
+msgid "Initializing..."
+msgstr "Inicijalizacija..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
-msgstr ""
-"Zbog meðuzavisnosti, sledeæi paket(i) moraju\n"
-"da budu neizabrani:\n"
-"\n"
+msgid "Save changes"
+msgstr "Saèuvaj izmene"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr ""
-"®alim, ali sledeæi paket(i) ne mogu da budu izabrani:\n"
-"\n"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "Gre¹ka tokom preuzimanja sa interneta"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "%s conflicts with %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Package installation..."
+msgstr "Instalacija paketa"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages can't be installed"
-msgstr "Neki paketi ne mogu da se instaliraju"
+msgid "Importance: "
+msgstr "Va¾nost: "
 
 #: ../rpmdrake:1
 #, c-format
@@ -658,314 +591,309 @@ msgstr ""
 "da se instaliraju:\n"
 "\n"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "Potrebni su dodatni paketi"
+msgid "Add..."
+msgstr "Dodaj..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some packages can't be removed"
-msgstr "Neki paketi se ne mogu ukloniti"
+msgid "Unable to create medium."
+msgstr "Ne mogu da napravim medijum."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Removing these packages would break your system, sorry:\n"
+"The installation is finished; %s.\n"
 "\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
 msgstr ""
-"®alim, ali uklanjanjem ovih paketa bi ste o¹tetiti sistem:\n"
+"Instalacija je gotova, %s.\n"
 "\n"
+"Napravio sam neke fajlove sa pode¹avanjima, primer `.rpmnew' ili `."
+"rpmsave',\n"
+"mo¾ete da ih proverite kako bi ste ne¹to preduzeli:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"Da bi zadovoljili sve zavisnosti,sledeæi paket(i) bi takoðe\n"
-"trebalo da se uklone:\n"
-"\n"
+msgid "Browse..."
+msgstr "Tra¾i..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Jo¹ neki paketi moraju biti uklonjeni"
+msgid "Some packages can't be removed"
+msgstr "Neki paketi se ne mogu ukloniti"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "More information on package..."
-msgstr "Dodatne informacije o paketu..."
+msgid "Info..."
+msgstr "Informacije..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Information on packages"
-msgstr "Informacije o paketima"
+msgid "You need to insert the medium to continue"
+msgstr "Morate da ubacite medijum kako bi ste nastavili"
 
-#. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "More info"
-msgstr "Vi¹e informacija"
+msgid "Copying file for media `%s'..."
+msgstr "Kopiram fajl za izvor `%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Addable"
-msgstr "Mogu se dodati"
+msgid "Remove"
+msgstr "Ukloni"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Upgradable"
-msgstr "Mogu se a¾urirati"
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Instalacija paketa"
 
 #: ../rpmdrake:1
-#, c-format
-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 ""
-"Lista paketa za a¾uriranje nije kreirana. Ovo ili znaèi ili da nema "
-"dostupnih\n"
-"paketa za a¾uriranje za va¹ raèunar,\n"
-"ili su oni veKj instalirani."
+#, fuzzy, c-format
+msgid "by media repository"
+msgstr "po stanju izvornog koda"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "No update"
-msgstr "Bez a¾uriranja"
+msgid "No mirror"
+msgstr "Nema mirora"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
-msgstr "(nijedan)"
+msgid "You need to fill up at least the two first entries."
+msgstr "Morate da popunite najmanje prva dva polja."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Molim Vas saèekajte, prikazujem pakete..."
+msgid "Install"
+msgstr "Instaliraj"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "unknown package "
-msgstr "nepoznati paket "
+msgid "Japan"
+msgstr "Japan"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Jedan od sledeæih paketa je potreban:"
+msgid "Do nothing"
+msgstr "Ne radi ni¹ta"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Izaberite"
+msgid "No update"
+msgstr "Bez a¾uriranja"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Description: "
+msgstr "Opis:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Not selected"
-msgstr "Nisu izabrani"
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr ""
+"Upozorenje: izgleda da poku¹avate da dodate toliko\n"
+"paketa da va¹ fajl sistem mo¾e ostati bez slobodnog prostora,\n"
+"tokom ili nakon instalacije paketa ; ovo je posebno\n"
+"opasno i treba obratiti dodatnu pa¾nju.\n"
+"\n"
+"Da li zaista ¾elite da instalirate izabrane pakete?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected"
-msgstr "Izabrani"
+msgid "Name: "
+msgstr "Ime: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results"
-msgstr "Rezultati pretrage"
+msgid "Inspect..."
+msgstr "Proveri..."
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing media \"%s\":"
+msgstr "Menjam izvor \"%s\":"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Stop"
-msgstr "Stop"
+msgid "No package found for installation."
+msgstr "Nije pronaðen paket za instalaciju."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Molim Vas saèekajte, tra¾im..."
+msgid "Australia"
+msgstr "Australija"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Rezultat pretrage (nema)"
+msgid "Installation finished"
+msgstr "Instalacija gotova"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Other"
-msgstr "Ostalo"
+msgid "by update availability"
+msgstr "po dostupnosti"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Welcome to the packages source editor!\n"
-"\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
-msgstr ""
-"Dobrodo¹li u Editor izvornog koda u Paketima!\n"
-"\n"
-"Ovaj alat vam mo¾e pomoKji da podesite kod u paketima koje ¾elite da "
-"koristite\n"
-"na va¹em raèunaru. Nakon toga Kje biti spremi za instalaciju kao novi "
-"paketi\n"
-"ili za a¾uriranje starih."
+msgid "Poland"
+msgstr "Poljska"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
-msgstr "Saèuvaj i izaði"
+msgid "Version: "
+msgstr "Verzija: "
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Proxy..."
-msgstr "Proksi..."
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Mo¾ete da podesite korisnika/lozinku za identifikaciju proksija:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Update..."
-msgstr "A¾uriraj..."
+msgid "Upgradable"
+msgstr "Mogu se a¾urirati"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Add..."
-msgstr "Dodaj..."
+msgid " done."
+msgstr " uraðeno."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Edit"
-msgstr "Izmeni"
+msgid "Software Packages Installation"
+msgstr "Instalacija paketa"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Source"
-msgstr "Izvor"
+msgid "Additional packages needed"
+msgstr "Potrebni su dodatni paketi"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Enabled?"
-msgstr "Ukljuèi?"
+msgid "Bugfixes updates"
+msgstr "Nadogradnje sa ispravkama"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Configure sources"
-msgstr "Pode¹avanje izvora"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "Download sa `%s', vreme do kraja:%s, brzina:%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Password:"
-msgstr "Lozinka:"
+msgid "Germany"
+msgstr "Nemaèka"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "User:"
-msgstr "Korisnik:"
+msgid "Russia"
+msgstr "Rusija"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "Mo¾ete da podesite korisnika/lozinku za identifikaciju proksija:"
+msgid "Norway"
+msgstr "Norve¹ka"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "Ime proksi domaæina(hostname):"
+msgid "Problem during installation"
+msgstr "Problem za vreme instaliranja"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
-msgstr ""
-"Ako Vam je potrebna proksi, unesite ime domaæina i neobavezni port "
-"(sintaksa: <proksi-domacin[:port]>):"
+msgid "Search"
+msgstr "Tra¾i"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure proxies"
-msgstr "Pode¹avanje proksija"
+#, fuzzy, c-format
+msgid "Edit a media"
+msgstr "Izmeni izvor"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Molim Vas saèekajte, a¾uriram medijum..."
+msgid "Czech Republic"
+msgstr "Èe¹ka"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "Da bi ste saèuvali izmene, morate da ubacite medijum u ureðaj."
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "Morate da ubacite medijum kako bi ste nastavili"
+msgid "Stop"
+msgstr "Stop"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Save changes"
-msgstr "Saèuvaj izmene"
+msgid "Update"
+msgstr "A¾uriranje"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Relativna putanja ka synthesis/hdlist:"
+msgid "Please wait, removing packages..."
+msgstr "Molim Vas saèekajte, uklanjam pakete..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "Normal information"
+msgstr "Normalana informacija"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Editing source \"%s\":"
-msgstr "Menjam izvor \"%s\":"
+msgid "Media: "
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Edit a source"
-msgstr "Izmeni izvor"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "Download-ujem pakete `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Molimo Vas da saèekate, uklanjam medijum..."
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Izabrano: %d MB / Slobodan prostor na disku: %d MB"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Type of source:"
-msgstr "Tip izvora:"
+msgid "Media"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Dodajem izvor:"
+msgid "Spain"
+msgstr "©panija"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
-msgstr ""
-"VeKj postoji medij sa tim imenom, da li\n"
-"zaista ¾elite da je zamenite?"
+msgid "Normal updates"
+msgstr "Obiène nadogradnje"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Morate da popunite najmanje prva dva polja."
+msgid "by selection state"
+msgstr "po izabranosti"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Name:"
-msgstr "Ime:"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
+"Molim Vas saèekajte, skidam listu dodatnih adresa sa MandrakeSoft-ovog veb "
+"sajta."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -973,143 +901,148 @@ msgid "Login:"
 msgstr "Prijava:"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Choose a mirror..."
-msgstr "Izaberite svoj miror sajt..."
+#, fuzzy, c-format
+msgid "Adding a media:"
+msgstr "Dodajem izvor:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Browse..."
-msgstr "Tra¾i..."
+msgid "Austria"
+msgstr "Austrija"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Fatal error"
+msgstr "Gre¹ka pri èitanju\n"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Path or mount point:"
-msgstr "Putanja ili taèka montiranja:"
+msgid "Update..."
+msgstr "A¾uriraj..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "Prenosni ureðaj"
+msgid "Starting download of `%s'..."
+msgstr "Pokreæem download sa `%s'..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "HTTP server"
+msgid "(none)"
+msgstr "(nijedan)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "FTP server"
-msgstr "FTP server"
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
+"®alim, ali uklanjanjem ovih paketa bi ste o¹tetiti sistem:\n"
+"\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Path:"
-msgstr "Putanja:"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Instaliram paket `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "Lokalni fajlovi"
+msgid "Currently installed version: "
+msgstr "Trenutno instalirana verzija: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add a source"
-msgstr "Dodaj izvor"
+msgid "Other"
+msgstr "Ostalo"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr "Ne mogu da a¾uriram medijum; on æe biti automatski iskljuèen."
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "Razlog a¾uriranja:"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to create medium."
-msgstr "Ne mogu da napravim medijum."
+msgid "Please choose the desired mirror."
+msgstr "Izaberite sajt po ¾elji."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "A¾uriranje"
+msgid "Edit"
+msgstr "Izmeni"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Izaberite koje paket(e) ¾elite da a¾urirate:"
+msgid "Please wait, finding available packages..."
+msgstr "Molim Vas saèekajte, pronalazim dostupne pakete..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Molim Vas saèekajte, a¾uriram medijum..."
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Relativna putanja ka synthesis/hdlist:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " failed!"
-msgstr " neuspelo!"
+msgid "Search results (none)"
+msgstr "Rezultat pretrage (nema)"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid " done."
-msgstr " uraðeno."
+msgid "Danmark"
+msgstr "Danska"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "Download sa `%s', brzina:%s"
+msgid "China"
+msgstr "Kina"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "Download sa `%s', vreme do kraja:%s, brzina:%s"
+msgid "United States"
+msgstr "Sjedinjene Amerièke Dr¾ave"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Starting download of `%s'..."
-msgstr "Pokreæem download sa `%s'..."
+msgid "changes:"
+msgstr "izmene:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "Ispitujem udaljrni fajl za izvor `%s'..."
+msgid "Some additional packages need to be removed"
+msgstr "Jo¹ neki paketi moraju biti uklonjeni"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "Ispitujem fajl za izvor `%s'..."
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "Kopiram fajl za izvor `%s'..."
+msgid "No"
+msgstr "Ne"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure medias"
+msgstr "Pode¹avanje izvora"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a media"
+msgstr "Dodaj izvor"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Please choose the desired mirror."
-msgstr "Izaberite sajt po ¾elji."
+msgid "Summary: "
+msgstr "Sa¾etak: "
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
-msgstr ""
-"Ne mogu da pronagjem nijedan odgovarajugji miror.\n"
-"\n"
-"Mo¾e postojati nekoliko razloga za ovaj problem; najèe¹Kji je\n"
-"sluèaj da arhitektura va¹eg procesora nije podr¾ana\n"
-"od strane Mandrake Linux Official Updates."
+msgid "Canada"
+msgstr "Kanada"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No mirror"
-msgstr "Nema mirora"
+msgid "Greece"
+msgstr "Grèka"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1126,180 +1059,247 @@ msgstr ""
 "Internet, ili MandrakeSoft-ov veb sajt mo¾da nisu trenutno dostupni.\n"
 "Poku¹ajte kasnije ponovo."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
-msgstr "Gre¹ka tokom preuzimanja sa interneta"
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Ne mogu da dobavim izvorne pakete, ¾ao mi je. %s"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
-"Molim Vas saèekajte, skidam listu dodatnih adresa sa MandrakeSoft-ovog veb "
-"sajta."
+msgid "Path:"
+msgstr "Putanja:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"®elim da posetim MandrakeSoft veb sajt da bi dobavio listu mirora.\n"
-"Proverite da li je va¹a konekcija fukcionalna.\n"
-"\n"
-"Da li je U redu da nastavim?"
+msgid "Problem during removal"
+msgstr "Problem prilikom uklanjanja"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United States"
-msgstr "Sjedinjene Amerièke Dr¾ave"
+msgid "Selected"
+msgstr "Izabrani"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "Kina"
+msgid "Netherlands"
+msgstr "Holandija"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Ujedinjeno Kraljevstvo"
+msgid "Addable"
+msgstr "Mogu se dodati"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Tajvan"
+msgid "(Not available)"
+msgstr "(Nije dostupno)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
+msgstr ""
+"®alim, ali sledeæi paket(i) ne mogu da budu izabrani:\n"
+"\n"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Sweden"
-msgstr "©vedska"
+msgid "Not selected"
+msgstr "Nisu izabrani"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Russia"
-msgstr "Rusija"
+msgid "Software Packages Removal"
+msgstr "Uklanjanje paketa"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Portugal"
-msgstr "Portugal"
+msgid "Sweden"
+msgstr "©vedska"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
-msgstr "Poljska"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
+msgstr ""
+"\n"
+"\n"
+"Prijavljena Gre¹ka(e):\n"
+"%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Norway"
-msgstr "Norve¹ka"
+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 ""
+"Lista paketa za a¾uriranje nije kreirana. Ovo ili znaèi ili da nema "
+"dostupnih\n"
+"paketa za a¾uriranje za va¹ raèunar,\n"
+"ili su oni veKj instalirani."
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Netherlands"
-msgstr "Holandija"
+#, fuzzy, c-format
+msgid "Examining file of media `%s'..."
+msgstr "Ispitujem fajl za izvor `%s'..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Korea"
-msgstr "Koreja"
+msgid "Download of `%s', speed:%s"
+msgstr "Download sa `%s', brzina:%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "Japan"
+msgid "One of the following packages is needed:"
+msgstr "Jedan od sledeæih paketa je potreban:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Italy"
-msgstr "Italija"
+msgid "Quit"
+msgstr "Kraj"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Israel"
-msgstr "Izrael"
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Ja ¾elim da posetim miror radi dobavljanja najnovijih verzija paketa.\n"
+"Proverite da li je va¹a konekcija funkcionalna i uspostavljena.\n"
+"\n"
+"Da li je U redu da nastavim?"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update media(s)"
+msgstr "A¾uriranje izvora"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Greece"
-msgstr "Grèka"
+msgid "Ok"
+msgstr "U redu"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "France"
-msgstr "Francuska"
+msgid "Please wait, adding medium..."
+msgstr "Molimo Vas da saèekate, dodajem medijum..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "Finska"
+msgid "Unable to get source packages."
+msgstr "Ne mogu da dobavim izvorne pakete."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Spain"
-msgstr "©panija"
+msgid "Too many packages are selected"
+msgstr "Izabrali ste previ¹e paketa"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"Dobrodo¹li u Editor izvornog koda u Paketima!\n"
+"\n"
+"Ovaj alat vam mo¾e pomoKji da podesite kod u paketima koje ¾elite da "
+"koristite\n"
+"na va¹em raèunaru. Nakon toga Kje biti spremi za instalaciju kao novi "
+"paketi\n"
+"ili za a¾uriranje starih."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Danmark"
-msgstr "Danska"
+msgid "%s conflicts with %s"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "Nemaèka"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Dobrodo¹li u MandrakeUpdate!\n"
+"\n"
+"Ovaj alat vam mo¾e pomoæi da izabete nove verzije paketa koje ¾elite da "
+"instalirate na\n"
+"va¹ raèunar."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Èe¹ka"
+msgid "Mandrake choices"
+msgstr "Mandrake-ov izbor"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Kostarika"
+msgid "Changelog:\n"
+msgstr "Izmene:\n"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "Kanada"
+msgid "Korea"
+msgstr "Koreja"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Brazil"
-msgstr "Brazil"
+msgid "Removable device"
+msgstr "Prenosni ureðaj"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Belgija"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Australija"
+msgid "Change medium"
+msgstr "Promeni medijum"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "Austrija"
+msgid "Mandrake Update"
+msgstr "Mandrake Update"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
-msgstr "Informacije..."
+msgid "by size"
+msgstr "po velièini"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "Ne"
+msgid "FTP server"
+msgstr "FTP server"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "Da"
+msgid "Files:\n"
+msgstr "Fajlovi:\n"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr "Ne mogu da a¾uriram medijum; on æe biti automatski iskljuèen."
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -1573,6 +1573,12 @@ msgstr "Ukloni softver"
 msgid "Software Sources Manager"
 msgstr "Menad¾er Softverskog Koda"
 
+#~ msgid "Source: "
+#~ msgstr "Izvor: "
+
+#~ msgid "Source"
+#~ msgstr "Izvor"
+
 #~ msgid ""
 #~ "some packages failed to install\n"
 #~ "correctly"
@@ -1611,9 +1617,6 @@ msgstr "Menad¾er Softverskog Koda"
 #~ "\n"
 #~ "Da li ¾elite da probate sa drugim mirorom?"
 
-#~ msgid "Error adding update medium"
-#~ msgstr "Gre¹ka prilikom dodavanja medijuma sa nadogradnjom"
-
 #~ msgid "Please wait, contacting mirror to initialize updates packages."
 #~ msgstr ""
 #~ "Molim Vas saèekajte, kontaktiram miror sajt radi iniciranja a¾uriranja "
diff --git a/po/sr@Latn.pom b/po/sr@Latn.pom
index 579d0899..3a9f789f 100644
--- a/po/sr@Latn.pom
+++ b/po/sr@Latn.pom
@@ -3,6 +3,10 @@ msgid "Server"
 msgstr "Server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+msgid "Development"
+msgstr "Razvojna"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Office Workstation"
 msgstr "Radna(Office) stanica"
@@ -18,11 +22,6 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Radna stanica"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
 msgid "Game station"
 msgstr "Stanica za igru"
 
@@ -110,11 +109,6 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Grafièko Okru¾enje"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
 msgid "Gnome Workstation"
 msgstr "Gnome radna stanica"
 
@@ -139,12 +133,6 @@ msgstr "Icewm, Window Maker, Enlightenment, Fvwm, itd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-msgid "Development"
-msgstr "Razvojna"
-
-# 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 i C++ razvojne biblioteke, programi  i propratne datoteke"
 
@@ -231,42 +219,6 @@ msgstr "NFS server, SMB server, Proxy server, SSH server"
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 #, fuzzy
-msgid "Audio station"
-msgstr "Multimedijalna stanica"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Sound playing/editing programs"
-msgstr "Programi za pu¹tanje zvuka i videa"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Video station"
-msgstr "Stanica za igru"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Video playing programs"
-msgstr "Programi za pu¹tanje zvuka i videa"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Graphic station"
-msgstr "Stanica za igru"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Graphics programs"
-msgstr "Grafièki programi kao ¹to je Gimp"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
 msgid "Set of tools to read and send mail and news and to browse the Web"
 msgstr ""
 "Skup alata za èitanje i slanje el.po¹te i vesti (pine, mutt, tin..) i za "
diff --git a/po/sv.po b/po/sv.po
index 605ce437..f5dcb29a 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: 2003-02-17 15:38+0200\n"
 "Last-Translator: Magnus Björklöf <bjorklof@nic.fi>\n"
 "Language-Team: Svenska <sv@li.org>\n"
@@ -17,16 +17,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"Är det OK att fortsätta?"
+msgid "Enabled?"
+msgstr "Aktiverad?"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Sökväg eller monteringspunkt:"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Portugal"
+msgstr "Portugal"
 
 #: ../rpmdrake:1
 #, c-format
@@ -45,104 +49,54 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"Välkommen till MandrakeUpdate.\n"
-"\n"
-"Det här verktyget hjälper dig att välja uppdateringarna du vill\n"
-"installera på datorn."
+msgid "by group"
+msgstr "efter grupp"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
-msgstr ""
-"Välkommen till verktyget för borttag av paket.\n"
-"\n"
-"Det här verktyget hjälper dig att välja vilka program du vill ta bort från\n"
-"datorn."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Det uppstod ett fel vid paketinstallation:\n"
-"\n"
-"%s"
+msgid "Name:"
+msgstr "Namn:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Problem during removal"
-msgstr "Problem vid borttag"
+msgid "Italy"
+msgstr "Italien"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "Vänta, tar bort paket..."
+msgid "How to choose manually your mirror"
+msgstr "Hur du manuellt väljer en spegel"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Vänta, läser paketdatabas..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Det uppstod ett fel vid paketinstallation:\n"
-"\n"
-"%s"
+msgid "URL:"
+msgstr "URL:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation failed"
-msgstr "Installationen misslyckades"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Förbereder paket för installation..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Förbereder paket för installation..."
+msgid "Some packages need to be removed"
+msgstr "Vissa paket måste tas bort"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Alla begärda paket installerades utan problem."
+msgid "More information on package..."
+msgstr "Mer information om paket..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Allt installerades utan problem"
+msgid "Yes"
+msgstr "Ja"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
 msgstr ""
-"Installationen är slutförd; %s.\n"
+"På grund av deras beroenden måste följande paket\n"
+"avmarkeras:\n"
 "\n"
-"Några konfigurationsfiler skapades som \".rpmnew\" eller \".rpmsave\",\n"
-"du kan nu undersöka några för att vidta åtgärder:"
 
 #: ../rpmdrake:1
 #, c-format
@@ -150,455 +104,450 @@ msgid "everything was installed correctly"
 msgstr "allt installerades utan problem"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Problem uppstod under installationen"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Installerar paket \"%s\" (%s/%s)..."
+msgid "%s KB"
+msgstr "%s KB"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Förbereder paket för installation..."
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"Du kan också välja önskad spegel manuellt. För att göra det\n"
+"startar du Programhanterare för källor och lägger till en\n"
+" \"Säkerhetsuppdatering\"-källa.\n"
+"\n"
+"Starta sedan om MandrakeUpdate."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
+"Welcome to the software removal tool!\n"
 "\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
 msgstr ""
+"Välkommen till verktyget för borttag av paket.\n"
 "\n"
-"\n"
-"Fel rapporterade:\n"
-"%s"
+"Det här verktyget hjälper dig att välja vilka program du vill ta bort från\n"
+"datorn."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"Installationen misslyckades, vissa filer saknas.\n"
-"Du kanske ska uppdatera din källdatabas."
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "För att kunna spara ändringarna måste du lägga i mediet i enheten."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Spara och avsluta"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
+"There was a problem during the removal of packages:\n"
 "\n"
-"Do you want to continue installation?"
+"%s"
 msgstr ""
-"Följande paket måste tas bort för att andra ska kunna uppdateras.\n"
-"%s\n"
+"Det uppstod ett fel vid paketinstallation:\n"
 "\n"
-"Är det OK att fortsätta?"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Laddar ner paket \"%s\" (%s/%s)..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Cancel"
-msgstr "Avbryt"
+msgid "Size: "
+msgstr "Storlek: "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Ok"
-msgstr "OK"
+msgid "Security updates"
+msgstr "Säkerhetsuppdateringar"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Lägg i media med namn \"%s\" i enhet [%s]"
+msgid "Already existing update medias"
+msgstr "Fel vid tillägg av uppdateringsmedia"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Change medium"
-msgstr "Byt media"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Initializing..."
-msgstr "Initierar..."
+msgid "Maximum information"
+msgstr "Maximal information"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Förbereder paket för installation..."
+msgid "Proxy..."
+msgstr "Fel..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Du måste vara root för att kunna installera paket."
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Unable to get source packages."
-msgstr "Kunde inte hämta källpaket."
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspect..."
-msgstr "Undersök..."
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
+msgstr ""
+"Installationen misslyckades, vissa filer saknas.\n"
+"Du kanske ska uppdatera din källdatabas."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Installation finished"
-msgstr "Installation slutförd"
+msgid "United Kingdom"
+msgstr "Storbritannien"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Gör ingenting"
+msgid "in names"
+msgstr "i namn"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Använd .%s som huvudfil"
+msgid ""
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
+msgstr ""
+"Kan inte hitta en passande spegel.\n"
+"\n"
+"Det kan finnas många anledningar till det här problemet. Den vanligaste\n"
+"är att din processorarkitektur inte stöds av Mandrake Linux officiella "
+"uppdateringar."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Remove .%s"
 msgstr "Ta bort .%s"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "changes:"
-msgstr "ändringar:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspecting %s"
-msgstr "Undersöker %s"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Vänta, hittar tillgängliga paket..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "Vänta, lägger till media..."
+msgid "Finland"
+msgstr "Finland"
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
+"The following packages have bad signatures:\n"
 "\n"
-"Then, restart MandrakeUpdate."
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"Du kan också välja önskad spegel manuellt. För att göra det\n"
-"startar du Programhanterare för källor och lägger till en\n"
-" \"Säkerhetsuppdatering\"-källa.\n"
+"Följande paket måste tas bort för att andra ska kunna uppdateras.\n"
+"%s\n"
 "\n"
-"Starta sedan om MandrakeUpdate."
+"Är det OK att fortsätta?"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "How to choose manually your mirror"
-msgstr "Hur du manuellt väljer en spegel"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Examining distant file of media `%s'..."
+msgstr "Undersöker fjärrfil för källa \"%s\"..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
+msgid "Verifying packages signatures..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Already existing update sources"
-msgstr ""
+msgid "France"
+msgstr "Frankrike"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "More info"
+msgstr "Mer information"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
+"%s\n"
 "\n"
 "Is it ok to continue?"
 msgstr ""
-"Behöver kontakta spegeln för att hämta de senaste uppdateringspaketen.\n"
-"Kontrollera att ditt nätverk fungerar.\n"
+"%s\n"
 "\n"
 "Är det OK att fortsätta?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Reload the packages list"
+msgstr "Ladda om paketlistan"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Välj en spegel..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Filfel"
+msgid "Some packages can't be installed"
+msgstr "Paketet \"%s\" kan inte installeras\n"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
+msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Förbereder paket för installation..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Uppdatera Mandrake"
+msgid "All packages,"
+msgstr "Alla paket,"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Software Packages Removal"
-msgstr "Paketborttag"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Type of media:"
+msgstr "Typ av källa:"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Quit"
-msgstr "Avsluta"
+msgid "in files"
+msgstr "i filer"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Installera"
+msgid "All requested packages were installed successfully."
+msgstr "Alla begärda paket installerades utan problem."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove"
-msgstr "Ta bort"
+msgid "Proxy hostname:"
+msgstr "Proxyvärddatornamn:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Help"
-msgstr "Hjälp"
+msgid "Local files"
+msgstr "Lokala filer"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search"
-msgstr "Sök"
+msgid "Inspecting %s"
+msgstr "Undersöker %s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Find:"
-msgstr "Hitta:"
+msgid "Israel"
+msgstr "Israel"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Följande paket måste tas bort för att andra ska kunna uppdateras.\n"
-"%s\n"
-"\n"
-"Är det OK att fortsätta?"
+msgid "Help"
+msgstr "Hjälp"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Vissa paket måste tas bort"
+msgid "HTTP server"
+msgstr "HTTP-server"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
-"\n"
-"Do you really want to install all the selected packages?"
-msgstr ""
-"Varning: Det verkar som om du försöker lägga till så\n"
-"många paket att utrymmet på disken kan ta slut under\n"
-"eller efter paketinstallation. Detta är särskillt farligt\n"
-"och bör inte ignoreras.\n"
-"\n"
-"Vill du verkligen installera alla valda paket?"
+msgid "Installation failed"
+msgstr "Installationen misslyckades"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "För många paket är valda"
+msgid "Use .%s as main file"
+msgstr "Använd .%s som huvudfil"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "Maximal information"
+msgid "Search results"
+msgstr "Sökresultat"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Normal information"
-msgstr "Normal information"
+msgid " failed!"
+msgstr " misslyckades."
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Update source(s)"
-msgstr "Uppdatera källor"
+msgid "Brazil"
+msgstr "Brasilien"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Ladda om paketlistan"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"Det finns redan ett media med det namnet.\n"
+"Vill du verkligen ersätta det?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "Återställ valet"
+msgid "Find:"
+msgstr "Hitta:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "i filer"
+msgid "All packages, alphabetical"
+msgstr "Alla paket, alfabetiskt"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "i beskrivningar"
+msgid "Please wait, searching..."
+msgstr "Vänta, söker..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "i namn"
+msgid "Please wait, reading packages database..."
+msgstr "Vänta, läser paketdatabas..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by update availability"
-msgstr "efter uppdateringstillgänglighet"
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "Kan inte öppna paket \"%s\"\n"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by source repository"
-msgstr "efter källagringsplats"
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Lägg i media med namn \"%s\" i enhet [%s]"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by selection state"
-msgstr "efter valstatus"
+msgid "Reset the selection"
+msgstr "Återställ valet"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by size"
-msgstr "efter storlek"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"Om du behöver en proxy, ange värddatornamnet och en valfi port (syntax: "
+"<proxyhost[:port]>):"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-msgstr "efter grupp"
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
+"På grund av deras beroenden måste följande paket också tas bort:\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "All packages,"
-msgstr "Alla paket,"
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "All packages, alphabetical"
-msgstr "Alla paket, alfabetiskt"
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Det uppstod ett fel vid paketinstallation:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Mandrake-val"
+msgid "Please wait, removing medium..."
+msgstr "Vänta, tar bort media..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
-msgstr "Normala uppdateringar"
+msgid "Password:"
+msgstr "Lösenord:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Felrättningsuppdateringar"
+msgid "Taiwan"
+msgstr "Taiwan"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Security updates"
-msgstr "Säkerhetsuppdateringar"
+msgid "User:"
+msgstr "Användare:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Description: "
-msgstr "Beskrivning: "
+msgid "Please wait, updating medium..."
+msgstr "Vänta, uppdaterar media..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Orsak för uppdatering: "
+msgid "Please wait, listing packages..."
+msgstr "Vänta, listar paket..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Summary: "
-msgstr "Sammanfattning: "
+msgid "Information on packages"
+msgstr "Information om paket"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Importance: "
-msgstr "Viktighet: "
+msgid "Cancel"
+msgstr "Avbryt"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Everything installed successfully"
+msgstr "Allt installerades utan problem"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Size: "
-msgstr "Storlek: "
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Select the media(s) you wish to update:"
+msgstr "Välj källan/källorna du vill uppdatera:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Version: "
-msgstr "Version: "
+msgid "Please wait, updating media..."
+msgstr "Vänta, uppdaterar media..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "Namn: "
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Installerad version: "
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Följande paket måste tas bort för att andra ska kunna uppdateras.\n"
+"%s\n"
+"\n"
+"Är det OK att fortsätta?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Source: "
-msgstr "Källa: "
+msgid "in descriptions"
+msgstr "i beskrivningar"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(Not available)"
-msgstr "(Ingen tillgänglig)"
+msgid "Configure proxies"
+msgstr "Anpassa proxy"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Ändringslogg:\n"
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Behöver kontakta MandrakeSofts webbplats för att hämta listan över speglar.\n"
+"Kontrollera att ditt nätverk fungerar.\n"
+"\n"
+"Är det OK att fortsätta?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Files:\n"
-msgstr "Filer:\n"
+msgid "Please choose"
+msgstr "Välj"
 
 #: ../rpmdrake:1
 #, c-format
@@ -607,43 +556,28 @@ msgstr "Vald storlek: %d MB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Valda: %d MB / ledigt diskutrymme: %d MB"
+msgid "Initializing..."
+msgstr "Initierar..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
-msgstr ""
-"På grund av deras beroenden måste följande paket\n"
-"avmarkeras:\n"
-"\n"
+msgid "Save changes"
+msgstr "Spara ändringar"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr ""
-"Följande paket kan inte väljas:\n"
-"\n"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "Fel vid nerladdning"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "i konflikt med"
+msgid "Package installation..."
+msgstr "Förbereder paket för installation..."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Paketet \"%s\" kan inte installeras\n"
+#, c-format
+msgid "Importance: "
+msgstr "Viktighet: "
 
 #: ../rpmdrake:1
 #, c-format
@@ -655,455 +589,455 @@ msgstr ""
 "För att uppfylla beroenden måste följande paket också installeras:\n"
 "\n"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "Ytterligare paket krävs"
+msgid "Add..."
+msgstr "Lägg till..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "Paketet \"%s\" kan inte installeras\n"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "Kan inte skapa media."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Removing these packages would break your system, sorry:\n"
+"The installation is finished; %s.\n"
 "\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
 msgstr ""
-"Om du tar bort dessa paket kommer systemet att sluta fungera:\n"
+"Installationen är slutförd; %s.\n"
 "\n"
+"Några konfigurationsfiler skapades som \".rpmnew\" eller \".rpmsave\",\n"
+"du kan nu undersöka några för att vidta åtgärder:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"På grund av deras beroenden måste följande paket också tas bort:\n"
-"\n"
+msgid "Browse..."
+msgstr "Bläddra..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "Paketet \"%s\" kan inte installeras\n"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Några ytterligare paket måste tas bort"
+msgid "Info..."
+msgstr "Information..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "More information on package..."
-msgstr "Mer information om paket..."
+msgid "You need to insert the medium to continue"
+msgstr "Du måste lägga i mediet för att fortsätta"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Copying file for media `%s'..."
+msgstr "Kopierar fil för källa \"%s\"..."
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Information on packages"
-msgstr "Information om paket"
+msgid "Remove"
+msgstr "Ta bort"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "More info"
-msgstr "Mer information"
+msgid "Preparing packages installation..."
+msgstr "Förbereder paket för installation..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "by media repository"
+msgstr "efter källagringsplats"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "Kan läggas till"
+msgid "No mirror"
+msgstr "Ingen spegel"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Upgradable"
-msgstr "Kan uppdateras"
+msgid "You need to fill up at least the two first entries."
+msgstr "Du måste fylla i åtminstone de två första posterna."
 
 #: ../rpmdrake:1
 #, c-format
-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 ""
-"Listan över uppdateringar är tom. Detta betyder att\n"
-"det inte finns några tillgängliga uppdateringar för paketen\n"
-"som är installerade på systemet. Eller så har du redan installerat alla."
+msgid "Install"
+msgstr "Installera"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "No update"
-msgstr "Ingen uppdatering"
+msgid "Japan"
+msgstr "Japan"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "(none)"
-msgstr "(inget)"
+msgid "Do nothing"
+msgstr "Gör ingenting"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Vänta, listar paket..."
+msgid "No update"
+msgstr "Ingen uppdatering"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "Kan inte öppna paket \"%s\"\n"
+#, c-format
+msgid "Description: "
+msgstr "Beskrivning: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Ett av följande paket krävs:"
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr ""
+"Varning: Det verkar som om du försöker lägga till så\n"
+"många paket att utrymmet på disken kan ta slut under\n"
+"eller efter paketinstallation. Detta är särskillt farligt\n"
+"och bör inte ignoreras.\n"
+"\n"
+"Vill du verkligen installera alla valda paket?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Välj"
+msgid "Name: "
+msgstr "Namn: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Inspect..."
+msgstr "Undersök..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Not selected"
-msgstr "Konflikter identifierade"
+msgid "Editing media \"%s\":"
+msgstr "Redigerar källa \"%s\":"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Selected"
-msgstr "Vald"
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "Förbereder paket för installation..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results"
-msgstr "Sökresultat"
+msgid "Australia"
+msgstr "Australien"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Stop"
-msgstr "Stoppa"
+msgid "Installation finished"
+msgstr "Installation slutförd"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Vänta, söker..."
+msgid "by update availability"
+msgstr "efter uppdateringstillgänglighet"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Sökresultat (inget)"
+msgid "Poland"
+msgstr "Polen"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Other"
-msgstr "Annan"
+msgid "Version: "
+msgstr "Version: "
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the packages source editor!\n"
-"\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
-msgstr ""
-"Välkommen till editorn för paketkällor.\n"
-"\n"
-"Det här verktyget hjälper dig att ställa in paketkällorna som du vill "
-"använda\n"
-"på datorn. De kommer sedan att att finnas tillgängliga när det är dags att\n"
-"installera nya programpaket eller utföra uppdateringar."
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Du kan specificera ett användarnamn/lösenord för proxyautentiseringen:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
-msgstr "Spara och avsluta"
+msgid "Upgradable"
+msgstr "Kan uppdateras"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid " done."
+msgstr " klar."
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Fel..."
+msgid "Software Packages Installation"
+msgstr "Förbereder paket för installation..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Update..."
-msgstr "Uppdatera..."
+msgid "Additional packages needed"
+msgstr "Ytterligare paket krävs"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "Lägg till..."
+msgid "Bugfixes updates"
+msgstr "Felrättningsuppdateringar"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "Redigera"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "Nedladdnig av \"%s\", återstående tid:%s, hastighet:%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Source"
-msgstr "Källa"
+msgid "Germany"
+msgstr "Tyskland"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Enabled?"
-msgstr "Aktiverad?"
+msgid "Russia"
+msgstr "Ryssland"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Configure sources"
-msgstr "Anpassa källor"
+msgid "Norway"
+msgstr "Norge"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Password:"
-msgstr "Lösenord:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during installation"
+msgstr "Problem uppstod under installationen"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "User:"
-msgstr "Användare:"
+msgid "Search"
+msgstr "Sök"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "Du kan specificera ett användarnamn/lösenord för proxyautentiseringen:"
+#, fuzzy, c-format
+msgid "Edit a media"
+msgstr "Redigera en källa"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "Proxyvärddatornamn:"
+msgid "Czech Republic"
+msgstr "Tjeckien"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"Om du behöver en proxy, ange värddatornamnet och en valfi port (syntax: "
-"<proxyhost[:port]>):"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Anpassa proxy"
+msgid "Stop"
+msgstr "Stoppa"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Vänta, uppdaterar media..."
+msgid "Update"
+msgstr "Uppdatera"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "För att kunna spara ändringarna måste du lägga i mediet i enheten."
+msgid "Please wait, removing packages..."
+msgstr "Vänta, tar bort paket..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "Du måste lägga i mediet för att fortsätta"
+msgid "Normal information"
+msgstr "Normal information"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "Spara ändringar"
+msgid "Media: "
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Relativ sökväg till synthesis eller hdlist:"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "Laddar ner paket \"%s\" (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Valda: %d MB / ledigt diskutrymme: %d MB"
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "Redigerar källa \"%s\":"
+#, c-format
+msgid "Media"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit a source"
-msgstr "Redigera en källa"
+msgid "Spain"
+msgstr "Spanien"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Vänta, tar bort media..."
+msgid "Normal updates"
+msgstr "Normala uppdateringar"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Type of source:"
-msgstr "Typ av källa:"
+msgid "by selection state"
+msgstr "efter valstatus"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Lägger till en källa:"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "Vänta, laddar ner spegeladresser från MandrakeSofts webbplats."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
-msgstr ""
-"Det finns redan ett media med det namnet.\n"
-"Vill du verkligen ersätta det?"
+msgid "Login:"
+msgstr "Användarnamn:"
 
 #: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Adding a media:"
+msgstr "Lägger till en källa:"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Du måste fylla i åtminstone de två första posterna."
+msgid "Austria"
+msgstr "Österrike"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Fatal error"
+msgstr "Filfel"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Name:"
-msgstr "Namn:"
+msgid "Update..."
+msgstr "Uppdatera..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "Verifierar signatur för \"%s\"..."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Login:"
-msgstr "Användarnamn:"
+msgid "(none)"
+msgstr "(inget)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr "Välj en spegel..."
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
+"Om du tar bort dessa paket kommer systemet att sluta fungera:\n"
+"\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
-msgstr "Bläddra..."
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Installerar paket \"%s\" (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Path or mount point:"
-msgstr "Sökväg eller monteringspunkt:"
+msgid "Currently installed version: "
+msgstr "Installerad version: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Removable device"
-msgstr "Flyttbar enhet"
+msgid "Other"
+msgstr "Annan"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "HTTP-server"
+msgid "Reason for update: "
+msgstr "Orsak för uppdatering: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "FTP-server"
+msgid "Please choose the desired mirror."
+msgstr "Välj önskad spegel."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Path:"
-msgstr "Sökväg:"
+msgid "Edit"
+msgstr "Redigera"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "Lokala filer"
+msgid "Please wait, finding available packages..."
+msgstr "Vänta, hittar tillgängliga paket..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Add a source"
-msgstr "Lägg till en källa"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr "Kan inte uppdatera media; det kommer att inaktiveras automatiskt."
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Relativ sökväg till synthesis eller hdlist:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Unable to create medium."
-msgstr "Kan inte skapa media."
+msgid "Search results (none)"
+msgstr "Sökresultat (inget)"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Update"
-msgstr "Uppdatera"
+msgid "Danmark"
+msgstr "Danmark"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Välj källan/källorna du vill uppdatera:"
+msgid "China"
+msgstr "Kina"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Vänta, uppdaterar media..."
+msgid "United States"
+msgstr "Amerikas förenta stater"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " failed!"
-msgstr " misslyckades."
+msgid "changes:"
+msgstr "ändringar:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " done."
-msgstr " klar."
+msgid "Some additional packages need to be removed"
+msgstr "Några ytterligare paket måste tas bort"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "Nedladdnig av \"%s\", hastighet:%s"
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "Nedladdnig av \"%s\", återstående tid:%s, hastighet:%s"
+msgid "No"
+msgstr "Nej"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "Verifierar signatur för \"%s\"..."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "Undersöker fjärrfil för källa \"%s\"..."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Examining file of source `%s'..."
-msgstr "Undersöker fil för källa \"%s\"..."
+msgid "Configure medias"
+msgstr "Anpassa källor"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Copying file for source `%s'..."
-msgstr "Kopierar fil för källa \"%s\"..."
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a media"
+msgstr "Lägg till en källa"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please choose the desired mirror."
-msgstr "Välj önskad spegel."
+msgid "Summary: "
+msgstr "Sammanfattning: "
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
-msgstr ""
-"Kan inte hitta en passande spegel.\n"
-"\n"
-"Det kan finnas många anledningar till det här problemet. Den vanligaste\n"
-"är att din processorarkitektur inte stöds av Mandrake Linux officiella "
-"uppdateringar."
+msgid "Canada"
+msgstr "Kanada"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No mirror"
-msgstr "Ingen spegel"
+msgid "Greece"
+msgstr "Grekland"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1120,178 +1054,244 @@ msgstr ""
 "Nätverket eller MandrakeSofts webbplats är kanske inte tillgängligt.\n"
 "Försök igen senare."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Du måste vara root för att kunna installera paket."
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Error during download"
-msgstr "Fel vid nerladdning"
+msgid "Path:"
+msgstr "Sökväg:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr "Vänta, laddar ner spegeladresser från MandrakeSofts webbplats."
+msgid "Problem during removal"
+msgstr "Problem vid borttag"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Behöver kontakta MandrakeSofts webbplats för att hämta listan över speglar.\n"
-"Kontrollera att ditt nätverk fungerar.\n"
-"\n"
-"Är det OK att fortsätta?"
+msgid "Selected"
+msgstr "Vald"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United States"
-msgstr "Amerikas förenta stater"
+msgid "Netherlands"
+msgstr "Nederländerna"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "China"
-msgstr "Kina"
+msgid "Addable"
+msgstr "Kan läggas till"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Storbritannien"
+msgid "(Not available)"
+msgstr "(Ingen tillgänglig)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
+msgstr ""
+"Följande paket kan inte väljas:\n"
+"\n"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Not selected"
+msgstr "Konflikter identifierade"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Taiwan"
+msgid "Software Packages Removal"
+msgstr "Paketborttag"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Sweden"
 msgstr "Sverige"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Russia"
-msgstr "Ryssland"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
+msgstr ""
+"\n"
+"\n"
+"Fel rapporterade:\n"
+"%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Portugal"
-msgstr "Portugal"
+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 ""
+"Listan över uppdateringar är tom. Detta betyder att\n"
+"det inte finns några tillgängliga uppdateringar för paketen\n"
+"som är installerade på systemet. Eller så har du redan installerat alla."
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Poland"
-msgstr "Polen"
+#, fuzzy, c-format
+msgid "Examining file of media `%s'..."
+msgstr "Undersöker fil för källa \"%s\"..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Norway"
-msgstr "Norge"
+msgid "Download of `%s', speed:%s"
+msgstr "Nedladdnig av \"%s\", hastighet:%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Netherlands"
-msgstr "Nederländerna"
+msgid "One of the following packages is needed:"
+msgstr "Ett av följande paket krävs:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Korea"
-msgstr "Korea"
+msgid "Quit"
+msgstr "Avsluta"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "Japan"
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Behöver kontakta spegeln för att hämta de senaste uppdateringspaketen.\n"
+"Kontrollera att ditt nätverk fungerar.\n"
+"\n"
+"Är det OK att fortsätta?"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Italy"
-msgstr "Italien"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update media(s)"
+msgstr "Uppdatera källor"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Israel"
-msgstr "Israel"
+msgid "Ok"
+msgstr "OK"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Greece"
-msgstr "Grekland"
+msgid "Please wait, adding medium..."
+msgstr "Vänta, lägger till media..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "France"
-msgstr "Frankrike"
+msgid "Unable to get source packages."
+msgstr "Kunde inte hämta källpaket."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "Finland"
+msgid "Too many packages are selected"
+msgstr "För många paket är valda"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Spain"
-msgstr "Spanien"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"Välkommen till editorn för paketkällor.\n"
+"\n"
+"Det här verktyget hjälper dig att ställa in paketkällorna som du vill "
+"använda\n"
+"på datorn. De kommer sedan att att finnas tillgängliga när det är dags att\n"
+"installera nya programpaket eller utföra uppdateringar."
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Danmark"
-msgstr "Danmark"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
+msgstr "i konflikt med"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "Tyskland"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Välkommen till MandrakeUpdate.\n"
+"\n"
+"Det här verktyget hjälper dig att välja uppdateringarna du vill\n"
+"installera på datorn."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Tjeckien"
+msgid "Mandrake choices"
+msgstr "Mandrake-val"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Costa Rica"
+msgid "Changelog:\n"
+msgstr "Ändringslogg:\n"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "Kanada"
+msgid "Korea"
+msgstr "Korea"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Brazil"
-msgstr "Brasilien"
+msgid "Removable device"
+msgstr "Flyttbar enhet"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Belgien"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Australien"
+msgid "Change medium"
+msgstr "Byt media"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "Österrike"
+msgid "Mandrake Update"
+msgstr "Uppdatera Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
-msgstr "Information..."
+msgid "by size"
+msgstr "efter storlek"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "Nej"
+msgid "FTP server"
+msgstr "FTP-server"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "Ja"
+msgid "Files:\n"
+msgstr "Filer:\n"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr "Kan inte uppdatera media; det kommer att inaktiveras automatiskt."
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -1564,6 +1564,12 @@ msgstr "Ta bort program"
 msgid "Software Sources Manager"
 msgstr "Programhanterare för källor"
 
+#~ msgid "Source: "
+#~ msgstr "Källa: "
+
+#~ msgid "Source"
+#~ msgstr "Källa"
+
 #~ msgid ""
 #~ "some packages failed to install\n"
 #~ "correctly"
@@ -1600,9 +1606,6 @@ msgstr "Programhanterare för källor"
 #~ "\n"
 #~ "Vill du försöka med en annan spegel?"
 
-#~ msgid "Error adding update medium"
-#~ msgstr "Fel vid tillägg av uppdateringsmedia"
-
 #~ msgid "Please wait, contacting mirror to initialize updates packages."
 #~ msgstr "Vänta, kontaktar spegel för att initiera uppdateringspaket."
 
diff --git a/po/ta.po b/po/ta.po
index 971d8ae2..74e4bbef 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: 2002-08-31 16:35+0800\n"
 "Last-Translator: prabu anand <prabu_anand2000@yahoo.com>\n"
 "Language-Team: tamil <tamilinix@yahoogroups.com>\n"
@@ -14,16 +14,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"இப�படியே தொடரலாமா?"
+msgid "Enabled?"
+msgstr "ெசயல�பட�த�தப�பட�ட�ள�ளதா?"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "பாதை அல�லத� �ற�றப�ப�ள�ளி"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Portugal"
+msgstr "போர�ச�கல�"
 
 #: ../rpmdrake:1
 #, c-format
@@ -41,104 +45,54 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"மாண�ட�ேரக�ப�த�ப�பித�தல�க�க� வர�க!\n"
-"\n"
-"இக�கர�வி மூலம� உங�கள� கணினியில� உள�ள  ெமன�ெபார�ளை நீங�கள� ப�த�ப�பிக�க\n"
-" ம�டிய�ம�"
+msgid "by group"
+msgstr "க�ழ�ப�படி"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
-msgstr ""
-"ெமன�ெபார�ள� நீக�கக� கர�விக�க� வர�க!\n"
-"\n"
-"இக�கர�வி மூலம� தேவையில�லாத ெமன�ெபார�ளை உங�கள� கணினியில� இர�ந�த�\n"
-" நீக�க ம�டிய�ம�"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"பொதி நிற�வலின� போத� பிழை நேர�ந�த�ள�ளத�:\n"
-"\n"
-"%s"
+msgid "Name:"
+msgstr "பெயர�:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Problem during removal"
-msgstr "நீக�க�தலில� பிழை நேர�ந�த�ள�ளத�"
+msgid "Italy"
+msgstr "இத�தாலி"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�...பொதிகள� நீக�கப�பட�கின�றன..."
+msgid "How to choose manually your mirror"
+msgstr "உங�கள� இணைபதிப�ைப ைகம�ைறயாக எப�படித� தேர�வ�ச� செய�வத�"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�...பொதித� தரவ� வாசிக�கப�பட�கிறத�..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"பொதி நிற�வலின� போத� பிழை நேர�ந�த�ள�ளத�:\n"
-"\n"
-"%s"
+msgid "URL:"
+msgstr "URL:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation failed"
-msgstr "நிற�வ�தலில� பிழை நேர�ந�த�ள�ளத�"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "நிற�வ�வதற�காக பொதிகள� தயாராகின�றன..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "நிற�வ�வதற�காக பொதிகள� தயாராகின�றன..."
+msgid "Some packages need to be removed"
+msgstr "சில பொதிகள� நீக�கப�படவேண�ட�ம�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "நீங�கள� கேட�ட அனைத�த� பொதிகள�ம� வெற�றிகரமாக நிற�வப�பட�டத�"
+msgid "More information on package..."
+msgstr "பொதிகளைப� பற�றிய மேல�ம� விவரங�கள�"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "அனைத�த�ம� வெற�றிகரமாக நிற�வப�பட�ட�ள�ளத�"
+msgid "Yes"
+msgstr "ஆம�"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
 msgstr ""
-"நிற�வ�தல� ம�டிந�த� விட�டத�; %s.\n"
+"சில கட�ட�ப�பாட�களினால� கீேழ ெகாட�க�கப�பட�ட�ள�ள பொதிகள� \n"
+"நிற�வப�படக�கூடாத�, அவற�ைற ேதர�விலிர�ந�த� விலக�க�ங�கள�:\n"
 "\n"
-"சில வடிவமைப�ப�க� கோப�ப�கள�  `.rpmnew அல�லத� rpmsave',\n"
-"என�ற பெயர�களில� உர�வாக�கப�பட�டத�. அவற�ைறப� பார�த�த� தேவையான நடவடிக�கை எட�க�கவ�ம�"
 
 #: ../rpmdrake:1
 #, c-format
@@ -146,450 +100,448 @@ msgid "everything was installed correctly"
 msgstr "அனைத�த�ம� சரியாக நிற�வப�பட�ட�ள�ளத�"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "பொதி நிற�வலின� போத� பிழை நேர�ந�த�ள�ளத�"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "பின�வர�ம� பொதி நிற�வப�பட�கிறத�  `%s' (%s/%s)..."
+msgid "%s KB"
+msgstr "%s KB"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "நிற�வ�வதற�காக பொதிகள� தயாராகின�றன..."
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr "உங�கள� இணை பதிப�ைப எப�படித� தேர�வ�ச� செய�வத�"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
+"Welcome to the software removal tool!\n"
 "\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
 msgstr ""
+"ெமன�ெபார�ள� நீக�கக� கர�விக�க� வர�க!\n"
 "\n"
-"\n"
-"பிழை ேநர�ந�த�ள�ளத�:\n"
-"%s"
+"இக�கர�வி மூலம� தேவையில�லாத ெமன�ெபார�ளை உங�கள� கணினியில� இர�ந�த�\n"
+" நீக�க ம�டிய�ம�"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"நிற�வ�தலில� பிழை நேர�ந�த�ள�ளத� சில கோப�ப�கள� கானப�படவில�ைல.\n"
-"உங�கள� மூலத�தரவ�களை ப�த�ப�பித�த� பார�ங�கள�"
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "நீங�கள� செய�த மாற�றங�களை சேமிக�க, நீங�கள� ஊடகத�ைத உள�ளீட� செய�ய வேண�ட�ம�"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "சேமித�த�விட�ட� ெவளிச�ெசல�"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
+"There was a problem during the removal of packages:\n"
 "\n"
-"Do you want to continue installation?"
+"%s"
 msgstr ""
-"ேதர�ந�ெதட�த�த�ள�ள பொதிகளை நிற�வ இந�த பொதிகள� நீக�கப�படவேண�ட�ம�:\n"
-"\n"
-"%s\n"
+"பொதி நிற�வலின� போத� பிழை நேர�ந�த�ள�ளத�:\n"
 "\n"
-"தொடர�ந�த� செல�ல சம�மதமா?"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "பின�வர�ம� பொதிகள�  இறக�கப�பட�கிறத� `%s' (%s/%s)..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Cancel"
-msgstr "தவிர�"
+msgid "Size: "
+msgstr "அளவ�: "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Ok"
-msgstr "சரி"
+msgid "Security updates"
+msgstr "பாத�காப�ப� ப�த�ப�பித�தல�"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr " \"%s\" என�ற ஊடகத�ைத [%s] என�ற சாதனத�தில� வைக�கவ�ம�."
+msgid "Already existing update medias"
+msgstr "ப�த�ப�பித�தல�ல� ஊடகத�தில� பிழை நேர�ந�த�ள�ளத�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Change medium"
-msgstr "ஊடகத�ைத மாற�றவ�ம�"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Initializing..."
-msgstr "த�வக�கப�பட�கிறத�..."
+msgid "Maximum information"
+msgstr "அதிகபட�ச விவரம�"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "நிற�வ�வதற�காக பொதிகள� தயாராகின�றன..."
+msgid "Proxy..."
+msgstr " பிழை நேர�ந�த�ள�ளத�..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "பொதிகளை நிற�வ�வதற�க� நீங�கள� நிர�வாகியாக இர�க�க வேண�ட�ம�"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Unable to get source packages."
-msgstr "மூலப� பொதிகள� கிடைக�கவில�ைல"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspect..."
-msgstr "சோதிக�கப�பட�கிறத�..."
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
+msgstr ""
+"நிற�வ�தலில� பிழை நேர�ந�த�ள�ளத� சில கோப�ப�கள� கானப�படவில�ைல.\n"
+"உங�கள� மூலத�தரவ�களை ப�த�ப�பித�த� பார�ங�கள�"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Installation finished"
-msgstr "நிற�வ�தல� ம�டிந�தத�"
+msgid "United Kingdom"
+msgstr "பிரிட�டன�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "ஒன�ற�ம� செய�யாதே"
+msgid "in names"
+msgstr "பெயர�களில�"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr ".%s என�பதை ம�க�கிய கோப�பாக பயன�பட�த�த�"
+msgid ""
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
+msgstr ""
+"மாற�ற� இணைப� பதிப�ப� �த�மில�ைல\n"
+"\n"
+"நீங�கள� வேற� வழியில� ம�யற�சி செய�த� பார�ங�கள�.\n"
+"இணையத�தில� www.google.com சென�ற� தேடி\n"
+"பார�ங�கள�"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Remove .%s"
 msgstr "நீக�க�  .%s"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "changes:"
-msgstr "மாற�றங�கள�:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspecting %s"
-msgstr "சோதிக�கப�பட�கிறத�  %s"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Please wait, finding available packages..."
-msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�..இர�க�க�ம� பொதிகளை கண�ட�பிடிக�கப� பட�கிறத�"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�.... ப�திய ஊடகம� சேர�க�கப�பட�கிறத�"
+msgid "Finland"
+msgstr "பின�லாந�த�"
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
+"The following packages have bad signatures:\n"
 "\n"
-"Then, restart MandrakeUpdate."
-msgstr "உங�கள� இணை பதிப�ைப எப�படித� தேர�வ�ச� செய�வத�"
+"%s\n"
+"\n"
+"Do you want to continue installation?"
+msgstr ""
+"ேதர�ந�ெதட�த�த�ள�ள பொதிகளை நிற�வ இந�த பொதிகள� நீக�கப�படவேண�ட�ம�:\n"
+"\n"
+"%s\n"
+"\n"
+"தொடர�ந�த� செல�ல சம�மதமா?"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "How to choose manually your mirror"
-msgstr "உங�கள� இணைபதிப�ைப ைகம�ைறயாக எப�படித� தேர�வ�ச� செய�வத�"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Examining distant file of media `%s'..."
+msgstr "`%s'... என�ற ெதாைலவில�ள�ள நிரலின� மூலம� ஆராயப�பட�கிறத�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
+msgid "Verifying packages signatures..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Already existing update sources"
-msgstr ""
+msgid "France"
+msgstr "பிரான�ஸ�"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "More info"
+msgstr "ேமலதிக விவரம�"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
+"%s\n"
 "\n"
 "Is it ok to continue?"
 msgstr ""
-"நான� இணைப� பதிப�பிற�க�க� சென�ற� ப�திய பொதிகளை \n"
-"இறக�க வேண�ட�ம�.இதற�க� நீங�கள� இணையத�தில� இனைந�திர�க�கவேண�ட�ம�.\n"
+"%s\n"
 "\n"
-"தொடர�ந�த� செல�ல சம�மதமா?"
+"இப�படியே தொடரலாமா?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Reload the packages list"
+msgstr "பொதிகளின� பட�டியலை மீலேற�றவ�ம�"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "அர�கில� உள�ள இணைப�பதிப�ைப தேர�வ�ச� செய�..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Fatal error"
-msgstr "கோப�பில� பிழை"
+msgid "Some packages can't be installed"
+msgstr " `%s'  என�ற பொதியை நிற�வ ம�டியவில�ைல\n"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
+msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "நிற�வ�வதற�காக பொதிகள� தயாராகின�றன..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "மாண�ட�ேரக� ப�த�ப�பித�தல�"
+msgid "All packages,"
+msgstr "அனைத�த� பொதிகள�ம�"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Software Packages Removal"
-msgstr "ெமன�ெபார�ள� நீக�கம�"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Type of media:"
+msgstr "மூலத�தின� வகை"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Quit"
-msgstr "ெவளிச�ெசல�"
+msgid "in files"
+msgstr "கோப�ப�களில�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "நிற�வ�"
+msgid "All requested packages were installed successfully."
+msgstr "நீங�கள� கேட�ட அனைத�த� பொதிகள�ம� வெற�றிகரமாக நிற�வப�பட�டத�"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove"
-msgstr "நீக�க�"
+msgid "Proxy hostname:"
+msgstr "பினாமியின� பெயர�"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Help"
-msgstr "உதவி"
+msgid "Local files"
+msgstr "உள�ளமைக� கோப�ப�கள�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search"
-msgstr "தேட�"
+msgid "Inspecting %s"
+msgstr "சோதிக�கப�பட�கிறத�  %s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Find:"
-msgstr "கண�ட�பிடி:"
+msgid "Israel"
+msgstr "இஸ�ேரல�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"ேதர�ந�ெதட�த�த�ள�ள பொதிகளை நிற�வ இந�த பொதிகள� நீக�கப�படவேண�ட�ம�:\n"
-"\n"
-"%s\n"
-"\n"
-"தொடர�ந�த� செல�ல சம�மதமா?"
+msgid "Help"
+msgstr "உதவி"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "சில பொதிகள� நீக�கப�படவேண�ட�ம�"
+msgid "HTTP server"
+msgstr "HTTP பாிமாறி"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
-"\n"
-"Do you really want to install all the selected packages?"
-msgstr ""
-"எச�சரிக�கை; நீங�கள� அளவ�க�கதிகமான பொதிகளை தேர�வ� செய�த�ள�ளீர�கள�. உங�கள� \n"
-"வன�தட�டில� இதற�க� தேவையான இடமில�ைல,\n"
-"\n"
-"நீங�கள� இந�த எச�சரிக�கையை மீறி இவை அனைத�ைதய�ம� நிற�வ விர�ம�ப�கிறீர�களா?"
+msgid "Installation failed"
+msgstr "நிற�வ�தலில� பிழை நேர�ந�த�ள�ளத�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "அளவ�க�கதிகமான பொதிகள� தேர�வ� செய�யப�பட�ட�ள�ளத�"
+msgid "Use .%s as main file"
+msgstr ".%s என�பதை ம�க�கிய கோப�பாக பயன�பட�த�த�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "அதிகபட�ச விவரம�"
+msgid "Search results"
+msgstr "தேடலின� ம�டிவ�கள�"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Normal information"
-msgstr "சாதரன விவரம�"
+msgid " failed!"
+msgstr "ெவற�றியடையவில�ைல"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Update source(s)"
-msgstr "ப�த�ப�பிக�கப�பட வேண�டிய மூல(ங�கள�)"
+msgid "Brazil"
+msgstr "பிரேசில�"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "பொதிகளின� பட�டியலை மீலேற�றவ�ம�"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"இதே பெயரில� ஊடகம� ஒன�ற�ள�ளத�,நீங�கள� \n"
+"நிச�சயமாக இதனை மாற�ற போகிறிர�களா?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "தேர�வ�களை மறந�த� விட�"
+msgid "Find:"
+msgstr "கண�ட�பிடி:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "கோப�ப�களில�"
+msgid "All packages, alphabetical"
+msgstr "அனைத�த� பொதிகள�ம�,அகர வரிசைப�படி"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "விளக�கங�களில� "
+msgid "Please wait, searching..."
+msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�..தேடப�பட�கிறத�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "பெயர�களில�"
+msgid "Please wait, reading packages database..."
+msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�...பொதித� தரவ� வாசிக�கப�பட�கிறத�..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by update availability"
-msgstr "ப�த�ப�பிக�கப�பட வேண�டியவையின�படி"
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr " `%s'  என�ற பொதியை திறக�க ம�டியவில�ைல\n"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by source repository"
-msgstr "மூலங�களின� இர�ப�ப�ப�படி"
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr " \"%s\" என�ற ஊடகத�ைத [%s] என�ற சாதனத�தில� வைக�கவ�ம�."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by selection state"
-msgstr "தேர�வாகிய�ள�ளபடி"
+msgid "Reset the selection"
+msgstr "தேர�வ�களை மறந�த� விட�"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by size"
-msgstr "அளவ�ப�படி"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"உங�கள�க�க� பினாமி தேவைப�பட�டால�, பினாமியின�  பயனர� பெயரைய�ம� த�றையைய�ம� கொட�க�கவ�ம�"
+"(மாதிரி: <proxyhost[:port]>):"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-msgstr "க�ழ�ப�படி"
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
+"சில கட�ட�ப�பாட�களினால� கீேழ ெகாட�க�கப�பட�ட�ள�ள பொதிகள� நீக�கப�பட \n"
+"வேண�ட�ம�:\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "All packages,"
-msgstr "அனைத�த� பொதிகள�ம�"
+msgid "Costa Rica"
+msgstr "கோஸ�டா ரிகா"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "All packages, alphabetical"
-msgstr "அனைத�த� பொதிகள�ம�,அகர வரிசைப�படி"
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"பொதி நிற�வலின� போத� பிழை நேர�ந�த�ள�ளத�:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "மாண�ட�ேரக� தேர�வ�கள�"
+msgid "Please wait, removing medium..."
+msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�.... ஊடகம� நீக�கப�பட�கிறத�"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
-msgstr "சாதரன ப�த�ப�பித�தல�"
+msgid "Password:"
+msgstr "கடவ�ச�செல�:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "பிழைநீக�க ப�த�ப�பித�தல�"
+msgid "Taiwan"
+msgstr "தைவான�"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Security updates"
-msgstr "பாத�காப�ப� ப�த�ப�பித�தல�"
+msgid "User:"
+msgstr "பயனர�:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Description: "
-msgstr "விளக�கம�: "
+msgid "Please wait, updating medium..."
+msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�.... ஊடகம� ப�த�ப�பிக�கப�பட�கிறத�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reason for update: "
-msgstr "ப�த�ப�பிக�க வேண�டிய காரனம�"
+msgid "Please wait, listing packages..."
+msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�, பொதிகள� பட�டியலிடப�பட�கிறத�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Summary: "
-msgstr "விவரம�: "
+msgid "Information on packages"
+msgstr "பொதிகளைப� பற�றிய மேலதிக விவரங�கள�"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Importance: "
-msgstr "ம�க�கியத�த�வம�: "
+msgid "Cancel"
+msgstr "தவிர�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Everything installed successfully"
+msgstr "அனைத�த�ம� வெற�றிகரமாக நிற�வப�பட�ட�ள�ளத�"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Size: "
-msgstr "அளவ�: "
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Select the media(s) you wish to update:"
+msgstr "நீங�கள� ப�த�ப�பிக�க விர�ம�ப�கிற  மூலங�களை தேர�வ� செய�யவ�ம�"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Version: "
-msgstr "வெளியீட�: "
+msgid "Please wait, updating media..."
+msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�.... ஊடகம� ப�த�ப�பிக�கப�பட�கிறத�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "பெயர�: "
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "தற�ேபாத� நிற�வப�பட�ட�ள�ள பொதியின� வெளியீட�: "
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"ேதர�ந�ெதட�த�த�ள�ள பொதிகளை நிற�வ இந�த பொதிகள� நீக�கப�படவேண�ட�ம�:\n"
+"\n"
+"%s\n"
+"\n"
+"தொடர�ந�த� செல�ல சம�மதமா?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Source: "
-msgstr "மூலம�: "
+msgid "in descriptions"
+msgstr "விளக�கங�களில� "
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(Not available)"
-msgstr "(கிைடக�கவில�ைல)"
+msgid "Configure proxies"
+msgstr "பினாமிகளை வடிவமை"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "மாற�றப�பதிவ�:\n"
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"நான� மாண�ட�ேரக�இணையதளத�திற�க�ச� சென�ற� இணைப� பதிப�ப� விவரங�களை \n"
+"இறக�க வேண�ட�ம�.இதற�க� நீங�கள� இணையத�தில� இனைந�திர�க�கவேண�ட�ம�.\n"
+"\n"
+"தொடர�ந�த� செல�ல சம�மதமா?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Files:\n"
-msgstr "கோப�ப�கள�:\n"
+msgid "Please choose"
+msgstr "தயவ�செய�த� ேதர�ந�ெதட�க�கவ�ம�"
 
 #: ../rpmdrake:1
 #, c-format
@@ -598,43 +550,28 @@ msgstr "ேதர�ந�ெதட�த�த�ள�ள அளவ�: %d MB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "ேதர�ந�ெதட�த�த�ள�ளவற�றின� அளவ�: %d MB / தற�ேபாத�ள�ள இடம�: %d MB"
+msgid "Initializing..."
+msgstr "த�வக�கப�பட�கிறத�..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
-msgstr ""
-"சில கட�ட�ப�பாட�களினால� கீேழ ெகாட�க�கப�பட�ட�ள�ள பொதிகள� \n"
-"நிற�வப�படக�கூடாத�, அவற�ைற ேதர�விலிர�ந�த� விலக�க�ங�கள�:\n"
-"\n"
+msgid "Save changes"
+msgstr "மாற�றங�களை சேமி"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr ""
-"மன�னிக�கவ�ம�, கீேழ ெகாட�க�கப�பட�ட�ள�ள பொதிகளை தேர�வ�ச� செய�ய ம�டியவில�ைல:\n"
-"\n"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "பொதியை இறக�க�வதில� பிழை நேர�ந�த�ள�ளத�"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "பிரச�சினைகள� எழ�கிறத�"
+msgid "Package installation..."
+msgstr "நிற�வ�வதற�காக பொதிகள� தயாராகின�றன..."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr " `%s'  என�ற பொதியை நிற�வ ம�டியவில�ைல\n"
+#, c-format
+msgid "Importance: "
+msgstr "ம�க�கியத�த�வம�: "
 
 #: ../rpmdrake:1
 #, c-format
@@ -647,455 +584,453 @@ msgstr ""
 "வேண�ட�ம�:\n"
 "\n"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "மேல�ம� சில பொதிகள� தேவை"
+msgid "Add..."
+msgstr "சேர�..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr " `%s'  என�ற பொதியை நிற�வ ம�டியவில�ைல\n"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "ஊடகத�ைத உர�வாக�க ம�டியவில�ைல"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Removing these packages would break your system, sorry:\n"
+"The installation is finished; %s.\n"
 "\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
 msgstr ""
-"மன�னிக�கவ�ம�, இந�த ெபாதிகளை நீக�கினால� அத� உங�கள� கணினியை பழ�தாக�கி விட�ம�\n"
+"நிற�வ�தல� ம�டிந�த� விட�டத�; %s.\n"
 "\n"
+"சில வடிவமைப�ப�க� கோப�ப�கள�  `.rpmnew அல�லத� rpmsave',\n"
+"என�ற பெயர�களில� உர�வாக�கப�பட�டத�. அவற�ைறப� பார�த�த� தேவையான நடவடிக�கை எட�க�கவ�ம�"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"சில கட�ட�ப�பாட�களினால� கீேழ ெகாட�க�கப�பட�ட�ள�ள பொதிகள� நீக�கப�பட \n"
-"வேண�ட�ம�:\n"
-"\n"
+msgid "Browse..."
+msgstr "ேமலோட�..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr " `%s'  என�ற பொதியை நிற�வ ம�டியவில�ைல\n"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "மேல�ம� சில பொதிகள� நீக�கப�பட வேண�ட�ம�"
+msgid "Info..."
+msgstr "தகவல�..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "More information on package..."
-msgstr "பொதிகளைப� பற�றிய மேல�ம� விவரங�கள�"
+msgid "You need to insert the medium to continue"
+msgstr "தொடர�ந�த� செல�ல நீங�கள� ஊடகத�ைத உள�ளீட� செய�ய வேண�ட�ம�"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Copying file for media `%s'..."
+msgstr "`%s'... என�ற மூலத�திற�க� ேகாப�ப� நகலிடப�பட�கிறத�"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Information on packages"
-msgstr "பொதிகளைப� பற�றிய மேலதிக விவரங�கள�"
+msgid "Remove"
+msgstr "நீக�க�"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "More info"
-msgstr "ேமலதிக விவரம�"
+msgid "Preparing packages installation..."
+msgstr "நிற�வ�வதற�காக பொதிகள� தயாராகின�றன..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "by media repository"
+msgstr "மூலங�களின� இர�ப�ப�ப�படி"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "சேர�க�கப�படக�கூடிய"
+msgid "No mirror"
+msgstr "இணைப�பதிப�ப� �த�மில�ைல"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Upgradable"
-msgstr "ப�த�ப�பிக�கக�கூடிய"
+msgid "You need to fill up at least the two first entries."
+msgstr "நீங�கள� க�ைறந�தபட�சம� மேலிர�க�க�ம� ம�தல� இரண�ட� கேள�விக�க� பதில� அளிக�கவ�ம�"
 
 #: ../rpmdrake:1
 #, c-format
-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 ""
-"நிகழ�நிலைப�பட�த�த ஒன�ற�மில�ைல\n"
-"அப�படியென�றால� நிகழ�நிலைப�பட�த�த ப�திய பொதிகள� �த�மில�ைல,\n"
-"அல�லத� அனைத�த�ம� நிற�வப�பட�ட�விட�டன."
+msgid "Install"
+msgstr "நிற�வ�"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "No update"
-msgstr "ப�த�ப�பிக�க ஒன�ற�மில�ைல"
+msgid "Japan"
+msgstr "ஜப�பான�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "(none)"
-msgstr "(ஒன�ற�மில�ைல)"
+msgid "Do nothing"
+msgstr "ஒன�ற�ம� செய�யாதே"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�, பொதிகள� பட�டியலிடப�பட�கிறத�"
+msgid "No update"
+msgstr "ப�த�ப�பிக�க ஒன�ற�மில�ைல"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr " `%s'  என�ற பொதியை திறக�க ம�டியவில�ைல\n"
+#, c-format
+msgid "Description: "
+msgstr "விளக�கம�: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "கீழ�ள�ள பொதிகளில� ஒன�ற� தேவை"
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr ""
+"எச�சரிக�கை; நீங�கள� அளவ�க�கதிகமான பொதிகளை தேர�வ� செய�த�ள�ளீர�கள�. உங�கள� \n"
+"வன�தட�டில� இதற�க� தேவையான இடமில�ைல,\n"
+"\n"
+"நீங�கள� இந�த எச�சரிக�கையை மீறி இவை அனைத�ைதய�ம� நிற�வ விர�ம�ப�கிறீர�களா?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "தயவ�செய�த� ேதர�ந�ெதட�க�கவ�ம�"
+msgid "Name: "
+msgstr "பெயர�: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "டிேரக�ெமன�ெபார�ள�"
+msgid "Inspect..."
+msgstr "சோதிக�கப�பட�கிறத�..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Not selected"
-msgstr "பொதிகளிடையே பிரச�சினைகள� எழ�கிறத�"
+msgid "Editing media \"%s\":"
+msgstr "\"%s\": என�ற மூலத�ைத திர�த�தியமை"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Selected"
-msgstr "தேர�வ� ெசய�யப�பட�ட�ள�ளத�"
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "நிற�வ�வதற�காக பொதிகள� தயாராகின�றன..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results"
-msgstr "தேடலின� ம�டிவ�கள�"
+msgid "Australia"
+msgstr "ஆஸ�திரேலியா"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Stop"
-msgstr "நிற�த�த�"
+msgid "Installation finished"
+msgstr "நிற�வ�தல� ம�டிந�தத�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�..தேடப�பட�கிறத�"
+msgid "by update availability"
+msgstr "ப�த�ப�பிக�கப�பட வேண�டியவையின�படி"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results (none)"
-msgstr "தேடலின� ம�டிவ�கள�(ஒன�ற�மில�ைல)"
+msgid "Poland"
+msgstr "போலாந�த�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Other"
-msgstr "மற�ற"
+msgid "Version: "
+msgstr "வெளியீட�: "
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the packages source editor!\n"
-"\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
-msgstr ""
-"மூல பொதிகளின� தொக�ப�பாளர� உங�களை வரவேற�கிறத�\n"
-"\n"
-"இதன� ம�லம� பொதிகள� உள�ள மூலங�களை வடிவமைக�கலாம�\n"
-"வடிவமைத�த பிறக� இந�த பொதிகளை நிரல�களை நிற�வ அல�லத� \n"
-"நிகழ�நிலைப�பட�த�தலாம�"
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "நீங�கள� பயனர�/கடவ�ச�ெசால�ைல கொட�த�தால� தான� பினாமியை பயன�பட�த�த ம�டிய�ம�"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
-msgstr "சேமித�த�விட�ட� ெவளிச�ெசல�"
+msgid "Upgradable"
+msgstr "ப�த�ப�பிக�கக�கூடிய"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid " done."
+msgstr "ம�டிந�தத�"
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr " பிழை நேர�ந�த�ள�ளத�..."
+msgid "Software Packages Installation"
+msgstr "நிற�வ�வதற�காக பொதிகள� தயாராகின�றன..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Update..."
-msgstr "ப�த�ப�பிக�கவ�ம�..."
+msgid "Additional packages needed"
+msgstr "மேல�ம� சில பொதிகள� தேவை"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "சேர�..."
+msgid "Bugfixes updates"
+msgstr "பிழைநீக�க ப�த�ப�பித�தல�"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "தொக�"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "`%s' இறக�கத�திற�க�, ேதவைப�பட�ம� ேநரம�:%s, ேவகம�:%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Source"
-msgstr "மூலம�"
+msgid "Germany"
+msgstr "ெஜர�மனி"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Enabled?"
-msgstr "ெசயல�பட�த�தப�பட�ட�ள�ளதா?"
+msgid "Russia"
+msgstr "ரஷ�யா"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Configure sources"
-msgstr "மூலங�களை வடிவமை"
+msgid "Norway"
+msgstr "நார�ேவ"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Password:"
-msgstr "கடவ�ச�செல�:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during installation"
+msgstr "பொதி நிற�வலின� போத� பிழை நேர�ந�த�ள�ளத�"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "User:"
-msgstr "பயனர�:"
+msgid "Search"
+msgstr "தேட�"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "நீங�கள� பயனர�/கடவ�ச�ெசால�ைல கொட�த�தால� தான� பினாமியை பயன�பட�த�த ம�டிய�ம�"
+#, fuzzy, c-format
+msgid "Edit a media"
+msgstr "மூலத�ைத திர�த�தி அமை"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "பினாமியின� பெயர�"
+msgid "Czech Republic"
+msgstr "செக� க�டியரச�"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"உங�கள�க�க� பினாமி தேவைப�பட�டால�, பினாமியின�  பயனர� பெயரைய�ம� த�றையைய�ம� கொட�க�கவ�ம�"
-"(மாதிரி: <proxyhost[:port]>):"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "பினாமிகளை வடிவமை"
+msgid "Stop"
+msgstr "நிற�த�த�"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�.... ஊடகம� ப�த�ப�பிக�கப�பட�கிறத�"
+msgid "Update"
+msgstr "ப�த�ப�பிக�கவ�ம�"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "நீங�கள� செய�த மாற�றங�களை சேமிக�க, நீங�கள� ஊடகத�ைத உள�ளீட� செய�ய வேண�ட�ம�"
+msgid "Please wait, removing packages..."
+msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�...பொதிகள� நீக�கப�பட�கின�றன..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "தொடர�ந�த� செல�ல நீங�கள� ஊடகத�ைத உள�ளீட� செய�ய வேண�ட�ம�"
+msgid "Normal information"
+msgstr "சாதரன விவரம�"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "மாற�றங�களை சேமி"
+msgid "Media: "
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "synthesis/hdlist ேகாப�ப�களின� சார�ப� பாதை"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "பின�வர�ம� பொதிகள�  இறக�கப�பட�கிறத� `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "ேதர�ந�ெதட�த�த�ள�ளவற�றின� அளவ�: %d MB / தற�ேபாத�ள�ள இடம�: %d MB"
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "\"%s\": என�ற மூலத�ைத திர�த�தியமை"
+#, c-format
+msgid "Media"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit a source"
-msgstr "மூலத�ைத திர�த�தி அமை"
+msgid "Spain"
+msgstr "ஸ�ெபயின�"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�.... ஊடகம� நீக�கப�பட�கிறத�"
+msgid "Normal updates"
+msgstr "சாதரன ப�த�ப�பித�தல�"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Type of source:"
-msgstr "மூலத�தின� வகை"
+msgid "by selection state"
+msgstr "தேர�வாகிய�ள�ளபடி"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Adding a source:"
-msgstr "ப�திய மூலம� சேர�க�கப�பட�கிறத�"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�... இணைப�பதிப�ப� விவரங�கள� இறக�கப�பட�கிறத�"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
-msgstr ""
-"இதே பெயரில� ஊடகம� ஒன�ற�ள�ளத�,நீங�கள� \n"
-"நிச�சயமாக இதனை மாற�ற போகிறிர�களா?"
+msgid "Login:"
+msgstr "பயனர�கணக�க�"
 
 #: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Adding a media:"
+msgstr "ப�திய மூலம� சேர�க�கப�பட�கிறத�"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "நீங�கள� க�ைறந�தபட�சம� மேலிர�க�க�ம� ம�தல� இரண�ட� கேள�விக�க� பதில� அளிக�கவ�ம�"
+msgid "Austria"
+msgstr "ஆஸ�திரியா"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Fatal error"
+msgstr "கோப�பில� பிழை"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Name:"
-msgstr "பெயர�:"
+msgid "Update..."
+msgstr "ப�த�ப�பிக�கவ�ம�..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "பொதி கையெழ�த�த� சோதனையில� உள�ளத�  `%s'.."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Login:"
-msgstr "பயனர�கணக�க�"
+msgid "(none)"
+msgstr "(ஒன�ற�மில�ைல)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr "அர�கில� உள�ள இணைப�பதிப�ைப தேர�வ�ச� செய�..."
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
+"மன�னிக�கவ�ம�, இந�த ெபாதிகளை நீக�கினால� அத� உங�கள� கணினியை பழ�தாக�கி விட�ம�\n"
+"\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
-msgstr "ேமலோட�..."
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "பின�வர�ம� பொதி நிற�வப�பட�கிறத�  `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Path or mount point:"
-msgstr "பாதை அல�லத� �ற�றப�ப�ள�ளி"
+msgid "Currently installed version: "
+msgstr "தற�ேபாத� நிற�வப�பட�ட�ள�ள பொதியின� வெளியீட�: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Removable device"
-msgstr "கழற�ற� சாதனங�கள�"
+msgid "Other"
+msgstr "மற�ற"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "HTTP பாிமாறி"
+msgid "Reason for update: "
+msgstr "ப�த�ப�பிக�க வேண�டிய காரனம�"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "FTP பாிமாறி"
+msgid "Please choose the desired mirror."
+msgstr "தயவ�செய�த� உங�கள�க�க� அர�கில�ள�ள இணைப�பதிப�ைப ேதர�ந�ெதட�ங�கள�"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Path:"
-msgstr "பாதை:"
+msgid "Edit"
+msgstr "தொக�"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "உள�ளமைக� கோப�ப�கள�"
+msgid "Please wait, finding available packages..."
+msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�..இர�க�க�ம� பொதிகளை கண�ட�பிடிக�கப� பட�கிறத�"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Add a source"
-msgstr "ப�திய மூலம� சேர�க�கப�பட�கிறத�"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr "ஊடகத�ைத ப�த�ப�பிக�க ம�டியவில�ைல,அத� தானாகவே ம�டக�கப�பட�ம�"
+msgid "Relative path to synthesis/hdlist:"
+msgstr "synthesis/hdlist ேகாப�ப�களின� சார�ப� பாதை"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Unable to create medium."
-msgstr "ஊடகத�ைத உர�வாக�க ம�டியவில�ைல"
+msgid "Search results (none)"
+msgstr "தேடலின� ம�டிவ�கள�(ஒன�ற�மில�ைல)"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Update"
-msgstr "ப�த�ப�பிக�கவ�ம�"
+msgid "Danmark"
+msgstr "டென�மார�க�"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "நீங�கள� ப�த�ப�பிக�க விர�ம�ப�கிற  மூலங�களை தேர�வ� செய�யவ�ம�"
+msgid "China"
+msgstr "சீனா"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�.... ஊடகம� ப�த�ப�பிக�கப�பட�கிறத�"
+msgid "United States"
+msgstr "அமெரிக�கா"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " failed!"
-msgstr "ெவற�றியடையவில�ைல"
+msgid "changes:"
+msgstr "மாற�றங�கள�:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " done."
-msgstr "ம�டிந�தத�"
+msgid "Some additional packages need to be removed"
+msgstr "மேல�ம� சில பொதிகள� நீக�கப�பட வேண�ட�ம�"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "`%s' இறக�கத�தின� ேவகம�:%s , "
+msgid "rpmdrake"
+msgstr "டிேரக�ெமன�ெபார�ள�"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "`%s' இறக�கத�திற�க�, ேதவைப�பட�ம� ேநரம�:%s, ேவகம�:%s"
+msgid "No"
+msgstr "இல�ைல"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "பொதி கையெழ�த�த� சோதனையில� உள�ளத�  `%s'.."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "`%s'... என�ற ெதாைலவில�ள�ள நிரலின� மூலம� ஆராயப�பட�கிறத�"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Examining file of source `%s'..."
-msgstr "`%s'... என�ற நிரலின� மூலம� ஆராயப�பட�கிறத�"
+msgid "Configure medias"
+msgstr "மூலங�களை வடிவமை"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Copying file for source `%s'..."
-msgstr "`%s'... என�ற மூலத�திற�க� ேகாப�ப� நகலிடப�பட�கிறத�"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a media"
+msgstr "ப�திய மூலம� சேர�க�கப�பட�கிறத�"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please choose the desired mirror."
-msgstr "தயவ�செய�த� உங�கள�க�க� அர�கில�ள�ள இணைப�பதிப�ைப ேதர�ந�ெதட�ங�கள�"
+msgid "Summary: "
+msgstr "விவரம�: "
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
-msgstr ""
-"மாற�ற� இணைப� பதிப�ப� �த�மில�ைல\n"
-"\n"
-"நீங�கள� வேற� வழியில� ம�யற�சி செய�த� பார�ங�கள�.\n"
-"இணையத�தில� www.google.com சென�ற� தேடி\n"
-"பார�ங�கள�"
+msgid "Canada"
+msgstr "கனடா"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No mirror"
-msgstr "இணைப�பதிப�ப� �த�மில�ைல"
+msgid "Greece"
+msgstr "கிரேக�கம�"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1112,178 +1047,243 @@ msgstr ""
 "நீங�கள� இணையத�தில� இல�லாதிர�க�கலாம�;இல�ைல மாண�ட�ேரக� இணையதளத�தில�.\n"
 "பிரச�சினையிர�க�கலாம�.தயவ�செய�த� பிறக� ம�யற�சி செய�யவ�ம�"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr "பொதிகளை நிற�வ�வதற�க� நீங�கள� நிர�வாகியாக இர�க�க வேண�ட�ம�"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Error during download"
-msgstr "பொதியை இறக�க�வதில� பிழை நேர�ந�த�ள�ளத�"
+msgid "Path:"
+msgstr "பாதை:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�... இணைப�பதிப�ப� விவரங�கள� இறக�கப�பட�கிறத�"
+msgid "Problem during removal"
+msgstr "நீக�க�தலில� பிழை நேர�ந�த�ள�ளத�"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"நான� மாண�ட�ேரக�இணையதளத�திற�க�ச� சென�ற� இணைப� பதிப�ப� விவரங�களை \n"
-"இறக�க வேண�ட�ம�.இதற�க� நீங�கள� இணையத�தில� இனைந�திர�க�கவேண�ட�ம�.\n"
-"\n"
-"தொடர�ந�த� செல�ல சம�மதமா?"
+msgid "Selected"
+msgstr "தேர�வ� ெசய�யப�பட�ட�ள�ளத�"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United States"
-msgstr "அமெரிக�கா"
+msgid "Netherlands"
+msgstr "நெதர�லாந�த�"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "China"
-msgstr "சீனா"
+msgid "Addable"
+msgstr "சேர�க�கப�படக�கூடிய"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "பிரிட�டன�"
+msgid "(Not available)"
+msgstr "(கிைடக�கவில�ைல)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
+msgstr ""
+"மன�னிக�கவ�ம�, கீேழ ெகாட�க�கப�பட�ட�ள�ள பொதிகளை தேர�வ�ச� செய�ய ம�டியவில�ைல:\n"
+"\n"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Not selected"
+msgstr "பொதிகளிடையே பிரச�சினைகள� எழ�கிறத�"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "தைவான�"
+msgid "Software Packages Removal"
+msgstr "ெமன�ெபார�ள� நீக�கம�"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Sweden"
 msgstr "ச�விடன�"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Russia"
-msgstr "ரஷ�யா"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
+msgstr ""
+"\n"
+"\n"
+"பிழை ேநர�ந�த�ள�ளத�:\n"
+"%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Portugal"
-msgstr "போர�ச�கல�"
+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 ""
+"நிகழ�நிலைப�பட�த�த ஒன�ற�மில�ைல\n"
+"அப�படியென�றால� நிகழ�நிலைப�பட�த�த ப�திய பொதிகள� �த�மில�ைல,\n"
+"அல�லத� அனைத�த�ம� நிற�வப�பட�ட�விட�டன."
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Poland"
-msgstr "போலாந�த�"
+#, fuzzy, c-format
+msgid "Examining file of media `%s'..."
+msgstr "`%s'... என�ற நிரலின� மூலம� ஆராயப�பட�கிறத�"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Norway"
-msgstr "நார�ேவ"
+msgid "Download of `%s', speed:%s"
+msgstr "`%s' இறக�கத�தின� ேவகம�:%s , "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Netherlands"
-msgstr "நெதர�லாந�த�"
+msgid "One of the following packages is needed:"
+msgstr "கீழ�ள�ள பொதிகளில� ஒன�ற� தேவை"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Korea"
-msgstr "கொரியா"
+msgid "Quit"
+msgstr "ெவளிச�ெசல�"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "ஜப�பான�"
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"நான� இணைப� பதிப�பிற�க�க� சென�ற� ப�திய பொதிகளை \n"
+"இறக�க வேண�ட�ம�.இதற�க� நீங�கள� இணையத�தில� இனைந�திர�க�கவேண�ட�ம�.\n"
+"\n"
+"தொடர�ந�த� செல�ல சம�மதமா?"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Italy"
-msgstr "இத�தாலி"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update media(s)"
+msgstr "ப�த�ப�பிக�கப�பட வேண�டிய மூல(ங�கள�)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Israel"
-msgstr "இஸ�ேரல�"
+msgid "Ok"
+msgstr "சரி"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Greece"
-msgstr "கிரேக�கம�"
+msgid "Please wait, adding medium..."
+msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�.... ப�திய ஊடகம� சேர�க�கப�பட�கிறத�"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "France"
-msgstr "பிரான�ஸ�"
+msgid "Unable to get source packages."
+msgstr "மூலப� பொதிகள� கிடைக�கவில�ைல"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "பின�லாந�த�"
+msgid "Too many packages are selected"
+msgstr "அளவ�க�கதிகமான பொதிகள� தேர�வ� செய�யப�பட�ட�ள�ளத�"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Spain"
-msgstr "ஸ�ெபயின�"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"மூல பொதிகளின� தொக�ப�பாளர� உங�களை வரவேற�கிறத�\n"
+"\n"
+"இதன� ம�லம� பொதிகள� உள�ள மூலங�களை வடிவமைக�கலாம�\n"
+"வடிவமைத�த பிறக� இந�த பொதிகளை நிரல�களை நிற�வ அல�லத� \n"
+"நிகழ�நிலைப�பட�த�தலாம�"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Danmark"
-msgstr "டென�மார�க�"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
+msgstr "பிரச�சினைகள� எழ�கிறத�"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "ெஜர�மனி"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"மாண�ட�ேரக�ப�த�ப�பித�தல�க�க� வர�க!\n"
+"\n"
+"இக�கர�வி மூலம� உங�கள� கணினியில� உள�ள  ெமன�ெபார�ளை நீங�கள� ப�த�ப�பிக�க\n"
+" ம�டிய�ம�"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
-msgstr "செக� க�டியரச�"
+msgid "Mandrake choices"
+msgstr "மாண�ட�ேரக� தேர�வ�கள�"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "கோஸ�டா ரிகா"
+msgid "Changelog:\n"
+msgstr "மாற�றப�பதிவ�:\n"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "கனடா"
+msgid "Korea"
+msgstr "கொரியா"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Brazil"
-msgstr "பிரேசில�"
+msgid "Removable device"
+msgstr "கழற�ற� சாதனங�கள�"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "பெல�ஜியம�"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "ஆஸ�திரேலியா"
+msgid "Change medium"
+msgstr "ஊடகத�ைத மாற�றவ�ம�"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "ஆஸ�திரியா"
+msgid "Mandrake Update"
+msgstr "மாண�ட�ேரக� ப�த�ப�பித�தல�"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
-msgstr "தகவல�..."
+msgid "by size"
+msgstr "அளவ�ப�படி"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "இல�ைல"
+msgid "FTP server"
+msgstr "FTP பாிமாறி"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "ஆம�"
+msgid "Files:\n"
+msgstr "கோப�ப�கள�:\n"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr "ஊடகத�ைத ப�த�ப�பிக�க ம�டியவில�ைல,அத� தானாகவே ம�டக�கப�பட�ம�"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -1556,6 +1556,12 @@ msgstr " ெமன�ெபார�ளை நீக�கவ�ம�"
 msgid "Software Sources Manager"
 msgstr " ெமன�ெபார�ள� மூலங�கள� மேலாளர�"
 
+#~ msgid "Source: "
+#~ msgstr "மூலம�: "
+
+#~ msgid "Source"
+#~ msgstr "மூலம�"
+
 #~ msgid ""
 #~ "some packages failed to install\n"
 #~ "correctly"
@@ -1593,9 +1599,6 @@ msgstr " ெமன�ெபார�ள� மூலங�கள� மேலா
 #~ "\n"
 #~ "மற�ற இணைப� பதிப�பில� ம�யற�சி செய�த� பார�ங�கள�"
 
-#~ msgid "Error adding update medium"
-#~ msgstr "ப�த�ப�பித�தல�ல� ஊடகத�தில� பிழை நேர�ந�த�ள�ளத�"
-
 #~ msgid "Please wait, contacting mirror to initialize updates packages."
 #~ msgstr ""
 #~ "தயவ�செய�த� காத�திர�க�கவ�ம�...இைணப�பதிப�ேபாட� தொடர�ப� கொன�ட� "
diff --git a/po/tg.po b/po/tg.po
index 8089536e..a4ee40d7 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: 2003-02-17 16:54+0500\n"
 "Last-Translator: Dilshod Marupov <dma165@hotmail.com>\n"
 "Language-Team: Tajik\n"
@@ -15,16 +15,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"Давом додан гирем?"
+msgid "Enabled?"
+msgstr "Даргирифта?"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Роҳ ё нуқтаи ва�лкунӣ:"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Portugal"
+msgstr "Пуртуқол"
 
 #: ../rpmdrake:1
 #, c-format
@@ -43,104 +47,54 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"Марҳамат ба MandrakeUpdate!\n"
-"\n"
-"Ин а�боб ба шумо барои интихоби навигарӣ барои коргузоштан ба компютери\n"
-"Шумо ёрӣ медиҳад."
+msgid "by group"
+msgstr "аз рӯи қуттӣ"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
-msgstr ""
-"Марҳамат ба а�боби хориҷи нармафзор!\n"
-"\n"
-"Ин а�боб ба шумо барои интихоби нармафзор барои хориҷ аз компютери Шумо\n"
-"ёрӣ медиҳад."
+msgid "Name:"
+msgstr "�ом:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Хатогӣ ҳангоми коргузории қуттиҳо рӯй дод:\n"
-"\n"
-"%s"
+msgid "Italy"
+msgstr "Коргузорӣ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Problem during removal"
-msgstr "Муаммо ҳангоми хориҷкунӣ"
+msgid "How to choose manually your mirror"
+msgstr "Чӣ тавр оинаатонро да�тӣ интихоб мекунед"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "Интизор шавед, хориҷи қуттиҳо..."
+msgid "URL:"
+msgstr "URL:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Интизор шавед, хониши манбаи маълумоти қуттиҳо..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Хатогӣ ҳангоми коргузории қуттиҳо рӯй дод:\n"
-"\n"
-"%s"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Коргузории ҳамааш"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Тайёркунии қуттиҳо барои коргузорӣ..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Тайёркунии қуттиҳо барои коргузорӣ..."
+msgid "Some packages need to be removed"
+msgstr "Баъзе қуттиҳо бо�д хориҷ шаванд"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Ҳамаи қуттиҳои талабшуда бомуваффақи�т коргузошташуданд."
+msgid "More information on package..."
+msgstr "Маълумоти иловагӣ барои қуттӣ..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Ҳамачиз бомуваффақи�т кор гузошта шуд"
+msgid "Yes"
+msgstr "Ҳа"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
 msgstr ""
-"Коргузориш ба итмом ра�ид; %s.\n"
+"�з барои тобеи�тҳо�шон, қуттиҳои зерин бо�д ноинтихоб хоҳанд\n"
+"шуд, ҳозир:\n"
 "\n"
-"Баъзе файлҳои танзимдарорӣ ҳамчун `.rpmnew' ё `.rpmsave' офаридашуда\n"
-"буданд, акнун метавонед баъзеашонро барои амалиётҳо бозра�ӣ кунед:"
 
 #: ../rpmdrake:1
 #, c-format
@@ -148,459 +102,456 @@ msgid "everything was installed correctly"
 msgstr "ҳамачиз дуру�т коргузошта шуд"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Муаммоҳо ҳангоми коргузориш рӯй доданд"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Коргузории қуттии `%s' (%s/%s)..."
+msgid "%s KB"
+msgstr "%s KБ"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Тайёркунии қуттиҳо барои коргузорӣ..."
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"Ҳамчунин метавонед оинаи хо�тагиатонро да�тӣ интихоб кунед: барои ин,\n"
+"Мудири Сарчашмаҳои �армафзорро �ар диҳед ва па� �арчашмаи `�авигариҳои\n"
+"бехатарӣ' илова кунед.\n"
+"\n"
+"Па�, MandrakeUpdate-ро бозоғоз кунед."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
+"Welcome to the software removal tool!\n"
 "\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
 msgstr ""
+"Марҳамат ба а�боби хориҷи нармафзор!\n"
 "\n"
-"\n"
-"Ҳи�оботи Хатогӣ(ҳо):\n"
-"%s"
+"Ин а�боб ба шумо барои интихоби нармафзор барои хориҷ аз компютери Шумо\n"
+"ёрӣ медиҳад."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"In order to save the changes, you need to insert the medium in the drive."
 msgstr ""
-"Коргузориш нагузашт, баъзе файлҳо не�танд.\n"
-"Мумкин Шумо бо�д манбаи маълумоти �арчашмаҳо�тонро нав кунед."
+"Барои нигоҳ доштани тағирот, Шумо бо�д ба ҳаракатовар миёна дохил кунед."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "�игоҳ дошта бароед"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
+"There was a problem during the removal of packages:\n"
 "\n"
-"Do you want to continue installation?"
+"%s"
 msgstr ""
-"Қуттиҳои зерин бо�д хориҷ карда шаванд барои навкунии дигаронаш:\n"
-"\n"
-"%s\n"
+"Хатогӣ ҳангоми коргузории қуттиҳо рӯй дод:\n"
 "\n"
-"Давом додан гирем?"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Фаровиркунии қутии `%s' (%s/%s)..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Cancel"
-msgstr "Бекор кардан"
+msgid "Size: "
+msgstr "Ҳаҷм: "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid "Security updates"
+msgstr "�авигариҳои бехатарӣ"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Лутфан миёнаи номаш \"%s\" бударо дар да�тгоҳи [%s] гузоред"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Change medium"
-msgstr "Ивази миёна"
+msgid "Already existing update medias"
+msgstr "Сарчашмаи %s дар таҳлил а�т"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "Коргузорӣ..."
+msgid "Maximum information"
+msgstr "Маълумоти калонтарин"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Тайёркунии қуттиҳо барои коргузорӣ..."
+msgid "Proxy..."
+msgstr "Хатогӣ..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Барои коргузории қуттиҳо Шумо бо�д root бошед, узр."
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Unable to get source packages."
-msgstr "Қуттиҳои �арчашмавӣ гирифта нашуд."
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspect..."
-msgstr "Бозра�(�азорат)..."
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
+msgstr ""
+"Коргузориш нагузашт, баъзе файлҳо не�танд.\n"
+"Мумкин Шумо бо�д манбаи маълумоти �арчашмаҳо�тонро нав кунед."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Installation finished"
-msgstr "Коргузориш шуд"
+msgid "United Kingdom"
+msgstr "Подшоҳии Муттаҳида"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Ҳеҷ кор накунед"
+msgid "in names"
+msgstr "дар номҳо"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "И�тифодаи .%s ҳамчун файли а�о�ӣ"
+msgid ""
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
+msgstr ""
+"Ин �гон оинаи мувофиқ ёфта наметавонад.\n"
+"\n"
+"Барои ин муаммо �кчанд а�о�ҳо шуданаш мумкин; аз ҳама би�ёртараш ин\n"
+"ҳолате ки �охти пардозандаи шумо бо �авигариҳои Ра�мии Mandrake Linux\n"
+"да�тгир нашудаа�т."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Remove .%s"
 msgstr "Хориҷи .%s"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "changes:"
-msgstr "тағиротҳо:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspecting %s"
-msgstr "Бозра�ии(�азорати) %s"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Интизор шавед, ёфтани қуттиҳои да�тра�..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "Интизор шавед, иловаи миёна..."
+msgid "Finland"
+msgstr "Финлонд"
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
+"The following packages have bad signatures:\n"
 "\n"
-"Then, restart MandrakeUpdate."
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"Ҳамчунин метавонед оинаи хо�тагиатонро да�тӣ интихоб кунед: барои ин,\n"
-"Мудири Сарчашмаҳои �армафзорро �ар диҳед ва па� �арчашмаи `�авигариҳои\n"
-"бехатарӣ' илова кунед.\n"
+"Қуттиҳои зерин бо�д хориҷ карда шаванд барои навкунии дигаронаш:\n"
 "\n"
-"Па�, MandrakeUpdate-ро бозоғоз кунед."
+"%s\n"
+"\n"
+"Давом додан гирем?"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "How to choose manually your mirror"
-msgstr "Чӣ тавр оинаатонро да�тӣ интихоб мекунед"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Examining distant file of media `%s'..."
+msgstr "Санҷидани файли дурда�ти �арчашмаи `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
+msgid "Verifying packages signatures..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Already existing update sources"
-msgstr "Сарчашмаи %s дар таҳлил а�т"
+msgid "France"
+msgstr "Маҷбурӣ"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "More info"
+msgstr "Маълумоти изофа"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
+"%s\n"
 "\n"
 "Is it ok to continue?"
 msgstr ""
-"Барои гирифтани қуттиҳои навтарин, ба оина пайва�т шуданам даркор.\n"
-"Лутфан мӯътақид шавед, ки шабакаи шумо кор карда и�тодаа�т.\n"
+"%s\n"
 "\n"
 "Давом додан гирем?"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
-"Хатогии дохили рух дод :\n"
-"%s"
+#, c-format
+msgid "Reload the packages list"
+msgstr "Бозборкунии рӯйхати қуттиҳо"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Оина интихоб кунед..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Хатогии файл"
+msgid "Some packages can't be installed"
+msgstr "Қуттӣ коргузорӣ шуда наметавонад"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
+msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Тайёркунии қуттиҳо барои коргузорӣ..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "�авигарии Mandrake"
+msgid "All packages,"
+msgstr "Ҳаммаи қуттиҳо,"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Software Packages Removal"
-msgstr "Хориҷкунии Қуттиҳои �армафзор"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Type of media:"
+msgstr "�авъи �арчашма:"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Quit"
-msgstr "Баромад"
+msgid "in files"
+msgstr "дар файлҳо"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Коргузорӣ"
+msgid "All requested packages were installed successfully."
+msgstr "Ҳамаи қуттиҳои талабшуда бомуваффақи�т коргузошташуданд."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove"
-msgstr "Хориҷ"
+msgid "Proxy hostname:"
+msgstr "�оиби номихидматгор:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Help"
-msgstr "�рӣ"
+msgid "Local files"
+msgstr "Файлҳои маҳаллӣ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search"
-msgstr "Ҷу�туҷӯ"
+msgid "Inspecting %s"
+msgstr "Бозра�ии(�азорати) %s"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Find:"
-msgstr "�фтан:"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Israel"
+msgstr "Коргузорӣ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Қуттиҳои зерин бо�д хориҷ карда шаванд барои навкунии дигаронаш:\n"
-"\n"
-"%s\n"
-"\n"
-"Давом додан гирем?"
+msgid "Help"
+msgstr "�рӣ"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Баъзе қуттиҳо бо�д хориҷ шаванд"
+msgid "HTTP server"
+msgstr "Хидматра�они HTTP"
 
 #: ../rpmdrake:1
-#, c-format
-msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
-"\n"
-"Do you really want to install all the selected packages?"
-msgstr ""
-"Огоҳӣ: шумо кӯшиши иловаи қуттиҳоро аз ҳад зиёд карда и�тодагӣ\n"
-"барин, ки ба файл�и�теми шумо дар ди�к ҷои холӣ нара�иданаш мумкин,\n"
-"ҳангоми ё баъди коргузоштани қуттиҳо; ин хеле хатарнок а�т ва\n"
-"бо�д бо �ҳтиёт ба назар гирифта шавад.\n"
-"\n"
-"Шумо ҳақиқатан ҳамаи қуттиҳои интихобшударо коргузоштан мехоҳед?"
+#, fuzzy, c-format
+msgid "Installation failed"
+msgstr "Коргузории ҳамааш"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "�з ҳад зиёд қуттиҳо интихоб шудаанд"
+msgid "Use .%s as main file"
+msgstr "И�тифодаи .%s ҳамчун файли а�о�ӣ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "Маълумоти калонтарин"
+msgid "Search results"
+msgstr "�атиҷаҳои ҷу�туҷӯ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Normal information"
-msgstr "Маълумоти оддӣ"
+msgid " failed!"
+msgstr " нагузашт!"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Update source(s)"
-msgstr "�авкунии �арчашма(ҳо)"
+msgid "Brazil"
+msgstr "Бразил"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Бозборкунии рӯйхати қуттиҳо"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"�ллакай миёна бо ин ном вуҷуд дорад, шумо ҳақиқатан\n"
+"онро иваз кардан мехоҳед?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "Бознишондодани интихоб"
+msgid "Find:"
+msgstr "�фтан:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "дар файлҳо"
+msgid "All packages, alphabetical"
+msgstr "Ҳамаи қуттиҳо, аз рӯи алифбо"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "дар тав�ифҳо"
+msgid "Please wait, searching..."
+msgstr "Интизор шавед, ҷу�туҷӯ..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "дар номҳо"
+msgid "Please wait, reading packages database..."
+msgstr "Интизор шавед, хониши манбаи маълумоти қуттиҳо..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by update availability"
-msgstr "аз рӯи да�тра�ии навигарӣ"
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "Қуттиро кушода намешавад"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by source repository"
-msgstr "аз рӯи анбори �арчашма"
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Лутфан миёнаи номаш \"%s\" бударо дар да�тгоҳи [%s] гузоред"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by selection state"
-msgstr "аз рӯи вазъи�ти интихоб"
+msgid "Reset the selection"
+msgstr "Бознишондодани интихоб"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by size"
-msgstr "бо ҳаҷм"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"Ба Шумо ноиб лозим бошад, номихидматгор ва даргоҳи ихтиёрӣ гузоред (наҳв: "
+"<хидматгорноиб[:даргоҳ]>):"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-msgstr "аз рӯи қуттӣ"
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
+"�з барои тобеи�тҳо�шон, қуттиҳои зерин ҳамчунин хориҷ хоҳанд\n"
+"шуд:\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "All packages,"
-msgstr "Ҳаммаи қуттиҳо,"
+msgid "Costa Rica"
+msgstr "Ко�то Рико"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "All packages, alphabetical"
-msgstr "Ҳамаи қуттиҳо, аз рӯи алифбо"
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Хатогӣ ҳангоми коргузории қуттиҳо рӯй дод:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Интихоботи Mandrake"
+msgid "Please wait, removing medium..."
+msgstr "Интизор шавед, хориҷи миёна..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
-msgstr "�авигариҳои оддӣ"
+msgid "Password:"
+msgstr "Гузарвожа:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "�авигариҳои Ғалати�лоҳ (Bugfixes)"
+msgid "Taiwan"
+msgstr "Тойвон"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Security updates"
-msgstr "�авигариҳои бехатарӣ"
+msgid "User:"
+msgstr "Корванд:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Description: "
-msgstr "Тав�иф: "
+msgid "Please wait, updating medium..."
+msgstr "Интизор шавед, навкунии миёна..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reason for update: "
-msgstr "��о� барои навигарӣ: "
+msgid "Please wait, listing packages..."
+msgstr "Интизор шавед, рӯйхат�озии қуттиҳо..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Summary: "
-msgstr "Маълумот: "
+#, fuzzy, c-format
+msgid "Information on packages"
+msgstr "Қуттиро кушода намешавад"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Importance: "
-msgstr "Зарури�т: "
+msgid "Cancel"
+msgstr "Бекор кардан"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KБ"
+msgid "Everything installed successfully"
+msgstr "Ҳамачиз бомуваффақи�т кор гузошта шуд"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Size: "
-msgstr "Ҳаҷм: "
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Select the media(s) you wish to update:"
+msgstr "Сарчашмаҳое, ки афзоиш додан мехоҳед, интихоб кунед:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Version: "
-msgstr "�у�ха: "
+msgid "Please wait, updating media..."
+msgstr "Интизор шавед, навкунии муҳит..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Name: "
-msgstr "�ом: "
+#, fuzzy, c-format
+msgid "A fatal error occurred: %s."
+msgstr ""
+"Хатогии дохили рух дод :\n"
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "�у�хаи коргузошта шуда: "
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Қуттиҳои зерин бо�д хориҷ карда шаванд барои навкунии дигаронаш:\n"
+"\n"
+"%s\n"
+"\n"
+"Давом додан гирем?"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Source: "
-msgstr "Маҷбурӣ"
+#, c-format
+msgid "in descriptions"
+msgstr "дар тав�ифҳо"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(Not available)"
-msgstr "(Да�тра� �е�т)"
+msgid "Configure proxies"
+msgstr "Танзимдарории ноибҳо"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Changelog:\n"
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Барои гирифтани рӯйхати оинаҳо ба пойгоҳи MandrakeSoft пайва�т шудан лозим.\n"
+"Лутфан тафтиш кунед ки шабакаи шумо кор карда и�тодаа�т.\n"
+"\n"
+"Давом додан гирем?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Files:\n"
-msgstr "Файлҳо:\n"
+msgid "Please choose"
+msgstr "Илтимо� интихоб кунед"
 
 #: ../rpmdrake:1
 #, c-format
@@ -609,43 +560,28 @@ msgstr "Ҳаҷми интихобшуда %d МБ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Интихобшуда: %d МБ / Фо�илаи озоди ди�к: %d МБ"
+msgid "Initializing..."
+msgstr "Коргузорӣ..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
-msgstr ""
-"�з барои тобеи�тҳо�шон, қуттиҳои зерин бо�д ноинтихоб хоҳанд\n"
-"шуд, ҳозир:\n"
-"\n"
+msgid "Save changes"
+msgstr "�игоҳдории тағиротҳо"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr ""
-"Узр, қуттиҳои зерин интихоб намешаванд:\n"
-"\n"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "Хатогӣ ҳангоми фаровир"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "зидди�тҳо бо"
+msgid "Package installation..."
+msgstr "Тайёркунии қуттиҳо барои коргузорӣ..."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Қуттӣ коргузорӣ шуда наметавонад"
+#, c-format
+msgid "Importance: "
+msgstr "Зарури�т: "
 
 #: ../rpmdrake:1
 #, c-format
@@ -658,314 +594,307 @@ msgstr ""
 "коргузошта шаванд:\n"
 "\n"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "Қуттиҳои иловагӣ лозиманд"
+msgid "Add..."
+msgstr "Илова..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "Қуттӣ коргузорӣ шуда наметавонад"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "Сохтани миёна номумкин."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Removing these packages would break your system, sorry:\n"
+"The installation is finished; %s.\n"
 "\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
 msgstr ""
-"Хориҷи ин қуттиҳо �и�теми Шуморо вайрон ме�озад, узр:\n"
+"Коргузориш ба итмом ра�ид; %s.\n"
 "\n"
+"Баъзе файлҳои танзимдарорӣ ҳамчун `.rpmnew' ё `.rpmsave' офаридашуда\n"
+"буданд, акнун метавонед баъзеашонро барои амалиётҳо бозра�ӣ кунед:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"�з барои тобеи�тҳо�шон, қуттиҳои зерин ҳамчунин хориҷ хоҳанд\n"
-"шуд:\n"
-"\n"
+msgid "Browse..."
+msgstr "Барра�ии..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "Қуттӣ коргузорӣ шуда наметавонад"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Баъзе қуттиҳои иловагӣ бо�д хориҷ карда шаванд"
+msgid "Info..."
+msgstr "Маълумот..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "More information on package..."
-msgstr "Маълумоти иловагӣ барои қуттӣ..."
+msgid "You need to insert the medium to continue"
+msgstr "Барои давом Шумо бо�д миёна дохил кунед"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Information on packages"
-msgstr "Қуттиро кушода намешавад"
+msgid "Copying file for media `%s'..."
+msgstr "�у�хабардории файл барои �арчашма `%s'..."
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "Хориҷ"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "More info"
-msgstr "Маълумоти изофа"
+msgid "Preparing packages installation..."
+msgstr "Тайёркунии қуттиҳо барои коргузорӣ..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "by media repository"
+msgstr "аз рӯи анбори �арчашма"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "Иловашаванда"
+msgid "No mirror"
+msgstr "Оина не�т"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Upgradable"
-msgstr "�фзоишшаванда"
+msgid "You need to fill up at least the two first entries."
+msgstr "Шумо бо�д ақалан ду оинаи авваларо пур кунед."
 
 #: ../rpmdrake:1
 #, c-format
-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 ""
-"Рӯйхати навигариҳо холӣ. Ин маънои онро дорад ки ё навигарӣ да�тра�\n"
-"не�т барои қуттиҳои дар компютери шумо коргузошта шуда, ё шумо аллакай\n"
-"ҳамаашро коргузошта шудаед."
+msgid "Install"
+msgstr "Коргузорӣ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "No update"
-msgstr "�авигарӣ не�т"
+msgid "Japan"
+msgstr "Ҷопон"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "(none)"
-msgstr "(ҳеҷ)"
+msgid "Do nothing"
+msgstr "Ҳеҷ кор накунед"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Интизор шавед, рӯйхат�озии қуттиҳо..."
+msgid "No update"
+msgstr "�авигарӣ не�т"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "Қуттиро кушода намешавад"
+#, c-format
+msgid "Description: "
+msgstr "Тав�иф: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Яке аз қуттиҳои зерин лозим а�т:"
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr ""
+"Огоҳӣ: шумо кӯшиши иловаи қуттиҳоро аз ҳад зиёд карда и�тодагӣ\n"
+"барин, ки ба файл�и�теми шумо дар ди�к ҷои холӣ нара�иданаш мумкин,\n"
+"ҳангоми ё баъди коргузоштани қуттиҳо; ин хеле хатарнок а�т ва\n"
+"бо�д бо �ҳтиёт ба назар гирифта шавад.\n"
+"\n"
+"Шумо ҳақиқатан ҳамаи қуттиҳои интихобшударо коргузоштан мехоҳед?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Илтимо� интихоб кунед"
+msgid "Name: "
+msgstr "�ом: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Inspect..."
+msgstr "Бозра�(�азорат)..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Not selected"
-msgstr "Зидди�тҳо пайдо шуданд"
+msgid "Editing media \"%s\":"
+msgstr "Таҳрири �арчашмаи \"%s\":"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Selected"
-msgstr "Интихобшуда"
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "Тайёркунии қуттиҳо барои коргузорӣ..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results"
-msgstr "�атиҷаҳои ҷу�туҷӯ"
+msgid "Australia"
+msgstr "О�тролиё"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Stop"
-msgstr "И�т"
+msgid "Installation finished"
+msgstr "Коргузориш шуд"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Интизор шавед, ҷу�туҷӯ..."
+msgid "by update availability"
+msgstr "аз рӯи да�тра�ии навигарӣ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results (none)"
-msgstr "�атиҷаҳои ҷу�туҷӯ (ҳеҷ)"
+msgid "Poland"
+msgstr "Лаҳи�тон"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Other"
-msgstr "Дигар"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid ""
-"Welcome to the packages source editor!\n"
-"\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
-msgstr ""
-"Марҳамат ба муҳаррири �арчашмаи қуттиҳо!\n"
-"\n"
-"Ин а�боб барои танзими �арчашмаҳои қуттиҳое ки шумо дар компютери худ "
-"и�тифода\n"
-"бурдан мехоҳед ёрӣ медиҳад. Онҳо па� барои коргузоштани қуттии нармафзори "
-"нав\n"
-"ё иҷрои навигариҳо да�тра� мешаванд."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Save and quit"
-msgstr "�игоҳ дошта бароед"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Хатогӣ..."
+msgid "Version: "
+msgstr "�у�ха: "
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update..."
-msgstr "�авкунӣ..."
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Шумо метавонед барои а�лшино�ии ноиб корванд/гузарвожа муай�н кунед:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "Илова..."
+msgid "Upgradable"
+msgstr "�фзоишшаванда"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "Таҳрир кардан"
+msgid " done."
+msgstr " шуд."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Source"
-msgstr "Маҷбурӣ"
+msgid "Software Packages Installation"
+msgstr "Тайёркунии қуттиҳо барои коргузорӣ..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Enabled?"
-msgstr "Даргирифта?"
+msgid "Additional packages needed"
+msgstr "Қуттиҳои иловагӣ лозиманд"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure sources"
-msgstr "Танзимдарории �арчашмаҳо"
+msgid "Bugfixes updates"
+msgstr "�авигариҳои Ғалати�лоҳ (Bugfixes)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Password:"
-msgstr "Гузарвожа:"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "Фаровири `%s', вақт:%s, �уръат:%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "User:"
-msgstr "Корванд:"
+msgid "Germany"
+msgstr "Олмон"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "Шумо метавонед барои а�лшино�ии ноиб корванд/гузарвожа муай�н кунед:"
+msgid "Russia"
+msgstr "Ру�и�"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "�оиби номихидматгор:"
+msgid "Norway"
+msgstr "�орвеж"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
-msgstr ""
-"Ба Шумо ноиб лозим бошад, номихидматгор ва даргоҳи ихтиёрӣ гузоред (наҳв: "
-"<хидматгорноиб[:даргоҳ]>):"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during installation"
+msgstr "Муаммоҳо ҳангоми коргузориш рӯй доданд"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Танзимдарории ноибҳо"
+msgid "Search"
+msgstr "Ҷу�туҷӯ"
 
 #: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Edit a media"
+msgstr "Таҳрири �арчашма"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Интизор шавед, навкунии миёна..."
+msgid "Czech Republic"
+msgstr "Ҷумҳурии Чех"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"Барои нигоҳ доштани тағирот, Шумо бо�д ба ҳаракатовар миёна дохил кунед."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "Барои давом Шумо бо�д миёна дохил кунед"
+msgid "Stop"
+msgstr "И�т"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Save changes"
-msgstr "�игоҳдории тағиротҳо"
+msgid "Update"
+msgstr "�ав кардан"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Роҳи ни�би ба synthesis/hdlist:"
+msgid "Please wait, removing packages..."
+msgstr "Интизор шавед, хориҷи қуттиҳо..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "Normal information"
+msgstr "Маълумоти оддӣ"
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "Таҳрири �арчашмаи \"%s\":"
+#: ../rpmdrake:1
+#, c-format
+msgid "Media: "
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Edit a source"
-msgstr "Таҳрири �арчашма"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "Фаровиркунии қутии `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Интизор шавед, хориҷи миёна..."
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Интихобшуда: %d МБ / Фо�илаи озоди ди�к: %d МБ"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Type of source:"
-msgstr "�авъи �арчашма:"
+msgid "Media"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Иловаи �арчашма:"
+msgid "Spain"
+msgstr "У�паниё"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
-msgstr ""
-"�ллакай миёна бо ин ном вуҷуд дорад, шумо ҳақиқатан\n"
-"онро иваз кардан мехоҳед?"
+msgid "Normal updates"
+msgstr "�авигариҳои оддӣ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Шумо бо�д ақалан ду оинаи авваларо пур кунед."
+msgid "by selection state"
+msgstr "аз рӯи вазъи�ти интихоб"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Name:"
-msgstr "�ом:"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
+"Лутфан интизор шавед, фаровири адре�ҳои оинаҳо аз пойгоҳи MandrakeSoft."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -973,143 +902,148 @@ msgid "Login:"
 msgstr "�оми дохилӣ (login):"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Choose a mirror..."
-msgstr "Оина интихоб кунед..."
+#, fuzzy, c-format
+msgid "Adding a media:"
+msgstr "Иловаи �арчашма:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Browse..."
-msgstr "Барра�ии..."
+msgid "Austria"
+msgstr "Утришш"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Path or mount point:"
-msgstr "Роҳ ё нуқтаи ва�лкунӣ:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Fatal error"
+msgstr "Хатогии файл"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Removable device"
-msgstr "Да�тгоҳи хориҷ шаванда"
+msgid "Update..."
+msgstr "�авкунӣ..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "Та�диқкунии имзои `%s'..."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "Хидматра�они HTTP"
+msgid "(none)"
+msgstr "(ҳеҷ)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "FTP server"
-msgstr "Хидматра�они FTP"
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
+"Хориҷи ин қуттиҳо �и�теми Шуморо вайрон ме�озад, узр:\n"
+"\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Path:"
-msgstr "Роҳ:"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Коргузории қуттии `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "Файлҳои маҳаллӣ"
+msgid "Currently installed version: "
+msgstr "�у�хаи коргузошта шуда: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add a source"
-msgstr "Иловаи �арчашма"
+msgid "Other"
+msgstr "Дигар"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr "�авкунии миёна номумкин, ин автоматикӣ хомӯш карда мешавад."
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "��о� барои навигарӣ: "
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to create medium."
-msgstr "Сохтани миёна номумкин."
+msgid "Please choose the desired mirror."
+msgstr "Лутфан оинаи хоҳиширо интихоб кунед."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "�ав кардан"
+msgid "Edit"
+msgstr "Таҳрир кардан"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Сарчашмаҳое, ки афзоиш додан мехоҳед, интихоб кунед:"
+msgid "Please wait, finding available packages..."
+msgstr "Интизор шавед, ёфтани қуттиҳои да�тра�..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Интизор шавед, навкунии муҳит..."
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Роҳи ни�би ба synthesis/hdlist:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " failed!"
-msgstr " нагузашт!"
+msgid "Search results (none)"
+msgstr "�атиҷаҳои ҷу�туҷӯ (ҳеҷ)"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid " done."
-msgstr " шуд."
+msgid "Danmark"
+msgstr "Донморк"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "Фаровири `%s', �уръат:%s"
+msgid "China"
+msgstr "Хитой"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "Фаровири `%s', вақт:%s, �уръат:%s"
+msgid "United States"
+msgstr "Иолоти Муттаҳида"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "Та�диқкунии имзои `%s'..."
+#: ../rpmdrake:1
+#, c-format
+msgid "changes:"
+msgstr "тағиротҳо:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "Санҷидани файли дурда�ти �арчашмаи `%s'..."
+msgid "Some additional packages need to be removed"
+msgstr "Баъзе қуттиҳои иловагӣ бо�д хориҷ карда шаванд"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "Санҷидани файли �арчашмаи `%s'..."
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "�у�хабардории файл барои �арчашма `%s'..."
+msgid "No"
+msgstr "�е"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure medias"
+msgstr "Танзимдарории �арчашмаҳо"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a media"
+msgstr "Иловаи �арчашма"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Please choose the desired mirror."
-msgstr "Лутфан оинаи хоҳиширо интихоб кунед."
+msgid "Summary: "
+msgstr "Маълумот: "
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
-msgstr ""
-"Ин �гон оинаи мувофиқ ёфта наметавонад.\n"
-"\n"
-"Барои ин муаммо �кчанд а�о�ҳо шуданаш мумкин; аз ҳама би�ёртараш ин\n"
-"ҳолате ки �охти пардозандаи шумо бо �авигариҳои Ра�мии Mandrake Linux\n"
-"да�тгир нашудаа�т."
+msgid "Canada"
+msgstr "Канада"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No mirror"
-msgstr "Оина не�т"
+msgid "Greece"
+msgstr "Юнон"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1126,179 +1060,245 @@ msgstr ""
 "Шабака, ё пойгоҳи MandrakeSoft, мумкин да�тра� набошанд.\n"
 "Лутфан дертар такрор кунед."
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Error during download"
-msgstr "Хатогӣ ҳангоми фаровир"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Барои коргузории қуттиҳо Шумо бо�д root бошед, узр."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
-"Лутфан интизор шавед, фаровири адре�ҳои оинаҳо аз пойгоҳи MandrakeSoft."
+msgid "Path:"
+msgstr "Роҳ:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Барои гирифтани рӯйхати оинаҳо ба пойгоҳи MandrakeSoft пайва�т шудан лозим.\n"
-"Лутфан тафтиш кунед ки шабакаи шумо кор карда и�тодаа�т.\n"
-"\n"
-"Давом додан гирем?"
+msgid "Problem during removal"
+msgstr "Муаммо ҳангоми хориҷкунӣ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United States"
-msgstr "Иолоти Муттаҳида"
+msgid "Selected"
+msgstr "Интихобшуда"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "Хитой"
+msgid "Netherlands"
+msgstr "Ҳуланд"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Подшоҳии Муттаҳида"
+msgid "Addable"
+msgstr "Иловашаванда"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Тойвон"
+msgid "(Not available)"
+msgstr "(Да�тра� �е�т)"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Sweden"
-msgstr "Суид"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
+msgstr ""
+"Узр, қуттиҳои зерин интихоб намешаванд:\n"
+"\n"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Russia"
-msgstr "Ру�и�"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Not selected"
+msgstr "Зидди�тҳо пайдо шуданд"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Portugal"
-msgstr "Пуртуқол"
+msgid "Software Packages Removal"
+msgstr "Хориҷкунии Қуттиҳои �армафзор"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Poland"
-msgstr "Лаҳи�тон"
+msgid "Sweden"
+msgstr "Суид"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Norway"
-msgstr "�орвеж"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
+msgstr ""
+"\n"
+"\n"
+"Ҳи�оботи Хатогӣ(ҳо):\n"
+"%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Netherlands"
-msgstr "Ҳуланд"
+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 ""
+"Рӯйхати навигариҳо холӣ. Ин маънои онро дорад ки ё навигарӣ да�тра�\n"
+"не�т барои қуттиҳои дар компютери шумо коргузошта шуда, ё шумо аллакай\n"
+"ҳамаашро коргузошта шудаед."
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Korea"
-msgstr "Маҷбурӣ"
+msgid "Examining file of media `%s'..."
+msgstr "Санҷидани файли �арчашмаи `%s'..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Japan"
-msgstr "Ҷопон"
+msgid "Download of `%s', speed:%s"
+msgstr "Фаровири `%s', �уръат:%s"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Italy"
-msgstr "Коргузорӣ"
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Яке аз қуттиҳои зерин лозим а�т:"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Israel"
-msgstr "Коргузорӣ"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Баромад"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Greece"
-msgstr "Юнон"
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Барои гирифтани қуттиҳои навтарин, ба оина пайва�т шуданам даркор.\n"
+"Лутфан мӯътақид шавед, ки шабакаи шумо кор карда и�тодаа�т.\n"
+"\n"
+"Давом додан гирем?"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "France"
-msgstr "Маҷбурӣ"
+msgid "Update media(s)"
+msgstr "�авкунии �арчашма(ҳо)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Finland"
-msgstr "Финлонд"
+msgid "Ok"
+msgstr "Ok"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Spain"
-msgstr "У�паниё"
+msgid "Please wait, adding medium..."
+msgstr "Интизор шавед, иловаи миёна..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Danmark"
-msgstr "Донморк"
+msgid "Unable to get source packages."
+msgstr "Қуттиҳои �арчашмавӣ гирифта нашуд."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "Олмон"
+msgid "Too many packages are selected"
+msgstr "�з ҳад зиёд қуттиҳо интихоб шудаанд"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"Марҳамат ба муҳаррири �арчашмаи қуттиҳо!\n"
+"\n"
+"Ин а�боб барои танзими �арчашмаҳои қуттиҳое ки шумо дар компютери худ "
+"и�тифода\n"
+"бурдан мехоҳед ёрӣ медиҳад. Онҳо па� барои коргузоштани қуттии нармафзори "
+"нав\n"
+"ё иҷрои навигариҳо да�тра� мешаванд."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
+msgstr "зидди�тҳо бо"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Ҷумҳурии Чех"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Марҳамат ба MandrakeUpdate!\n"
+"\n"
+"Ин а�боб ба шумо барои интихоби навигарӣ барои коргузоштан ба компютери\n"
+"Шумо ёрӣ медиҳад."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Ко�то Рико"
+msgid "Mandrake choices"
+msgstr "Интихоботи Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Canada"
-msgstr "Канада"
+msgid "Changelog:\n"
+msgstr "Changelog:\n"
 
 #: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Korea"
+msgstr "Маҷбурӣ"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Brazil"
-msgstr "Бразил"
+msgid "Removable device"
+msgstr "Да�тгоҳи хориҷ шаванда"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Белжик"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "О�тролиё"
+msgid "Change medium"
+msgstr "Ивази миёна"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "Утришш"
+msgid "Mandrake Update"
+msgstr "�авигарии Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
-msgstr "Маълумот..."
+msgid "by size"
+msgstr "бо ҳаҷм"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "�е"
+msgid "FTP server"
+msgstr "Хидматра�они FTP"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "Ҳа"
+msgid "Files:\n"
+msgstr "Файлҳо:\n"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr "�авкунии миёна номумкин, ин автоматикӣ хомӯш карда мешавад."
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -1572,6 +1572,14 @@ msgstr "Хориҷи �армафзор"
 msgid "Software Sources Manager"
 msgstr "Менеҷери Сарчашмаҳои �армафзор"
 
+#, fuzzy
+#~ msgid "Source: "
+#~ msgstr "Маҷбурӣ"
+
+#, fuzzy
+#~ msgid "Source"
+#~ msgstr "Маҷбурӣ"
+
 #~ msgid ""
 #~ "some packages failed to install\n"
 #~ "correctly"
diff --git a/po/th.po b/po/th.po
index cfe86b12..2829676a 100644
--- a/po/th.po
+++ b/po/th.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: 2002-11-27 21:43+0700\n"
 "Last-Translator: Varokas Panusuwan <varokasp@hotmail.com>\n"
 "Language-Team: Thai <th@li.org>\n"
@@ -14,16 +14,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"คุณต้อง�ารจะทำต่อหรือไม่?"
+msgid "Enabled?"
+msgstr "เปิดใช้?"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "ที่อยู่หรือจุดเมาท์:"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Portugal"
+msgstr "โปรตุเ�ส"
 
 #: ../rpmdrake:1
 #, c-format
@@ -42,58 +46,105 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "by group"
+msgstr "ตาม�ลุ่ม"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "ชื่อ:"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Italy"
+msgstr "อิตาลี"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "วิธีเลือ� mirror ของคุณเอง"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "๊URL:"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "เพ�เ�จบางตัวต้องถู�ลบออ�"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
+msgstr "ข้อมูลเพื่มเติมบน�พ�เ�จ..."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "ใช่"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Welcome to MandrakeUpdate!\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
 msgstr ""
-"ยินดีต้อนรับสู่ Mandrake Update!\n"
+"เนื่องจา� dependencies จา�เพจเ�จเหล่านี้ ทำให้ต้องเลือ�ออ�ตอนนี้:\n"
 "\n"
-"โปร��รมนี้จะช่วยคุณใน�ารเลือ�ตัวอัพเดทที่คุณต้อง�าร install ลงในเครื่อง"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "everything was installed correctly"
+msgstr "ทุ�อย่างถู� install เรียบร้อย"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
 msgid ""
-"Welcome to the software removal tool!\n"
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
 "\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
+"Then, restart MandrakeUpdate."
 msgstr ""
-"ยินดีต้อนรับสู่ software removal tool!\n"
+"คุณสามารถเลือ� mirror ได้เอง\n"
+"โดยเปิด Software Sources Manager �ล้ว�็เพิ่ม Security updates' source\n"
 "\n"
-"โปร��รมนี้จะช่วยคุณใน�ารเลือ�โปร��รมที่คุณต้อง�ารลบออ�จา�เครื่อง"
+"จา�นั้น �็ปิด�ล้วเปิด Mandrake Update อี�ครั้ง"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"Welcome to the software removal tool!\n"
 "\n"
-"%s"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
 msgstr ""
-"เ�ิดปั�หาขณะ install:\n"
+"ยินดีต้อนรับสู่ software removal tool!\n"
 "\n"
-"%s"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during removal"
-msgstr "เ�ิดปั�หาขณะ install"
+"โปร��รมนี้จะช่วยคุณใน�ารเลือ�โปร��รมที่คุณต้อง�ารลบออ�จา�เครื่อง"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "�ำลังลบเพ�เ�จ, �รุณารอสั�ครู่..."
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "ถ้าคุณต้อง�ารบันทึ��ารเปลี่ยน�ปลง, คุณต้องใส่�ผ่นข้อมูล"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "�ำลังอ่านจา��านข้อมูลเพ�เ�จ, �รุณารอสั�ครู่..."
+msgid "Save and quit"
+msgstr "บันทึ��ล้วออ�"
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"There was a problem during the installation:\n"
+"There was a problem during the removal of packages:\n"
 "\n"
 "%s"
 msgstr ""
@@ -103,79 +154,71 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation failed"
-msgstr "install ไม่สำเร็จ"
+msgid "Size: "
+msgstr "ขนาด:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr ""
+msgid "Security updates"
+msgstr "อัพเดทระบบรั�ษาความปลอดภัย"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "�าร install package"
+msgid "Already existing update medias"
+msgstr "เ�ิดข้อผิดพลาดขณะ�ำลังเพื่ม�ผ่นข้อมูลอัพเดท"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "เพ�เ�จทุ�ตัวที่เลือ�ไว้ถู� install เรียบร้อย"
+msgid "Maximum information"
+msgstr "ข้อมูล�บบละเอียด"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "ทุ�อย่างถู� install เรียบร้อย"
+msgid "Proxy..."
+msgstr "Proxy..."
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The installation is finished; %s.\n"
-"\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
 msgstr ""
-"install เสร็จสมบูรณ์; %s\n"
-"\n"
-"ไฟล์ configuration บางตัวถู�สร้างในชื่อ '.rpmnew' หรือ '.rpmsave', \n"
-"คุณอาจจะต้องตรวจสอบไฟล์เหล่านี้หา�ต้อง�ารทำอย่างอื่นต่อไป"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "everything was installed correctly"
-msgstr "ทุ�อย่างถู� install เรียบร้อย"
+"install ไม่สำเร็จ, ไฟล์บางไฟล์อยู่ไท่ครบ\n"
+"คุณอาจจะต้องอัพเดท�านข้อมูล source ของคุณ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Problem during installation"
-msgstr "เ�ิดปั�หาขณะ install"
+msgid "United Kingdom"
+msgstr "อัง�ฤษ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr ""
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "�าร install package"
+msgid "in names"
+msgstr "ในชื่อ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
+"I can't find any suitable mirror.\n"
 "\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
+"ไม่สามารถพบ mirror ที่เหมาะสมได้\n"
+"\n"
+"ปั�หานี้เ�ิดได้จา�หลายสาเหตุ; ส่วนมา��ล้วจะมาจา��ารที่ architecture ของ\n"
+"หน่วยประมวลผลของคุณไม่ได้สนับสนุนโดย Mandrake Linux Offical Updates"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"install ไม่สำเร็จ, ไฟล์บางไฟล์อยู่ไท่ครบ\n"
-"คุณอาจจะต้องอัพเดท�านข้อมูล source ของคุณ"
+msgid "Remove .%s"
+msgstr "ลบ %s"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "ฟิน�ลนด์"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -192,354 +235,338 @@ msgstr ""
 "\n"
 "คุณต้อง�ารทำต่อหรือไม่?"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Verifying packages signatures..."
+msgid "Examining distant file of media `%s'..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
+msgid "Verifying packages signatures..."
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Cancel"
-msgstr "ย�เลิ�"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "ต�ลง"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "�รุณาใส่สื่อข้อมูลชื่อ \"%s\" ลงในอุป�รณ์ชื่อ [%s]"
+msgid "France"
+msgstr "�รั่งเศส"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "Change medium"
-msgstr "เปลื่ยนสื่อข้อมูล"
+msgid "More info"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Initializing..."
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
+"%s\n"
+"\n"
+"คุณต้อง�ารจะทำต่อหรือไม่?"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Package installation..."
-msgstr "�าร install package"
+#, c-format
+msgid "Reload the packages list"
+msgstr "โหลดรายชื่อเพจเ�จใหม่"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "ไม่สามารถหา source เพ�เ�จได้"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "เลือ� mirror..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Unable to get source packages."
-msgstr "ไม่สามารถหา source เพ�เ�จได้"
+msgid "Some packages can't be installed"
+msgstr "ไม่สามารถ install บางเพ�เ�จได้"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "ตรวจสอบ..."
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation finished"
-msgstr "install เสร็จเรียบร้อย"
+msgid "All packages,"
+msgstr "ทุ�เพ�เ�จ,"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Type of media:"
+msgstr "ชนิดของ source:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "ไม่ต้องทำอะไร"
+msgid "in files"
+msgstr "ในไฟล์"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "ใช้ %s เป็นไฟล์หลั�Manager"
+msgid "All requested packages were installed successfully."
+msgstr "เพ�เ�จทุ�ตัวที่เลือ�ไว้ถู� install เรียบร้อย"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove .%s"
-msgstr "ลบ %s"
+msgid "Proxy hostname:"
+msgstr "ชื่อโฮส proxy: "
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "changes:"
-msgstr "บันทึ��ารเปลี่ยน�ปลง"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "ไฟล์ในเครื่องนี้"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspecting %s"
 msgstr "�ำลังตรวจสอบ %s"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Please wait, finding available packages..."
-msgstr "�ำลังหาเพ�เ�จที่มีอยู่, �รุณารอสั�ครู่..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "�ำลังเพิ่ม�ผ่นข้อมูล, �รุณารอสั�ครู่"
+msgid "Israel"
+msgstr "อิสราเอล"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
-"\n"
-"Then, restart MandrakeUpdate."
-msgstr ""
-"คุณสามารถเลือ� mirror ได้เอง\n"
-"โดยเปิด Software Sources Manager �ล้ว�็เพิ่ม Security updates' source\n"
-"\n"
-"จา�นั้น �็ปิด�ล้วเปิด Mandrake Update อี�ครั้ง"
+msgid "Help"
+msgstr "ความช่วยเหลือ"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "วิธีเลือ� mirror ของคุณเอง"
+msgid "HTTP server"
+msgstr "เซอร์้เวอร์ HTTP"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
-msgstr ""
+msgid "Installation failed"
+msgstr "install ไม่สำเร็จ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Already existing update sources"
-msgstr ""
+msgid "Use .%s as main file"
+msgstr "ใช้ %s เป็นไฟล์หลั�Manager"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"โปร��รทต้อง�ารติดต่อ�ับ mirror เพื่อหาตัวอัพเดทล่าสุด\n"
-"�รุณาตรวจสอบว่าระบบเนตเวอร์��ำลังใช้งานอยู่\n"
-"\n"
-"คุณต้อง�ารจะทำต่อไปหรือไม่?"
+msgid "Search results"
+msgstr "ผล�ารค้นหา"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid " failed!"
+msgstr "ในไฟล์"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Brazil"
+msgstr "บราซิล"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Fatal error"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 msgstr ""
+"มีสื่อข้อมูลชื่อดัง�ล่าวอยู่�ล้ว\n"
+"คุณต้อง�ารจะเขียนทับหรือไม่?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Software Packages Installation"
-msgstr "�าร install package"
+msgid "Find:"
+msgstr "ค้นหา:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "อัพเดทของ Mandrake"
+msgid "All packages, alphabetical"
+msgstr "ทุ�เพ�เ�จ, เรียงตามตัวอั�ษร"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "�ารลบเพ�เ�จ"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Quit"
-msgstr "ออ�"
+msgid "Please wait, searching..."
+msgstr "�ำลังค้นหา �รุณารอสั�ครู่..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Install"
+msgid "Please wait, reading packages database..."
+msgstr "�ำลังอ่านจา��านข้อมูลเพ�เ�จ, �รุณารอสั�ครู่..."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "เอาออ�"
+msgid "unknown package "
+msgstr "ไม่รู้จั�เพ�เ�จนี้"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Help"
-msgstr "ความช่วยเหลือ"
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "�รุณาใส่สื่อข้อมูลชื่อ \"%s\" ลงในอุป�รณ์ชื่อ [%s]"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search"
-msgstr "ค้นหา"
+msgid "Reset the selection"
+msgstr "reset รายชื่อที่ถู�เลือ�"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Find:"
-msgstr "ค้นหา:"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr "ถ้าคุณต้อง�ารใช้ proxy �รุณาใส่ชื่อ host �ละ port (รูป�บบ: <proxyhost[:port]>):"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
 "\n"
-"Is it ok to continue?"
 msgstr ""
-"เพ�เ�จเหล่านี้ต้องถู�ลบออ�เพื่อให้เพจเ�จอื่นๆอัพเ�รดได้:\n"
-"\n"
-"%s\n"
+"เนื่องจา� dependencies จา�เพจเ�จเหล่านี้ ทำให้เพ�เ�จที่มีชื่อดังนี้\n"
+"ต้องถู�ลบออ�:\n"
 "\n"
-"คุณต้อง�ารทำต่อหรือไม่?"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "เพ�เ�จบางตัวต้องถู�ลบออ�"
+msgid "Costa Rica"
+msgstr "คอสตาริ�า"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
+"There was a problem during the installation:\n"
 "\n"
-"Do you really want to install all the selected packages?"
+"%s"
 msgstr ""
-"คำเตือน: คุณ�ำลังเพิ่มเพ�เ�จเป็นจำนวนมา�ลงเครื่องของคุณ�ละอาจจะ\n"
-"ทำให้พื้นที่ว่างในระบบหมดไปขณะ หรือ หลัง�ารลงเพ�เ�จ�ล้ว\n"
-"�าร�ระทำนี้อาจเป็นอันตราย�ละควรจะพิจารณาให้ถี่ถ้วน\n"
+"เ�ิดปั�หาขณะ install:\n"
 "\n"
-"คุณต้อง�ารจะลงเพ�เ�จที่เลือ�ไว้ทั้งหมดหรือไม่?"
+"%s"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "มีเพ�เ�จที่ถู�เลือ�มา�เ�ินไป"
+msgid "Please wait, removing medium..."
+msgstr "�ำลังเอาสื่อข้อมูลออ�, �รุณารอสั�ครู่"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Maximum information"
-msgstr "ข้อมูล�บบละเอียด"
+msgid "Password:"
+msgstr "พาสเวิร์ด:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Normal information"
-msgstr "ข้อมูล�บบป�ตื"
+msgid "Taiwan"
+msgstr "ไต้หวัน"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update source(s)"
-msgstr "อัพเดท source(s)"
+msgid "User:"
+msgstr "ผู้ใช้:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "โหลดรายชื่อเพจเ�จใหม่"
+msgid "Please wait, updating medium..."
+msgstr "�ำลังอัพเดท�ผ่นข้อมูล, �รุณารอสั�ครู่"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "reset รายชื่อที่ถู�เลือ�"
+msgid "Please wait, listing packages..."
+msgstr "�ำลังทำรายชื่อเพ�เ�จ, �รุณารอสั�ครู่"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "in files"
-msgstr "ในไฟล์"
+#, fuzzy, c-format
+msgid "Information on packages"
+msgstr "ข้อมูลเพื่มเติมบน�พ�เ�จ..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "in descriptions"
-msgstr "ตามคำอธิบาย"
+msgid "Cancel"
+msgstr "ย�เลิ�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "ในชื่อ"
+msgid "Everything installed successfully"
+msgstr "ทุ�อย่างถู� install เรียบร้อย"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "by update availability"
-msgstr "ตามความพร้อมใน�ารอัพเดท"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Select the media(s) you wish to update:"
+msgstr "เลือ� source(s) ที่คุณต้อง�ารจะอัพเดท"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by source repository"
-msgstr "ตาม source repository"
+msgid "Please wait, updating media..."
+msgstr "�ำลังอัพเดทสื่อข้อมูล, �รุณารอสั�ครู่"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by selection state"
-msgstr "ตาม�ารถู�เลือ�"
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by size"
-msgstr "ตามขนาด"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"เพ�เ�จเหล่านี้ต้องถู�ลบออ�เพื่อให้เพจเ�จอื่นๆอัพเ�รดได้:\n"
+"\n"
+"%s\n"
+"\n"
+"คุณต้อง�ารทำต่อหรือไม่?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-msgstr "ตาม�ลุ่ม"
+msgid "in descriptions"
+msgstr "ตามคำอธิบาย"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "All packages,"
-msgstr "ทุ�เพ�เ�จ,"
+msgid "Configure proxies"
+msgstr "ปรับ�ต่ง proxies"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "ทุ�เพ�เ�จ, เรียงตามตัวอั�ษร"
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"โปร��รมต้อง�ารติดต่อเวปไซต์ MandrakeSoft เพื่ออ่านรายชื่อ mirrors\n"
+"�รุณาตรวจสอบว่าระบบเนตเวิร์�ของคุณ�ำลังเปิดใช้งานอยู่\n"
+"\n"
+"คุณต้อง�ารจะทำต่อหรือไม่?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Mandrake choices"
+msgid "Please choose"
+msgstr "�รุณาเลือ�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Normal updates"
-msgstr "อัพเดททั่วไป"
+msgid "Selected size: %d MB"
+msgstr "ขนาดรวมที่เลือ�: %d MB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "อัพเดท�บบ��้ไขบั�"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Security updates"
-msgstr "อัพเดทระบบรั�ษาความปลอดภัย"
+msgid "Initializing..."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Description: "
-msgstr "คำอธิบาย:"
+msgid "Save changes"
+msgstr "บันทึ��ารเปลี่ยน�ปลง"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Reason for update: "
-msgstr "เหตุผลใน�ารอัพเดท:"
+msgid "Error during download"
+msgstr "เ�ิดข้อผิดพลาดขณะดาวน์โหลด"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Summary: "
-msgstr "ข้อความสรุป:"
+#, fuzzy, c-format
+msgid "Package installation..."
+msgstr "�าร install package"
 
 #: ../rpmdrake:1
 #, c-format
@@ -548,545 +575,460 @@ msgstr "ความสำคั�:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Size: "
-msgstr "ขนาด:"
+msgid ""
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
+msgstr ""
+"เนื่องจา� dependencies, เพจเ�จเหล่านี้จะต้อง install ไปด้วย:\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Version: "
-msgstr "เวอร์ชัน:"
+msgid "Add..."
+msgstr "เพิ่ม..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Name: "
-msgstr "ชื่อ:"
+msgid "Unable to create medium."
+msgstr "ไม่สามารถสร้าง�ผ่นข้อมูลได้"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "เวอร์ชันที่�ำลังใช้อยู่:"
+msgid ""
+"The installation is finished; %s.\n"
+"\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
+msgstr ""
+"install เสร็จสมบูรณ์; %s\n"
+"\n"
+"ไฟล์ configuration บางตัวถู�สร้างในชื่อ '.rpmnew' หรือ '.rpmsave', \n"
+"คุณอาจจะต้องตรวจสอบไฟล์เหล่านี้หา�ต้อง�ารทำอย่างอื่นต่อไป"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Source: "
-msgstr "Source:"
+msgid "Browse..."
+msgstr "เลือ�..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "(Not available)"
-msgstr "(ไม่พร้อมใช้งาน)"
+msgid "Some packages can't be removed"
+msgstr "ไม่สามารถลบเพ�เ�จบางตัวออ�ได้"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Changelog:\n"
+msgid "Info..."
+msgstr "ข้อมูล..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Files:\n"
-msgstr "�ฟ้ม:\n"
+msgid "You need to insert the medium to continue"
+msgstr "คุณต้องใส่สื่อข้อมูลเพื่อทำต่อ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "ขนาดรวมที่เลือ�: %d MB"
+msgid "Copying file for media `%s'..."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "เลือ�ไป: %d MB / พื้นที่ดิส�์ที่เหลือ: %d MB"
+msgid "Remove"
+msgstr "เอาออ�"
 
 #: ../rpmdrake:1
-#, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
-msgstr ""
-"เนื่องจา� dependencies จา�เพจเ�จเหล่านี้ ทำให้ต้องเลือ�ออ�ตอนนี้:\n"
-"\n"
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "�าร install package"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr ""
-"เพ�เ�จเหล่านี้ไม่สามารถถู�เลือ�ได้:\n"
-"\n"
+msgid "by media repository"
+msgstr "ตาม source repository"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "%s conflicts with %s"
-msgstr ""
+msgid "No mirror"
+msgstr "ไม่พบ mirror"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Some packages can't be installed"
-msgstr "ไม่สามารถ install บางเพ�เ�จได้"
+msgid "You need to fill up at least the two first entries."
+msgstr "คุณต้องใส่ข้อมูลอย่างน้อยในสองช่อง�ร�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
-msgstr ""
-"เนื่องจา� dependencies, เพจเ�จเหล่านี้จะต้อง install ไปด้วย:\n"
-"\n"
+msgid "Install"
+msgstr "Install"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Japan"
+msgstr "�ี่ปุ่น"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "ต้อง�ารเพจเ�จเพิ่มเติม"
+msgid "Do nothing"
+msgstr "ไม่ต้องทำอะไร"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages can't be removed"
-msgstr "ไม่สามารถลบเพ�เ�จบางตัวออ�ได้"
+msgid "No update"
+msgstr "ไม่มีตัวอัพเดท"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
+msgid "Description: "
+msgstr "คำอธิบาย:"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
 "\n"
+"Do you really want to install all the selected packages?"
 msgstr ""
-"เนื่องจา� dependencies จา�เพจเ�จเหล่านี้ ทำให้เพ�เ�จที่มีชื่อดังนี้\n"
-"ต้องถู�ลบออ�:\n"
+"คำเตือน: คุณ�ำลังเพิ่มเพ�เ�จเป็นจำนวนมา�ลงเครื่องของคุณ�ละอาจจะ\n"
+"ทำให้พื้นที่ว่างในระบบหมดไปขณะ หรือ หลัง�ารลงเพ�เ�จ�ล้ว\n"
+"�าร�ระทำนี้อาจเป็นอันตราย�ละควรจะพิจารณาให้ถี่ถ้วน\n"
 "\n"
+"คุณต้อง�ารจะลงเพ�เ�จที่เลือ�ไว้ทั้งหมดหรือไม่?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "มีเพ�เ�จบางตัวยังต้องถู�เอาออ�"
+msgid "Name: "
+msgstr "ชื่อ:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "More information on package..."
-msgstr "ข้อมูลเพื่มเติมบน�พ�เ�จ..."
+msgid "Inspect..."
+msgstr "ตรวจสอบ..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Information on packages"
-msgstr "ข้อมูลเพื่มเติมบน�พ�เ�จ..."
+msgid "Editing media \"%s\":"
+msgstr "�ำลัง��้ไข source \"%s\":"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
-#, c-format
-msgid "More info"
-msgstr ""
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "�าร install package"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "เพิ่มได้"
+msgid "Australia"
+msgstr "ออสเตรเลีย"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Upgradable"
-msgstr "อัพเ�รดได้"
+msgid "Installation finished"
+msgstr "install เสร็จเรียบร้อย"
 
 #: ../rpmdrake:1
 #, c-format
-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 ""
-"ไม่มีราย�ารที่ต้องอัพเดท หมายความว่าอาจจะยังไม่มีอัพเดทสำหรัับ\n"
-"เพ�เ�จที่อยู่ในเครื่องของคุณหรือไม่�็ถู� install หมด�ล้ว"
+msgid "by update availability"
+msgstr "ตามความพร้อมใน�ารอัพเดท"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "No update"
-msgstr "ไม่มีตัวอัพเดท"
+msgid "Poland"
+msgstr "โป�ลนด๋"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "(none)"
-msgstr "(ไม่มี)"
+msgid "Version: "
+msgstr "เวอร์ชัน:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "�ำลังทำรายชื่อเพ�เ�จ, �รุณารอสั�ครู่"
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "คุณต้องใส่ล็อ�อิน�ละพาสเวิร์ดเพื่อใช้ proxy:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "unknown package "
-msgstr "ไม่รู้จั�เพ�เ�จนี้"
+msgid "Upgradable"
+msgstr "อัพเ�รดได้"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "ต้อง�าร�พ�เ�จหนึ่งในรายชื่อนี้:"
+msgid " done."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "�รุณาเลือ�"
+msgid "Software Packages Installation"
+msgstr "�าร install package"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Additional packages needed"
+msgstr "ต้อง�ารเพจเ�จเพิ่มเติม"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Not selected"
-msgstr "ไม่ได้ถู�เลือ�"
+msgid "Bugfixes updates"
+msgstr "อัพเดท�บบ��้ไขบั�"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Selected"
-msgstr "ถู�เลือ�"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results"
-msgstr "ผล�ารค้นหา"
+msgid "Germany"
+msgstr "เยอรมนี"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Stop"
-msgstr "หยุด"
+msgid "Russia"
+msgstr "รัสเซีย"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "�ำลังค้นหา �รุณารอสั�ครู่..."
+msgid "Norway"
+msgstr "นอร์เวย์"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results (none)"
-msgstr "ผล�ารค้นหา (ไม่พบ)"
+msgid "Problem during installation"
+msgstr "เ�ิดปั�หาขณะ install"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Other"
-msgstr "อื่นๆ"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid ""
-"Welcome to the packages source editor!\n"
-"\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
-msgstr ""
-"ยินดีต้อนรับสู่ package source editor!\n"
-"\n"
-"เครื่องมือนี้จะช่วยคุณใน�ารปรับ�ต่ง package sources ที่คุณจะใช้ในเครื่องคอมพิวเตอร์\n"
-"ของคุณ เพื่อที่เพ�เ�จเหล่านี้จะได้พร้อมสำหรับ�าร install หรืออัพเดทต่อไป"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Save and quit"
-msgstr "บันทึ��ล้วออ�"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Proxy..."
-msgstr "Proxy..."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Update..."
-msgstr "อัพเดท..."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add..."
-msgstr "เพิ่ม..."
+msgid "Search"
+msgstr "ค้นหา"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Edit"
-msgstr "��้ไข"
+#, fuzzy, c-format
+msgid "Edit a media"
+msgstr "��้ไข source"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Source"
-msgstr "Source"
+msgid "Czech Republic"
+msgstr "สาธารณรั�เช็ค"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Enabled?"
-msgstr "เปิดใช้?"
+msgid ""
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure sources"
-msgstr "ปรับ�ต่ง source"
+msgid "Stop"
+msgstr "หยุด"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Password:"
-msgstr "พาสเวิร์ด:"
+msgid "Update"
+msgstr "อัพเดท"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "User:"
-msgstr "ผู้ใช้:"
+msgid "Please wait, removing packages..."
+msgstr "�ำลังลบเพ�เ�จ, �รุณารอสั�ครู่..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "คุณต้องใส่ล็อ�อิน�ละพาสเวิร์ดเพื่อใช้ proxy:"
+msgid "Normal information"
+msgstr "ข้อมูล�บบป�ตื"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "ชื่อโฮส proxy: "
+msgid "Media: "
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
-msgstr "ถ้าคุณต้อง�ารใช้ proxy �รุณาใส่ชื่อ host �ละ port (รูป�บบ: <proxyhost[:port]>):"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "ปรับ�ต่ง proxies"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "เลือ�ไป: %d MB / พื้นที่ดิส�์ที่เหลือ: %d MB"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "�ำลังอัพเดท�ผ่นข้อมูล, �รุณารอสั�ครู่"
+msgid "Media"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "ถ้าคุณต้อง�ารบันทึ��ารเปลี่ยน�ปลง, คุณต้องใส่�ผ่นข้อมูล"
+msgid "Spain"
+msgstr "สเปน"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "คุณต้องใส่สื่อข้อมูลเพื่อทำต่อ"
+msgid "Normal updates"
+msgstr "อัพเดททั่วไป"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "บันทึ��ารเปลี่ยน�ปลง"
+msgid "by selection state"
+msgstr "ตาม�ารถู�เลือ�"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "พาธ�บบ relative ไปยัง synthesis/hdlist:"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "�รุณารอสั�ครุ่, �ำลังดาว์นโหลดรายชื่อ mirrors จา�เวป MandrakeSoft"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "URL:"
-msgstr "๊URL:"
+msgid "Login:"
+msgstr "ล็อ�อิน:"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "�ำลัง��้ไข source \"%s\":"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Edit a source"
-msgstr "��้ไข source"
+msgid "Adding a media:"
+msgstr "เพิ่ม source: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "�ำลังเอาสื่อข้อมูลออ�, �รุณารอสั�ครู่"
+msgid "Austria"
+msgstr "ออสเตรีย"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Type of source:"
-msgstr "ชนิดของ source:"
+msgid "Fatal error"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Adding a source:"
-msgstr "เพิ่ม source: "
+msgid "Update..."
+msgstr "อัพเดท..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
+msgid "Starting download of `%s'..."
 msgstr ""
-"มีสื่อข้อมูลชื่อดัง�ล่าวอยู่�ล้ว\n"
-"คุณต้อง�ารจะเขียนทับหรือไม่?"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "คุณต้องใส่ข้อมูลอย่างน้อยในสองช่อง�ร�"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Name:"
-msgstr "ชื่อ:"
+msgid "(none)"
+msgstr "(ไม่มี)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Login:"
-msgstr "ล็อ�อิน:"
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr "เลือ� mirror..."
+msgid "Installing package `%s' (%s/%s)..."
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
-msgstr "เลือ�..."
+msgid "Currently installed version: "
+msgstr "เวอร์ชันที่�ำลังใช้อยู่:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Path or mount point:"
-msgstr "ที่อยู่หรือจุดเมาท์:"
+msgid "Other"
+msgstr "อื่นๆ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Removable device"
-msgstr "ไดร์ฟเคลื่อนย้ายได้"
+msgid "Reason for update: "
+msgstr "เหตุผลใน�ารอัพเดท:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "HTTP server"
-msgstr "เซอร์้เวอร์ HTTP"
+msgid "Please choose the desired mirror."
+msgstr "�รุณาเลือ� mirror ที่ต้อง�าร"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "FTP server"
-msgstr "เซอร์เวอร์ FTP"
+msgid "Edit"
+msgstr "��้ไข"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Path:"
-msgstr "พาธ:"
+msgid "Please wait, finding available packages..."
+msgstr "�ำลังหาเพ�เ�จที่มีอยู่, �รุณารอสั�ครู่..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Local files"
-msgstr "ไฟล์ในเครื่องนี้"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Add a source"
-msgstr "เพิ่ม source: "
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr "ไม่สามารถอัพเดท�ผ่นข้อมูลได้; �ผ่นข้อมูลนี้จะไม่ถู�ใช้โดยอัตโนมัติ"
+msgid "Relative path to synthesis/hdlist:"
+msgstr "พาธ�บบ relative ไปยัง synthesis/hdlist:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Unable to create medium."
-msgstr "ไม่สามารถสร้าง�ผ่นข้อมูลได้"
+msgid "Search results (none)"
+msgstr "ผล�ารค้นหา (ไม่พบ)"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Update"
-msgstr "อัพเดท"
+msgid "Danmark"
+msgstr "เดนมาร์�"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "เลือ� source(s) ที่คุณต้อง�ารจะอัพเดท"
+msgid "China"
+msgstr "จีน"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "�ำลังอัพเดทสื่อข้อมูล, �รุณารอสั�ครู่"
+msgid "United States"
+msgstr "สหรั�อเมริ�า"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid " failed!"
-msgstr "ในไฟล์"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid " done."
-msgstr ""
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Download of `%s', speed:%s"
-msgstr ""
+msgid "changes:"
+msgstr "บันทึ��ารเปลี่ยน�ปลง"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr ""
+msgid "Some additional packages need to be removed"
+msgstr "มีเพ�เ�จบางตัวยังต้องถู�เอาออ�"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Starting download of `%s'..."
-msgstr ""
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr ""
+msgid "No"
+msgstr "ไม่ใช่"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Examining file of source `%s'..."
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure medias"
+msgstr "ปรับ�ต่ง source"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Copying file for source `%s'..."
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a media"
+msgstr "เพิ่ม source: "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please choose the desired mirror."
-msgstr "�รุณาเลือ� mirror ที่ต้อง�าร"
+msgid "Summary: "
+msgstr "ข้อความสรุป:"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
-msgstr ""
-"ไม่สามารถพบ mirror ที่เหมาะสมได้\n"
-"\n"
-"ปั�หานี้เ�ิดได้จา�หลายสาเหตุ; ส่วนมา��ล้วจะมาจา��ารที่ architecture ของ\n"
-"หน่วยประมวลผลของคุณไม่ได้สนับสนุนโดย Mandrake Linux Offical Updates"
+msgid "Canada"
+msgstr "�คนาดา"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No mirror"
-msgstr "ไม่พบ mirror"
+msgid "Greece"
+msgstr "�รืซ"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1102,178 +1044,236 @@ msgstr ""
 "%s\n"
 "ระบบเนตเวิร์� หรือ เวป MandrakeSoft ในขณะนี้อาจจะไม่พร้อมให้บริ�าร �รุณาลองใหม่ภายหลัง"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr "ไม่สามารถหา source เพ�เ�จได้"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Error during download"
-msgstr "เ�ิดข้อผิดพลาดขณะดาวน์โหลด"
+msgid "Path:"
+msgstr "พาธ:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during removal"
+msgstr "เ�ิดปั�หาขณะ install"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr "�รุณารอสั�ครุ่, �ำลังดาว์นโหลดรายชื่อ mirrors จา�เวป MandrakeSoft"
+msgid "Selected"
+msgstr "ถู�เลือ�"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"โปร��รมต้อง�ารติดต่อเวปไซต์ MandrakeSoft เพื่ออ่านรายชื่อ mirrors\n"
-"�รุณาตรวจสอบว่าระบบเนตเวิร์�ของคุณ�ำลังเปิดใช้งานอยู่\n"
-"\n"
-"คุณต้อง�ารจะทำต่อหรือไม่?"
+msgid "Netherlands"
+msgstr "เนเธอร์�ลนด์"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United States"
-msgstr "สหรั�อเมริ�า"
+msgid "Addable"
+msgstr "เพิ่มได้"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "China"
-msgstr "จีน"
+msgid "(Not available)"
+msgstr "(ไม่พร้อมใช้งาน)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
+msgstr ""
+"เพ�เ�จเหล่านี้ไม่สามารถถู�เลือ�ได้:\n"
+"\n"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "อัง�ฤษ"
+msgid "Not selected"
+msgstr "ไม่ได้ถู�เลือ�"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "ไต้หวัน"
+msgid "Software Packages Removal"
+msgstr "�ารลบเพ�เ�จ"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Sweden"
 msgstr "สวีเดน"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Russia"
-msgstr "รัสเซีย"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Portugal"
-msgstr "โปรตุเ�ส"
+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 ""
+"ไม่มีราย�ารที่ต้องอัพเดท หมายความว่าอาจจะยังไม่มีอัพเดทสำหรัับ\n"
+"เพ�เ�จที่อยู่ในเครื่องของคุณหรือไม่�็ถู� install หมด�ล้ว"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Poland"
-msgstr "โป�ลนด๋"
+msgid "Examining file of media `%s'..."
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Norway"
-msgstr "นอร์เวย์"
+msgid "Download of `%s', speed:%s"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Netherlands"
-msgstr "เนเธอร์�ลนด์"
+msgid "One of the following packages is needed:"
+msgstr "ต้อง�าร�พ�เ�จหนึ่งในรายชื่อนี้:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Korea"
-msgstr "เ�าหลี"
+msgid "Quit"
+msgstr "ออ�"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "�ี่ปุ่น"
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"โปร��รทต้อง�ารติดต่อ�ับ mirror เพื่อหาตัวอัพเดทล่าสุด\n"
+"�รุณาตรวจสอบว่าระบบเนตเวอร์��ำลังใช้งานอยู่\n"
+"\n"
+"คุณต้อง�ารจะทำต่อไปหรือไม่?"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Italy"
-msgstr "อิตาลี"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update media(s)"
+msgstr "อัพเดท source(s)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Israel"
-msgstr "อิสราเอล"
+msgid "Ok"
+msgstr "ต�ลง"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Greece"
-msgstr "�รืซ"
+msgid "Please wait, adding medium..."
+msgstr "�ำลังเพิ่ม�ผ่นข้อมูล, �รุณารอสั�ครู่"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "France"
-msgstr "�รั่งเศส"
+msgid "Unable to get source packages."
+msgstr "ไม่สามารถหา source เพ�เ�จได้"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "ฟิน�ลนด์"
+msgid "Too many packages are selected"
+msgstr "มีเพ�เ�จที่ถู�เลือ�มา�เ�ินไป"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Spain"
-msgstr "สเปน"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"ยินดีต้อนรับสู่ package source editor!\n"
+"\n"
+"เครื่องมือนี้จะช่วยคุณใน�ารปรับ�ต่ง package sources ที่คุณจะใช้ในเครื่องคอมพิวเตอร์\n"
+"ของคุณ เพื่อที่เพ�เ�จเหล่านี้จะได้พร้อมสำหรับ�าร install หรืออัพเดทต่อไป"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Danmark"
-msgstr "เดนมาร์�"
+msgid "%s conflicts with %s"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "เยอรมนี"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"ยินดีต้อนรับสู่ Mandrake Update!\n"
+"\n"
+"โปร��รมนี้จะช่วยคุณใน�ารเลือ�ตัวอัพเดทที่คุณต้อง�าร install ลงในเครื่อง"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
-msgstr "สาธารณรั�เช็ค"
+msgid "Mandrake choices"
+msgstr "Mandrake choices"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "คอสตาริ�า"
+msgid "Changelog:\n"
+msgstr "Changelog:\n"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "�คนาดา"
+msgid "Korea"
+msgstr "เ�าหลี"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Brazil"
-msgstr "บราซิล"
+msgid "Removable device"
+msgstr "ไดร์ฟเคลื่อนย้ายได้"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "เบลเยียม"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "ออสเตรเลีย"
+msgid "Change medium"
+msgstr "เปลื่ยนสื่อข้อมูล"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "ออสเตรีย"
+msgid "Mandrake Update"
+msgstr "อัพเดทของ Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
-msgstr "ข้อมูล..."
+msgid "by size"
+msgstr "ตามขนาด"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "ไม่ใช่"
+msgid "FTP server"
+msgstr "เซอร์เวอร์ FTP"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "ใช่"
+msgid "Files:\n"
+msgstr "�ฟ้ม:\n"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr "ไม่สามารถอัพเดท�ผ่นข้อมูลได้; �ผ่นข้อมูลนี้จะไม่ถู�ใช้โดยอัตโนมัติ"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -1546,6 +1546,12 @@ msgstr "ลบโปร��รท"
 msgid "Software Sources Manager"
 msgstr "ตัวจัด�าร Software Sources"
 
+#~ msgid "Source: "
+#~ msgstr "Source:"
+
+#~ msgid "Source"
+#~ msgstr "Source"
+
 #~ msgid ""
 #~ "some packages failed to install\n"
 #~ "correctly"
@@ -1581,9 +1587,6 @@ msgstr "ตัวจัด�าร Software Sources"
 #~ "\n"
 #~ "คุณต้อง�ารจะลอง mirror อื่นหรือไม่?"
 
-#~ msgid "Error adding update medium"
-#~ msgstr "เ�ิดข้อผิดพลาดขณะ�ำลังเพื่ม�ผ่นข้อมูลอัพเดท"
-
 #~ msgid "Please wait, contacting mirror to initialize updates packages."
 #~ msgstr "�ำลังติดต่อ�ับ mirror เพื่อขออัพเดทเพ�เ�จ �รุณารอสั�ครู่"
 
diff --git a/po/tr.po b/po/tr.po
index fb4390f3..5ff5ab42 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: 2003-02-13 18:29+0200\n"
 "Last-Translator: Ömer Fadıl USTA <omer_fad@hotmail.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -16,16 +16,20 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"Devam etmek için herşey tamam mı ?"
+msgid "Enabled?"
+msgstr "Etkin?"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Yol veya bağlama noktası:"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Portugal"
+msgstr "Portekiz"
 
 #: ../rpmdrake:1
 #, c-format
@@ -45,104 +49,53 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"MandrakeUpdate'e hoÅŸgeldiniz!\n"
-"\n"
-"Bu araç, bilgisayarınıza yüklemek istediğiniz güncellemeleri seçmede size\n"
-"yardımcı olacak."
+msgid "by group"
+msgstr "gruba göre"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
-msgstr ""
-"Yazılım kaldırma aracına hoş geldiniz!\n"
-"\n"
-"Bu araç, bilgisayarınızdan kaldırmak istediğiniz uygulamaları seçmede size\n"
-"yardımcı olacak."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Paketlerin kurulumu sırasında bir hata ile karşılaşıldı:\n"
-"\n"
-"%s"
+msgid "Name:"
+msgstr "Adı:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Problem during removal"
-msgstr "Kaldırım esnasında problem"
+msgid "Italy"
+msgstr "Ä°talya"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "Lütfen bekleyin, paketler kaldırılıyor..."
+msgid "How to choose manually your mirror"
+msgstr "Yansınızı elle nasıl seçersiniz?"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Lütfen bekleyin, paket veritabanı okunuyor..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Paketlerin kurulumu sırasında bir hata ile karşılaşıldı:\n"
-"\n"
-"%s"
+msgid "URL:"
+msgstr "URL:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation failed"
-msgstr "Kurulum başarısız"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Kurulum için paketler hazırlanılıyor..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Kurulum için paketler hazırlanılıyor..."
+msgid "Some packages need to be removed"
+msgstr "Bazı paketlerin kaldırılması gerekiyor"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "İstenen paketler başarılı bir şekilde yüklendi."
+msgid "More information on package..."
+msgstr "Paket hakkında daha fazla bilgi..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Herşey başarılı bir şekilde yüklendi"
+msgid "Yes"
+msgstr "Evet"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
 msgstr ""
-"Kurulum tamamlandır; %s.\n"
+"Bağımlılıkları nedeniyle şu paketlerin seçili olmaması gerekiyor:\n"
 "\n"
-"'.rpmnew' veya '.rpmsave' olak bazı yapılandırma dosyaları oluşturuldu.\n"
-"Harekete geçmek için artık birkaçını inceleyebilirsiniz:"
 
 #: ../rpmdrake:1
 #, c-format
@@ -150,456 +103,452 @@ msgid "everything was installed correctly"
 msgstr "HerÅŸey kusursuz kuruldu"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Kurulum sırasında sorunlar oluştu"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "'%s' paketi kuruluyor ( %s/%s)..."
+msgid "%s KB"
+msgstr "%s KB"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Kurulum için paketler hazırlanılıyor..."
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"İstediğiniz yansıyı elle de seçebilirsiniz: bunu yapmak\n"
+"için Yazılım Kaynakları Yöneticisini açın ve sonra\n"
+"'Güvenlik güncellemeleri' kaynağı ekleyin.\n"
+"\n"
+"Daha sonra, MandrakeUpdate'i yeniden çalıştırın."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
+"Welcome to the software removal tool!\n"
 "\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
 msgstr ""
+"Yazılım kaldırma aracına hoş geldiniz!\n"
 "\n"
-"\n"
-"Hata(lar) rapor edildi:\n"
-"%s"
+"Bu araç, bilgisayarınızdan kaldırmak istediğiniz uygulamaları seçmede size\n"
+"yardımcı olacak."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"Kurulum başarısız, bazı dosyalar eksik.\n"
-"Kaynak veritabanınızı güncellemeyi düşünebilirsiniz."
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "Değişiklikleri kaydetmek için ortamı sürücüye takın."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Kaydet ve çık"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
+"There was a problem during the removal of packages:\n"
 "\n"
-"Do you want to continue installation?"
+"%s"
 msgstr ""
-"Diğerlerinin güncellenmesi için şu paketlerin kaldırılması gerekiyor:\n"
-"\n"
-"%s\n"
+"Paketlerin kurulumu sırasında bir hata ile karşılaşıldı:\n"
 "\n"
-"Devam etmek için herşey tamam mı?"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "`%s' paketi indiriliyor (%s/%s)..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Cancel"
-msgstr "Ä°ptal"
+msgid "Size: "
+msgstr "Boyut: "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Ok"
-msgstr "Tamam"
+msgid "Security updates"
+msgstr "Güvenlik güncellemeleri"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "\"%s\" ismindeki ortamı [%s] aygıtına takın"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Change medium"
-msgstr "Ortam deÄŸiÅŸtir"
+msgid "Already existing update medias"
+msgstr "Güncelleme ortamı eklenirken hata"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "Başlatılıyor..."
+msgid "Maximum information"
+msgstr "En fazla bilgi"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Kurulum için paketler hazırlanılıyor..."
+msgid "Proxy..."
+msgstr "Hata..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Paketleri yüklemek için root olmanız gerekli, üzgünüm."
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Unable to get source packages."
-msgstr "Kaynak paketleri alınamıyor."
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspect..."
-msgstr "Ä°ncele..."
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
+msgstr ""
+"Kurulum başarısız, bazı dosyalar eksik.\n"
+"Kaynak veritabanınızı güncellemeyi düşünebilirsiniz."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Installation finished"
-msgstr "Kurulum tamamlandı"
+msgid "United Kingdom"
+msgstr "Birleşik Krallık"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "BirÅŸey yapma"
+msgid "in names"
+msgstr "isimlerde"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Ana dosya olarak .%s kullan"
+msgid ""
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
+msgstr ""
+"Uygun bir yansı bulamıyorum.\n"
+"\n"
+"Bunun birçok nedeni olabilir, en yaygın olan ise işlemci\n"
+"mimarinizin Mandrake Linux Resmi Güncellemeler tarafından\n"
+"desteklenmemesidir."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Remove .%s"
 msgstr "Kaldır .%s"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "changes:"
-msgstr "deÄŸiÅŸiklikler:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspecting %s"
-msgstr "%s inceleniyor"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Lütfen bekleyin, erişilebilir paketler aranıyor..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "Lütfen bekleyin, ortam ekleniyor..."
+msgid "Finland"
+msgstr "Finlandiya"
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
+"The following packages have bad signatures:\n"
 "\n"
-"Then, restart MandrakeUpdate."
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"İstediğiniz yansıyı elle de seçebilirsiniz: bunu yapmak\n"
-"için Yazılım Kaynakları Yöneticisini açın ve sonra\n"
-"'Güvenlik güncellemeleri' kaynağı ekleyin.\n"
+"Diğerlerinin güncellenmesi için şu paketlerin kaldırılması gerekiyor:\n"
 "\n"
-"Daha sonra, MandrakeUpdate'i yeniden çalıştırın."
+"%s\n"
+"\n"
+"Devam etmek için herşey tamam mı?"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "How to choose manually your mirror"
-msgstr "Yansınızı elle nasıl seçersiniz?"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Examining distant file of media `%s'..."
+msgstr "'%s' uzak dosyasının kaynağı sınanıyor..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
+msgid "Verifying packages signatures..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Already existing update sources"
-msgstr ""
+msgid "France"
+msgstr "Fransa"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "More info"
+msgstr "Daha Bilgi"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
+"%s\n"
 "\n"
 "Is it ok to continue?"
 msgstr ""
-"En son güncelleme paketlerini almak için yansıya bağlanmam gerekiyor.\n"
-"Ağınızın çalışıp çalışmadığını kontrol edin.\n"
+"%s\n"
 "\n"
-"Devam etmek için herşey tamam mı?"
+"Devam etmek için herşey tamam mı ?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Reload the packages list"
+msgstr "Paket listesini yeniden yükle"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Yansı adresini seçin..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Dosya hatası"
+msgid "Some packages can't be installed"
+msgstr "'%s' paketi yüklenemedi\n"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
+msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Kurulum için paketler hazırlanılıyor..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Mandrake Güncelleme"
+msgid "All packages,"
+msgstr "Tüm paketler,"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Software Packages Removal"
-msgstr "Yazılım Paketleri Kaldırıcı"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Type of media:"
+msgstr "Kaynağın türü"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Quit"
-msgstr "Çık"
+msgid "in files"
+msgstr "dosyalarda"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Kur"
+msgid "All requested packages were installed successfully."
+msgstr "İstenen paketler başarılı bir şekilde yüklendi."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove"
-msgstr "Kaldır"
+msgid "Proxy hostname:"
+msgstr "Vekil sunucu adı:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Help"
-msgstr "Yardım"
+msgid "Local files"
+msgstr "Yerel dosyalar"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search"
-msgstr "Ara"
+msgid "Inspecting %s"
+msgstr "%s inceleniyor"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Find:"
-msgstr "Bul:"
+msgid "Israel"
+msgstr "Ä°srail"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Diğerlerinin güncellenmesi için şu paketlerin kaldırılması gerekiyor:\n"
-"\n"
-"%s\n"
-"\n"
-"Devam etmek için herşey tamam mı?"
+msgid "Help"
+msgstr "Yardım"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Bazı paketlerin kaldırılması gerekiyor"
+msgid "HTTP server"
+msgstr "HTTP sunucu"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
-"\n"
-"Do you really want to install all the selected packages?"
-msgstr ""
-"Uyarı: öyle görünüyor ki paket kurulumu sırasında ya da sonrasında\n"
-"dosya sisteminizi dolduracak kadar çok paket eklemek istiyorsunuz.\n"
-"Bu genellikle tehlikelidir ve dikkatle ele alınması gerekir.\n"
-"\n"
-"Bütün seçili paketleri gerçekten yüklemek istiyor musunuz?"
+msgid "Installation failed"
+msgstr "Kurulum başarısız"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Aşırı fazla paket seçildi"
+msgid "Use .%s as main file"
+msgstr "Ana dosya olarak .%s kullan"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "En fazla bilgi"
+msgid "Search results"
+msgstr "Arama sonuçları"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Normal information"
-msgstr "Normal bilgi"
+msgid " failed!"
+msgstr " başarısız!"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Update source(s)"
-msgstr "Kaynakları güncelle"
+msgid "Brazil"
+msgstr "Brezilya"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Paket listesini yeniden yükle"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"Aynı isme sahip bir başka ortam mevcut, onu\n"
+"deÄŸiÅŸtirmek ister misiniz?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "Seçimi sıfırla"
+msgid "Find:"
+msgstr "Bul:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "dosyalarda"
+msgid "All packages, alphabetical"
+msgstr "Tüm paketler, alfabetik"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "tanımlarda"
+msgid "Please wait, searching..."
+msgstr "Lütfen bekleyin, aranıyor..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "isimlerde"
+msgid "Please wait, reading packages database..."
+msgstr "Lütfen bekleyin, paket veritabanı okunuyor..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by update availability"
-msgstr "güncellenebilirliğine göre"
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "'%s' paketi açılamadı\n"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by source repository"
-msgstr "kaynak deposuna göre"
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "\"%s\" ismindeki ortamı [%s] aygıtına takın"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by selection state"
-msgstr "seçim durumuna göre"
+msgid "Reset the selection"
+msgstr "Seçimi sıfırla"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by size"
-msgstr "boyuta göre"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"Eğer vekil sunucuya ihtiyacınız varsa makina adı ve isteğe bağlı olarak "
+"portu girin (<vekilsunucu[:port]>):"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-msgstr "gruba göre"
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
+"Bağımlılıkları nedeniyle şu paketlerinde kaldırlması gerekiyor:\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "All packages,"
-msgstr "Tüm paketler,"
+msgid "Costa Rica"
+msgstr "Kosta Rika"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "All packages, alphabetical"
-msgstr "Tüm paketler, alfabetik"
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Paketlerin kurulumu sırasında bir hata ile karşılaşıldı:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Mandrake seçimleri"
+msgid "Please wait, removing medium..."
+msgstr "Lütfen bekleyin, ortam kaldırılıyor..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
-msgstr "Normal güncellemeler"
+msgid "Password:"
+msgstr "Parola:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Hata düzeltme güncellemeleri"
+msgid "Taiwan"
+msgstr "Tayvan"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Security updates"
-msgstr "Güvenlik güncellemeleri"
+msgid "User:"
+msgstr "Kullanıcı:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Description: "
-msgstr "Tanım: "
+msgid "Please wait, updating medium..."
+msgstr "Lütfen bekleyin, ortam güncelleniyor..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Güncelleme nedeni: "
+msgid "Please wait, listing packages..."
+msgstr "Lütfen bekleyin, paketler listeleniyor..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Summary: "
-msgstr "Özet: "
+msgid "Information on packages"
+msgstr "Paket hakkında daha fazla bilgi"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Importance: "
-msgstr "Önem: "
+msgid "Cancel"
+msgstr "Ä°ptal"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Everything installed successfully"
+msgstr "Herşey başarılı bir şekilde yüklendi"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Size: "
-msgstr "Boyut: "
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Select the media(s) you wish to update:"
+msgstr "Lütfen güncellemek istediğiniz kaynakları seçiniz:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Version: "
-msgstr "Sürümü: "
+msgid "Please wait, updating media..."
+msgstr "Lütfen bekleyin, ortam güncelleniyor..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "Adı: "
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Kurulu olan sürüm: "
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Diğerlerinin güncellenmesi için şu paketlerin kaldırılması gerekiyor:\n"
+"\n"
+"%s\n"
+"\n"
+"Devam etmek için herşey tamam mı?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Source: "
-msgstr "Kaynak: "
+msgid "in descriptions"
+msgstr "tanımlarda"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(Not available)"
-msgstr "(EriÅŸilemez)"
+msgid "Configure proxies"
+msgstr "Vekil sunucuları yapılandır"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Günlük:\n"
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Yansı adreslerini almak için MandrakeSoft'un web sayfası ile bağlantı\n"
+"kurmam gerekiyor. Ağ bağlantısının çalışıp çalışmadığından emin olun.\n"
+"\n"
+"Devam etmek için herşey tamam mı?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Files:\n"
-msgstr "Dosyalar:\n"
+msgid "Please choose"
+msgstr "Lütfen seçin"
 
 #: ../rpmdrake:1
 #, c-format
@@ -608,42 +557,28 @@ msgstr "Seçili boyut: %d MB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Seçili: %d MB / Diskteki boş alan: %d MB"
+msgid "Initializing..."
+msgstr "Başlatılıyor..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
-msgstr ""
-"Bağımlılıkları nedeniyle şu paketlerin seçili olmaması gerekiyor:\n"
-"\n"
+msgid "Save changes"
+msgstr "DeÄŸiÅŸiklikleri kaydet"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr ""
-"Üzgünüm, şu paketler seçilemezler:\n"
-"\n"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "İndirme sırasında hata"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "şununla çakışıyor:"
+msgid "Package installation..."
+msgstr "Kurulum için paketler hazırlanılıyor..."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "'%s' paketi yüklenemedi\n"
+#, c-format
+msgid "Importance: "
+msgstr "Önem: "
 
 #: ../rpmdrake:1
 #, c-format
@@ -656,312 +591,307 @@ msgstr ""
 "gerekiyor:\n"
 "\n"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "Ek paketlere ihtiyaç var"
+msgid "Add..."
+msgstr "Ekle..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "'%s' paketi yüklenemedi\n"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "Ortam oluşturulamıyor."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Removing these packages would break your system, sorry:\n"
+"The installation is finished; %s.\n"
 "\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
 msgstr ""
-"Bu paketleri kaldırmak sisteminizin göçmesine sebeb olabilir, üzgünüm:\n"
+"Kurulum tamamlandır; %s.\n"
 "\n"
+"'.rpmnew' veya '.rpmsave' olak bazı yapılandırma dosyaları oluşturuldu.\n"
+"Harekete geçmek için artık birkaçını inceleyebilirsiniz:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"Bağımlılıkları nedeniyle şu paketlerinde kaldırlması gerekiyor:\n"
-"\n"
+msgid "Browse..."
+msgstr "Gözat..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "'%s' paketi yüklenemedi\n"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Bazı ek paketlerin kaldırılması gerekiyor"
+msgid "Info..."
+msgstr "Hakkında..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "More information on package..."
-msgstr "Paket hakkında daha fazla bilgi..."
+msgid "You need to insert the medium to continue"
+msgstr "Devam etmek için ortamı takmanız gerekli"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Copying file for media `%s'..."
+msgstr "'%s' dosyasının kaynağı kopyalanıyor..."
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Information on packages"
-msgstr "Paket hakkında daha fazla bilgi"
+msgid "Remove"
+msgstr "Kaldır"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "More info"
-msgstr "Daha Bilgi"
+msgid "Preparing packages installation..."
+msgstr "Kurulum için paketler hazırlanılıyor..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "by media repository"
+msgstr "kaynak deposuna göre"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "Eklenebilir"
+msgid "No mirror"
+msgstr "Yansı yok"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Upgradable"
-msgstr "Güncellenebilinir"
+msgid "You need to fill up at least the two first entries."
+msgstr "En azından İlk iki girişi doldurmak zorundasınız."
 
 #: ../rpmdrake:1
 #, c-format
-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 ""
-"Güncelleme listesi boş. Bu ya bilgisayarınızda yüklü paketler için\n"
-"güncelleme olmadığı ya da bütün güncellemeleri yüklediğiniz anlamına\n"
-"gelir."
+msgid "Install"
+msgstr "Kur"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "No update"
-msgstr "Güncelleme yok"
+msgid "Japan"
+msgstr "Japonya"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "(none)"
-msgstr "(hiçbiri)"
+msgid "Do nothing"
+msgstr "BirÅŸey yapma"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Lütfen bekleyin, paketler listeleniyor..."
+msgid "No update"
+msgstr "Güncelleme yok"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "'%s' paketi açılamadı\n"
+#, c-format
+msgid "Description: "
+msgstr "Tanım: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Şu paketler birinin yüklenmesi gerekiyor:"
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr ""
+"Uyarı: öyle görünüyor ki paket kurulumu sırasında ya da sonrasında\n"
+"dosya sisteminizi dolduracak kadar çok paket eklemek istiyorsunuz.\n"
+"Bu genellikle tehlikelidir ve dikkatle ele alınması gerekir.\n"
+"\n"
+"Bütün seçili paketleri gerçekten yüklemek istiyor musunuz?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Lütfen seçin"
+msgid "Name: "
+msgstr "Adı: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Inspect..."
+msgstr "Ä°ncele..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Not selected"
-msgstr "Çakışmalar bulundu"
+msgid "Editing media \"%s\":"
+msgstr "\"%s\" kaynağı düzenleniyor:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Selected"
-msgstr "Seçili"
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "Kurulum için paketler hazırlanılıyor..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results"
-msgstr "Arama sonuçları"
+msgid "Australia"
+msgstr "Avusturalya"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Stop"
-msgstr "Dur"
+msgid "Installation finished"
+msgstr "Kurulum tamamlandı"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Lütfen bekleyin, aranıyor..."
+msgid "by update availability"
+msgstr "güncellenebilirliğine göre"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Arama sonuçları (hiçbiri)"
+msgid "Poland"
+msgstr "Polonya"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Other"
-msgstr "DiÄŸer"
+msgid "Version: "
+msgstr "Sürümü: "
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the packages source editor!\n"
-"\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
+msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
-"Paket kaynağı düzenleyicisine hoşgeldiniz!\n"
-"\n"
-"Bu araç bilgisayarınızda kullanmak istediğiniz paket kaynaklarını "
-"yapılandırmada\n"
-"size yardımcı olacak. Sonra da yeni yazılım paketi yüklemek veya güncelleme\n"
-"yapmak için bunları kullanabileceksiniz."
+"Vekil sunucu kimlik denetimi için kullanıcıadı/parola belirtebilirsiniz:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
-msgstr "Kaydet ve çık"
+msgid "Upgradable"
+msgstr "Güncellenebilinir"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid " done."
+msgstr " tamamlandı."
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Hata..."
+msgid "Software Packages Installation"
+msgstr "Kurulum için paketler hazırlanılıyor..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Update..."
-msgstr "Güncelle..."
+msgid "Additional packages needed"
+msgstr "Ek paketlere ihtiyaç var"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "Ekle..."
+msgid "Bugfixes updates"
+msgstr "Hata düzeltme güncellemeleri"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "Düzenle"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "'%s' indirmesi , kalan zaman:%s , hız:%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Source"
-msgstr "Kaynak"
+msgid "Germany"
+msgstr "Almanya"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Enabled?"
-msgstr "Etkin?"
+msgid "Russia"
+msgstr "Rusya"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Configure sources"
-msgstr "Kaynakları yapılandır"
+msgid "Norway"
+msgstr "Norveç"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Password:"
-msgstr "Parola:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during installation"
+msgstr "Kurulum sırasında sorunlar oluştu"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "User:"
-msgstr "Kullanıcı:"
+msgid "Search"
+msgstr "Ara"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr ""
-"Vekil sunucu kimlik denetimi için kullanıcıadı/parola belirtebilirsiniz:"
+#, fuzzy, c-format
+msgid "Edit a media"
+msgstr "Kaynağı Düzenle"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "Vekil sunucu adı:"
+msgid "Czech Republic"
+msgstr "Çek Cumhuriyeti"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"Eğer vekil sunucuya ihtiyacınız varsa makina adı ve isteğe bağlı olarak "
-"portu girin (<vekilsunucu[:port]>):"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Vekil sunucuları yapılandır"
+msgid "Stop"
+msgstr "Dur"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Lütfen bekleyin, ortam güncelleniyor..."
+msgid "Update"
+msgstr "Güncelle"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "Değişiklikleri kaydetmek için ortamı sürücüye takın."
+msgid "Please wait, removing packages..."
+msgstr "Lütfen bekleyin, paketler kaldırılıyor..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "Devam etmek için ortamı takmanız gerekli"
+msgid "Normal information"
+msgstr "Normal bilgi"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "DeÄŸiÅŸiklikleri kaydet"
+msgid "Media: "
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "synthesis/hdlist'e göreli yol:"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "`%s' paketi indiriliyor (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "\"%s\" kaynağı düzenleniyor:"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Seçili: %d MB / Diskteki boş alan: %d MB"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit a source"
-msgstr "Kaynağı Düzenle"
+msgid "Media"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Lütfen bekleyin, ortam kaldırılıyor..."
+msgid "Spain"
+msgstr "Ä°spanya"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Type of source:"
-msgstr "Kaynağın türü"
+msgid "Normal updates"
+msgstr "Normal güncellemeler"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Kaynak ekleniyor:"
+msgid "by selection state"
+msgstr "seçim durumuna göre"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
-"Aynı isme sahip bir başka ortam mevcut, onu\n"
-"deÄŸiÅŸtirmek ister misiniz?"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "En azından İlk iki girişi doldurmak zorundasınız."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Name:"
-msgstr "Adı:"
+"Lütfen bekleyin, yansı adresleri MandrakeSoft'un web sitesinden indiriliyor."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -969,143 +899,148 @@ msgid "Login:"
 msgstr "Kullanıcı adı:"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Choose a mirror..."
-msgstr "Yansı adresini seçin..."
+#, fuzzy, c-format
+msgid "Adding a media:"
+msgstr "Kaynak ekleniyor:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Browse..."
-msgstr "Gözat..."
+msgid "Austria"
+msgstr "Avusturya"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Path or mount point:"
-msgstr "Yol veya bağlama noktası:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Fatal error"
+msgstr "Dosya hatası"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Removable device"
-msgstr "Kaldırılabilinir aygıt"
+msgid "Update..."
+msgstr "Güncelle..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "'%s' paketinin imzası doğrulanıyor..."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "HTTP sunucu"
+msgid "(none)"
+msgstr "(hiçbiri)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "FTP server"
-msgstr "FTP sunucu"
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
+"Bu paketleri kaldırmak sisteminizin göçmesine sebeb olabilir, üzgünüm:\n"
+"\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Path:"
-msgstr "Yol:"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "'%s' paketi kuruluyor ( %s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "Yerel dosyalar"
+msgid "Currently installed version: "
+msgstr "Kurulu olan sürüm: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add a source"
-msgstr "Bir kaynak ekle"
+msgid "Other"
+msgstr "DiÄŸer"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr "Ortam güncellenemiyor; otomatik olarak görünmeyecek."
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "Güncelleme nedeni: "
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to create medium."
-msgstr "Ortam oluşturulamıyor."
+msgid "Please choose the desired mirror."
+msgstr "Lütfen istediğiniz yansıyı seçin."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "Güncelle"
+msgid "Edit"
+msgstr "Düzenle"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Lütfen güncellemek istediğiniz kaynakları seçiniz:"
+msgid "Please wait, finding available packages..."
+msgstr "Lütfen bekleyin, erişilebilir paketler aranıyor..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Lütfen bekleyin, ortam güncelleniyor..."
+msgid "Relative path to synthesis/hdlist:"
+msgstr "synthesis/hdlist'e göreli yol:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " failed!"
-msgstr " başarısız!"
+msgid "Search results (none)"
+msgstr "Arama sonuçları (hiçbiri)"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid " done."
-msgstr " tamamlandı."
+msgid "Danmark"
+msgstr "Danimarka"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "'%s' indirmesi , hız:%s"
+msgid "China"
+msgstr "Çin"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "'%s' indirmesi , kalan zaman:%s , hız:%s"
+msgid "United States"
+msgstr "BirleÅŸik Devletler"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "'%s' paketinin imzası doğrulanıyor..."
+#: ../rpmdrake:1
+#, c-format
+msgid "changes:"
+msgstr "deÄŸiÅŸiklikler:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "'%s' uzak dosyasının kaynağı sınanıyor..."
+msgid "Some additional packages need to be removed"
+msgstr "Bazı ek paketlerin kaldırılması gerekiyor"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "'%s' dosyasının kaynağı sınanıyor..."
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "'%s' dosyasının kaynağı kopyalanıyor..."
+msgid "No"
+msgstr "Hayır"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure medias"
+msgstr "Kaynakları yapılandır"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a media"
+msgstr "Bir kaynak ekle"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Please choose the desired mirror."
-msgstr "Lütfen istediğiniz yansıyı seçin."
+msgid "Summary: "
+msgstr "Özet: "
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
-msgstr ""
-"Uygun bir yansı bulamıyorum.\n"
-"\n"
-"Bunun birçok nedeni olabilir, en yaygın olan ise işlemci\n"
-"mimarinizin Mandrake Linux Resmi Güncellemeler tarafından\n"
-"desteklenmemesidir."
+msgid "Canada"
+msgstr "Kanada"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No mirror"
-msgstr "Yansı yok"
+msgid "Greece"
+msgstr "Yunanistan"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1122,179 +1057,244 @@ msgstr ""
 "Ağ veya MandrakeSoft'un web sayfasını erişilemez durumda\n"
 "olabilir. Lütfen daha sonra tekrar deneyin."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Paketleri yüklemek için root olmanız gerekli, üzgünüm."
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Error during download"
-msgstr "İndirme sırasında hata"
+msgid "Path:"
+msgstr "Yol:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
-"Lütfen bekleyin, yansı adresleri MandrakeSoft'un web sitesinden indiriliyor."
+msgid "Problem during removal"
+msgstr "Kaldırım esnasında problem"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Yansı adreslerini almak için MandrakeSoft'un web sayfası ile bağlantı\n"
-"kurmam gerekiyor. Ağ bağlantısının çalışıp çalışmadığından emin olun.\n"
-"\n"
-"Devam etmek için herşey tamam mı?"
+msgid "Selected"
+msgstr "Seçili"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United States"
-msgstr "BirleÅŸik Devletler"
+msgid "Netherlands"
+msgstr "Hollanda"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "China"
-msgstr "Çin"
+msgid "Addable"
+msgstr "Eklenebilir"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Birleşik Krallık"
+msgid "(Not available)"
+msgstr "(EriÅŸilemez)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
+msgstr ""
+"Üzgünüm, şu paketler seçilemezler:\n"
+"\n"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Not selected"
+msgstr "Çakışmalar bulundu"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Tayvan"
+msgid "Software Packages Removal"
+msgstr "Yazılım Paketleri Kaldırıcı"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Sweden"
 msgstr "İsveç"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Russia"
-msgstr "Rusya"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
+msgstr ""
+"\n"
+"\n"
+"Hata(lar) rapor edildi:\n"
+"%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Portugal"
-msgstr "Portekiz"
+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 ""
+"Güncelleme listesi boş. Bu ya bilgisayarınızda yüklü paketler için\n"
+"güncelleme olmadığı ya da bütün güncellemeleri yüklediğiniz anlamına\n"
+"gelir."
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Poland"
-msgstr "Polonya"
+#, fuzzy, c-format
+msgid "Examining file of media `%s'..."
+msgstr "'%s' dosyasının kaynağı sınanıyor..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Norway"
-msgstr "Norveç"
+msgid "Download of `%s', speed:%s"
+msgstr "'%s' indirmesi , hız:%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Netherlands"
-msgstr "Hollanda"
+msgid "One of the following packages is needed:"
+msgstr "Şu paketler birinin yüklenmesi gerekiyor:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Korea"
-msgstr "Kore"
+msgid "Quit"
+msgstr "Çık"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "Japonya"
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"En son güncelleme paketlerini almak için yansıya bağlanmam gerekiyor.\n"
+"Ağınızın çalışıp çalışmadığını kontrol edin.\n"
+"\n"
+"Devam etmek için herşey tamam mı?"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Italy"
-msgstr "Ä°talya"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update media(s)"
+msgstr "Kaynakları güncelle"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Israel"
-msgstr "Ä°srail"
+msgid "Ok"
+msgstr "Tamam"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Greece"
-msgstr "Yunanistan"
+msgid "Please wait, adding medium..."
+msgstr "Lütfen bekleyin, ortam ekleniyor..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "France"
-msgstr "Fransa"
+msgid "Unable to get source packages."
+msgstr "Kaynak paketleri alınamıyor."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "Finlandiya"
+msgid "Too many packages are selected"
+msgstr "Aşırı fazla paket seçildi"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Spain"
-msgstr "Ä°spanya"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"Paket kaynağı düzenleyicisine hoşgeldiniz!\n"
+"\n"
+"Bu araç bilgisayarınızda kullanmak istediğiniz paket kaynaklarını "
+"yapılandırmada\n"
+"size yardımcı olacak. Sonra da yeni yazılım paketi yüklemek veya güncelleme\n"
+"yapmak için bunları kullanabileceksiniz."
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Danmark"
-msgstr "Danimarka"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
+msgstr "şununla çakışıyor:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "Almanya"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"MandrakeUpdate'e hoÅŸgeldiniz!\n"
+"\n"
+"Bu araç, bilgisayarınıza yüklemek istediğiniz güncellemeleri seçmede size\n"
+"yardımcı olacak."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Çek Cumhuriyeti"
+msgid "Mandrake choices"
+msgstr "Mandrake seçimleri"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Kosta Rika"
+msgid "Changelog:\n"
+msgstr "Günlük:\n"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "Kanada"
+msgid "Korea"
+msgstr "Kore"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Brazil"
-msgstr "Brezilya"
+msgid "Removable device"
+msgstr "Kaldırılabilinir aygıt"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Belçika"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Avusturalya"
+msgid "Change medium"
+msgstr "Ortam deÄŸiÅŸtir"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "Avusturya"
+msgid "Mandrake Update"
+msgstr "Mandrake Güncelleme"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
-msgstr "Hakkında..."
+msgid "by size"
+msgstr "boyuta göre"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "Hayır"
+msgid "FTP server"
+msgstr "FTP sunucu"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "Evet"
+msgid "Files:\n"
+msgstr "Dosyalar:\n"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr "Ortam güncellenemiyor; otomatik olarak görünmeyecek."
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -1567,6 +1567,12 @@ msgstr "Yazılımı Kaldır"
 msgid "Software Sources Manager"
 msgstr "Yazılım Kaynakları Yöneticisi"
 
+#~ msgid "Source: "
+#~ msgstr "Kaynak: "
+
+#~ msgid "Source"
+#~ msgstr "Kaynak"
+
 #~ msgid ""
 #~ "some packages failed to install\n"
 #~ "correctly"
@@ -1605,9 +1611,6 @@ msgstr "Yazılım Kaynakları Yöneticisi"
 #~ "\n"
 #~ "Başka bir yansı denemek istiyor musunuz?"
 
-#~ msgid "Error adding update medium"
-#~ msgstr "Güncelleme ortamı eklenirken hata"
-
 #~ msgid "Please wait, contacting mirror to initialize updates packages."
 #~ msgstr ""
 #~ "Lütfen bekleyin, güncelleme paketlerini ilklendirmek için yansıya "
diff --git a/po/uk.po b/po/uk.po
index f2500d84..240d846c 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: 2003-05-13 09:38+02:00\n"
 "Last-Translator: Serge A. Ribalchenko <fisher@obu.ck.ua>\n"
 "Language-Team: Ukrainian <utrans-mandrake@lists.sourceforge.net>\n"
@@ -15,16 +15,20 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-u\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"÷ÓÅ ÇÁÒÁÚÄ? ðÒÏÄÏ×ÖÕ×ÁÔÉ?"
+msgid "Enabled?"
+msgstr "äÏÓÔÕÐÎÉÊ?"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "ûÌÑÈ ÁÂÏ ÔÏÞËÁ ÍÏÎÔÕ×ÁÎÎÑ:"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Portugal"
+msgstr "ðÏÒÔ:"
 
 #: ../rpmdrake:1
 #, c-format
@@ -43,16 +47,79 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "by group"
+msgstr "ÚÁ ÇÒÕÐÏÀ"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Name:"
+msgstr "îÁÚ×Á"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Italy"
+msgstr "¶ÎÓÔÁÌÀ×ÁÔÉ"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "ñË ×ÉÂÒÁÔÉ ÄÚÅÒËÁÌÏ ×ÒÕÞÎÕ"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "äÅÑ˦ ÐÁËÕÎËÉ ÐÏ×ÉÎΦ ÂÕÔÉ ×ÉÄÁÌÅΦ"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
+msgstr "â¦ÌØÛÅ ¦ÎÆÏÒÍÁæ§ ÐÒÏ ÐÁËÕÎÏË..."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "ôÁË"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Welcome to MandrakeUpdate!\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
 msgstr ""
-"ìÁÓËÁ×Ï ÐÒÏÓÉÍÏ ÄÏ ðÏÎÏ×ÌÅÎÎÑ íÁÎÄÒÅÊË!\n"
+"þÅÒÅÚ ×ÉÍÏÇÉ ÚÁÌÅÖÎÏÓÔ¦ ×ÉÂ¦Ò ÎÁÓÔÕÐÎÉÈ ÐÁËÕÎË¦× ÐÏÎÅÎ ÂÕÔÉ\n"
+"ÓËÁÓÏ×ÁÎÉÊ:\n"
 "\n"
-"ãÑ ÐÒÏÇÒÁÍÁ ÄÏÐÏÍÏÖÅ ×ÁÍ ×ÉÂÒÁÔÉ ÐÏÎÏ×ÌÅÎÎÑ, Ñ˦ ×É ÈÏÞÅÔÅ ×ÓÔÁÎÏ×ÉÔÉ ÎÁ \n"
-"×ÁÛ ËÏÍÐ'ÀÔÅÒ."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "×ÓÅ ÂÕÌÏ ×ÓÔÁÎÏ×ÌÅÎÏ ËÏÒÅËÔÎÏ"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "%s KB"
+msgstr "%.1f ËÂ"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"÷É ÔÁËÏÖ ÍÏÖÅÔÅ ×ÉÂÒÁÔÉ ÂÁÖÁÎÅ ÄÚÅÒËÁÌÏ ÓÁÍÏÓÔ¦ÊÎÏ: ÝÏ ÃÅ ÚÒÏÂÉÔÉ,\n"
+"ÚÁ×ÁÎÔÁÖÔÅ íÅÎÅÄÖÅÒ äÖÅÒÅÌ ðÁËÕÎ˦×, Á ÐÏÔ¦Í ÄÏÄÁÊÔÅ ÄÖÅÒÅÌÏ 'âÅÚÐÅÞΦ\n"
+"ÐÏÎÏ×ÌÅÎÎÑ'.\n"
+"\n"
+"ðÏÔ¦Í ÐÅÒÅÚÁÐÕÓÔ¦ÔØ ðÏÎÏ×ÌÅÎÎÑ íÁÎÄÒÅÊË."
 
 #: ../rpmdrake:1
 #, c-format
@@ -68,40 +135,21 @@ msgstr ""
 "×ÁÛÏÇÏ\n"
 "ËÏÍÐ'ÀÔÅÒÁ."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:1
+#, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"ôÒÁÐÉÌÁÓØ ÐÏÍÉÌËÁ Ð¦Ä ÞÁÓ ÕÓÔÁÎÏ×ËÉ ÐÁËÅÔÕ:\n"
-"\n"
-"%s"
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "ýÏ ÚÂÅÒÅÇÔÉ ÚͦÎÉ, ×ÁÍ ÓÌ¦Ä ×ÓÔÁ×ÉÔÉ ÎÏÓ¦Ñ ÄÏ ÐÒÉÓÔÒÏÀ"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Problem during removal"
-msgstr "ðÒÏÂÌÅÍÁ Ð¦Ä ÞÁÓ ×ÉÌÕÞÅÎÎÑ"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, removing packages..."
-msgstr ""
-"úÁÞÅËÁÊÔÅ\n"
-"óÏÒÔÕ×ÁÎÎÑ ÐÁËÅÔ¦×"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, reading packages database..."
-msgstr ""
-"úÁÞÅËÁÊÔÅ\n"
-"óÏÒÔÕ×ÁÎÎÑ ÐÁËÅÔ¦×"
+msgid "Save and quit"
+msgstr "úÂÅÒÅÇÔÉ ¦ ×ÉÊÔÉ"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"There was a problem during the installation:\n"
+"There was a problem during the removal of packages:\n"
 "\n"
 "%s"
 msgstr ""
@@ -111,83 +159,72 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Installation failed"
-msgstr "÷ÓÔÁÎÏ×ÉÔÉ ×ÓÅ"
+msgid "Size: "
+msgstr "òÏÚͦÒ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "çÏÔÕÀÓØ ÐÁËÕÎËÉ ÄÏ ÕÓÔÁÎÏ×ËÉ..."
+msgid "Security updates"
+msgstr "ðÏËÁÚÁÔÉ ÓÐÉÓÏË ÐÏÎÏ×ÌÅÎØ Ú ÍÅÔÏÀ ЦÄ×ÉÝÅÎÎÑ ÂÅÚÐÅËÉ"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "çÏÔÕÀÓØ ÐÁËÕÎËÉ ÄÏ ÕÓÔÁÎÏ×ËÉ..."
+msgid "Already existing update medias"
+msgstr "úÁÞÅËÁÊÔÅ, ÂÕÄØ-ÌÁÓËÁ, ÐÏÎÏ×ÌÀÀÔØÓÑ ÎÏÓ¦§..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "÷Ó¦ ×ÉÂÒÁΦ ÐÁËÕÎËÉ ÂÕÌÏ ÕÓЦÛÎÏ ×ÓÔÁÎÏ×ÌÅÎÏ."
+msgid "Maximum information"
+msgstr "îÁʦÌØÛÅ ¦ÎÆÏÒÍÁæ§"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Everything installed successfully"
-msgstr "÷ÓÅ ×ÓÔÁÎÏ×ÌÅÎÏ ÕÓЦÛÎÏ"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Proxy..."
+msgstr "ðÏÍÉÌËÁ..."
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The installation is finished; %s.\n"
-"\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
 msgstr ""
-"÷ÓÔÁÎÏ×ÌÅÎÎÑ ÚÁ×ÅÒÛÅÎÏ; %s.\n"
-"\n"
-"äÅÑ˦ ËÏÎƦÇÕÒÁæÊΦ ÆÁÊÌÉ ÂÕÌÉ ÓÔ×ÏÒÅΦ ÑË '.rpmnew' ÁÂÏ '.rmpsave',\n"
-"×É ÍÏÖÅÔÅ ÒÅÔÅÌØÎÏ ÐÅÒÅÇÌÑÎÕÔÉ §È ÄÌÑ ÐÏÄÁÌØÛÉÈ Ä¦Ê:"
+"÷ÓÔÁÎÏ×ÌÅÎÎÑ ÐÅÒÅÒ×ÁÎÏ, צÄÓÕÔΦ ÄÅÑ˦ ÆÁÊÌÉ.\n"
+"íÏÖÌÉ×Ï, ×ÁÍ ÐÏÔÒ¦ÂÎÏ ÐÏÎÏ×ÉÔÉ ÂÁÚÕ ÄÁÎÉÈ ÄÖÅÒÅÌ."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "everything was installed correctly"
-msgstr "×ÓÅ ÂÕÌÏ ×ÓÔÁÎÏ×ÌÅÎÏ ËÏÒÅËÔÎÏ"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "ð¦Ä ÞÁÓ ÕÓÔÁÎÏ×ËÉ ÓÔÁÌÁÓÑ ÐÏÍÉÌËÁ"
+msgid "United Kingdom"
+msgstr "ïÂ'¤ÄÎÁÎÅ ëÏÒÏ̦×ÓÔ×Ï"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "÷ÓÔÁÎÏ×ÌÀÀ ÐÁËÅÔ '%s' (%s/%s)..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "çÏÔÕÀÓØ ÐÁËÕÎËÉ ÄÏ ÕÓÔÁÎÏ×ËÉ..."
+msgid "in names"
+msgstr "× ÎÁÚ×ÁÈ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
+"I can't find any suitable mirror.\n"
 "\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
+"ñ ÎÅ ÍÏÖÕ ÚÎÁÊÔÉ ÐÒÉÄÁÔÎÏÇÏ ÄÚÅÒËÁÌÁ.\n"
 "\n"
-"\n"
-"ðÏצÄÏÍÌÅÎÏ ÐÒÏ ÐÏÍÉÌËÉ:\n"
-"%s"
+"íÏÖÅ ÂÕÌÉ ÂÁÇÁÔÏ ÐÒÉÞÉΠ椧 ÐÒÏÂÌÅÍÉ; ÎÁÊÞÁÓÔ¦ÛÅ ÃÅ\n"
+"ÓÔÁ¤ÔØÓÑ ÞÅÒÅÚ ÔÅ, ÝÏ ÁÒȦÔÅËÔÕÒÁ ×ÁÛÏÇÏ ÐÒÏÃÅÓÏÒÁ ΊЦÄÔÒÉÍÕ¤ÔØÓÑ\n"
+"Mandrake Linux Official Updates."
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"÷ÓÔÁÎÏ×ÌÅÎÎÑ ÐÅÒÅÒ×ÁÎÏ, צÄÓÕÔΦ ÄÅÑ˦ ÆÁÊÌÉ.\n"
-"íÏÖÌÉ×Ï, ×ÁÍ ÐÏÔÒ¦ÂÎÏ ÐÏÎÏ×ÉÔÉ ÂÁÚÕ ÄÁÎÉÈ ÄÖÅÒÅÌ."
+msgid "Remove .%s"
+msgstr "÷ÉÌÕÞÉÔÉ .%s"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "æ¦ÎÌÑÎĦÑ"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -204,207 +241,276 @@ msgstr ""
 "\n"
 "ðÒÏÄÏ×ÖÉÔÉ?"
 
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Examining distant file of media `%s'..."
+msgstr "ðÅÒÅצÒËÁ צÄÄÁÌÅÎÏÇÏ ÆÁÊÌÕ ÄÖÅÒÅÌÁ `%s'..."
+
 #: ../rpmdrake:1
 #, c-format
 msgid "Verifying packages signatures..."
 msgstr ""
 
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "France"
+msgstr "ðÒÉÍÕÓÏ×Ï"
+
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "More info"
+msgstr "â¦ÌØÛÅ ¦ÎÆÏÒÍÁæ§"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "úËÁÞÕÀ ÐÁËÅÔ '%s' (%s/%s)..."
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"÷ÓÅ ÇÁÒÁÚÄ? ðÒÏÄÏ×ÖÕ×ÁÔÉ?"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "÷¦ÄͦÎÉÔÉ"
+msgid "Reload the packages list"
+msgstr "ðÅÒÅ×ÁÎÔÁÖÉÔÉ ÐÅÒÅÌ¦Ë ÐÁËÕÎ˦×"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Ok"
-msgstr "çÁÒÁÚÄ"
+msgid "Choose a mirror..."
+msgstr "÷ÉÂÅÒ¦ÔØ ÄÚÅÒËÁÌÏ..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "âÕÄØ ÌÁÓËÁ, ×ÓÔÁ×ÔÅ ÄÉÓË Ú ÎÁÚ×ÏÀ \"%s\" Õ ÐÒÉÓÔÒ¦Ê [%s]"
+msgid "Some packages can't be installed"
+msgstr "îÅ ÍÏÖÕ ×ÓÔÁÎÏ×ÉÔÉ ÐÁËÕÎÏË '%s'\n"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "çÏÔÕÀÓØ ÐÁËÕÎËÉ ÄÏ ÕÓÔÁÎÏ×ËÉ..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Change medium"
-msgstr "úͦΦÔØ ÎÏÓ¦Ê"
+msgid "All packages,"
+msgstr "÷Ó¦ ÐÁËÕÎËÉ,"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Type of media:"
+msgstr "ôÉÐ ÄÖÅÒÅÌÁ:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "÷ÓÔÁÎÏ×ÌÀÀ..."
+msgid "in files"
+msgstr "Õ ÆÁÊÌÁÈ"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Package installation..."
-msgstr "çÏÔÕÀÓØ ÐÁËÕÎËÉ ÄÏ ÕÓÔÁÎÏ×ËÉ..."
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "÷Ó¦ ×ÉÂÒÁΦ ÐÁËÕÎËÉ ÂÕÌÏ ÕÓЦÛÎÏ ×ÓÔÁÎÏ×ÌÅÎÏ."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "îÁÚ×Á ÐÒÏËÓ¦:"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "ìÏËÁÌØΦ ÆÁÊÌÉ"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr "÷É×ÞÅÎÎÑ %s"
+
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "÷É ÐÏ×ÉÎΦ ÍÁÔÉ ÐÒÁ×Á ÁÄͦΦÓÔÒÁÔÏÒÁ, ×ÉÂÁÞÁÊÔÅ."
+msgid "Israel"
+msgstr "¶ÎÓÔÁÌÀ×ÁÔÉ"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unable to get source packages."
-msgstr "÷ÉÂÅÒ¦ÔØ Ó×ϧ ÐÁËÅÔÉ"
+msgid "Help"
+msgstr "/_ð¦ÄËÁÚËÁ"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Inspect..."
-msgstr "÷É×ÞÁÀ..."
+msgid "HTTP server"
+msgstr "óÅÒ×ÅÒ HTTP"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Installation finished"
-msgstr "÷ÓÔÁÎÏ×ÌÅÎÏ"
+msgid "Installation failed"
+msgstr "÷ÓÔÁÎÏ×ÉÔÉ ×ÓÅ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "î¦ÞÏÇÏ ÎÅ ÒÏÂÉÔÉ"
+msgid "Use .%s as main file"
+msgstr "÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ .%s ÑË ÇÏÌÏ×ÎÉÊ ÆÁÊÌ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ .%s ÑË ÇÏÌÏ×ÎÉÊ ÆÁÊÌ"
+msgid "Search results"
+msgstr "òÅÚÕÌØÔÁÔÉ ÐÏÛÕËÕ"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid " failed!"
+msgstr " ÎÅÕÓЦÛÎÏ!"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
+msgstr "âÒÁÚÉ̦Ñ"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"÷ÖÅ ¤ ÎÏÓ¦Ê Ú ÔÁËÉÍ ¦ÍÅÎÅÍ,\n"
+"×É Ä¦ÊÓÎÏ ÈÏÞÅÔÅ ÊÏÇÏ ÚÁͦÎÉÔÉ?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Remove .%s"
-msgstr "÷ÉÌÕÞÉÔÉ .%s"
+msgid "Find:"
+msgstr "úÎÁÊÔÉ:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "changes:"
-msgstr "ÚͦÎÉ:"
+msgid "All packages, alphabetical"
+msgstr "÷Ó¦ ÐÁËÕÎËÉ ÚÁ ÁÂÅÔËÏÀ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "÷É×ÞÅÎÎÑ %s"
+msgid "Please wait, searching..."
+msgstr "úÁÞÅËÁÊÔÅ, ÂÕÄØ ÌÁÓËÁ, ÛÕËÁÀ..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, finding available packages..."
+msgid "Please wait, reading packages database..."
 msgstr ""
 "úÁÞÅËÁÊÔÅ\n"
 "óÏÒÔÕ×ÁÎÎÑ ÐÁËÅÔ¦×"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Please wait, adding medium..."
-msgstr "úÁÞÅËÁÊÔÅ, ÂÕÄØ-ÌÁÓËÁ, ÄÏÄÁÀ ÎÏÓ¦Ñ..."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "ÎÅצÄÏÍÏ"
 
 #: ../rpmdrake:1
-#, c-format
-msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
-"\n"
-"Then, restart MandrakeUpdate."
-msgstr ""
-"÷É ÔÁËÏÖ ÍÏÖÅÔÅ ×ÉÂÒÁÔÉ ÂÁÖÁÎÅ ÄÚÅÒËÁÌÏ ÓÁÍÏÓÔ¦ÊÎÏ: ÝÏ ÃÅ ÚÒÏÂÉÔÉ,\n"
-"ÚÁ×ÁÎÔÁÖÔÅ íÅÎÅÄÖÅÒ äÖÅÒÅÌ ðÁËÕÎ˦×, Á ÐÏÔ¦Í ÄÏÄÁÊÔÅ ÄÖÅÒÅÌÏ 'âÅÚÐÅÞΦ\n"
-"ÐÏÎÏ×ÌÅÎÎÑ'.\n"
-"\n"
-"ðÏÔ¦Í ÐÅÒÅÚÁÐÕÓÔ¦ÔØ ðÏÎÏ×ÌÅÎÎÑ íÁÎÄÒÅÊË."
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "âÕÄØ ÌÁÓËÁ, ×ÓÔÁ×ÔÅ ÄÉÓË Ú ÎÁÚ×ÏÀ \"%s\" Õ ÐÒÉÓÔÒ¦Ê [%s]"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "ñË ×ÉÂÒÁÔÉ ÄÚÅÒËÁÌÏ ×ÒÕÞÎÕ"
+msgid "Reset the selection"
+msgstr "óËÁÓÕ×ÁÔÉ ×ɦÒ"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
 msgstr ""
+"ñËÝÏ ×ÁÍ ÐÏÔÒ¦ÂÎÅÎ ÐÒÏËÓ¦, ××ÅĦÔØ ÊÏÇÏ ÎÁÚ×Õ ¦ ÐÏÒÔ (ÎÅÏÂÏ×'ÑÚËÏ×Ï) "
+"(ÓÉÎÔÁËÓÉÓ: <ÎÁÚ×Á[:ÐÏÒÔ]>):"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Already existing update sources"
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
 msgstr ""
+"÷ Ú×'ÑÚËÕ Ú ÎÅÏÂȦÄΦÓÔÀ ÚÁÄÏ×ÏÌÅÎÎÑ ×Ó¦È ÚÁÌÅÖÎÏÓÔÅÊ\n"
+"ÎÁÓÔÕÐΦ ÐÁËÕÎËÉ ÂÕÄÕÔØ ×ÉÌÕÞÅΦ:\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
+msgid "Costa Rica"
+msgstr "ëÏÓÔÁ-ò¦ËÁ"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
+"There was a problem during the installation:\n"
 "\n"
-"Is it ok to continue?"
+"%s"
 msgstr ""
-"íÅΦ ÎÅÏÂȦÄÎÏ Ú'¤ÄÎÁÔÉÓÑ Ú ÄÚÅÒËÁÌÏÍ, ÝÏ ÏÔÒÉÍÁÔÉ ÏÓÔÁÎΦ ÐÏÎÏ×ÌÅÎÎÑ "
-"ÐÁËÕÎ˦×.\n"
-"âÕÄØ ÌÁÓËÁ, ÐÅÒÅצÒÔÅ, ÞÉ ×ÁÛÁ ÍÅÒÅÖÁ × ÄÁÎÉÊ ÞÁÓ ÐÒÁÃÀ¤.\n"
+"ôÒÁÐÉÌÁÓØ ÐÏÍÉÌËÁ Ð¦Ä ÞÁÓ ÕÓÔÁÎÏ×ËÉ ÐÁËÅÔÕ:\n"
 "\n"
-"ðÒÏÄÏ×ÖÉÔÉ?"
+"%s"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Please wait, removing medium..."
+msgstr "úÁÞÅËÁÊÔÅ, ÂÕÄØ-ÌÁÓËÁ, ×ÉÄÁÌÑÀ ÎÏÓ¦Ñ..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Fatal error"
-msgstr "ðÏÍÉÌËÁ ÆÁÊÌÕ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "ðÁÒÏÌØ:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "çÏÔÕÀÓØ ÐÁËÕÎËÉ ÄÏ ÕÓÔÁÎÏ×ËÉ..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "ôÁÊ×ÁÎØ"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
+msgstr "ëÏÒÉÓÔÕ×ÁÞ:"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr "úÁÞÅËÁÊÔÅ, ÂÕÄØ-ÌÁÓËÁ, ÐÏÎÏ×ÌÀÀ ÎÏÓ¦Ñ..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Mandrake Update"
-msgstr "÷ÉËÏÎÁÔÉ ÐÏÎÏ×ÌÅÎÎÑ"
+msgid "Please wait, listing packages..."
+msgstr ""
+"úÁÞÅËÁÊÔÅ\n"
+"óÏÒÔÕ×ÁÎÎÑ ÐÁËÅÔ¦×"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Software Packages Removal"
-msgstr "÷ÉÌÕÞÅÎÎÑ ÐÁËÕÎË¦× Ú ÐÒÏÇÒÁÍÁÍÉ"
+#, fuzzy, c-format
+msgid "Information on packages"
+msgstr "÷ÉÂÅÒ¦ÔØ Ó×ϧ ÐÁËÅÔÉ"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "÷ÉȦÄ"
+msgid "Cancel"
+msgstr "÷¦ÄͦÎÉÔÉ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "¶ÎÓÔÁÌÀ×ÁÔÉ"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Remove"
-msgstr "÷ÉÌÕÞÉÔÉ"
+msgid "Everything installed successfully"
+msgstr "÷ÓÅ ×ÓÔÁÎÏ×ÌÅÎÏ ÕÓЦÛÎÏ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Help"
-msgstr "/_ð¦ÄËÁÚËÁ"
+msgid "Select the media(s) you wish to update:"
+msgstr "÷ÉÂÅÒ¦ÔØ ÄÖÅÒÅÌÏÁ, Ñ˦ ×É ÈÏÞÅÔÅ ÐÏÎÏ×ÉÔÉ:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search"
-msgstr "ðÏÛÕË"
+msgid "Please wait, updating media..."
+msgstr "úÁÞÅËÁÊÔÅ, ÂÕÄØ-ÌÁÓËÁ, ÐÏÎÏ×ÌÀÀÔØÓÑ ÎÏÓ¦§..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "úÎÁÊÔÉ:"
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -422,161 +528,189 @@ msgstr ""
 "ðÒÏÄÏ×ÖÉÔÉ?"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "in descriptions"
+msgstr "ïÐÉÓÉ"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "äÅÑ˦ ÐÁËÕÎËÉ ÐÏ×ÉÎΦ ÂÕÔÉ ×ÉÄÁÌÅΦ"
+msgid "Configure proxies"
+msgstr "îÁÌÁÛÔÕ×ÁÔÉ ÐÒÏËÓ¦"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
 "\n"
-"Do you really want to install all the selected packages?"
+"Is it ok to continue?"
 msgstr ""
-"ðÏÐÅÒÅÄÖÅÎÎÑ: ÓÈÏÖÅ, ÝÏ ×É ÈÏÞÅÔÅ ÄÏÄÁÔÉ ÚÁÎÁÄÔÏ ÂÁÇÁÔÏ ÐÁËÕÎ˦×,\n"
-"ÞÅÒÅÚ ÝÏ ×ÁÛ¦Ê ÆÁÊÌÏ×¦Ê ÓÉÓÔÅͦ ÎÅ ×ÉÓÔÁÞÉÔØ ×¦ÌØÎÏÇÏ Í¦ÓÃÑ\n"
-"Ð¦Ä ÞÁÓ ÁÂÏ Ð¦ÓÌÑ ×ÓÔÁÎÏ×ÌÅÎÎÑ ÐÁËÕÎ˦×; ÃÅ ÄÕÖÅ ÎÅÂÅÚÐÅÞÎÏ,\n"
-"¦ ×É ÐÏ×ÉÎΦ ÃÅ ×ÒÁÈÕ×ÁÔÉ.\n"
+"íÅΦ ÐÏÔÒ¦ÂÎÏ Ú'¤ÄÎÁÔÉÓÑ Ú ×ÅÂ-ÓÁÊÔÏÍ MandrakeSoft, ÝÏ ÏÔÒÉÍÁÔÉ ÐÅÒÅÌ¦Ë "
+"ÄÚÅÒËÁÌ.\n"
+"âÕÄØ ÌÁÓËÁ, ÐÅÒÅצÒÔÅ, ÞÅ Ú'¤ÄÎÁΦ ×É Ú ¦ÎÔÅÒÎÅÔÏÍ.\n"
 "\n"
-"÷É Ä¦ÊÓÎÏ ÈÏÞÅÔÅ ×ÓÔÁÎÏ×ÉÔÉ ×Ó¦ ×ÉÂÒÁΦ ÐÁËÕÎËÉ?"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Too many packages are selected"
-msgstr "÷ÉÂÒÁÎÏ ÚÁÎÁÄÔÏ ÂÁÇÁÔÏ ÐÁËÕÎ˦×"
+"ðÒÏÄÏ×ÖÉÔÉ?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "îÁʦÌØÛÅ ¦ÎÆÏÒÍÁæ§"
+msgid "Please choose"
+msgstr "âÕÄØ ÌÁÓËÁ, ×ÉÂÅÒ¦ÔØ"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Normal information"
-msgstr "óÔÁÎÄÁÒÔÎÁ ¦ÎÆÏÒÍÁæÑ"
-
-#: ../rpmdrake:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Update source(s)"
-msgstr "ðÏÎÏ×ÉÔÉ ÄÖÅÒÅÌÏ(Á)"
+#, fuzzy, c-format
+msgid "Selected size: %d MB"
+msgstr "%d ×ÉÂÒÁÎÉÈ ÐÁËÅÔ¦×: %.1f íÂ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "ðÅÒÅ×ÁÎÔÁÖÉÔÉ ÐÅÒÅÌ¦Ë ÐÁËÕÎ˦×"
+msgid "Initializing..."
+msgstr "÷ÓÔÁÎÏ×ÌÀÀ..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reset the selection"
-msgstr "óËÁÓÕ×ÁÔÉ ×ɦÒ"
+msgid "Save changes"
+msgstr "úÂÅÒÅÇÔÉ ÚͦÎÉ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "in files"
-msgstr "Õ ÆÁÊÌÁÈ"
+msgid "Error during download"
+msgstr "ðÏÍÉÌËÁ Ð¦Ä ÞÁÓ ÚËÁÞÕ×ÁÎÎÑ"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "in descriptions"
-msgstr "ïÐÉÓÉ"
+msgid "Package installation..."
+msgstr "çÏÔÕÀÓØ ÐÁËÕÎËÉ ÄÏ ÕÓÔÁÎÏ×ËÉ..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "× ÎÁÚ×ÁÈ"
+msgid "Importance: "
+msgstr "÷ÁÖÌÉצÓÔØ: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
-msgstr "ÚÁ ÐÒÉÄÁÔΦÓÔÀ ÄÏ ÐÏÎÏ×ÌÅÎÎÑ"
+msgid ""
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
+msgstr ""
+"äÌÑ ÚÁÂÅÚÐÅÎÎÑ ÚÁÌÅÖÎÏÓÔÅÊ ×É ÔÁËÏÖ ÐÏ×ÉÎΦ ×ÓÔÁÎÏ×ÉÔÉ\n"
+"ÎÁÓÔÕÐΦ ÐÁËÕÎËÉ:\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by source repository"
-msgstr "ÚÁ ÄÖÅÒÅÌÏÍ"
+msgid "Add..."
+msgstr "äÏÄÁÔÉ..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by selection state"
-msgstr "ÚÁ ÓÔÁÎÏÍ ×ÉÂÏÒÕ"
+msgid "Unable to create medium."
+msgstr "îÅÍÏÖÌÉ×Ï ÓÔ×ÏÒÉÔÉ ÎÏÓ¦Ñ."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by size"
-msgstr "ÚÁ ÒÏÚͦÒÏÍ"
+msgid ""
+"The installation is finished; %s.\n"
+"\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
+msgstr ""
+"÷ÓÔÁÎÏ×ÌÅÎÎÑ ÚÁ×ÅÒÛÅÎÏ; %s.\n"
+"\n"
+"äÅÑ˦ ËÏÎƦÇÕÒÁæÊΦ ÆÁÊÌÉ ÂÕÌÉ ÓÔ×ÏÒÅΦ ÑË '.rpmnew' ÁÂÏ '.rmpsave',\n"
+"×É ÍÏÖÅÔÅ ÒÅÔÅÌØÎÏ ÐÅÒÅÇÌÑÎÕÔÉ §È ÄÌÑ ÐÏÄÁÌØÛÉÈ Ä¦Ê:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by group"
-msgstr "ÚÁ ÇÒÕÐÏÀ"
+msgid "Browse..."
+msgstr "ðÅÒÅÇÌÑÎÕÔÉ..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "îÅ ÍÏÖÕ ×ÓÔÁÎÏ×ÉÔÉ ÐÁËÕÎÏË '%s'\n"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "All packages,"
-msgstr "÷Ó¦ ÐÁËÕÎËÉ,"
+msgid "Info..."
+msgstr "¶ÎÆÏÒÍÁæÑ..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "÷Ó¦ ÐÁËÕÎËÉ ÚÁ ÁÂÅÔËÏÀ"
+msgid "You need to insert the medium to continue"
+msgstr "÷ÁÍ ÐÏÔÒ¦ÂÎÏ ×ÓÔÁ×ÉÔÉ ÎÏÓ¦Ñ ÄÌÑ ÐÒÏÄÏ×ÖÅÎÎÑ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Copying file for media `%s'..."
+msgstr "ëÏЦÀ×ÁÎÎÑ ÆÁÊÌÕ Ú ÄÖÅÒÅÌÁ `%s'..."
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "÷ÉÂ¦Ò íÁÎÄÒÅÊËÁ"
+msgid "Remove"
+msgstr "÷ÉÌÕÞÉÔÉ"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Normal updates"
-msgstr "÷ÉËÏÎÁÔÉ ÐÏÎÏ×ÌÅÎÎÑ"
+msgid "Preparing packages installation..."
+msgstr "çÏÔÕÀÓØ ÐÁËÕÎËÉ ÄÏ ÕÓÔÁÎÏ×ËÉ..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Bugfixes updates"
-msgstr "ðÏËÁÚÁÔÉ ÓÐÉÓÏË ÐÏÎÏ×ÌÅÎÎØ ÄÌÑ ×ÉÐÒÁ×ÌÅÎÎÑ ÐÏÍÉÌÏË"
+msgid "by media repository"
+msgstr "ÚÁ ÄÖÅÒÅÌÏÍ"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Security updates"
-msgstr "ðÏËÁÚÁÔÉ ÓÐÉÓÏË ÐÏÎÏ×ÌÅÎØ Ú ÍÅÔÏÀ ЦÄ×ÉÝÅÎÎÑ ÂÅÚÐÅËÉ"
+msgid "No mirror"
+msgstr "ÄÚÅÒËÁÌÏ:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Description: "
-msgstr "ïÐÉÓÉ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to fill up at least the two first entries."
+msgstr "÷ÁÍ ÐÏÔÒ¦ÂÎÏ ÚÁÐÏ×ÎÉÔÉ ÈÏÞÁ  Ä×Á ÐÅÒÛ¦ ÐÏÌÑ."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reason for update: "
-msgstr "ðÒÉÞÉÎÁ ÐÏÎÏ×ÌÅÎÎÑ: "
+msgid "Install"
+msgstr "¶ÎÓÔÁÌÀ×ÁÔÉ"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Summary: "
-msgstr "ð¦ÄÓÕÍÏË"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Japan"
+msgstr "ñÐÏΦÑ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Importance: "
-msgstr "÷ÁÖÌÉצÓÔØ: "
+msgid "Do nothing"
+msgstr "î¦ÞÏÇÏ ÎÅ ÒÏÂÉÔÉ"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "%s KB"
-msgstr "%.1f ËÂ"
+msgid "No update"
+msgstr "÷ÉËÏÎÁÔÉ ÐÏÎÏ×ÌÅÎÎÑ"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Size: "
-msgstr "òÏÚͦÒ"
+msgid "Description: "
+msgstr "ïÐÉÓÉ"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Version: "
-msgstr "÷ÅÒÓ¦Ñ:"
+#, c-format
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr ""
+"ðÏÐÅÒÅÄÖÅÎÎÑ: ÓÈÏÖÅ, ÝÏ ×É ÈÏÞÅÔÅ ÄÏÄÁÔÉ ÚÁÎÁÄÔÏ ÂÁÇÁÔÏ ÐÁËÕÎ˦×,\n"
+"ÞÅÒÅÚ ÝÏ ×ÁÛ¦Ê ÆÁÊÌÏ×¦Ê ÓÉÓÔÅͦ ÎÅ ×ÉÓÔÁÞÉÔØ ×¦ÌØÎÏÇÏ Í¦ÓÃÑ\n"
+"Ð¦Ä ÞÁÓ ÁÂÏ Ð¦ÓÌÑ ×ÓÔÁÎÏ×ÌÅÎÎÑ ÐÁËÕÎ˦×; ÃÅ ÄÕÖÅ ÎÅÂÅÚÐÅÞÎÏ,\n"
+"¦ ×É ÐÏ×ÉÎΦ ÃÅ ×ÒÁÈÕ×ÁÔÉ.\n"
+"\n"
+"÷É Ä¦ÊÓÎÏ ÈÏÞÅÔÅ ×ÓÔÁÎÏ×ÉÔÉ ×Ó¦ ×ÉÂÒÁΦ ÐÁËÕÎËÉ?"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -585,84 +719,63 @@ msgstr "îÁÚ×Á: %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "÷ÓÔÁÎÏ×ÌÅÎÁ ×ÅÒÓ¦Ñ: "
+msgid "Inspect..."
+msgstr "÷É×ÞÁÀ..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Source: "
-msgstr "äÖÅÒÅÌÏ"
+msgid "Editing media \"%s\":"
+msgstr "òÅÄÁÇÕ×ÁÎÎÑ ÄÖÅÒÅÌÁ \"%s\":"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "(Not available)"
-msgstr "(îÅÄÏÓÔÕÐÎÅ)"
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "çÏÔÕÀÓØ ÐÁËÕÎËÉ ÄÏ ÕÓÔÁÎÏ×ËÉ..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "ðÅÒÅÌ¦Ë ÚͦÎ:\n"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Files:\n"
-msgstr "/_æÁÊÌ"
+msgid "Australia"
+msgstr "á×ÓÔÒÁ̦Ñ"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Selected size: %d MB"
-msgstr "%d ×ÉÂÒÁÎÉÈ ÐÁËÅÔ¦×: %.1f íÂ"
+msgid "Installation finished"
+msgstr "÷ÓÔÁÎÏ×ÌÅÎÏ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "÷ÉÂÒÁÎÏ: %d í / ÷¦ÌØÎÏ ÎÁ ÄÉÓËÕ: %d í"
+msgid "by update availability"
+msgstr "ÚÁ ÐÒÉÄÁÔΦÓÔÀ ÄÏ ÐÏÎÏ×ÌÅÎÎÑ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
-msgstr ""
-"þÅÒÅÚ ×ÉÍÏÇÉ ÚÁÌÅÖÎÏÓÔ¦ ×ÉÂ¦Ò ÎÁÓÔÕÐÎÉÈ ÐÁËÕÎË¦× ÐÏÎÅÎ ÂÕÔÉ\n"
-"ÓËÁÓÏ×ÁÎÉÊ:\n"
-"\n"
+msgid "Poland"
+msgstr "ðÏÌØÝÁ"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr ""
-"÷ÉÂÁÞÔÅ, ÎÁÓÔÕÐΦ ÐÁËÕÎËÉ ÎÅ ÍÏÖÕÔØ ÂÕÔÉ ×ÉÂÒÁΦ:\n"
-"\n"
+msgid "Version: "
+msgstr "÷ÅÒÓ¦Ñ:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "ËÏÎÆ̦ËÔÕ¤ Ú"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "÷É ÍÏÖÅÔÅ ×ÓÔÁÎÏ×ÉÔÉ ËÏÒÉÓÔÕ×ÁÞÁ/ÐÁÒÏÌØ ÄÌÑ ÁÕÔÅÎÔÉƦËÁæ§ ÐÒÏËÓ¦:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "îÅ ÍÏÖÕ ×ÓÔÁÎÏ×ÉÔÉ ÐÁËÕÎÏË '%s'\n"
+msgid "Upgradable"
+msgstr "ðÏÎÏ×ÌÅÎÎÑ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
-msgstr ""
-"äÌÑ ÚÁÂÅÚÐÅÎÎÑ ÚÁÌÅÖÎÏÓÔÅÊ ×É ÔÁËÏÖ ÐÏ×ÉÎΦ ×ÓÔÁÎÏ×ÉÔÉ\n"
-"ÎÁÓÔÕÐΦ ÐÁËÕÎËÉ:\n"
-"\n"
+msgid " done."
+msgstr " ×ÉËÏÎÁÎÏ."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Software Packages Installation"
+msgstr "çÏÔÕÀÓØ ÐÁËÕÎËÉ ÄÏ ÕÓÔÁÎÏ×ËÉ..."
 
 #: ../rpmdrake:1
 #, c-format
@@ -671,647 +784,534 @@ msgstr "ðÏÔÒ¦ÂΦ ÄÏÄÁÔËÏצ ÐÁËÕÎËÉ"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "îÅ ÍÏÖÕ ×ÓÔÁÎÏ×ÉÔÉ ÐÁËÕÎÏË '%s'\n"
+msgid "Bugfixes updates"
+msgstr "ðÏËÁÚÁÔÉ ÓÐÉÓÏË ÐÏÎÏ×ÌÅÎÎØ ÄÌÑ ×ÉÐÒÁ×ÌÅÎÎÑ ÐÏÍÉÌÏË"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
-"÷ÉÂÁÞÔÅ, ÁÌÅ ×ÉÌÕÞÅÎÎÑ ÃÉÈ ÐÁËÕÎË¦× ÐÏÒÕÛÉÔØ ÒÏÂÏÔÕ ×ÁÛϧ ÓÉÓÔÅÍÉ:\n"
-"\n"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "úÁ×ÁÎÔÁÖÅÎÏ `%s', ÚÁÌÉÛÉÌÏÓØ ÞÁÓÕ:%s, Û×ÉÄ˦ÓÔØ:%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"÷ Ú×'ÑÚËÕ Ú ÎÅÏÂȦÄΦÓÔÀ ÚÁÄÏ×ÏÌÅÎÎÑ ×Ó¦È ÚÁÌÅÖÎÏÓÔÅÊ\n"
-"ÎÁÓÔÕÐΦ ÐÁËÕÎËÉ ÂÕÄÕÔØ ×ÉÌÕÞÅΦ:\n"
-"\n"
+msgid "Germany"
+msgstr "î¦ÍÅÞÞÉÎÁ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "ðÏÔÒ¦ÂÎÏ ÄÏÄÁÔËÏ×Ï ×ÉÌÕÞÉÔÉ ÄÅÑ˦ ÐÁËÕÎËÉ"
+msgid "Russia"
+msgstr "òÏÓ¦Ñ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "More information on package..."
-msgstr "â¦ÌØÛÅ ¦ÎÆÏÒÍÁæ§ ÐÒÏ ÐÁËÕÎÏË..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Information on packages"
-msgstr "÷ÉÂÅÒ¦ÔØ Ó×ϧ ÐÁËÅÔÉ"
+msgid "Norway"
+msgstr "îÏÒ×ÅǦÑ"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "More info"
-msgstr "â¦ÌØÛÅ ¦ÎÆÏÒÍÁæ§"
+msgid "Problem during installation"
+msgstr "ð¦Ä ÞÁÓ ÕÓÔÁÎÏ×ËÉ ÓÔÁÌÁÓÑ ÐÏÍÉÌËÁ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Addable"
-msgstr "íÏÖÌÉ×Ï ÄÏÄÁÔÉ"
+msgid "Search"
+msgstr "ðÏÛÕË"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Upgradable"
-msgstr "ðÏÎÏ×ÌÅÎÎÑ"
+msgid "Edit a media"
+msgstr "òÅÄÁÇÕ×ÁÔÉ ÄÖÅÒÅÌÏ "
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
+msgstr "þÅȦÑ"
 
 #: ../rpmdrake:1
 #, c-format
 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."
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"ðÅÒÅÌ¦Ë ÐÏÎÏ×ÌÅÎØ ÐÏÒÏÖΦÊ. ãÅ ÏÚÎÁÞÁ¤, ÝÏ ÁÂÏ ÎÅÍÁ¤\n"
-"ÐÏÎÏ×ÌÅÎØ ÄÌÑ ÐÁËÕÎ˦×, Ñ˦ ×ÓÔÁÎÏ×ÌÅΦ ÎÁ ×ÁÛÏÍÕ ËÏÍÐ'ÀÔÅÒ¦,\n"
-"ÁÂÏ ×ÏÎÉ ×Ó¦ ×ÖÅ ×ÓÔÁÎÏ×ÌÅΦ."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "No update"
-msgstr "÷ÉËÏÎÁÔÉ ÐÏÎÏ×ÌÅÎÎÑ"
+#, c-format
+msgid "Stop"
+msgstr "úÕÐÉÎÉÔÉ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(none)"
-msgstr "(ΦÞÏÇÏ)"
+msgid "Update"
+msgstr "ðÏÎÏ×ÌÅÎÎÑ"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, listing packages..."
+msgid "Please wait, removing packages..."
 msgstr ""
 "úÁÞÅËÁÊÔÅ\n"
 "óÏÒÔÕ×ÁÎÎÑ ÐÁËÅÔ¦×"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "ÎÅצÄÏÍÏ"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "One of the following packages is needed:"
-msgstr "ðÏÔÒ¦ÂÎÉÊ ÏÄÉÎ Ú ÎÁÓÔÕÐÎÉÈ ÐÁËÕÎ˦×:"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "âÕÄØ ÌÁÓËÁ, ×ÉÂÅÒ¦ÔØ"
+msgid "Normal information"
+msgstr "óÔÁÎÄÁÒÔÎÁ ¦ÎÆÏÒÍÁæÑ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr "ðÏͦÞÅΦ ËÏÎÆ̦ËÔÉ"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Selected"
+msgid "Media: "
 msgstr ""
-"÷ÉÂÒÁÔÉ \n"
-"×ÓÅ"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Search results"
-msgstr "òÅÚÕÌØÔÁÔÉ ÐÏÛÕËÕ"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Stop"
-msgstr "úÕÐÉÎÉÔÉ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "úÁÞÅËÁÊÔÅ, ÂÕÄØ ÌÁÓËÁ, ÛÕËÁÀ..."
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Search results (none)"
-msgstr "òÅÚÕÌØÔÁÔ ÐÏÛÕËÕ (ÎÅÍÁ¤)"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "úËÁÞÕÀ ÐÁËÅÔ '%s' (%s/%s)..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Other"
-msgstr "¶ÎÛÅ"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "÷ÉÂÒÁÎÏ: %d í / ÷¦ÌØÎÏ ÎÁ ÄÉÓËÕ: %d í"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the packages source editor!\n"
-"\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
+msgid "Media"
 msgstr ""
-"ìÁÓËÁ×Ï ÐÒÏÓÉÍÏ ÄÏ ÒÅÄÁËÔÏÒÁ ÄÖÅÒÅÌ ÐÁËÕÎ˦×!\n"
-"\n"
-"ãÅÊ ¦ÎÓÔÒÕÍÅÎÔ ÄÏÐÏÍÏÖÅ ×ÁÍ ÎÁÌÁÛÔÕ×ÁÔÉ ÄÖÅÒÅÌÁ ÐÁËÕÎ˦×, Ñ˦ ×É ÈÏÞÅÔÅ "
-"×ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ÎÁ\n"
-" ×ÁÛÏÍÕ ËÏÍÐ'ÀÔÅÒ¦. ÷ÏÎÉ ÓÔÁÎÕÔØ ÄÏÓÔÕÐÎÉÍÉ ÄÌÑ ×ÓÔÁÎÏ×ÌÅÎÎÑ ÎÏ×ÉÈ ÐÁËÕÎË¦× "
-"Ú ÐÒÏÇÒÁÍÁÍÉ\n"
-"ÁÂÏ ÄÌÑ ÚĦÊÓÎÅÎÎÑ ÐÏÎÏ×ÌÅÎØ."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Save and quit"
-msgstr "úÂÅÒÅÇÔÉ ¦ ×ÉÊÔÉ"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Proxy..."
-msgstr "ðÏÍÉÌËÁ..."
+msgid "Spain"
+msgstr "¶ÓÐÁΦÑ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Update..."
-msgstr "ðÏÎÏ×ÌÅÎÎÑ"
+msgid "Normal updates"
+msgstr "÷ÉËÏÎÁÔÉ ÐÏÎÏ×ÌÅÎÎÑ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "äÏÄÁÔÉ..."
+msgid "by selection state"
+msgstr "ÚÁ ÓÔÁÎÏÍ ×ÉÂÏÒÕ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "òÅÄÁÇÕ×ÁÔÉ"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
+"úÁÞÅËÁÊÔÅ, ÂÕÄØ ÌÁÓËÁ, ÊÄÅ ÚÁ×ÁÎÔÁÖÅÎÎÑ ÁÄÒÅÓ ÄÚÅÒËÁÌ Ú ×ÅÂ-ÓÁÊÔÕ "
+"MandrakeSoft."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Source"
-msgstr "äÖÅÒÅÌÏ"
+msgid "Login:"
+msgstr "¶Í'Ñ:"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "äÏÓÔÕÐÎÉÊ?"
+#, fuzzy, c-format
+msgid "Adding a media:"
+msgstr "äÏÂÁ×ÌÑÀÔØÓÑ ÄÖÅÒÅÌÁ:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Configure sources"
-msgstr "óËÏÎƦ­ÕÒÕ×ÁÔÉ ÄÖÅÒÅÌÁ"
+msgid "Austria"
+msgstr "á×ÓÔÒ¦Ñ"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Password:"
-msgstr "ðÁÒÏÌØ:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Fatal error"
+msgstr "ðÏÍÉÌËÁ ÆÁÊÌÕ"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "User:"
-msgstr "ëÏÒÉÓÔÕ×ÁÞ:"
+#, fuzzy, c-format
+msgid "Update..."
+msgstr "ðÏÎÏ×ÌÅÎÎÑ"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "÷É ÍÏÖÅÔÅ ×ÓÔÁÎÏ×ÉÔÉ ËÏÒÉÓÔÕ×ÁÞÁ/ÐÁÒÏÌØ ÄÌÑ ÁÕÔÅÎÔÉƦËÁæ§ ÐÒÏËÓ¦:"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "ðÅÒÅצÒÑÀ ЦÄÐÉÓ '%s'..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "îÁÚ×Á ÐÒÏËÓ¦:"
+msgid "(none)"
+msgstr "(ΦÞÏÇÏ)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+"Removing these packages would break your system, sorry:\n"
+"\n"
 msgstr ""
-"ñËÝÏ ×ÁÍ ÐÏÔÒ¦ÂÎÅÎ ÐÒÏËÓ¦, ××ÅĦÔØ ÊÏÇÏ ÎÁÚ×Õ ¦ ÐÏÒÔ (ÎÅÏÂÏ×'ÑÚËÏ×Ï) "
-"(ÓÉÎÔÁËÓÉÓ: <ÎÁÚ×Á[:ÐÏÒÔ]>):"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure proxies"
-msgstr "îÁÌÁÛÔÕ×ÁÔÉ ÐÒÏËÓ¦"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Please wait, updating medium..."
-msgstr "úÁÞÅËÁÊÔÅ, ÂÕÄØ-ÌÁÓËÁ, ÐÏÎÏ×ÌÀÀ ÎÏÓ¦Ñ..."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "ýÏ ÚÂÅÒÅÇÔÉ ÚͦÎÉ, ×ÁÍ ÓÌ¦Ä ×ÓÔÁ×ÉÔÉ ÎÏÓ¦Ñ ÄÏ ÐÒÉÓÔÒÏÀ"
+"÷ÉÂÁÞÔÅ, ÁÌÅ ×ÉÌÕÞÅÎÎÑ ÃÉÈ ÐÁËÕÎË¦× ÐÏÒÕÛÉÔØ ÒÏÂÏÔÕ ×ÁÛϧ ÓÉÓÔÅÍÉ:\n"
+"\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "÷ÁÍ ÐÏÔÒ¦ÂÎÏ ×ÓÔÁ×ÉÔÉ ÎÏÓ¦Ñ ÄÌÑ ÐÒÏÄÏ×ÖÅÎÎÑ"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "÷ÓÔÁÎÏ×ÌÀÀ ÐÁËÅÔ '%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "úÂÅÒÅÇÔÉ ÚͦÎÉ"
+msgid "Currently installed version: "
+msgstr "÷ÓÔÁÎÏ×ÌÅÎÁ ×ÅÒÓ¦Ñ: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "÷¦ÄÎÏÓÎÉÊ ÛÌÑÈ ÄÏ synthesis/hdlist:"
+msgid "Other"
+msgstr "¶ÎÛÅ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "Reason for update: "
+msgstr "ðÒÉÞÉÎÁ ÐÏÎÏ×ÌÅÎÎÑ: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "òÅÄÁÇÕ×ÁÎÎÑ ÄÖÅÒÅÌÁ \"%s\":"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Edit a source"
-msgstr "òÅÄÁÇÕ×ÁÔÉ ÄÖÅÒÅÌÏ "
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Please wait, removing medium..."
-msgstr "úÁÞÅËÁÊÔÅ, ÂÕÄØ-ÌÁÓËÁ, ×ÉÄÁÌÑÀ ÎÏÓ¦Ñ..."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Type of source:"
-msgstr "ôÉÐ ÄÖÅÒÅÌÁ:"
+msgid "Please choose the desired mirror."
+msgstr ""
+"úÁÞÅËÁÊÔÅ \n"
+"þÉÔÁÀ ÓÐÉÓÏË ÄÚÅÒËÁÌ"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Adding a source:"
-msgstr "äÏÂÁ×ÌÑÀÔØÓÑ ÄÖÅÒÅÌÁ:"
+msgid "Edit"
+msgstr "òÅÄÁÇÕ×ÁÔÉ"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, finding available packages..."
 msgstr ""
-"÷ÖÅ ¤ ÎÏÓ¦Ê Ú ÔÁËÉÍ ¦ÍÅÎÅÍ,\n"
-"×É Ä¦ÊÓÎÏ ÈÏÞÅÔÅ ÊÏÇÏ ÚÁͦÎÉÔÉ?"
+"úÁÞÅËÁÊÔÅ\n"
+"óÏÒÔÕ×ÁÎÎÑ ÐÁËÅÔ¦×"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "÷ÁÍ ÐÏÔÒ¦ÂÎÏ ÚÁÐÏ×ÎÉÔÉ ÈÏÞÁ  Ä×Á ÐÅÒÛ¦ ÐÏÌÑ."
+msgid "Relative path to synthesis/hdlist:"
+msgstr "÷¦ÄÎÏÓÎÉÊ ÛÌÑÈ ÄÏ synthesis/hdlist:"
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Name:"
-msgstr "îÁÚ×Á"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
+msgstr "òÅÚÕÌØÔÁÔ ÐÏÛÕËÕ (ÎÅÍÁ¤)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Login:"
-msgstr "¶Í'Ñ:"
+msgid "Danmark"
+msgstr "äÁΦÑ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr "÷ÉÂÅÒ¦ÔØ ÄÚÅÒËÁÌÏ..."
+msgid "China"
+msgstr "ëÉÔÁÊ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Browse..."
-msgstr "ðÅÒÅÇÌÑÎÕÔÉ..."
+msgid "United States"
+msgstr "óÐÏÌÕÞÅΦ ûÔÁÔÉ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Path or mount point:"
-msgstr "ûÌÑÈ ÁÂÏ ÔÏÞËÁ ÍÏÎÔÕ×ÁÎÎÑ:"
+msgid "changes:"
+msgstr "ÚͦÎÉ:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Removable device"
-msgstr "úͦÎÎÉÊ ÐÒÉÓÔÒ¦Ê"
+msgid "Some additional packages need to be removed"
+msgstr "ðÏÔÒ¦ÂÎÏ ÄÏÄÁÔËÏ×Ï ×ÉÌÕÞÉÔÉ ÄÅÑ˦ ÐÁËÕÎËÉ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "óÅÒ×ÅÒ HTTP"
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "óÅÒ×ÅÒ FTP"
+msgid "No"
+msgstr "î¦"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Path:"
-msgstr "ðÏÒÔ:"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Local files"
-msgstr "ìÏËÁÌØΦ ÆÁÊÌÉ"
+msgid "Configure medias"
+msgstr "óËÏÎƦ­ÕÒÕ×ÁÔÉ ÄÖÅÒÅÌÁ"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add a source"
+#, fuzzy, c-format
+msgid "Add a media"
 msgstr "äÏÄÁÔÉ ÄÖÅÒÅÌÏ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr "îÅÍÏÖÌÉ×Ï ÐÏÎÏ×ÉÔÉ ÎÏÓ¦Ñ; ÊÏÇÏ ÂÕÄÅ Á×ÔÏÍÁÔÉÞÎÏ ×ÉÍËÎÅÎÏ."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Unable to create medium."
-msgstr "îÅÍÏÖÌÉ×Ï ÓÔ×ÏÒÉÔÉ ÎÏÓ¦Ñ."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Update"
-msgstr "ðÏÎÏ×ÌÅÎÎÑ"
+msgid "Summary: "
+msgstr "ð¦ÄÓÕÍÏË"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "÷ÉÂÅÒ¦ÔØ ÄÖÅÒÅÌÏÁ, Ñ˦ ×É ÈÏÞÅÔÅ ÐÏÎÏ×ÉÔÉ:"
+msgid "Canada"
+msgstr "ëÁÎÁÄÁ"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "úÁÞÅËÁÊÔÅ, ÂÕÄØ-ÌÁÓËÁ, ÐÏÎÏ×ÌÀÀÔØÓÑ ÎÏÓ¦§..."
+msgid "Greece"
+msgstr "çÒÅæÑ"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid " failed!"
-msgstr " ÎÅÕÓЦÛÎÏ!"
+msgid ""
+"There was an error downloading the mirrors list:\n"
+"\n"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
+msgstr ""
+"óÔÁÌÁÓÑ ÐÏÍÉÌËÁ Ð¦Ä ÞÁÓ ÚÁ×ÁÎÔÁÖÅÎÎÑ ÓÐÉÓËÕ ÄÚÅÒËÁÌ:\n"
+"\n"
+"%s\n"
+"íÏÖÌÉ×Ï, ÍÅÒÅÖÁ ÁÂÏ ×ÅÂ-ÓÁÊÔ MandrakeSoft ÎÅÄÏÓÔÕÐΦ.\n"
+"âÕÄØ ÌÁÓËÁ, ÓÐÒÏÂÕÊÔÅ ÝÅ ÒÁÚ Ð¦ÚΦÛÅ."
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid " done."
-msgstr " ×ÉËÏÎÁÎÏ."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr "÷É ÐÏ×ÉÎΦ ÍÁÔÉ ÐÒÁ×Á ÁÄͦΦÓÔÒÁÔÏÒÁ, ×ÉÂÁÞÁÊÔÅ."
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "úÁ×ÁÎÔÁÖÅÎÏ `%s', Û×ÉÄ˦ÓÔØ:%s"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Path:"
+msgstr "ðÏÒÔ:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "úÁ×ÁÎÔÁÖÅÎÏ `%s', ÚÁÌÉÛÉÌÏÓØ ÞÁÓÕ:%s, Û×ÉÄ˦ÓÔØ:%s"
+msgid "Problem during removal"
+msgstr "ðÒÏÂÌÅÍÁ Ð¦Ä ÞÁÓ ×ÉÌÕÞÅÎÎÑ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "ðÅÒÅצÒÑÀ ЦÄÐÉÓ '%s'..."
+msgid "Selected"
+msgstr ""
+"÷ÉÂÒÁÔÉ \n"
+"×ÓÅ"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "ðÅÒÅצÒËÁ צÄÄÁÌÅÎÏÇÏ ÆÁÊÌÕ ÄÖÅÒÅÌÁ `%s'..."
+msgid "Netherlands"
+msgstr "çÏÌÁÎĦÑ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "ðÅÒÅצÒËÁ ÆÁÊÌÕ ÄÖÅÒÅÌÁ `%s'..."
+msgid "Addable"
+msgstr "íÏÖÌÉ×Ï ÄÏÄÁÔÉ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "ëÏЦÀ×ÁÎÎÑ ÆÁÊÌÕ Ú ÄÖÅÒÅÌÁ `%s'..."
+msgid "(Not available)"
+msgstr "(îÅÄÏÓÔÕÐÎÅ)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please choose the desired mirror."
-msgstr ""
-"úÁÞÅËÁÊÔÅ \n"
-"þÉÔÁÀ ÓÐÉÓÏË ÄÚÅÒËÁÌ"
-
-#: ../rpmdrake.pm:1
-#, c-format
 msgid ""
-"I can't find any suitable mirror.\n"
+"Sorry, the following package(s) can't be selected:\n"
 "\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
-msgstr ""
-"ñ ÎÅ ÍÏÖÕ ÚÎÁÊÔÉ ÐÒÉÄÁÔÎÏÇÏ ÄÚÅÒËÁÌÁ.\n"
+"%s\n"
 "\n"
-"íÏÖÅ ÂÕÌÉ ÂÁÇÁÔÏ ÐÒÉÞÉΠ椧 ÐÒÏÂÌÅÍÉ; ÎÁÊÞÁÓÔ¦ÛÅ ÃÅ\n"
-"ÓÔÁ¤ÔØÓÑ ÞÅÒÅÚ ÔÅ, ÝÏ ÁÒȦÔÅËÔÕÒÁ ×ÁÛÏÇÏ ÐÒÏÃÅÓÏÒÁ ΊЦÄÔÒÉÍÕ¤ÔØÓÑ\n"
-"Mandrake Linux Official Updates."
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "No mirror"
-msgstr "ÄÚÅÒËÁÌÏ:"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid ""
-"There was an error downloading the mirrors list:\n"
+"Reasons follow:\n"
 "\n"
-"%s\n"
-"The network, or MandrakeSoft website, are maybe unavailable.\n"
-"Please try again later."
+"%s"
 msgstr ""
-"óÔÁÌÁÓÑ ÐÏÍÉÌËÁ Ð¦Ä ÞÁÓ ÚÁ×ÁÎÔÁÖÅÎÎÑ ÓÐÉÓËÕ ÄÚÅÒËÁÌ:\n"
+"÷ÉÂÁÞÔÅ, ÎÁÓÔÕÐΦ ÐÁËÕÎËÉ ÎÅ ÍÏÖÕÔØ ÂÕÔÉ ×ÉÂÒÁΦ:\n"
 "\n"
-"%s\n"
-"íÏÖÌÉ×Ï, ÍÅÒÅÖÁ ÁÂÏ ×ÅÂ-ÓÁÊÔ MandrakeSoft ÎÅÄÏÓÔÕÐΦ.\n"
-"âÕÄØ ÌÁÓËÁ, ÓÐÒÏÂÕÊÔÅ ÝÅ ÒÁÚ Ð¦ÚΦÛÅ."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Not selected"
+msgstr "ðÏͦÞÅΦ ËÏÎÆ̦ËÔÉ"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
-msgstr "ðÏÍÉÌËÁ Ð¦Ä ÞÁÓ ÚËÁÞÕ×ÁÎÎÑ"
+msgid "Software Packages Removal"
+msgstr "÷ÉÌÕÞÅÎÎÑ ÐÁËÕÎË¦× Ú ÐÒÏÇÒÁÍÁÍÉ"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
-"úÁÞÅËÁÊÔÅ, ÂÕÄØ ÌÁÓËÁ, ÊÄÅ ÚÁ×ÁÎÔÁÖÅÎÎÑ ÁÄÒÅÓ ÄÚÅÒËÁÌ Ú ×ÅÂ-ÓÁÊÔÕ "
-"MandrakeSoft."
+msgid "Sweden"
+msgstr "û×ÅæÑ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
 "\n"
-"Is it ok to continue?"
+"\n"
+"Error(s) reported:\n"
+"%s"
 msgstr ""
-"íÅΦ ÐÏÔÒ¦ÂÎÏ Ú'¤ÄÎÁÔÉÓÑ Ú ×ÅÂ-ÓÁÊÔÏÍ MandrakeSoft, ÝÏ ÏÔÒÉÍÁÔÉ ÐÅÒÅÌ¦Ë "
-"ÄÚÅÒËÁÌ.\n"
-"âÕÄØ ÌÁÓËÁ, ÐÅÒÅצÒÔÅ, ÞÅ Ú'¤ÄÎÁΦ ×É Ú ¦ÎÔÅÒÎÅÔÏÍ.\n"
 "\n"
-"ðÒÏÄÏ×ÖÉÔÉ?"
+"\n"
+"ðÏצÄÏÍÌÅÎÏ ÐÒÏ ÐÏÍÉÌËÉ:\n"
+"%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United States"
-msgstr "óÐÏÌÕÞÅΦ ûÔÁÔÉ"
+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 ""
+"ðÅÒÅÌ¦Ë ÐÏÎÏ×ÌÅÎØ ÐÏÒÏÖΦÊ. ãÅ ÏÚÎÁÞÁ¤, ÝÏ ÁÂÏ ÎÅÍÁ¤\n"
+"ÐÏÎÏ×ÌÅÎØ ÄÌÑ ÐÁËÕÎ˦×, Ñ˦ ×ÓÔÁÎÏ×ÌÅΦ ÎÁ ×ÁÛÏÍÕ ËÏÍÐ'ÀÔÅÒ¦,\n"
+"ÁÂÏ ×ÏÎÉ ×Ó¦ ×ÖÅ ×ÓÔÁÎÏ×ÌÅΦ."
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "China"
-msgstr "ëÉÔÁÊ"
+#, fuzzy, c-format
+msgid "Examining file of media `%s'..."
+msgstr "ðÅÒÅצÒËÁ ÆÁÊÌÕ ÄÖÅÒÅÌÁ `%s'..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United Kingdom"
-msgstr "ïÂ'¤ÄÎÁÎÅ ëÏÒÏ̦×ÓÔ×Ï"
+msgid "Download of `%s', speed:%s"
+msgstr "úÁ×ÁÎÔÁÖÅÎÏ `%s', Û×ÉÄ˦ÓÔØ:%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "ôÁÊ×ÁÎØ"
+msgid "One of the following packages is needed:"
+msgstr "ðÏÔÒ¦ÂÎÉÊ ÏÄÉÎ Ú ÎÁÓÔÕÐÎÉÈ ÐÁËÕÎ˦×:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Sweden"
-msgstr "û×ÅæÑ"
+msgid "Quit"
+msgstr "÷ÉȦÄ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Russia"
-msgstr "òÏÓ¦Ñ"
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"íÅΦ ÎÅÏÂȦÄÎÏ Ú'¤ÄÎÁÔÉÓÑ Ú ÄÚÅÒËÁÌÏÍ, ÝÏ ÏÔÒÉÍÁÔÉ ÏÓÔÁÎΦ ÐÏÎÏ×ÌÅÎÎÑ "
+"ÐÁËÕÎ˦×.\n"
+"âÕÄØ ÌÁÓËÁ, ÐÅÒÅצÒÔÅ, ÞÉ ×ÁÛÁ ÍÅÒÅÖÁ × ÄÁÎÉÊ ÞÁÓ ÐÒÁÃÀ¤.\n"
+"\n"
+"ðÒÏÄÏ×ÖÉÔÉ?"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Portugal"
-msgstr "ðÏÒÔ:"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Poland"
-msgstr "ðÏÌØÝÁ"
+msgid "Update media(s)"
+msgstr "ðÏÎÏ×ÉÔÉ ÄÖÅÒÅÌÏ(Á)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Norway"
-msgstr "îÏÒ×ÅǦÑ"
+msgid "Ok"
+msgstr "çÁÒÁÚÄ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Netherlands"
-msgstr "çÏÌÁÎĦÑ"
+msgid "Please wait, adding medium..."
+msgstr "úÁÞÅËÁÊÔÅ, ÂÕÄØ-ÌÁÓËÁ, ÄÏÄÁÀ ÎÏÓ¦Ñ..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Korea"
-msgstr "ðÒÉÍÕÓÏ×Ï"
+msgid "Unable to get source packages."
+msgstr "÷ÉÂÅÒ¦ÔØ Ó×ϧ ÐÁËÅÔÉ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "ñÐÏΦÑ"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Italy"
-msgstr "¶ÎÓÔÁÌÀ×ÁÔÉ"
+msgid "Too many packages are selected"
+msgstr "÷ÉÂÒÁÎÏ ÚÁÎÁÄÔÏ ÂÁÇÁÔÏ ÐÁËÕÎ˦×"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Israel"
-msgstr "¶ÎÓÔÁÌÀ×ÁÔÉ"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Greece"
-msgstr "çÒÅæÑ"
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"ìÁÓËÁ×Ï ÐÒÏÓÉÍÏ ÄÏ ÒÅÄÁËÔÏÒÁ ÄÖÅÒÅÌ ÐÁËÕÎ˦×!\n"
+"\n"
+"ãÅÊ ¦ÎÓÔÒÕÍÅÎÔ ÄÏÐÏÍÏÖÅ ×ÁÍ ÎÁÌÁÛÔÕ×ÁÔÉ ÄÖÅÒÅÌÁ ÐÁËÕÎ˦×, Ñ˦ ×É ÈÏÞÅÔÅ "
+"×ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ÎÁ\n"
+" ×ÁÛÏÍÕ ËÏÍÐ'ÀÔÅÒ¦. ÷ÏÎÉ ÓÔÁÎÕÔØ ÄÏÓÔÕÐÎÉÍÉ ÄÌÑ ×ÓÔÁÎÏ×ÌÅÎÎÑ ÎÏ×ÉÈ ÐÁËÕÎË¦× "
+"Ú ÐÒÏÇÒÁÍÁÍÉ\n"
+"ÁÂÏ ÄÌÑ ÚĦÊÓÎÅÎÎÑ ÐÏÎÏ×ÌÅÎØ."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "France"
-msgstr "ðÒÉÍÕÓÏ×Ï"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Finland"
-msgstr "æ¦ÎÌÑÎĦÑ"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Spain"
-msgstr "¶ÓÐÁΦÑ"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Danmark"
-msgstr "äÁΦÑ"
+msgid "%s conflicts with %s"
+msgstr "ËÏÎÆ̦ËÔÕ¤ Ú"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "î¦ÍÅÞÞÉÎÁ"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"ìÁÓËÁ×Ï ÐÒÏÓÉÍÏ ÄÏ ðÏÎÏ×ÌÅÎÎÑ íÁÎÄÒÅÊË!\n"
+"\n"
+"ãÑ ÐÒÏÇÒÁÍÁ ÄÏÐÏÍÏÖÅ ×ÁÍ ×ÉÂÒÁÔÉ ÐÏÎÏ×ÌÅÎÎÑ, Ñ˦ ×É ÈÏÞÅÔÅ ×ÓÔÁÎÏ×ÉÔÉ ÎÁ \n"
+"×ÁÛ ËÏÍÐ'ÀÔÅÒ."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
-msgstr "þÅȦÑ"
+msgid "Mandrake choices"
+msgstr "÷ÉÂ¦Ò íÁÎÄÒÅÊËÁ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "ëÏÓÔÁ-ò¦ËÁ"
+msgid "Changelog:\n"
+msgstr "ðÅÒÅÌ¦Ë ÚͦÎ:\n"
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Canada"
-msgstr "ëÁÎÁÄÁ"
+#, fuzzy, c-format
+msgid "Korea"
+msgstr "ðÒÉÍÕÓÏ×Ï"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Brazil"
-msgstr "âÒÁÚÉ̦Ñ"
+msgid "Removable device"
+msgstr "úͦÎÎÉÊ ÐÒÉÓÔÒ¦Ê"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "âÅÌØǦÑ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "á×ÓÔÒÁ̦Ñ"
+msgid "Change medium"
+msgstr "úͦΦÔØ ÎÏÓ¦Ê"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Austria"
-msgstr "á×ÓÔÒ¦Ñ"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mandrake Update"
+msgstr "÷ÉËÏÎÁÔÉ ÐÏÎÏ×ÌÅÎÎÑ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
-msgstr "¶ÎÆÏÒÍÁæÑ..."
+msgid "by size"
+msgstr "ÚÁ ÒÏÚͦÒÏÍ"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "î¦"
+msgid "FTP server"
+msgstr "óÅÒ×ÅÒ FTP"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Files:\n"
+msgstr "/_æÁÊÌ"
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Yes"
-msgstr "ôÁË"
+#, fuzzy, c-format
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr "îÅÍÏÖÌÉ×Ï ÐÏÎÏ×ÉÔÉ ÎÏÓ¦Ñ; ÊÏÇÏ ÂÕÄÅ Á×ÔÏÍÁÔÉÞÎÏ ×ÉÍËÎÅÎÏ."
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -1585,6 +1585,13 @@ msgstr "÷ÉÄÁÌÉÔÉ ÐÒÏÇÒÁÍÉ"
 msgid "Software Sources Manager"
 msgstr "íÅÎÅÄÖÅÒ ÄÖÅÒÅÌ ÐÁËÕÎ˦×"
 
+#, fuzzy
+#~ msgid "Source: "
+#~ msgstr "äÖÅÒÅÌÏ"
+
+#~ msgid "Source"
+#~ msgstr "äÖÅÒÅÌÏ"
+
 #~ msgid "Couldn't read RPM config files"
 #~ msgstr "îÅ ÍÏÖÕ ÐÒÏÞÉÔÁÔÉ ËÏÎƦÇÕÒÁæÀ RPM"
 
diff --git a/po/uz.po b/po/uz.po
index 7ecea309..e8a130e0 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: 2003-03-04 13:14+0000\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <uz-li@yahoogroups.com>\n"
@@ -15,16 +15,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
+msgid "Enabled?"
 msgstr ""
-"%s\n"
-"\n"
-"Davom etsa bo'ladimi?"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Yo'l yoki ulash nuqtasi:"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Portugal"
+msgstr "Port:"
 
 #: ../rpmdrake:1
 #, c-format
@@ -38,56 +42,96 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
+msgid "by group"
+msgstr "guruh bo'yicha"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Name:"
+msgstr "Nom"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Italy"
+msgstr "O'rnat"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
 msgstr ""
 
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
+
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
+msgid "Some packages need to be removed"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
+msgid "More information on package..."
+msgstr ""
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Ha"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"%s"
 msgstr ""
-"Paketlarni o'rnatish paytida xato yuzaga keldi:\n"
-"\n"
-"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Problem during removal"
-msgstr ""
+msgid "everything was installed correctly"
+msgstr "hamma narsa to'g'ri o'rnatildi"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, removing packages..."
+msgid "%s KB"
+msgstr "%.1f KB"
+
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"Iltimos Kuting\n"
-"Paketlar saralanmoqda"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, reading packages database..."
+#, c-format
+msgid ""
+"Welcome to the software removal tool!\n"
+"\n"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
+msgstr ""
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
 msgstr ""
-"Iltimos Kuting\n"
-"Paketlar saralanmoqda"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Saqlash va chiqish"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"There was a problem during the installation:\n"
+"There was a problem during the removal of packages:\n"
 "\n"
 "%s"
 msgstr ""
@@ -97,74 +141,66 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Hammasini o'rnat"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "O'rnatishga paketlar tayyorlanmoqda..."
+msgid "Size: "
+msgstr "Hajm"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "O'rnatishga paketlar tayyorlanmoqda..."
+msgid "Security updates"
+msgstr "Xavfsizlik apdeytlarini ko'rsat"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
+msgid "Already existing update medias"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Hamma narsa muvaffaqiyatli o'rnatildi"
+msgid "Maximum information"
+msgstr "Eng ko'p ma'lumot"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Proxy..."
+msgstr "Xato..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
-"\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "everything was installed correctly"
-msgstr "hamma narsa to'g'ri o'rnatildi"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "O'rnatish paytida xatolar yuzaga keldi"
+msgid "United Kingdom"
+msgstr "Buyuk Britaniya"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "`%s' (%s/%s) paketi o'rnatilmoqda..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "O'rnatishga paketlar tayyorlanmoqda..."
+msgid "in names"
+msgstr "nomlarda"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
+"I can't find any suitable mirror.\n"
 "\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+msgid "Remove .%s"
 msgstr ""
 
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "Finlyandiya"
+
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
@@ -180,70 +216,112 @@ msgstr ""
 "\n"
 "Baribir davom etasizmi (bu paketni tashlab ketib)?"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Verifying packages signatures..."
+msgid "Examining distant file of media `%s'..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "`%s' (%s/%s) paketi olinmoqda..."
+msgid "Verifying packages signatures..."
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Cancel"
-msgstr "Bekor"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "France"
+msgstr "Majburla"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#. -PO: Keep it short, this is gonna be on a button
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "More info"
+msgstr "Qo'shimcha ma'lumot"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Davom etsa bo'ladimi?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+msgid "Reload the packages list"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Change medium"
+msgid "Choose a mirror..."
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Initializing..."
-msgstr "Boshlanish..."
+#, fuzzy, c-format
+msgid "Some packages can't be installed"
+msgstr "Paketni o'rnatish mumkin emas"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Package installation..."
+msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "O'rnatishga paketlar tayyorlanmoqda..."
 
 #: ../rpmdrake:1
+#, c-format
+msgid "All packages,"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Paketlarni o'rnatish uchun root bo'lish shart, uzr"
+msgid "Type of media:"
+msgstr "Manbaning turi:"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unable to get source packages."
-msgstr "Paketlaringizni tanlang"
+#, c-format
+msgid "in files"
+msgstr "fayllarda"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "Tekshirish..."
+msgid "All requested packages were installed successfully."
+msgstr ""
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Proxy hostname:"
+msgstr "Proksi yuzer nomi:"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "Lokal fayllar"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr "%s tekshirilmoqda"
+
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Installation finished"
-msgstr "O'rnatilgan"
+msgid "Israel"
+msgstr "O'rnat"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Help"
+msgstr "/_Yordam"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Do nothing"
-msgstr "Hech narsa qilmash"
+msgid "HTTP server"
+msgstr "HTTP server"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Installation failed"
+msgstr "Hammasini o'rnat"
 
 #: ../rpmdrake:1
 #, c-format
@@ -252,125 +330,155 @@ msgstr "Faylni (.%s) asosiy fayl safatida islatish"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Remove .%s"
+msgid "Search results"
+msgstr "Qidirish natijalari"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid " failed!"
+msgstr "fayllarda"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
+msgstr "Braziliya"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "changes:"
-msgstr "o'zgarishlar:"
+msgid "Find:"
+msgstr "Qidirish:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "%s tekshirilmoqda"
+msgid "All packages, alphabetical"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, searching..."
+msgstr "Qidirayapman, iltimos kutib turing..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, finding available packages..."
+msgid "Please wait, reading packages database..."
 msgstr ""
 "Iltimos Kuting\n"
 "Paketlar saralanmoqda"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Please wait, adding medium..."
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "Paketni ocholmadim"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
-"\n"
-"Then, restart MandrakeUpdate."
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
+msgid "Reset the selection"
+msgstr "Tanlashni tiklash"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
 "\n"
-"Then, restart MandrakeUpdate."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Already existing update sources"
-msgstr ""
+msgid "Costa Rica"
+msgstr "Kosta Rika"
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
+"There was a problem during the installation:\n"
 "\n"
-"Is it ok to continue?"
+"%s"
 msgstr ""
+"Paketlarni o'rnatish paytida xato yuzaga keldi:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "A fatal error occurred: %s."
+msgid "Please wait, removing medium..."
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Fayl xatosi"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "Parol:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "Tayvan"
+
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "O'rnatishga paketlar tayyorlanmoqda..."
+msgid "User:"
+msgstr "Yuzer nomi:"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Mandrake Update"
-msgstr "MandrakeUpdate Tanlovlari"
+msgid "Please wait, listing packages..."
+msgstr ""
+"Iltimos Kuting\n"
+"Paketlar saralanmoqda"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Software Packages Removal"
-msgstr ""
+#, fuzzy, c-format
+msgid "Information on packages"
+msgstr "Paketni ocholmadim"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "Chiqish"
+msgid "Cancel"
+msgstr "Bekor"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "O'rnat"
+msgid "Everything installed successfully"
+msgstr "Hamma narsa muvaffaqiyatli o'rnatildi"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Remove"
-msgstr "Olibtashlash"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Help"
-msgstr "/_Yordam"
+msgid "Select the media(s) you wish to update:"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search"
-msgstr "Qidirish"
+msgid "Please wait, updating media..."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Qidirish:"
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -383,155 +491,171 @@ msgid ""
 msgstr ""
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "in descriptions"
+msgstr "Tavsiflar"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Some packages need to be removed"
+msgid "Configure proxies"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
 "\n"
-"Do you really want to install all the selected packages?"
+"Is it ok to continue?"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr ""
+msgid "Please choose"
+msgstr "Iltimos tanlang"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Maximum information"
-msgstr "Eng ko'p ma'lumot"
+#, fuzzy, c-format
+msgid "Selected size: %d MB"
+msgstr "%dta tanlangan paket: %.1f MB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Normal information"
-msgstr "Oddiy ma'lumot"
+msgid "Initializing..."
+msgstr "Boshlanish..."
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update source(s)"
-msgstr "Manba(lar)ni yangilash"
+msgid "Save changes"
+msgstr "O'zgarishlarni saqlash"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Reload the packages list"
-msgstr ""
+msgid "Error during download"
+msgstr "Download paytida xato"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reset the selection"
-msgstr "Tanlashni tiklash"
+#, fuzzy, c-format
+msgid "Package installation..."
+msgstr "O'rnatishga paketlar tayyorlanmoqda..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "fayllarda"
+msgid "Importance: "
+msgstr "Muhimligi: "
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "in descriptions"
-msgstr "Tavsiflar"
+#, c-format
+msgid ""
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "in names"
-msgstr "nomlarda"
+msgid "Add..."
+msgstr "Qo'shish"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by update availability"
+msgid "Unable to create medium."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by source repository"
-msgstr "manba bo'yicha"
+msgid ""
+"The installation is finished; %s.\n"
+"\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by selection state"
-msgstr "tanlash holati bo'yicha"
+msgid "Browse..."
+msgstr "Tanlash..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by size"
-msgstr "hajmi bo'yicha"
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "Paketni o'rnatish mumkin emas"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by group"
-msgstr "guruh bo'yicha"
+msgid "Info..."
+msgstr "Ma'lumot"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "All packages,"
+msgid "You need to insert the medium to continue"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "All packages, alphabetical"
+msgid "Copying file for media `%s'..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Mandrake choices"
-msgstr ""
+msgid "Remove"
+msgstr "Olibtashlash"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Normal updates"
-msgstr "Oddiy Apdeytlar"
+msgid "Preparing packages installation..."
+msgstr "O'rnatishga paketlar tayyorlanmoqda..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Bugfixes updates"
-msgstr "Xato tuzatish apdeytlarini ko'rsat"
+msgid "by media repository"
+msgstr "manba bo'yicha"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Security updates"
-msgstr "Xavfsizlik apdeytlarini ko'rsat"
+msgid "No mirror"
+msgstr "ko'zgu:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Description: "
-msgstr "Tavsiflar"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to fill up at least the two first entries."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Yangilash uchun sabab: "
+msgid "Install"
+msgstr "O'rnat"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Summary: "
-msgstr "Xulosa"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Japan"
+msgstr "Yaponiya"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Importance: "
-msgstr "Muhimligi: "
+msgid "Do nothing"
+msgstr "Hech narsa qilmash"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "%s KB"
-msgstr "%.1f KB"
+msgid "No update"
+msgstr "Yangila"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Size: "
-msgstr "Hajm"
+msgid "Description: "
+msgstr "Tavsiflar"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Version: "
-msgstr "Versiya:"
+#, c-format
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -540,689 +664,565 @@ msgstr "Nom: %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "O'rnatilgan versiyasi: "
+msgid "Inspect..."
+msgstr "Tekshirish..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Source: "
-msgstr "Manba'"
+msgid "Editing media \"%s\":"
+msgstr "Manbani (\"%s\") tuzatayapman:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "(Not available)"
-msgstr ""
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "O'rnatishga paketlar tayyorlanmoqda..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Changelog:\n"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Files:\n"
-msgstr "/_Fayl"
+msgid "Australia"
+msgstr "Avstraliya"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Selected size: %d MB"
-msgstr "%dta tanlangan paket: %.1f MB"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Tanlangan: %d Mb / Diskdagi bo'sh joy: %d Mb"
+msgid "Installation finished"
+msgstr "O'rnatilgan"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
+msgid "by update availability"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr ""
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "bu bilan ziddiyat"
+msgid "Poland"
+msgstr "Polsha"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Paketni o'rnatish mumkin emas"
+msgid "Version: "
+msgstr "Versiya:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
+msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Upgradable"
+msgstr "Apdeyt"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Additional packages needed"
+msgid " done."
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "Paketni o'rnatish mumkin emas"
+msgid "Software Packages Installation"
+msgstr "O'rnatishga paketlar tayyorlanmoqda..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
+msgid "Additional packages needed"
 msgstr ""
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Bugfixes updates"
+msgstr "Xato tuzatish apdeytlarini ko'rsat"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
+msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr ""
+msgid "Germany"
+msgstr "Olmoniya"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "More information on package..."
-msgstr ""
+msgid "Russia"
+msgstr "Rossiya"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Information on packages"
-msgstr "Paketni ocholmadim"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
+msgstr "Norvegiya"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "More info"
-msgstr "Qo'shimcha ma'lumot"
+msgid "Problem during installation"
+msgstr "O'rnatish paytida xatolar yuzaga keldi"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Addable"
-msgstr "Qo'shsa bo'ladi"
+msgid "Search"
+msgstr "Qidirish"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Upgradable"
-msgstr "Apdeyt"
+msgid "Edit a media"
+msgstr "Manbani tuzatish"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
+msgstr "Chex Respublikasi"
 
 #: ../rpmdrake:1
 #, c-format
 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."
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "No update"
-msgstr "Yangila"
+#, c-format
+msgid "Stop"
+msgstr "To'xtatish"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(none)"
-msgstr "(hech qanaqa)"
+msgid "Update"
+msgstr "Apdeyt"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, listing packages..."
+msgid "Please wait, removing packages..."
 msgstr ""
 "Iltimos Kuting\n"
 "Paketlar saralanmoqda"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "Paketni ocholmadim"
+#, c-format
+msgid "Normal information"
+msgstr "Oddiy ma'lumot"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "One of the following packages is needed:"
+msgid "Media: "
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Iltimos tanlang"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "`%s' (%s/%s) paketi olinmoqda..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr "Ziddiyatlar aniqlandi"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Selected"
-msgstr ""
-"Hammasini\n"
-"tanla"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Tanlangan: %d Mb / Diskdagi bo'sh joy: %d Mb"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search results"
-msgstr "Qidirish natijalari"
+msgid "Media"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Stop"
-msgstr "To'xtatish"
+msgid "Spain"
+msgstr "Ispaniya"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Please wait, searching..."
-msgstr "Qidirayapman, iltimos kutib turing..."
+#, fuzzy, c-format
+msgid "Normal updates"
+msgstr "Oddiy Apdeytlar"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Qidirish natijalari (hech qanaqa)"
+msgid "by selection state"
+msgstr "tanlash holati bo'yicha"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Other"
-msgstr "Boshqa"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the packages source editor!\n"
-"\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
-msgstr ""
+msgid "Login:"
+msgstr "Foydalanuvchi:"
 
 #: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Adding a media:"
+msgstr "Manbani qo'shayapman:"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Save and quit"
-msgstr "Saqlash va chiqish"
+msgid "Austria"
+msgstr "Avstriya"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Xato..."
+msgid "Fatal error"
+msgstr "Fayl xatosi"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Update..."
 msgstr "Apdeyt"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add..."
-msgstr "Qo'shish"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Edit"
-msgstr "Tuzatish"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "`%s' imzosi tekshirilmoqda..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Source"
-msgstr "Manba'"
+msgid "(none)"
+msgstr "(hech qanaqa)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Enabled?"
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure sources"
-msgstr "Manbalarni moslash"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "`%s' (%s/%s) paketi o'rnatilmoqda..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "Parol:"
+msgid "Currently installed version: "
+msgstr "O'rnatilgan versiyasi: "
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "User:"
-msgstr "Yuzer nomi:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Boshqa"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr ""
+msgid "Reason for update: "
+msgstr "Yangilash uchun sabab: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Proxy hostname:"
-msgstr "Proksi yuzer nomi:"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+msgid "Please choose the desired mirror."
 msgstr ""
+"Iltimos Kuting\n"
+"Ko'zgular ro'yxati yuklanmoqda"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Configure proxies"
-msgstr ""
+msgid "Edit"
+msgstr "Tuzatish"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Please wait, updating medium..."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, finding available packages..."
 msgstr ""
+"Iltimos Kuting\n"
+"Paketlar saralanmoqda"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
+msgid "Relative path to synthesis/hdlist:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr ""
+msgid "Search results (none)"
+msgstr "Qidirish natijalari (hech qanaqa)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Save changes"
-msgstr "O'zgarishlarni saqlash"
+msgid "Danmark"
+msgstr "Daniya"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr ""
+msgid "China"
+msgstr "Xitoy"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "Manbani (\"%s\") tuzatayapman:"
+msgid "United States"
+msgstr "Qo'shma Shtatlar"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Edit a source"
-msgstr "Manbani tuzatish"
+msgid "changes:"
+msgstr "o'zgarishlar:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing medium..."
+msgid "Some additional packages need to be removed"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Type of source:"
-msgstr "Manbaning turi:"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Adding a source:"
-msgstr "Manbani qo'shayapman:"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
-msgstr ""
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr ""
+msgid "No"
+msgstr "Jo'q"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Name:"
-msgstr "Nom"
+msgid "Configure medias"
+msgstr "Manbalarni moslash"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Login:"
-msgstr "Foydalanuvchi:"
+#, fuzzy, c-format
+msgid "Add a media"
+msgstr "Manbani qo'shish"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Choose a mirror..."
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Summary: "
+msgstr "Xulosa"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Browse..."
-msgstr "Tanlash..."
+msgid "Canada"
+msgstr "Kanada"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Path or mount point:"
-msgstr "Yo'l yoki ulash nuqtasi:"
+msgid "Greece"
+msgstr "Gretsiya"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
+msgid ""
+"There was an error downloading the mirrors list:\n"
+"\n"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "HTTP server"
-msgstr "HTTP server"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "FTP server"
-msgstr "FTP server"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Paketlarni o'rnatish uchun root bo'lish shart, uzr"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Path:"
 msgstr "Port:"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Local files"
-msgstr "Lokal fayllar"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add a source"
-msgstr "Manbani qo'shish"
+msgid "Problem during removal"
+msgstr ""
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Selected"
 msgstr ""
+"Hammasini\n"
+"tanla"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to create medium."
-msgstr ""
+msgid "Netherlands"
+msgstr "Gollandiya"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Update"
-msgstr "Apdeyt"
+msgid "Addable"
+msgstr "Qo'shsa bo'ladi"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
+msgid "(Not available)"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating media..."
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid " failed!"
-msgstr "fayllarda"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid " done."
-msgstr ""
+msgid "Not selected"
+msgstr "Ziddiyatlar aniqlandi"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Download of `%s', speed:%s"
+msgid "Software Packages Removal"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr ""
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "`%s' imzosi tekshirilmoqda..."
+msgid "Sweden"
+msgstr "Shvetsiya"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining file of source `%s'..."
+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.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr ""
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Please choose the desired mirror."
+msgid "Examining file of media `%s'..."
 msgstr ""
-"Iltimos Kuting\n"
-"Ko'zgular ro'yxati yuklanmoqda"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
+msgid "Download of `%s', speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "No mirror"
-msgstr "ko'zgu:"
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"There was an error downloading the mirrors list:\n"
-"\n"
-"%s\n"
-"The network, or MandrakeSoft website, are maybe unavailable.\n"
-"Please try again later."
+msgid "One of the following packages is needed:"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Error during download"
-msgstr "Download paytida xato"
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
+msgid "Quit"
+msgstr "Chiqish"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
 "\n"
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "United States"
-msgstr "Qo'shma Shtatlar"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update media(s)"
+msgstr "Manba(lar)ni yangilash"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "Xitoy"
+msgid "Ok"
+msgstr "Ok"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Buyuk Britaniya"
+msgid "Please wait, adding medium..."
+msgstr ""
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Taiwan"
-msgstr "Tayvan"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages."
+msgstr "Paketlaringizni tanlang"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Sweden"
-msgstr "Shvetsiya"
+msgid "Too many packages are selected"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Russia"
-msgstr "Rossiya"
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Portugal"
-msgstr "Port:"
+msgid "%s conflicts with %s"
+msgstr "bu bilan ziddiyat"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
-msgstr "Polsha"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Norway"
-msgstr "Norvegiya"
+msgid "Mandrake choices"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Netherlands"
-msgstr "Gollandiya"
+msgid "Changelog:\n"
+msgstr "Changelog:\n"
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Korea"
 msgstr "Majburla"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Japan"
-msgstr "Yaponiya"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Italy"
-msgstr "O'rnat"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Israel"
-msgstr "O'rnat"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Greece"
-msgstr "Gretsiya"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "France"
-msgstr "Majburla"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Finland"
-msgstr "Finlyandiya"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Spain"
-msgstr "Ispaniya"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Danmark"
-msgstr "Daniya"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Germany"
-msgstr "Olmoniya"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Czech Republic"
-msgstr "Chex Respublikasi"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Costa Rica"
-msgstr "Kosta Rika"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Canada"
-msgstr "Kanada"
-
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Brazil"
-msgstr "Braziliya"
+msgid "Removable device"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Belgiya"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Avstraliya"
+msgid "Change medium"
+msgstr ""
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Austria"
-msgstr "Avstriya"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mandrake Update"
+msgstr "MandrakeUpdate Tanlovlari"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
-msgstr "Ma'lumot"
+msgid "by size"
+msgstr "hajmi bo'yicha"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "Jo'q"
+msgid "FTP server"
+msgstr "FTP server"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Files:\n"
+msgstr "/_Fayl"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Yes"
-msgstr "Ha"
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -1512,6 +1512,13 @@ msgstr "Dasturni olib tashlash"
 msgid "Software Sources Manager"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Source: "
+#~ msgstr "Manba'"
+
+#~ msgid "Source"
+#~ msgstr "Manba'"
+
 #~ msgid "A required program is missing (grpmi). Check your installation."
 #~ msgstr ""
 #~ "Kerak bo'lgan grpmi dasturi etishmayapti. Bu dastur o'rnatilganligini "
diff --git a/po/vi.po b/po/vi.po
index 740c53d9..81b511bc 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: 2003-04-20 18:05+0700\n"
 "Last-Translator: Trinh Minh Thanh <tmthanh@yahoo.com>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
@@ -13,16 +13,20 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"Có đồng ý tiếp tục không?"
+msgid "Enabled?"
+msgstr "Bật ?"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "�ư�ng dẫn hoặc điểm gắn kết:"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Portugal"
+msgstr "Portugal"
 
 #: ../rpmdrake:1
 #, c-format
@@ -41,104 +45,54 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"Chào mừng MandrakeUpdate!\n"
-"\n"
-"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."
+msgid "by group"
+msgstr "theo nhóm"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
-msgstr ""
-"Chào mừng công cụ gỡ b� phần m�m!\n"
-"\n"
-"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:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Có lỗi khi đang cài đặt các gói tin:\n"
-"\n"
-"%s"
+msgid "Name:"
+msgstr "Tên:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Problem during removal"
-msgstr "Có trục trặc khi gỡ b�"
+msgid "Italy"
+msgstr "�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "Hãy đợi, đang gỡ b� các gói..."
+msgid "How to choose manually your mirror"
+msgstr "Cách ch�n thủ công mirror của bạn"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Hãy đợi, đang đ�c cơ sở dữ liệu các gói..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Có lỗi khi đang cài đặt các gói tin:\n"
-"\n"
-"%s"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Lỗi hoạt động giao diện http\n"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Chuẩn bị các gói tin để cài đặt..."
+msgid "URL:"
+msgstr "URL:"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Chuẩn bị các gói tin để cài đặt..."
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "Một số gói cần được gỡ b�"
 
 #: ../rpmdrake:1
 #, c-format
-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."
+msgid "More information on package..."
+msgstr "Thêm các thông tin v� gói..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "M�i thứ đã được cài đặt thành công"
+msgid "Yes"
+msgstr "Có"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
 msgstr ""
-"Quá trình cài đặt đã kết thúc; %s.\n"
+"Do các phụ thuộc của chúng, các gói sau phải được b� ch�n\n"
+"ngay bây gi�:\n"
 "\n"
-"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:1
 #, c-format
@@ -146,463 +100,453 @@ msgid "everything was installed correctly"
 msgstr "m�i thứ đã được cài đặt đúng"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Có vấn đ� xảy ra trong khi cài đặt"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "�ang cài đặt gói tin `%s' (%s/%s)..."
+msgid "%s KB"
+msgstr "%s KB"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Chuẩn bị các gói tin để cài đặt..."
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"Bạn cũng có thể ch�n thủ công mirror mong muốn. �ể làm vậy,\n"
+"hãy chạy Chương Trình Quản Lý Nguồn Phần M�m và sau đó\n"
+"thêm nguồn `Các cập nhật bảo mật' .\n"
+"\n"
+"Sau đó khởi chạy lại MandrakeUpdate."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
+"Welcome to the software removal tool!\n"
 "\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
 msgstr ""
+"Chào mừng công cụ gỡ b� phần m�m!\n"
 "\n"
-"\n"
-"Báo cáo lỗi:\n"
-"%s"
+"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:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-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."
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "�ể lưu các thay đổi, cần nạp phương tiện vào ổ."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Lưu và Thoát"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
+"There was a problem during the removal of packages:\n"
 "\n"
-"Do you want to continue installation?"
+"%s"
 msgstr ""
-"Các gói sau phải được gỡ b� để nâng cấp các gói khác:\n"
-"\n"
-"%s\n"
+"Có lỗi khi đang cài đặt các gói tin:\n"
 "\n"
-"�ã sẵn sàng tiếp tục?"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "�ang tải xuống gói tin `%s' (%s/%s)..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Cancel"
-msgstr "B� qua"
+msgid "Size: "
+msgstr "Kích thước: "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Ok"
-msgstr "OK"
+msgid "Security updates"
+msgstr "Cập nhật bảo mật"
 
 #: ../rpmdrake:1
 #, fuzzy, 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:1
-#, c-format
-msgid "Change medium"
-msgstr "Thay phương tiện"
+msgid "Already existing update medias"
+msgstr "Nguồn cập nhật đang tồn tại rồi"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "�ang khởi tạo..."
+msgid "Maximum information"
+msgstr "Thông tin tối đa"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Chuẩn bị các gói tin để cài đặt..."
+msgid "Proxy..."
+msgstr "Lá»—i..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Xin lỗi, bạn phải là root để cài đặt các gói tin."
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Unable to get source packages."
-msgstr "Không thể lấy các gói nguồn."
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspect..."
-msgstr "Thẩm tra..."
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
+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:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Installation finished"
-msgstr "Kết thúc cài đặt"
+msgid "United Kingdom"
+msgstr "Liên Hiệp Anh"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Không làm gì"
+msgid "in names"
+msgstr "trong các tên"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Dùng .%s là tập tin chính"
+msgid ""
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
+msgstr ""
+"Không thể tìm được mirror nào thích hợp.\n"
+"\n"
+"Có nhi�u nguyên nhân có thể gây ra, thư�ng gặp nhất là trư�ng hợp\n"
+"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:1
 #, c-format
 msgid "Remove .%s"
 msgstr "Gỡ B� .%s"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "changes:"
-msgstr "các thay đổi:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspecting %s"
-msgstr "Thẩm tra %s"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Hãy đợi, đang tìm các gói sẵn có..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "Hãy đợi, đang thêm phương tiện..."
+msgid "Finland"
+msgstr "Phần Lan"
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
+"The following packages have bad signatures:\n"
 "\n"
-"Then, restart MandrakeUpdate."
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"Bạn cũng có thể ch�n thủ công mirror mong muốn. �ể làm vậy,\n"
-"hãy chạy Chương Trình Quản Lý Nguồn Phần M�m và sau đó\n"
-"thêm nguồn `Các cập nhật bảo mật' .\n"
+"Các gói sau phải được gỡ b� để nâng cấp các gói khác:\n"
 "\n"
-"Sau đó khởi chạy lại MandrakeUpdate."
+"%s\n"
+"\n"
+"�ã sẵn sàng tiếp tục?"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "How to choose manually your mirror"
-msgstr "Cách ch�n thủ công mirror của bạn"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Examining distant file of media `%s'..."
+msgstr "�ang kiểm tra tập tin ở xa của nguồn `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
+msgid "Verifying packages signatures..."
 msgstr ""
-"Bạn đã có ít nhất là một nguồn cập nhật rồi, nhưng chúng\n"
-"đang bị tắt. Bạn nên chạy Trình Quản Lý Nguồn Phần M�m\n"
-"để bật chạy ít nhất một nguồn (đánh dấu vào cột Bật Chạy?)\n"
-"\n"
-"\n"
-"Sau đó chạy lại MandrakeUpdate."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Already existing update sources"
-msgstr "Nguồn cập nhật đang tồn tại rồi"
+msgid "France"
+msgstr "Pháp"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
+msgid "More info"
+msgstr "Thêm thông tin"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
+"%s\n"
 "\n"
 "Is it ok to continue?"
 msgstr ""
-"Cần liên lạc với mirror để lấy các gói cập nhật mới nhất.\n"
-"Hãy đảm bảo là mạng của bạn đang chạy.\n"
+"%s\n"
 "\n"
-"Tiếp tục được chưa?"
+"Có đồng ý tiếp tục không?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr "Xả ra lỗi trầm tr�ng: %s."
+msgid "Reload the packages list"
+msgstr "Nạp lại danh sách các gói"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Ch�n một mirror..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Lỗi tập tin"
+msgid "Some packages can't be installed"
+msgstr "Không thể cài đặt gói tin `%s'\n"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
+msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Chuẩn bị các gói tin để cài đặt..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Cập Nhật Mandrake"
+msgid "All packages,"
+msgstr "Toàn bộ các gói,"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Software Packages Removal"
-msgstr "Gỡ B� Các Gói Phần M�m"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Type of media:"
+msgstr "Loại nguồn:"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Quit"
-msgstr "Thoát"
+msgid "in files"
+msgstr "trong các tập tin"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Cài đặt"
+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:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove"
-msgstr "Gỡ B�"
+msgid "Proxy hostname:"
+msgstr "Proxy hostname:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Help"
-msgstr "Trợ giúp"
+msgid "Local files"
+msgstr "Tập tin cục bộ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search"
-msgstr "Tìm kiếm"
+msgid "Inspecting %s"
+msgstr "Thẩm tra %s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Find:"
-msgstr "Tìm:"
+msgid "Israel"
+msgstr "Israel"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Các gói sau phải được gỡ b� để nâng cấp các gói khác:\n"
-"\n"
-"%s\n"
-"\n"
-"�ã sẵn sàng tiếp tục?"
+msgid "Help"
+msgstr "Trợ giúp"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Một số gói cần được gỡ b�"
+msgid "HTTP server"
+msgstr "Máy chủ HTTP"
 
 #: ../rpmdrake:1
-#, c-format
-msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
-"\n"
-"Do you really want to install all the selected packages?"
-msgstr ""
-"Cảnh báo: có vẻ như bạn đang cố thêm quá nhi�u gói tin\n"
-"làm cho hệ thống tập tin hết cả không gian đĩa trống, trong\n"
-"hay sau khi cài đặt gói tin, đi�u này đặc biệt nguy hiểm và\n"
-"nên thận tr�ng.\n"
-"\n"
-"Bạn có thật sự muốn cài đặt tất cả các gói đã ch�n không?"
+#, fuzzy, c-format
+msgid "Installation failed"
+msgstr "Lỗi hoạt động giao diện http\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Có quá nhi�u gói tin được ch�n"
+msgid "Use .%s as main file"
+msgstr "Dùng .%s là tập tin chính"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "Thông tin tối đa"
+msgid "Search results"
+msgstr "Kết quả tìm kiếm"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Normal information"
-msgstr "Thông tin thông thư�ng"
+msgid " failed!"
+msgstr " không được!"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Update source(s)"
-msgstr "Cập nhật các nguồn"
+msgid "Brazil"
+msgstr "Brazil"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Nạp lại danh sách các gói"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"�ang có một phương tiện với tên đó rồi, bạn có\n"
+"thật sự muốn thay thế nó?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "Lập lại việc ch�n"
+msgid "Find:"
+msgstr "Tìm:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "trong các tập tin"
+msgid "All packages, alphabetical"
+msgstr "M�i gói tin, theo bảng chữ cái"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "trong các mô tả"
+msgid "Please wait, searching..."
+msgstr "Hãy đợi, đang tìm kiếm..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "trong các tên"
+msgid "Please wait, reading packages database..."
+msgstr "Hãy đợi, đang đ�c cơ sở dữ liệu các gói..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by update availability"
-msgstr "theo sự sẵn có để cập nhật"
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "Không thể mở gói tin `%s'\n"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by source repository"
-msgstr "theo nơi chứa nguồn"
+#, fuzzy, 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:1
 #, c-format
-msgid "by selection state"
-msgstr "theo tình trạng ch�n"
+msgid "Reset the selection"
+msgstr "Lập lại việc ch�n"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by size"
-msgstr "Theo kích thước"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"Nếu cần một proxy, hãy nhập hostname và một cổng (port) tùy ý (cú pháp: "
+"<proxyhost[:port]>):"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-msgstr "theo nhóm"
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
+"Do các phụ thuộc của chúng, mà những gói sau đây cũng cần được gỡ\n"
+"b�:\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "All packages,"
-msgstr "Toàn bộ các gói,"
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "All packages, alphabetical"
-msgstr "M�i gói tin, theo bảng chữ cái"
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Có lỗi khi đang cài đặt các gói tin:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Các lựa ch�n của Mandrake"
+msgid "Please wait, removing medium..."
+msgstr "Hãy đợi, đang gỡ b� phương tiện..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
-msgstr "Cập nhật thông thư�ng"
+msgid "Password:"
+msgstr "Mật khẩu:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Cập nhật sửa lỗi"
+msgid "Taiwan"
+msgstr "�ài Loan"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Security updates"
-msgstr "Cập nhật bảo mật"
+msgid "User:"
+msgstr "Ngư�i dùng:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Description: "
-msgstr "Mô tả: "
+msgid "Please wait, updating medium..."
+msgstr "Hãy đợi, đang cập nhật phương tiện..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Lý do cập nhật:"
+msgid "Please wait, listing packages..."
+msgstr "Hãy đợi, đang liệt kê các gói..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Summary: "
-msgstr "Tóm tắt: "
+msgid "Information on packages"
+msgstr "Thông tin v� các gói"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Importance: "
-msgstr "Mức độ quan tr�ng: "
+msgid "Cancel"
+msgstr "B� qua"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Everything installed successfully"
+msgstr "M�i thứ đã được cài đặt thành công"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Size: "
-msgstr "Kích thước: "
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Select the media(s) you wish to update:"
+msgstr "Hãy ch�n các nguồn mà bạn muốn cập nhật:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Version: "
-msgstr "Phiên bản: "
+msgid "Please wait, updating media..."
+msgstr "Hãy đợi, đang cập nhật phương tiện..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "Tên: "
+msgid "A fatal error occurred: %s."
+msgstr "Xả ra lỗi trầm tr�ng: %s."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Phiên bản đã cài đặt hiện th�i:"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Các gói sau phải được gỡ b� để nâng cấp các gói khác:\n"
+"\n"
+"%s\n"
+"\n"
+"�ã sẵn sàng tiếp tục?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Source: "
-msgstr "Nguồn: "
+msgid "in descriptions"
+msgstr "trong các mô tả"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(Not available)"
-msgstr "(Không có sẵn)"
+msgid "Configure proxies"
+msgstr "Cấu hình các proxy"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Bản ghi thay đổi (Changelog):\n"
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Cần liên lạc với website của MandrakeSoft để lấy danh sách mirror.\n"
+"Hãy kiểm tra là mạng của bạn đang chạy.\n"
+"\n"
+"Nó có tốt để tiếp tục không?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Files:\n"
-msgstr "Tập tin:\n"
+msgid "Please choose"
+msgstr "Hãy ch�n"
 
 #: ../rpmdrake:1
 #, c-format
@@ -611,48 +555,28 @@ msgstr "Kích thước được ch�n: %d MB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "�ã ch�n: %d MB / Không gian đĩa trống: %d MB"
+msgid "Initializing..."
+msgstr "�ang khởi tạo..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
-msgstr ""
-"Do các phụ thuộc của chúng, các gói sau phải được b� ch�n\n"
-"ngay bây gi�:\n"
-"\n"
+msgid "Save changes"
+msgstr "Lưu lại các thay đổi"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr ""
-"Xin lỗi, không thể ch�n các gói sau:\n"
-"\n"
-"%s\n"
-"\n"
-"Lý do như sau:\n"
-"\n"
-"%s"
+msgid "Error during download"
+msgstr "Lỗi khi đang tải xuống"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "xung Ä‘á»™t vá»›i"
+msgid "Package installation..."
+msgstr "Chuẩn bị các gói tin để cài đặt..."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Không thể cài đặt gói tin `%s'\n"
+#, c-format
+msgid "Importance: "
+msgstr "Mức độ quan tr�ng: "
 
 #: ../rpmdrake:1
 #, c-format
@@ -665,311 +589,313 @@ msgstr ""
 "cài đặt:\n"
 "\n"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "Cần thêm các gói bổ sung"
+msgid "Add..."
+msgstr "Thêm..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "Không thể cài đặt gói tin `%s'\n"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "Không thể tạo phương tiện."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Removing these packages would break your system, sorry:\n"
+"The installation is finished; %s.\n"
 "\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
 msgstr ""
-"Xin lỗi, gỡ b� các gói này sẽ làm h�ng hệ thống của bạn:\n"
+"Quá trình cài đặt đã kết thúc; %s.\n"
 "\n"
+"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:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"Do các phụ thuộc của chúng, mà những gói sau đây cũng cần được gỡ\n"
-"b�:\n"
-"\n"
+msgid "Browse..."
+msgstr "Duyệt..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "Không thể cài đặt gói tin `%s'\n"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Cần gỡ b� một số gói bổ sung"
+msgid "Info..."
+msgstr "Thông tin..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "More information on package..."
-msgstr "Thêm các thông tin v� gói..."
+msgid "You need to insert the medium to continue"
+msgstr "Cần nạp phương tiện để tiếp tục"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Copying file for media `%s'..."
+msgstr "�ang sao chép tập tin cho nguồn `%s'..."
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Information on packages"
-msgstr "Thông tin v� các gói"
+msgid "Remove"
+msgstr "Gỡ B�"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
-#, c-format
-msgid "More info"
-msgstr "Thêm thông tin"
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Chuẩn bị các gói tin để cài đặt..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "by media repository"
+msgstr "theo nơi chứa nguồn"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "Có thể thêm vào"
+msgid "No mirror"
+msgstr "Không có mirror"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Upgradable"
-msgstr "Có thể nâng cấp"
+msgid "You need to fill up at least the two first entries."
+msgstr "Bạn cần đi�n ít nhất là hai mục nhập đầu tiên."
 
 #: ../rpmdrake:1
 #, c-format
-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 ""
-"Dah sách các cập nhật trống. Có nghĩa là không có cập nhật\n"
-"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."
+msgid "Install"
+msgstr "Cài đặt"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "No update"
-msgstr "Không có cập nhật"
+msgid "Japan"
+msgstr "Nhật"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "(none)"
-msgstr "(không có)"
+msgid "Do nothing"
+msgstr "Không làm gì"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Hãy đợi, đang liệt kê các gói..."
+msgid "No update"
+msgstr "Không có cập nhật"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "Không thể mở gói tin `%s'\n"
+#, c-format
+msgid "Description: "
+msgstr "Mô tả: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Cần đến một trong các gói tin sau:"
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr ""
+"Cảnh báo: có vẻ như bạn đang cố thêm quá nhi�u gói tin\n"
+"làm cho hệ thống tập tin hết cả không gian đĩa trống, trong\n"
+"hay sau khi cài đặt gói tin, đi�u này đặc biệt nguy hiểm và\n"
+"nên thận tr�ng.\n"
+"\n"
+"Bạn có thật sự muốn cài đặt tất cả các gói đã ch�n không?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Hãy ch�n"
+msgid "Name: "
+msgstr "Tên: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Inspect..."
+msgstr "Thẩm tra..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Not selected"
-msgstr "Phát hiện xung đột"
+msgid "Editing media \"%s\":"
+msgstr "Hiệu chỉnh nguồn \"%s\":"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Selected"
-msgstr "�ược ch�n"
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "Chuẩn bị các gói tin để cài đặt..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results"
-msgstr "Kết quả tìm kiếm"
+msgid "Australia"
+msgstr "Châu úc"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Stop"
-msgstr "Dừng"
+msgid "Installation finished"
+msgstr "Kết thúc cài đặt"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Hãy đợi, đang tìm kiếm..."
+msgid "by update availability"
+msgstr "theo sự sẵn có để cập nhật"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Kết quả tìm kiếm (không)"
+msgid "Poland"
+msgstr "Ba Lan"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Other"
-msgstr "Khác"
+msgid "Version: "
+msgstr "Phiên bản: "
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the packages source editor!\n"
-"\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
-msgstr ""
-"Chào mừng trình biên soạn nguồn các gói tin!\n"
-"\n"
-"Công cụ này giúp cấu hình các nguồn gói tin mà bạn muốn dùng trên máy\n"
-"tính này. Chúng sẽ có sẵn để cài đặt các gói phần m�m mới hoặc thực hiện\n"
-"cập nhật."
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Bạn có thể chỉ định ngư�i dùng/mật khẩu cho xác thực của proxy:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
-msgstr "Lưu và Thoát"
+msgid "Upgradable"
+msgstr "Có thể nâng cấp"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid " done."
+msgstr " hoàn thành."
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Lá»—i..."
+msgid "Software Packages Installation"
+msgstr "Chuẩn bị các gói tin để cài đặt..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Update..."
-msgstr "Cập nhật..."
+msgid "Additional packages needed"
+msgstr "Cần thêm các gói bổ sung"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "Thêm..."
+msgid "Bugfixes updates"
+msgstr "Cập nhật sửa lỗi"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "Hiệu chỉnh"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "Tải xuống của `%s', th�i gian tải:%s, tốc độ:%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Source"
-msgstr "Nguồn"
+msgid "Germany"
+msgstr "Germany"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Enabled?"
-msgstr "Bật ?"
+msgid "Russia"
+msgstr "Nga"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Configure sources"
-msgstr "Cấu hình các nguồn"
+msgid "Norway"
+msgstr "Na Uy"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Password:"
-msgstr "Mật khẩu:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during installation"
+msgstr "Có vấn đ� xảy ra trong khi cài đặt"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "User:"
-msgstr "Ngư�i dùng:"
+msgid "Search"
+msgstr "Tìm kiếm"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "Bạn có thể chỉ định ngư�i dùng/mật khẩu cho xác thực của proxy:"
+#, fuzzy, c-format
+msgid "Edit a media"
+msgstr "Hiệu chỉnh nguồn"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "Proxy hostname:"
+msgid "Czech Republic"
+msgstr "Czech Republic"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
+#: ../rpmdrake:1
+#, fuzzy, c-format
 msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"Nếu cần một proxy, hãy nhập hostname và một cổng (port) tùy ý (cú pháp: "
-"<proxyhost[:port]>):"
+"Bạn đã có ít nhất là một nguồn cập nhật rồi, nhưng chúng\n"
+"đang bị tắt. Bạn nên chạy Trình Quản Lý Nguồn Phần M�m\n"
+"để bật chạy ít nhất một nguồn (đánh dấu vào cột Bật Chạy?)\n"
+"\n"
+"\n"
+"Sau đó chạy lại MandrakeUpdate."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Cấu hình các proxy"
+msgid "Stop"
+msgstr "Dừng"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Hãy đợi, đang cập nhật phương tiện..."
+msgid "Update"
+msgstr "Cập nhật"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "�ể lưu các thay đổi, cần nạp phương tiện vào ổ."
+msgid "Please wait, removing packages..."
+msgstr "Hãy đợi, đang gỡ b� các gói..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "Cần nạp phương tiện để tiếp tục"
+msgid "Normal information"
+msgstr "Thông tin thông thư�ng"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "Lưu lại các thay đổi"
+msgid "Media: "
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "�ư�ng dẫn liên quan tới synthesis/hdlist:"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "�ang tải xuống gói tin `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "Hiệu chỉnh nguồn \"%s\":"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "�ã ch�n: %d MB / Không gian đĩa trống: %d MB"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit a source"
-msgstr "Hiệu chỉnh nguồn"
+msgid "Media"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Hãy đợi, đang gỡ b� phương tiện..."
+msgid "Spain"
+msgstr "Tây ban nha"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Type of source:"
-msgstr "Loại nguồn:"
+msgid "Normal updates"
+msgstr "Cập nhật thông thư�ng"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Thêm một nguồn:"
+msgid "by selection state"
+msgstr "theo tình trạng ch�n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
-"�ang có một phương tiện với tên đó rồi, bạn có\n"
-"thật sự muốn thay thế nó?"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Bạn cần đi�n ít nhất là hai mục nhập đầu tiên."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Name:"
-msgstr "Tên:"
+"Hãy đợi, đang tải xuống các địa chỉ mirror từ website của MandrakeSoft."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -977,147 +903,148 @@ msgid "Login:"
 msgstr "�ăng nhập:"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Choose a mirror..."
-msgstr "Ch�n một mirror..."
+#, fuzzy, c-format
+msgid "Adding a media:"
+msgstr "Thêm một nguồn:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Browse..."
-msgstr "Duyệt..."
+msgid "Austria"
+msgstr "�o"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Path or mount point:"
-msgstr "�ư�ng dẫn hoặc điểm gắn kết:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Fatal error"
+msgstr "Lỗi tập tin"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Removable device"
-msgstr "Thiết bị có thể gỡ b�"
+msgid "Update..."
+msgstr "Cập nhật..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "�ang thẩm tra chữ ký của `%s'..."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "Máy chủ HTTP"
+msgid "(none)"
+msgstr "(không có)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "FTP server"
-msgstr "Máy chủ FTP"
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
+"Xin lỗi, gỡ b� các gói này sẽ làm h�ng hệ thống của bạn:\n"
+"\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Path:"
-msgstr "�ư�ng dẫn: "
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "�ang cài đặt gói tin `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "Tập tin cục bộ"
+msgid "Currently installed version: "
+msgstr "Phiên bản đã cài đặt hiện th�i:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add a source"
-msgstr "Thêm nguồn:"
+msgid "Other"
+msgstr "Khác"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr ""
-"Không thể cập nhật phương tiện, nó sẽ tự động tắt.\n"
-"\n"
-"Lá»—i:\n"
-"%s"
+msgid "Reason for update: "
+msgstr "Lý do cập nhật:"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to create medium."
-msgstr "Không thể tạo phương tiện."
+msgid "Please choose the desired mirror."
+msgstr "Hãy ch�n mirror mong muốn."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "Cập nhật"
+msgid "Edit"
+msgstr "Hiệu chỉnh"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Hãy ch�n các nguồn mà bạn muốn cập nhật:"
+msgid "Please wait, finding available packages..."
+msgstr "Hãy đợi, đang tìm các gói sẵn có..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Hãy đợi, đang cập nhật phương tiện..."
+msgid "Relative path to synthesis/hdlist:"
+msgstr "�ư�ng dẫn liên quan tới synthesis/hdlist:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " failed!"
-msgstr " không được!"
+msgid "Search results (none)"
+msgstr "Kết quả tìm kiếm (không)"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid " done."
-msgstr " hoàn thành."
+msgid "Danmark"
+msgstr "Danmark"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "Tải xuống của `%s', tốc độ:%s"
+msgid "China"
+msgstr "Trung Quốc"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "Tải xuống của `%s', th�i gian tải:%s, tốc độ:%s"
+msgid "United States"
+msgstr "Hoa Kỳ"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "�ang thẩm tra chữ ký của `%s'..."
+#: ../rpmdrake:1
+#, c-format
+msgid "changes:"
+msgstr "các thay đổi:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "�ang kiểm tra tập tin ở xa của nguồn `%s'..."
+msgid "Some additional packages need to be removed"
+msgstr "Cần gỡ b� một số gói bổ sung"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "�ang kiểm tra tập tin của nguồn `%s'..."
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "�ang sao chép tập tin cho nguồn `%s'..."
+msgid "No"
+msgstr "Không"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure medias"
+msgstr "Cấu hình các nguồn"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a media"
+msgstr "Thêm nguồn:"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Please choose the desired mirror."
-msgstr "Hãy ch�n mirror mong muốn."
+msgid "Summary: "
+msgstr "Tóm tắt: "
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
-msgstr ""
-"Không thể tìm được mirror nào thích hợp.\n"
-"\n"
-"Có nhi�u nguyên nhân có thể gây ra, thư�ng gặp nhất là trư�ng hợp\n"
-"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."
+msgid "Canada"
+msgstr "Canada"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No mirror"
-msgstr "Không có mirror"
+msgid "Greece"
+msgstr "Hy lạp"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1134,179 +1061,252 @@ 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:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Xin lỗi, bạn phải là root để cài đặt các gói tin."
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Error during download"
-msgstr "Lỗi khi đang tải xuống"
+msgid "Path:"
+msgstr "�ư�ng dẫn: "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-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."
+msgid "Problem during removal"
+msgstr "Có trục trặc khi gỡ b�"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Cần liên lạc với website của MandrakeSoft để lấy danh sách mirror.\n"
-"Hãy kiểm tra là mạng của bạn đang chạy.\n"
-"\n"
-"Nó có tốt để tiếp tục không?"
+msgid "Selected"
+msgstr "�ược ch�n"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United States"
-msgstr "Hoa Kỳ"
+msgid "Netherlands"
+msgstr "Netherlands"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "China"
-msgstr "Trung Quốc"
+msgid "Addable"
+msgstr "Có thể thêm vào"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Liên Hiệp Anh"
+msgid "(Not available)"
+msgstr "(Không có sẵn)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "�ài Loan"
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
+msgstr ""
+"Xin lỗi, không thể ch�n các gói sau:\n"
+"\n"
+"%s\n"
+"\n"
+"Lý do như sau:\n"
+"\n"
+"%s"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Not selected"
+msgstr "Phát hiện xung đột"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
+msgstr "Gỡ B� Các Gói Phần M�m"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Sweden"
 msgstr "Thụy �iển"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Russia"
-msgstr "Nga"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
+msgstr ""
+"\n"
+"\n"
+"Báo cáo lỗi:\n"
+"%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Portugal"
-msgstr "Portugal"
+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 ""
+"Dah sách các cập nhật trống. Có nghĩa là không có cập nhật\n"
+"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.pm:1
-#, c-format
-msgid "Poland"
-msgstr "Ba Lan"
+#, fuzzy, c-format
+msgid "Examining file of media `%s'..."
+msgstr "�ang kiểm tra tập tin của nguồn `%s'..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Norway"
-msgstr "Na Uy"
+msgid "Download of `%s', speed:%s"
+msgstr "Tải xuống của `%s', tốc độ:%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Netherlands"
-msgstr "Netherlands"
+msgid "One of the following packages is needed:"
+msgstr "Cần đến một trong các gói tin sau:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Korea"
-msgstr "Nam Tri�u Tiên"
+msgid "Quit"
+msgstr "Thoát"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "Nhật"
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Cần liên lạc với mirror để lấy các gói cập nhật mới nhất.\n"
+"Hãy đảm bảo là mạng của bạn đang chạy.\n"
+"\n"
+"Tiếp tục được chưa?"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Italy"
-msgstr "�"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update media(s)"
+msgstr "Cập nhật các nguồn"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Israel"
-msgstr "Israel"
+msgid "Ok"
+msgstr "OK"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Greece"
-msgstr "Hy lạp"
+msgid "Please wait, adding medium..."
+msgstr "Hãy đợi, đang thêm phương tiện..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "France"
-msgstr "Pháp"
+msgid "Unable to get source packages."
+msgstr "Không thể lấy các gói nguồn."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "Phần Lan"
+msgid "Too many packages are selected"
+msgstr "Có quá nhi�u gói tin được ch�n"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Spain"
-msgstr "Tây ban nha"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"Chào mừng trình biên soạn nguồn các gói tin!\n"
+"\n"
+"Công cụ này giúp cấu hình các nguồn gói tin mà bạn muốn dùng trên máy\n"
+"tính này. Chúng sẽ có sẵn để cài đặt các gói phần m�m mới hoặc thực hiện\n"
+"cập nhật."
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Danmark"
-msgstr "Danmark"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
+msgstr "xung Ä‘á»™t vá»›i"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "Germany"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Chào mừng MandrakeUpdate!\n"
+"\n"
+"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.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Czech Republic"
+msgid "Mandrake choices"
+msgstr "Các lựa ch�n của Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Costa Rica"
+msgid "Changelog:\n"
+msgstr "Bản ghi thay đổi (Changelog):\n"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "Canada"
+msgid "Korea"
+msgstr "Nam Tri�u Tiên"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Brazil"
-msgstr "Brazil"
+msgid "Removable device"
+msgstr "Thiết bị có thể gỡ b�"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Bỉ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Châu úc"
+msgid "Change medium"
+msgstr "Thay phương tiện"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "�o"
+msgid "Mandrake Update"
+msgstr "Cập Nhật Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
-msgstr "Thông tin..."
+msgid "by size"
+msgstr "Theo kích thước"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "Không"
+msgid "FTP server"
+msgstr "Máy chủ FTP"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "Tập tin:\n"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Yes"
-msgstr "Có"
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr ""
+"Không thể cập nhật phương tiện, nó sẽ tự động tắt.\n"
+"\n"
+"Lá»—i:\n"
+"%s"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -1578,6 +1578,12 @@ msgstr "Gỡ B� Phần M�m"
 msgid "Software Sources Manager"
 msgstr "Chương Trình Quản Lý Nguồn Phần M�m"
 
+#~ msgid "Source: "
+#~ msgstr "Nguồn: "
+
+#~ msgid "Source"
+#~ msgstr "Nguồn"
+
 #~ msgid ""
 #~ "some packages failed to install\n"
 #~ "correctly"
diff --git a/po/wa.po b/po/wa.po
index 98297e03..80d2fef3 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: 2003-05-13 13:32+0200\n"
 "Last-Translator: Pablo Saratxaga <pablo@mandrakesoft.com>\n"
 "Language-Team: Walon <linux-wa@chanae.alphanet.ch>\n"
@@ -17,16 +17,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0beta2\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"C' est bon di continuwer?"
+msgid "Enabled?"
+msgstr "En alaedje?"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Tchimin ou pont di montaedje:"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Portugal"
+msgstr "Portugal"
 
 #: ../rpmdrake:1
 #, c-format
@@ -45,105 +49,54 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"Bénvnowe a MandrakeUpdate!\n"
-"\n"
-"Ciste usteye chal vos aidrè a tchoezi les metaedjes a djoû ki vos vloz\n"
-"astaler sol copiutrece da vosse."
-
-#: ../rpmdrake:1
-#, c-format
-msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
-msgstr ""
-"Bénvnowe a l' usteye di oistaedje di programes!\n"
-"\n"
-"Ciste usteye chal vos aidrè a tchoezi kés programes ki vos vloz dizastaler\n"
-"di vosse copiutrece."
-
-#: ../rpmdrake:1
-#, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Åk n' a nén stî tins do oistaedje des pacaedjes:\n"
-"\n"
-"%s"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Problem during removal"
-msgstr "Åk n' a nén stî tins do oistaedje"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Please wait, removing packages..."
-msgstr "Tårdjîz on pô s' i vs plait, rpm oistêye les pacaedjes..."
+msgid "by group"
+msgstr "pa groupe"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Tårdjîz on pô s' i vs plait, dji lé li båze di dnêyes des pacaedjes..."
+msgid "Name:"
+msgstr "No:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Åk n' a nén stî tins d' l' astalaedje:\n"
-"\n"
-"%s"
+msgid "Italy"
+msgstr "Itåleye"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation failed"
-msgstr "L' astalaedje a fwait berwete"
+msgid "How to choose manually your mirror"
+msgstr "Kimint tchoezi manuwelmint vosse muroe"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr ""
+msgid "URL:"
+msgstr "Hårdêye:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "No package found for installation."
-msgstr "Nou pacaedje n' a stî trové po l' astalaedje."
+msgid "Some packages need to be removed"
+msgstr "Des pacaedjes k' i gn a dvèt esse dizastalés"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Totes les pacaedjes dimandés ont stî astalés comufåt."
+msgid "More information on package..."
+msgstr "Pus d' informåcions sol pacaedje..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Totafwait a stî astalé comufåt"
+msgid "Yes"
+msgstr "Oyi"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
 msgstr ""
-"L' astalaedje a fini; %s.\n"
+"Cåze di leu-z aloyances, les pacaedjes ki shuvèt dvèt esse\n"
+"dizastalés asteure:\n"
 "\n"
-"Sacwants fitchîs d' apontiaedje ont stî askepyîs dizo des nos\n"
-"avou «.rpmnew» ou «.rpmsave» come cawete, vos les dvrîz rloukî\n"
-"po decider cwè fé avou zels:"
 
 #: ../rpmdrake:1
 #, c-format
@@ -152,458 +105,454 @@ msgstr "totafwait a stî astalé comufåt"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Problem during installation"
-msgstr "Åk n' a nén stî tins d' l' astalaedje"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Dj' astale li pacaedje «%s» (%s/%s)..."
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Preparing packages installation..."
-msgstr "Dj' aprestêye les pacaedjes po l' astalaedje..."
+msgid "%s KB"
+msgstr "%s Ko"
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
 "\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"Then, restart MandrakeUpdate."
 msgstr ""
+"Vos ploz ossu tchoezi l' muroe ki vos vloz al mwin: po çoula,\n"
+"i vs fåt enonder li manaedjeu des sources des programes,\n"
+"et radjouter on sourdant «Metaedjes a djoû di såvrité».\n"
 "\n"
-"\n"
-"Aroke(s) di rapoirté(s):\n"
-"%s"
-
-#: ../rpmdrake:1
-#, c-format
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-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."
+"Poy, renondez MandrakeUpdate."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
+"Welcome to the software removal tool!\n"
 "\n"
-"Do you want to continue installation?"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
 msgstr ""
-"Les pacaedjes ki shuvèt ont des mwaijhès sinateures:\n"
-"\n"
-"%s\n"
+"Bénvnowe a l' usteye di oistaedje di programes!\n"
 "\n"
-"C' est bon di continuwer?"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Verifying packages signatures..."
-msgstr "Verifiaedje des sinateures des pacaedjes..."
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Aberwetant l' pacaedje «%s» (%s/%s)..."
+"Ciste usteye chal vos aidrè a tchoezi kés programes ki vos vloz dizastaler\n"
+"di vosse copiutrece."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Cancel"
-msgstr "Rinoncî"
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "Po pleur schaper les candjmints, vos dvoz mete li sopoirt e l' léjheu."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Ok"
-msgstr "'l est bon"
+msgid "Save and quit"
+msgstr "Schaper et cwiter"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Metoz l' sopoirt lomé «%s» dins l' léjheu [%s]"
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"Åk n' a nén stî tins do oistaedje des pacaedjes:\n"
+"\n"
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Change medium"
-msgstr "Candjî di sopoirt"
+msgid "Size: "
+msgstr "Grandeu: "
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Initializing..."
-msgstr "Inicialijhaedje..."
+msgid "Security updates"
+msgstr "Metaedjes a djoû di såvrité"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Package installation..."
-msgstr "Astalaedje do pacaedje..."
+#, fuzzy, c-format
+msgid "Already existing update medias"
+msgstr "Åk n' a nén stî tot radjoutant li sopoirt di metaedjes a djoû"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr ""
+msgid "Maximum information"
+msgstr "Li pus d' informåcions"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Unable to get source packages."
-msgstr "Dji n' a nén savou prinde les pacaedjes sourdants."
+msgid "Proxy..."
+msgstr "Proxy..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Inspect..."
-msgstr "Analijhant..."
+#, fuzzy, c-format
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
+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:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Installation finished"
-msgstr "L' astalaedje a fini"
+msgid "United Kingdom"
+msgstr "Rweyôme-Uni"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Èn rén fé"
+msgid "in names"
+msgstr "ezès Nos"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Eployî les *.%s come mwaisses fitchîs"
+msgid ""
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
+msgstr ""
+"Dji n' sai trover d' muroe.\n"
+"\n"
+"Ça pout esse cåze di sacwantès råjhons; li pus cmone c' est cwand\n"
+"l' årtchitecteure di vosse processeu n' est nén sopoirtêye påzès\n"
+"metaedjes a djoû oficirs di Mandrake Linux."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Remove .%s"
 msgstr "Oister les *.%s"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "changes:"
-msgstr "candjmints:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspecting %s"
-msgstr "Analijhant %s"
-
-#: ../rpmdrake:1
-#, c-format
-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:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "Tårdjîz on pô s' i vs plait, dji radjoute on sopoirt..."
+msgid "Finland"
+msgstr "Finlande"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
+"The following packages have bad signatures:\n"
 "\n"
-"Then, restart MandrakeUpdate."
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"Vos ploz ossu tchoezi l' muroe ki vos vloz al mwin: po çoula,\n"
-"i vs fåt enonder li manaedjeu des sources des programes,\n"
-"et radjouter on sourdant «Metaedjes a djoû di såvrité».\n"
+"Les pacaedjes ki shuvèt ont des mwaijhès sinateures:\n"
 "\n"
-"Poy, renondez MandrakeUpdate."
+"%s\n"
+"\n"
+"C' est bon di continuwer?"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Examining distant file of media `%s'..."
+msgstr "Dji corwaite li fitchî då lon do sourdant «%s»..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "Kimint tchoezi manuwelmint vosse muroe"
+msgid "Verifying packages signatures..."
+msgstr "Verifiaedje des sinateures des pacaedjes..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
-msgstr ""
+msgid "France"
+msgstr "France"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "Already existing update sources"
-msgstr ""
+msgid "More info"
+msgstr "Pus d' info"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
+"%s\n"
 "\n"
 "Is it ok to continue?"
 msgstr ""
-"Dj' a mezåjhe di m' raloyî sol muroe po prinde les dierins pacaedjes\n"
-"di metaedjes a djoû. Verifyîz ki vos estoz bén raloyîs al daegntoele\n"
-"pol moumint, s' i vs plait.\n"
+"%s\n"
 "\n"
 "C' est bon di continuwer?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr "I gn a-st avou èn aroke moirt: %s."
+msgid "Reload the packages list"
+msgstr "Ritcherdjî li djivêye des pacaedjes"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Fatal error"
-msgstr "Aroke moirt"
+msgid "Choose a mirror..."
+msgstr "Tchoezixhoz on muroe..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Software Packages Installation"
-msgstr "Astalaedje des pacaedjes di programes"
+msgid "Some packages can't be installed"
+msgstr "Des pacaedjes k' i gn a n' polèt nén esse astalés"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Metaedjes a djoû di Mandrake"
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Oistaedje des pacaedjes di programes"
+msgid "All packages,"
+msgstr "Tos les pacaedjes,"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Quit"
-msgstr "Moussî foû"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Type of media:"
+msgstr "Sôre di sourdant:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Astaler"
+msgid "in files"
+msgstr "ezès fitchîs"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "Oister"
+msgid "All requested packages were installed successfully."
+msgstr "Totes les pacaedjes dimandés ont stî astalés comufåt."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Help"
-msgstr "Aidance"
+msgid "Proxy hostname:"
+msgstr "No d' lodjoe do proxy:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search"
-msgstr "Cweri"
+msgid "Local files"
+msgstr "Fitchîs locås"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Trover:"
+msgid "Inspecting %s"
+msgstr "Analijhant %s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Les pacaedjes ki shuvèt dvèt esse oistés po ds ôtes poleur esse metous a "
-"djoû:\n"
-"\n"
-"%s\n"
-"\n"
-"C' est bon di continuwer?"
+msgid "Israel"
+msgstr "Israyel"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Des pacaedjes k' i gn a dvèt esse dizastalés"
+msgid "Help"
+msgstr "Aidance"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
-"\n"
-"Do you really want to install all the selected packages?"
-msgstr ""
-"Adviertixhmint: i shonne ki vos sayîz d' astaler télmint\n"
-"d' pacaedjes k' i poreut n' pus aveur di plaece di libe\n"
-"so vosse sistinme; çoula est pårticulirmint riskeus et doet\n"
-"esse consideré avou atincion.\n"
-"\n"
-"Voloz vs vormint astaler tos les pacaedjes tchoezis?"
+msgid "HTTP server"
+msgstr "Sierveu HTTP"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Pår trop di pacaedjes ont stî tchoezis"
+msgid "Installation failed"
+msgstr "L' astalaedje a fwait berwete"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "Li pus d' informåcions"
+msgid "Use .%s as main file"
+msgstr "Eployî les *.%s come mwaisses fitchîs"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Normal information"
-msgstr "Informåcions normåles"
+msgid "Search results"
+msgstr "Rizultats do cweraedje"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Update source(s)"
-msgstr "Mete a djoû sourdant(s)"
+msgid " failed!"
+msgstr " a fwait berwete!"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Ritcherdjî li djivêye des pacaedjes"
+msgid "Brazil"
+msgstr "Braezi"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reset the selection"
-msgstr "Rifé l' tchuze"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"I gn a ddja on sopoirt avou ç' no la,\n"
+"el voloz vs vormint replaecî?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "ezès fitchîs"
+msgid "Find:"
+msgstr "Trover:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "ezès discrijhaedjes"
+msgid "All packages, alphabetical"
+msgstr "Tos les pacaedjes, relîs alfabeticmint"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "ezès Nos"
+msgid "Please wait, searching..."
+msgstr "Tårdjîz on pô s' i vs plait, dji cwir..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
-msgstr "pa disponibilité di metaedjes a djoû"
+msgid "Please wait, reading packages database..."
+msgstr "Tårdjîz on pô s' i vs plait, dji lé li båze di dnêyes des pacaedjes..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by source repository"
-msgstr "pa sourdant d' astalaedje"
+msgid "unknown package "
+msgstr "pacaedje nén cnoxhou"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by selection state"
-msgstr "pa l' estat di tchoezixhaedje"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Metoz l' sopoirt lomé «%s» dins l' léjheu [%s]"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by size"
-msgstr "pa grandeu"
+msgid "Reset the selection"
+msgstr "Rifé l' tchuze"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by group"
-msgstr "pa groupe"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"Si vos avoz mezåjhe d' on proxy, dinez si no d' lodjoe et motoit ossu li "
+"pôrt a-z eployî (sintacse: <lodjoe_proxy[:pôrt]>):"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages,"
-msgstr "Tos les pacaedjes,"
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
+"Cåze di leu-z aloyances, les pacaedjes ki shuvèt dvèt esse\n"
+"oistés eto:\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Tos les pacaedjes, relîs alfabeticmint"
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Tchuzes di Mandrake"
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Åk n' a nén stî tins d' l' astalaedje:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
-msgstr "Metaedjes a djoû normås"
+msgid "Please wait, removing medium..."
+msgstr "Tårdjîz on pô s' i vs plait, dji oistêye on sopoirt..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Metaedjes a djoû di coridjaedje"
+msgid "Password:"
+msgstr "Sicret:"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Security updates"
-msgstr "Metaedjes a djoû di såvrité"
+msgid "Taiwan"
+msgstr "Taiwan"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Description: "
-msgstr "Discrijhaedje: "
+msgid "User:"
+msgstr "Uzeu:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Råjhon do metaedje a djoû: "
+msgid "Please wait, updating medium..."
+msgstr "Tårdjîz on pô s' i vs plait, metaedje a djoû do sopoirt..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Summary: "
-msgstr "Rascourti: "
+msgid "Please wait, listing packages..."
+msgstr "Tårdjîz on pô s' i vs plait, dji fwait l' djivêye des pacaedjes..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Importance: "
-msgstr "Impôrtance: "
+msgid "Information on packages"
+msgstr "Informåcion so les pacaedjes"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "%s KB"
-msgstr "%s Ko"
+msgid "Cancel"
+msgstr "Rinoncî"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Size: "
-msgstr "Grandeu: "
+msgid "Everything installed successfully"
+msgstr "Totafwait a stî astalé comufåt"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Select the media(s) you wish to update:"
+msgstr "Tchoezixhoz les sourdant(s) ki vos vloz mete a djoû:"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Version: "
-msgstr "Modêye: "
+msgid "Please wait, updating media..."
+msgstr "Tårdjîz on pô s' i vs plait, metaedje a djoû do sopoirt..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "No: "
+msgid "A fatal error occurred: %s."
+msgstr "I gn a-st avou èn aroke moirt: %s."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Modêye d' astalêye: "
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Les pacaedjes ki shuvèt dvèt esse oistés po ds ôtes poleur esse metous a "
+"djoû:\n"
+"\n"
+"%s\n"
+"\n"
+"C' est bon di continuwer?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Source: "
-msgstr "Sourdant: "
+msgid "in descriptions"
+msgstr "ezès discrijhaedjes"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(Not available)"
-msgstr "(Nén disponibe)"
+msgid "Configure proxies"
+msgstr "Apontyî les proxies"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Djournå des candjmints:\n"
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Dj' a mezåjhe di m' raloyî sol site waibe da MandrakeSoft po prinde\n"
+"li djivêye des muroes. Verifyîz ki vos estoz bén raloyîs al daegntoele\n"
+"pol moumint, s' i vs plait.\n"
+"\n"
+"C' est bon di continuwer?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Files:\n"
-msgstr "Fitchîs:\n"
+msgid "Please choose"
+msgstr "Tchoezixhoz s' i vs plait"
 
 #: ../rpmdrake:1
 #, c-format
@@ -612,48 +561,28 @@ msgstr "Grandeu tchoezeye: %d Mo"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Tchoezi: %d Mo / Plaece libe sol deure plake: %d Mo"
+msgid "Initializing..."
+msgstr "Inicialijhaedje..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
-msgstr ""
-"Cåze di leu-z aloyances, les pacaedjes ki shuvèt dvèt esse\n"
-"dizastalés asteure:\n"
-"\n"
+msgid "Save changes"
+msgstr "Schaper les candjmints"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr ""
-"Dji rgrete, les pacaedjes ki shuvèt n' polèt nén esse tchoezis:\n"
-"\n"
-"%s\n"
-"\n"
-"Vo ndè la les råjhons:\n"
-"\n"
-"%s"
+msgid "Error during download"
+msgstr "Åk n' a nén stî tot-z aberwetant"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "%s conflicts with %s"
-msgstr "%s fwait des conflits avou %s"
+msgid "Package installation..."
+msgstr "Astalaedje do pacaedje..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages can't be installed"
-msgstr "Des pacaedjes k' i gn a n' polèt nén esse astalés"
+msgid "Importance: "
+msgstr "Impôrtance: "
 
 #: ../rpmdrake:1
 #, c-format
@@ -666,311 +595,309 @@ msgstr ""
 "astalés eto:\n"
 "\n"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "Ôtes pacaedjes k' end a mezåjhe"
+msgid "Add..."
+msgstr "Radjouter..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some packages can't be removed"
-msgstr "Des pacaedjes k' i gn a n' polèt nén esse oistés"
+msgid "Unable to create medium."
+msgstr "Dji n' sai askepyî l' sopoirt."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Removing these packages would break your system, sorry:\n"
+"The installation is finished; %s.\n"
 "\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
 msgstr ""
-"Dji rgrete, mins oister ces pacaedjes la va spiyî l' sistinme da vosse:\n"
+"L' astalaedje a fini; %s.\n"
 "\n"
+"Sacwants fitchîs d' apontiaedje ont stî askepyîs dizo des nos\n"
+"avou «.rpmnew» ou «.rpmsave» come cawete, vos les dvrîz rloukî\n"
+"po decider cwè fé avou zels:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"Cåze di leu-z aloyances, les pacaedjes ki shuvèt dvèt esse\n"
-"oistés eto:\n"
-"\n"
+msgid "Browse..."
+msgstr "Foyter..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Kékès ôtes pacaedjes divèt esse oistés"
+msgid "Some packages can't be removed"
+msgstr "Des pacaedjes k' i gn a n' polèt nén esse oistés"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "More information on package..."
-msgstr "Pus d' informåcions sol pacaedje..."
+msgid "Info..."
+msgstr "Informåcions..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Information on packages"
-msgstr "Informåcion so les pacaedjes"
+msgid "You need to insert the medium to continue"
+msgstr "Vos dvoz mete li sopoirt dins l' léjheu po continuwer"
 
-#. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:1
-#, c-format
-msgid "More info"
-msgstr "Pus d' info"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Copying file for media `%s'..."
+msgstr "Dji copeye li fitchî pol sourdant «%s»..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Addable"
-msgstr "Pout esse radjouté"
+msgid "Remove"
+msgstr "Oister"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Upgradable"
-msgstr "Pout esse metou a djoû"
+msgid "Preparing packages installation..."
+msgstr "Dj' aprestêye les pacaedjes po l' astalaedje..."
 
 #: ../rpmdrake:1
-#, c-format
-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 ""
-"Li djivêye des metaedjes a djoû est vude. Çoula vout dire soeye-t i\n"
-"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."
+#, fuzzy, c-format
+msgid "by media repository"
+msgstr "pa sourdant d' astalaedje"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "No update"
-msgstr "Nou metaedjes a djoû"
+msgid "No mirror"
+msgstr "Nou muroe"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
-msgstr "(nole)"
+msgid "You need to fill up at least the two first entries."
+msgstr "Vos dvoz rimpli pol moens les deus prumirès intrêyes."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Tårdjîz on pô s' i vs plait, dji fwait l' djivêye des pacaedjes..."
+msgid "Install"
+msgstr "Astaler"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "unknown package "
-msgstr "pacaedje nén cnoxhou"
+msgid "Japan"
+msgstr "Djapon"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "I gn a mezåjhe d' onk des pacaedjes ki shuvèt:"
+msgid "Do nothing"
+msgstr "Èn rén fé"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Tchoezixhoz s' i vs plait"
+msgid "No update"
+msgstr "Nou metaedjes a djoû"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Description: "
+msgstr "Discrijhaedje: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Not selected"
-msgstr "Nén tchoezi"
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr ""
+"Adviertixhmint: i shonne ki vos sayîz d' astaler télmint\n"
+"d' pacaedjes k' i poreut n' pus aveur di plaece di libe\n"
+"so vosse sistinme; çoula est pårticulirmint riskeus et doet\n"
+"esse consideré avou atincion.\n"
+"\n"
+"Voloz vs vormint astaler tos les pacaedjes tchoezis?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected"
-msgstr "Tchoezi"
+msgid "Name: "
+msgstr "No: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results"
-msgstr "Rizultats do cweraedje"
+msgid "Inspect..."
+msgstr "Analijhant..."
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing media \"%s\":"
+msgstr "Dji candje li sourdants «%s»:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Stop"
-msgstr "Arester"
+msgid "No package found for installation."
+msgstr "Nou pacaedje n' a stî trové po l' astalaedje."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Tårdjîz on pô s' i vs plait, dji cwir..."
+msgid "Australia"
+msgstr "Ostraleye"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Rizultats do cweraedje (nouk)"
+msgid "Installation finished"
+msgstr "L' astalaedje a fini"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Other"
-msgstr "Ôte"
+msgid "by update availability"
+msgstr "pa disponibilité di metaedjes a djoû"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Welcome to the packages source editor!\n"
-"\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
-msgstr ""
-"Bénvnowe a l' aspougneu des sourdants des pacaedjes!\n"
-"\n"
-"Ciste usteye vos aidrè a-z apontyî les sourdants des pacaedjes ki vos vloz\n"
-"eployî e vosse copiutrece. I sront adon disponibes po l' astalaedje di\n"
-"pacaedjes di noveas programes ou po les metaedjes a djoû."
+msgid "Poland"
+msgstr "Pologne"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
-msgstr "Schaper et cwiter"
+msgid "Version: "
+msgstr "Modêye: "
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Proxy..."
-msgstr "Proxy..."
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Vos ploz dner èn uzeu et si scret po l' otintifiaedje sol proxy:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Update..."
-msgstr "Mete a djoû..."
+msgid "Upgradable"
+msgstr "Pout esse metou a djoû"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Add..."
-msgstr "Radjouter..."
+msgid " done."
+msgstr " fwait."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Edit"
-msgstr "Candjî"
+msgid "Software Packages Installation"
+msgstr "Astalaedje des pacaedjes di programes"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Source"
-msgstr "Sourdant"
+msgid "Additional packages needed"
+msgstr "Ôtes pacaedjes k' end a mezåjhe"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Enabled?"
-msgstr "En alaedje?"
+msgid "Bugfixes updates"
+msgstr "Metaedjes a djoû di coridjaedje"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Configure sources"
-msgstr "Apontyî les sourdants"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "Aberwetaedje di «%s», tins ki dmeure:%s, roedeu:%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Password:"
-msgstr "Sicret:"
+msgid "Germany"
+msgstr "Almagne"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "User:"
-msgstr "Uzeu:"
+msgid "Russia"
+msgstr "Rûsseye"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "Vos ploz dner èn uzeu et si scret po l' otintifiaedje sol proxy:"
+msgid "Norway"
+msgstr "Norvedje"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "No d' lodjoe do proxy:"
+msgid "Problem during installation"
+msgstr "Åk n' a nén stî tins d' l' astalaedje"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
-msgstr ""
-"Si vos avoz mezåjhe d' on proxy, dinez si no d' lodjoe et motoit ossu li "
-"pôrt a-z eployî (sintacse: <lodjoe_proxy[:pôrt]>):"
+msgid "Search"
+msgstr "Cweri"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure proxies"
-msgstr "Apontyî les proxies"
+#, fuzzy, c-format
+msgid "Edit a media"
+msgstr "Candjî on sourdant"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Tårdjîz on pô s' i vs plait, metaedje a djoû do sopoirt..."
+msgid "Czech Republic"
+msgstr "Tchekeye"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "Po pleur schaper les candjmints, vos dvoz mete li sopoirt e l' léjheu."
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "Vos dvoz mete li sopoirt dins l' léjheu po continuwer"
+msgid "Stop"
+msgstr "Arester"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Save changes"
-msgstr "Schaper les candjmints"
+msgid "Update"
+msgstr "Mete a djoû"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Tchimin relatif pol fitchî di sinteze ou hdlist:"
+msgid "Please wait, removing packages..."
+msgstr "Tårdjîz on pô s' i vs plait, rpm oistêye les pacaedjes..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "Hårdêye:"
+msgid "Normal information"
+msgstr "Informåcions normåles"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Editing source \"%s\":"
-msgstr "Dji candje li sourdants «%s»:"
+msgid "Media: "
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Edit a source"
-msgstr "Candjî on sourdant"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "Aberwetant l' pacaedje «%s» (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Tårdjîz on pô s' i vs plait, dji oistêye on sopoirt..."
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Tchoezi: %d Mo / Plaece libe sol deure plake: %d Mo"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Type of source:"
-msgstr "Sôre di sourdant:"
+msgid "Media"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Radjoutant on sourdant:"
+msgid "Spain"
+msgstr "Espagne"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
-msgstr ""
-"I gn a ddja on sopoirt avou ç' no la,\n"
-"el voloz vs vormint replaecî?"
+msgid "Normal updates"
+msgstr "Metaedjes a djoû normås"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Vos dvoz rimpli pol moens les deus prumirès intrêyes."
+msgid "by selection state"
+msgstr "pa l' estat di tchoezixhaedje"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Name:"
-msgstr "No:"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
+"Tårdjîz on pô s' i vs plait, dj' aberwetêye do waibe da MandrakeSoft les "
+"adresses des muroes."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -978,147 +905,148 @@ msgid "Login:"
 msgstr "No d' elodjaedje:"
 
 #: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Adding a media:"
+msgstr "Radjoutant on sourdant:"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr "Tchoezixhoz on muroe..."
+msgid "Austria"
+msgstr "Ôtriche"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
-msgstr "Foyter..."
+msgid "Fatal error"
+msgstr "Aroke moirt"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Path or mount point:"
-msgstr "Tchimin ou pont di montaedje:"
+msgid "Update..."
+msgstr "Mete a djoû..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "Bodjåve sopoirt"
+msgid "Starting download of `%s'..."
+msgstr "Dj' atake l' aberwetaedje di «%s»..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "Sierveu HTTP"
+msgid "(none)"
+msgstr "(nole)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "FTP server"
-msgstr "Sierveu FTP"
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
+"Dji rgrete, mins oister ces pacaedjes la va spiyî l' sistinme da vosse:\n"
+"\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Path:"
-msgstr "Tchimin:"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Dj' astale li pacaedje «%s» (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "Fitchîs locås"
+msgid "Currently installed version: "
+msgstr "Modêye d' astalêye: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add a source"
-msgstr "Radjoutant on sourdant"
+msgid "Other"
+msgstr "Ôte"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr ""
-"Dji n' sai mete a djoû l' sopoirt; i srè otomaticmint essocté.\n"
-"\n"
-"Arokes:\n"
-"%s"
+msgid "Reason for update: "
+msgstr "Råjhon do metaedje a djoû: "
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to create medium."
-msgstr "Dji n' sai askepyî l' sopoirt."
+msgid "Please choose the desired mirror."
+msgstr "Tchoezixhoz li muroe ki vos vloz, s' i vs plait."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "Mete a djoû"
+msgid "Edit"
+msgstr "Candjî"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Tchoezixhoz les sourdant(s) ki vos vloz mete a djoû:"
+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.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Tårdjîz on pô s' i vs plait, metaedje a djoû do sopoirt..."
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Tchimin relatif pol fitchî di sinteze ou hdlist:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " failed!"
-msgstr " a fwait berwete!"
+msgid "Search results (none)"
+msgstr "Rizultats do cweraedje (nouk)"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid " done."
-msgstr " fwait."
+msgid "Danmark"
+msgstr "Daenmåtche"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "Aberwetaedje di «%s», roedeu:%s"
+msgid "China"
+msgstr "Chine"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "Aberwetaedje di «%s», tins ki dmeure:%s, roedeu:%s"
+msgid "United States"
+msgstr "Estats Unis"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Starting download of `%s'..."
-msgstr "Dj' atake l' aberwetaedje di «%s»..."
+msgid "changes:"
+msgstr "candjmints:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "Dji corwaite li fitchî då lon do sourdant «%s»..."
+msgid "Some additional packages need to be removed"
+msgstr "Kékès ôtes pacaedjes divèt esse oistés"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "Dji corwaite li fitchî pol sourdant «%s»..."
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "Dji copeye li fitchî pol sourdant «%s»..."
+msgid "No"
+msgstr "Neni"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure medias"
+msgstr "Apontyî les sourdants"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a media"
+msgstr "Radjoutant on sourdant"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Please choose the desired mirror."
-msgstr "Tchoezixhoz li muroe ki vos vloz, s' i vs plait."
+msgid "Summary: "
+msgstr "Rascourti: "
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
-msgstr ""
-"Dji n' sai trover d' muroe.\n"
-"\n"
-"Ça pout esse cåze di sacwantès råjhons; li pus cmone c' est cwand\n"
-"l' årtchitecteure di vosse processeu n' est nén sopoirtêye påzès\n"
-"metaedjes a djoû oficirs di Mandrake Linux."
+msgid "Canada"
+msgstr "Canada"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No mirror"
-msgstr "Nou muroe"
+msgid "Greece"
+msgstr "Grece"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1136,181 +1064,253 @@ msgstr ""
 "disponibes pol moumint.\n"
 "Risayîz ene miete pus tård."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
-msgstr "Åk n' a nén stî tot-z aberwetant"
+msgid "Unable to get source packages, sorry. %s"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
-"Tårdjîz on pô s' i vs plait, dj' aberwetêye do waibe da MandrakeSoft les "
-"adresses des muroes."
+msgid "Path:"
+msgstr "Tchimin:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Dj' a mezåjhe di m' raloyî sol site waibe da MandrakeSoft po prinde\n"
-"li djivêye des muroes. Verifyîz ki vos estoz bén raloyîs al daegntoele\n"
-"pol moumint, s' i vs plait.\n"
-"\n"
-"C' est bon di continuwer?"
+msgid "Problem during removal"
+msgstr "Åk n' a nén stî tins do oistaedje"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United States"
-msgstr "Estats Unis"
+msgid "Selected"
+msgstr "Tchoezi"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "Chine"
+msgid "Netherlands"
+msgstr "Olande"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Rweyôme-Uni"
+msgid "Addable"
+msgstr "Pout esse radjouté"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Taiwan"
+msgid "(Not available)"
+msgstr "(Nén disponibe)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Sweden"
-msgstr "Suwede"
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
+msgstr ""
+"Dji rgrete, les pacaedjes ki shuvèt n' polèt nén esse tchoezis:\n"
+"\n"
+"%s\n"
+"\n"
+"Vo ndè la les råjhons:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Russia"
-msgstr "Rûsseye"
+msgid "Not selected"
+msgstr "Nén tchoezi"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Portugal"
-msgstr "Portugal"
+msgid "Software Packages Removal"
+msgstr "Oistaedje des pacaedjes di programes"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Poland"
-msgstr "Pologne"
+msgid "Sweden"
+msgstr "Suwede"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Norway"
-msgstr "Norvedje"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
+msgstr ""
+"\n"
+"\n"
+"Aroke(s) di rapoirté(s):\n"
+"%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Netherlands"
-msgstr "Olande"
+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 ""
+"Li djivêye des metaedjes a djoû est vude. Çoula vout dire soeye-t i\n"
+"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.pm:1
-#, c-format
-msgid "Korea"
-msgstr "Coreye"
+#, fuzzy, c-format
+msgid "Examining file of media `%s'..."
+msgstr "Dji corwaite li fitchî pol sourdant «%s»..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Japan"
-msgstr "Djapon"
+msgid "Download of `%s', speed:%s"
+msgstr "Aberwetaedje di «%s», roedeu:%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Italy"
-msgstr "Itåleye"
+msgid "One of the following packages is needed:"
+msgstr "I gn a mezåjhe d' onk des pacaedjes ki shuvèt:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Israel"
-msgstr "Israyel"
+msgid "Quit"
+msgstr "Moussî foû"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Greece"
-msgstr "Grece"
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Dj' a mezåjhe di m' raloyî sol muroe po prinde les dierins pacaedjes\n"
+"di metaedjes a djoû. Verifyîz ki vos estoz bén raloyîs al daegntoele\n"
+"pol moumint, s' i vs plait.\n"
+"\n"
+"C' est bon di continuwer?"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update media(s)"
+msgstr "Mete a djoû sourdant(s)"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "France"
-msgstr "France"
+msgid "Ok"
+msgstr "'l est bon"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Finland"
-msgstr "Finlande"
+msgid "Please wait, adding medium..."
+msgstr "Tårdjîz on pô s' i vs plait, dji radjoute on sopoirt..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Spain"
-msgstr "Espagne"
+msgid "Unable to get source packages."
+msgstr "Dji n' a nén savou prinde les pacaedjes sourdants."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Danmark"
-msgstr "Daenmåtche"
+msgid "Too many packages are selected"
+msgstr "Pår trop di pacaedjes ont stî tchoezis"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"Bénvnowe a l' aspougneu des sourdants des pacaedjes!\n"
+"\n"
+"Ciste usteye vos aidrè a-z apontyî les sourdants des pacaedjes ki vos vloz\n"
+"eployî e vosse copiutrece. I sront adon disponibes po l' astalaedje di\n"
+"pacaedjes di noveas programes ou po les metaedjes a djoû."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "Almagne"
+msgid "%s conflicts with %s"
+msgstr "%s fwait des conflits avou %s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Tchekeye"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Bénvnowe a MandrakeUpdate!\n"
+"\n"
+"Ciste usteye chal vos aidrè a tchoezi les metaedjes a djoû ki vos vloz\n"
+"astaler sol copiutrece da vosse."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Costa Rica"
+msgid "Mandrake choices"
+msgstr "Tchuzes di Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Canada"
-msgstr "Canada"
+msgid "Changelog:\n"
+msgstr "Djournå des candjmints:\n"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Brazil"
-msgstr "Braezi"
+msgid "Korea"
+msgstr "Coreye"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Removable device"
+msgstr "Bodjåve sopoirt"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Beljike"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Ostraleye"
+msgid "Change medium"
+msgstr "Candjî di sopoirt"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "Ôtriche"
+msgid "Mandrake Update"
+msgstr "Metaedjes a djoû di Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
-msgstr "Informåcions..."
+msgid "by size"
+msgstr "pa grandeu"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "Neni"
+msgid "FTP server"
+msgstr "Sierveu FTP"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "Fitchîs:\n"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Yes"
-msgstr "Oyi"
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr ""
+"Dji n' sai mete a djoû l' sopoirt; i srè otomaticmint essocté.\n"
+"\n"
+"Arokes:\n"
+"%s"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -1582,6 +1582,12 @@ msgstr "Oister des programes"
 msgid "Software Sources Manager"
 msgstr "Manaedjeu des sourdants d' astalaedje"
 
+#~ msgid "Source: "
+#~ msgstr "Sourdant: "
+
+#~ msgid "Source"
+#~ msgstr "Sourdant"
+
 #~ msgid ""
 #~ "some packages failed to install\n"
 #~ "correctly"
@@ -1620,9 +1626,6 @@ msgstr "Manaedjeu des sourdants d' astalaedje"
 #~ "\n"
 #~ "Voloz vs sayî avou èn ôte muroe?"
 
-#~ msgid "Error adding update medium"
-#~ msgstr "Åk n' a nén stî tot radjoutant li sopoirt di metaedjes a djoû"
-
 #~ 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 "
diff --git a/po/zh_CN.po b/po/zh_CN.po
index dbb58573..0f81bda3 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: 2003-03-13 22:13+0800\n"
 "Last-Translator: Shiyu Tang <shiyutang@netscape.net>\n"
 "Language-Team: Mandrake Simplified Chinese <mandrake@en2china.com>\n"
@@ -16,16 +16,20 @@ msgstr ""
 "Content-Type: text/plain; charset=GB2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"È·¶¨¼ÌÐøÂð?"
+msgid "Enabled?"
+msgstr "ÒÑÆôÓã¿"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "·¾¶»ò×°Ôص㣺"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Portugal"
+msgstr "ÆÏÌÑÑÀ"
 
 #: ../rpmdrake:1
 #, c-format
@@ -43,102 +47,53 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"»¶Ó­Ê¹Óà MandrakeUpdate ×Ô¶¯¸üй¤¾ß£¡\n"
-"\n"
-"±¾¹¤¾ß½«°ïÖúÄúΪÄúµÄµçÄÔÖа²×°¸üеÄÈí¼þ°ü¡£"
-
-#: ../rpmdrake:1
-#, c-format
-msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
-msgstr ""
-"»¶Ó­Ê¹ÓÃÈí¼þ°üɾ³ý¹¤¾ß£¡\n"
-"\n"
-"±¾¹¤¾ß½«°ïÖúÄúÑ¡ÔñÏëÒª´ÓÄúµÄµçÄÔÖÐɾ³ýµÄÈí¼þ°ü¡£"
-
-#: ../rpmdrake:1
-#, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"ɾ³ý°ü¹ý³ÌÖз¢ÉúÒ»¸öÎÊÌ⣺\n"
-"\n"
-"%s"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Problem during removal"
-msgstr "ÔÚɾ³ý¹ý³ÌÖз¢ÉúÎÊÌâ"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Please wait, removing packages..."
-msgstr "ÕýÔÚɾ³ýÈí¼þ°ü£¬ÇëÉÔºò..."
+msgid "by group"
+msgstr "°´ÕÕ×é±ðÅÅÁÐ"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "ÕýÔÚ¶ÁÈ¡Èí¼þ°üÊý¾Ý¿â£¬ÇëÉÔºò..."
+msgid "Name:"
+msgstr "Ãû³Æ£º"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"°²×°¹ý³ÌÖз¢ÉúÁËÎÊÌ⣺\n"
-"\n"
-"%s"
+msgid "Italy"
+msgstr "Òâ´óÀû"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation failed"
-msgstr "°²×°Ê§°Ü"
+msgid "How to choose manually your mirror"
+msgstr "ÈçºÎÊÖ¹¤Ñ¡ÔñÄúµÄ¾µÏñ"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "²»¿É»Ö¸´µÄ´íÎ󣺶Բ»Æð£¬Ã»Óз¢ÏÖ¿É°²×°µÄÈí¼þ°ü¡£"
+msgid "URL:"
+msgstr "URL:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "No package found for installation."
-msgstr "ûÓпɰ²×°µÄÈí¼þ°ü¡£"
+msgid "Some packages need to be removed"
+msgstr "ÐèҪɾ³ýһЩÈí¼þ°ü"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "ËùÓÐÒªÇóµÄÈí¼þ°ü¶¼Òѳɹ¦°²×°¡£"
+msgid "More information on package..."
+msgstr "¸ÃÈí¼þ°üµÄ¸ü¶àÐÅÏ¢..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "ËùÓÐÈí¼þ°ü¶¼Òѳɹ¦°²×°"
+msgid "Yes"
+msgstr "ÊÇ"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
 msgstr ""
-"°²×°Íê³É£»%s¡£\n"
+"ÓÉÓÚÈí¼þ°üÖ®¼äµÄÒÀÀµ¹Øϵ£¬Äú²»¿ÉÒÔÑ¡ÔñÏÂÁÐÈí¼þ°ü£º\n"
 "\n"
-"һЩÅäÖÃÎļþ±»±£´æΪ¡°.rpmnew¡±»ò¡°.rpmsave¡±£¬\n"
-"ÔÚÖ´ÐвÙ×÷ÒÔÇ°£¬ÄúÐèÒª¼ì²éһϣº"
 
 #: ../rpmdrake:1
 #, c-format
@@ -147,453 +102,444 @@ msgstr "ËùÓÐÈí¼þ°ü¶¼ÒÑÕýÈ·°²×°"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Problem during installation"
-msgstr "ÔÚ°²×°¹ý³ÌÖз¢ÉúÎÊÌâ"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr ""
+msgid "%s KB"
+msgstr "%s KB"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Èí¼þ°ü°²×°"
-
-#: ../rpmdrake:1
-#, c-format
 msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
 "\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"Then, restart MandrakeUpdate."
 msgstr ""
+"Äú»¹¿ÉÒÔÊÖ¶¯Ñ¡ÔñÄúÏ£ÍûʹÓõľµÏñ£º·½·¨ÊÇ£¬Ê¹ÓÃÈí¼þÔ´¹ÜÀíÆ÷£¬\n"
+"È»ºóÌí¼Ó¡°°²È«¸üС±Ô´¡£\n"
 "\n"
-"\n"
-"±¨¸æµÄ´íÎó£º\n"
-"%s"
+"È»ºóÖØÐÂÆô¶¯ MandrakeUpdate¡£"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"°²×°Ê§°Ü£¬È±ÉÙijЩÎļþ¡£\n"
-"Äú¿ÉÄÜÐèÒª¸üÐÂÄúµÄÈí¼þÔ´Êý¾Ý¿â¡£"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
+"Welcome to the software removal tool!\n"
 "\n"
-"Do you want to continue installation?"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
 msgstr ""
-"ÒªÉý¼¶ÆäËüÈí¼þ°ü£¬±ØÐëɾ³ýÏÂÁÐÈí¼þ°ü£º\n"
-"\n"
-"%s\n"
+"»¶Ó­Ê¹ÓÃÈí¼þ°üɾ³ý¹¤¾ß£¡\n"
 "\n"
-"È·¶¨¼ÌÐøÂð£¿"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr ""
+"±¾¹¤¾ß½«°ïÖúÄúÑ¡ÔñÏëÒª´ÓÄúµÄµçÄÔÖÐɾ³ýµÄÈí¼þ°ü¡£"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Cancel"
-msgstr "È¡Ïû"
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "Òª±£´æ¸Ä±ä£¬Äú±ØÐëÔÚÇý¶¯Æ÷ÖвåÈë½éÖÊ¡£"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Ok"
-msgstr "È·¶¨"
+msgid "Save and quit"
+msgstr "±£´æ²¢Í˳ö"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Çë°Ñ±ê¼ÇΪ¡°%s¡±µÄ½éÖʷŽøÉ豸 [%s]"
+#, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"ɾ³ý°ü¹ý³ÌÖз¢ÉúÒ»¸öÎÊÌ⣺\n"
+"\n"
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Change medium"
-msgstr "¸ü»»½éÖÊ"
+msgid "Size: "
+msgstr "´óС£º"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Initializing..."
-msgstr ""
+msgid "Security updates"
+msgstr "°²È«¸üÐÂ"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Èí¼þ°ü°²×°"
+msgid "Already existing update medias"
+msgstr "Ìí¼Ó¸üнéÖʳö´í"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "¶Ô²»Æð£¬ÎÞ·¨µÃµ½Ô´Èí¼þ°ü¡£%s"
+msgid "Maximum information"
+msgstr "×î¶àÐÅÏ¢"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Unable to get source packages."
-msgstr "Ô´Èí¼þ°üδÕÒµ½¡£"
+msgid "Proxy..."
+msgstr "´úÀí·þÎñÆ÷..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Inspect..."
-msgstr "¼ì²é..."
+#, fuzzy, c-format
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
+msgstr ""
+"°²×°Ê§°Ü£¬È±ÉÙijЩÎļþ¡£\n"
+"Äú¿ÉÄÜÐèÒª¸üÐÂÄúµÄÈí¼þÔ´Êý¾Ý¿â¡£"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Installation finished"
-msgstr "°²×°Íê³É"
+msgid "United Kingdom"
+msgstr "Ó¢¹ú"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "²»×öÈκÎÊÂ"
+msgid "in names"
+msgstr "ÔÚÃû³ÆÖÐ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "ʹÓà .%s ×÷ΪÖ÷Îļþ"
+msgid ""
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
+msgstr ""
+"ÕÒ²»µ½ÈκÎÊʺϵľµÏñ¡£\n"
+"´ËÎÊÌâ¿ÉÄÜÓкܶàÔ­Òò£»×î³£¼ûµÄ¾ÍÊÇÄúµÄ´¦ÀíÆ÷¼Ü¹¹²»Îª Mandrake\n"
+"Linux ¹Ù·½¸üÐÂËùÖ§³Ö¡£"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Remove .%s"
 msgstr "ɾ³ý .%s"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "changes:"
-msgstr "¸ü¸Ä:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspecting %s"
-msgstr "ÕýÔÚ¼ì²é %s"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Please wait, finding available packages..."
-msgstr "ÕýÔÚÑ°ÕÒ¿ÉÓõÄÈí¼þ°ü£¬ÇëÉÔºò..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "ÕýÔÚÌí¼Ó½éÖÊ£¬ÇëÉÔºò..."
+msgid "Finland"
+msgstr "·ÒÀ¼"
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
+"The following packages have bad signatures:\n"
 "\n"
-"Then, restart MandrakeUpdate."
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"Äú»¹¿ÉÒÔÊÖ¶¯Ñ¡ÔñÄúÏ£ÍûʹÓõľµÏñ£º·½·¨ÊÇ£¬Ê¹ÓÃÈí¼þÔ´¹ÜÀíÆ÷£¬\n"
-"È»ºóÌí¼Ó¡°°²È«¸üС±Ô´¡£\n"
+"ÒªÉý¼¶ÆäËüÈí¼þ°ü£¬±ØÐëɾ³ýÏÂÁÐÈí¼þ°ü£º\n"
 "\n"
-"È»ºóÖØÐÂÆô¶¯ MandrakeUpdate¡£"
+"%s\n"
+"\n"
+"È·¶¨¼ÌÐøÂð£¿"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "How to choose manually your mirror"
-msgstr "ÈçºÎÊÖ¹¤Ñ¡ÔñÄúµÄ¾µÏñ"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Examining distant file of media `%s'..."
+msgstr "ÕýÔÚ¼ì²éÔ´¡°%s¡±µÄ¾àÀëÎļþ..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
+msgid "Verifying packages signatures..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Already existing update sources"
-msgstr ""
+msgid "France"
+msgstr "·¨¹ú"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "More info"
+msgstr "¸ü¶àÐÅÏ¢"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
+"%s\n"
 "\n"
 "Is it ok to continue?"
 msgstr ""
-"ÎÒÐèÒªÁ¬½Ó¾µÏñ²ÅÄÜ»ñµÃ×îеĸüÐÂÈí¼þ°ü¡£\n"
-"Çë¼ì²éÄúµÄÍøÂçÊÇ·ñÔËתÕý³£¡£\n"
+"%s\n"
 "\n"
-"È·¶¨¼ÌÐøÂð£¿"
+"È·¶¨¼ÌÐøÂð?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Reload the packages list"
+msgstr "ÖØÐÂ×°ÈëÈí¼þ°üÇåµ¥"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Fatal error"
-msgstr ""
+msgid "Choose a mirror..."
+msgstr "Ñ¡Ôñ¾µÏñ..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Software Packages Installation"
-msgstr "Èí¼þ°ü°²×°"
+msgid "Some packages can't be installed"
+msgstr "ÓÐЩÈí¼þ°üÎÞ·¨°²×°"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Mandrake ¸üÐÂ"
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "²»¿É»Ö¸´µÄ´íÎ󣺶Բ»Æð£¬Ã»Óз¢ÏÖ¿É°²×°µÄÈí¼þ°ü¡£"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Èí¼þ°üɾ³ý"
+msgid "All packages,"
+msgstr "È«²¿Èí¼þ°ü£¬"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Quit"
-msgstr "Í˳ö"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Type of media:"
+msgstr "À´Ô´ÀàÐÍ£º"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "°²×°"
+msgid "in files"
+msgstr "ÔÚÎļþÖÐ"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "жÔØ"
+msgid "All requested packages were installed successfully."
+msgstr "ËùÓÐÒªÇóµÄÈí¼þ°ü¶¼Òѳɹ¦°²×°¡£"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Help"
-msgstr "°ïÖú"
+msgid "Proxy hostname:"
+msgstr "´úÀí·þÎñÆ÷Ö÷»úÃû£º"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search"
-msgstr "ËÑË÷"
+msgid "Local files"
+msgstr "±¾»úÎļþ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "²éÕÒ£º"
+msgid "Inspecting %s"
+msgstr "ÕýÔÚ¼ì²é %s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"ÒªÉý¼¶ÆäËüÈí¼þ°ü£¬±ØÐëɾ³ýÏÂÁÐÈí¼þ°ü£º\n"
-"\n"
-"%s\n"
-"\n"
-"È·¶¨¼ÌÐøÂð£¿"
+msgid "Israel"
+msgstr "ÒÔÉ«ÁÐ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "ÐèҪɾ³ýһЩÈí¼þ°ü"
+msgid "Help"
+msgstr "°ïÖú"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
-"\n"
-"Do you really want to install all the selected packages?"
-msgstr ""
-"¾¯¸æ£ºÄúÊÔͼÌí¼ÓµÄÈí¼þ°üÌ«¶à£¬ÓпÉÄÜÔÚ°²×°µÄ¹ý³ÌÖе¼ÖÂÊ£Óà´Å\n"
-"ÅÌ¿Õ¼ä¸æóÀ£»ÕâÊǺÜΣÏյģ¬ÄúÓ¦µ±Ð¡ÐIJÙ×÷¡£\n"
-"\n"
-"ÄúÕæµÄÏëÒª°²×°ËùÓÐÑ¡ÖеÄÈí¼þ°üÂð£¿"
+msgid "HTTP server"
+msgstr "HTTP ·þÎñÆ÷"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Ñ¡ÖеİüÌ«¶à"
+msgid "Installation failed"
+msgstr "°²×°Ê§°Ü"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "×î¶àÐÅÏ¢"
+msgid "Use .%s as main file"
+msgstr "ʹÓà .%s ×÷ΪÖ÷Îļþ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Normal information"
-msgstr "Õý³£ÐÅÏ¢"
+msgid "Search results"
+msgstr "ËÑË÷½á¹û"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Update source(s)"
-msgstr "¸üÐÂÈí¼þÔ´"
+msgid " failed!"
+msgstr " ʧ°Ü£¡"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "ÖØÐÂ×°ÈëÈí¼þ°üÇåµ¥"
+msgid "Brazil"
+msgstr "°ÍÎ÷"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reset the selection"
-msgstr "ÖØÖÃÑ¡ÖÐ"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr "ÒѾ­ÓиÃÃû³ÆµÄ½éÖÊ£¬ÄúÕæµÄÏëÒªÌæ»»Âð£¿"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "ÔÚÎļþÖÐ"
+msgid "Find:"
+msgstr "²éÕÒ£º"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "ÔÚÃèÊöÖÐ"
+msgid "All packages, alphabetical"
+msgstr "È«²¿Èí¼þ°ü£¬°´×Öĸ´ÎÐòÅÅÁÐ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "ÔÚÃû³ÆÖÐ"
+msgid "Please wait, searching..."
+msgstr "ÕýÔÚËÑË÷£¬ÇëÉÔºò..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
-msgstr "°´ÕÕÊÇ·ñ¿ÉÓÃÅÅÁÐ"
+msgid "Please wait, reading packages database..."
+msgstr "ÕýÔÚ¶ÁÈ¡Èí¼þ°üÊý¾Ý¿â£¬ÇëÉÔºò..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by source repository"
-msgstr "°´ÕÕÀ´Ô´¿âÅÅÁÐ"
+msgid "unknown package "
+msgstr "δ֪Èí¼þ°ü"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by selection state"
-msgstr "°´ÕÕÑ¡Ôñ״̬ÅÅÁÐ"
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Çë°Ñ±ê¼ÇΪ¡°%s¡±µÄ½éÖʷŽøÉ豸 [%s]"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by size"
-msgstr "°´ÕÕ´óСÅÅÁÐ"
+msgid "Reset the selection"
+msgstr "ÖØÖÃÑ¡ÖÐ"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by group"
-msgstr "°´ÕÕ×é±ðÅÅÁÐ"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"Èç¹ûÄúÐèÒªÓôúÀí·þÎñÆ÷£¬ÇëÊäÈëÖ÷»úÃûºÍ¶Ë¿Ú£¨Óï·¨£º<proxyhost[:port]>£©£º"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages,"
-msgstr "È«²¿Èí¼þ°ü£¬"
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
+"ΪÁËÂú×ãËùÓеÄÒÀÀµ¹Øϵ£¬ÐèҪɾ³ýÏÂÁÐÈí¼þ°ü£º\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "È«²¿Èí¼þ°ü£¬°´×Öĸ´ÎÐòÅÅÁÐ"
+msgid "Costa Rica"
+msgstr "¸ç˹´ïÀè¼Ó"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Mandrake ¾«Ñ¡"
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"°²×°¹ý³ÌÖз¢ÉúÁËÎÊÌ⣺\n"
+"\n"
+"%s"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
-msgstr "Õý³£¸üÐÂ"
+msgid "Please wait, removing medium..."
+msgstr "ÕýÔÚɾ³ý½éÖÊ£¬ÇëÉÔºò..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "ȱÏÝÐÞÕý¸üÐÂ"
+msgid "Password:"
+msgstr "ÃÜÂ룺"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Security updates"
-msgstr "°²È«¸üÐÂ"
+msgid "Taiwan"
+msgstr "Öйų́Íå"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Description: "
-msgstr "ÃèÊö£º"
+msgid "User:"
+msgstr "Óû§Ãû£º"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reason for update: "
-msgstr "¸üÐÂÔ­Òò£º"
+msgid "Please wait, updating medium..."
+msgstr "ÕýÔÚ¸üнéÖÊ£¬ÇëÉÔºò..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Summary: "
-msgstr "ͻ񻣼"
+msgid "Please wait, listing packages..."
+msgstr "ÕýÔÚÁгöÈí¼þ°ü£¬ÇëÉÔºò..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Importance: "
-msgstr "ÖØÒªÐÔ£º"
+msgid "Information on packages"
+msgstr "¸ÃÈí¼þ°üµÄÐÅÏ¢"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Cancel"
+msgstr "È¡Ïû"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Size: "
-msgstr "´óС£º"
+msgid "Everything installed successfully"
+msgstr "ËùÓÐÈí¼þ°ü¶¼Òѳɹ¦°²×°"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Select the media(s) you wish to update:"
+msgstr "Ñ¡ÔñÒª¸üеÄÔ´½éÖÊ£º"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Version: "
-msgstr "°æ±¾£º"
+msgid "Please wait, updating media..."
+msgstr "ÕýÔÚ¸üнéÖÊ£¬ÇëÉÔºò..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "Ãû³Æ£º"
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "µ±Ç°°²×°µÄ°æ±¾£º"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"ÒªÉý¼¶ÆäËüÈí¼þ°ü£¬±ØÐëɾ³ýÏÂÁÐÈí¼þ°ü£º\n"
+"\n"
+"%s\n"
+"\n"
+"È·¶¨¼ÌÐøÂð£¿"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Source: "
-msgstr "À´Ô´£º"
+msgid "in descriptions"
+msgstr "ÔÚÃèÊöÖÐ"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(Not available)"
-msgstr "£¨²»¿ÉÓã©"
+msgid "Configure proxies"
+msgstr "ÅäÖôúÀí·þÎñÆ÷"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "¸üÐÂÈÕÖ¾£º\n"
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"ÐèÒªÁ¬½Ó MandrakeSoft ÍøÕ¾²ÅÄÜ»ñµÃ¾µÏñÁÐ±í¡£\n"
+"Çë¼ì²éÄúµÄÍøÂçÊÇ·ñÔËתÕý³£¡£\n"
+"\n"
+"È·¶¨¼ÌÐøÂð£¿"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Files:\n"
-msgstr "Îļþ£º\n"
+msgid "Please choose"
+msgstr "ÇëÑ¡Ôñ"
 
 #: ../rpmdrake:1
 #, c-format
@@ -602,42 +548,28 @@ msgstr "Ñ¡ÖдóС£º%d MB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Ñ¡ÖÐÈí¼þ£º%d MB / Ê£Óà´ÅÅ̿ռ䣺%d MB"
+msgid "Initializing..."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
-msgstr ""
-"ÓÉÓÚÈí¼þ°üÖ®¼äµÄÒÀÀµ¹Øϵ£¬Äú²»¿ÉÒÔÑ¡ÔñÏÂÁÐÈí¼þ°ü£º\n"
-"\n"
+msgid "Save changes"
+msgstr "±£´æÐÞ¸Ä"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr ""
-"¶Ô²»Æ𣬲»ÄÜÑ¡ÔñÏÂÁÐÈí¼þ°ü£º\n"
-"\n"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "ÏÂÔسö´í"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "%s conflicts with %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Package installation..."
+msgstr "Èí¼þ°ü°²×°"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages can't be installed"
-msgstr "ÓÐЩÈí¼þ°üÎÞ·¨°²×°"
+msgid "Importance: "
+msgstr "ÖØÒªÐÔ£º"
 
 #: ../rpmdrake:1
 #, c-format
@@ -649,305 +581,304 @@ msgstr ""
 "ΪÂú×ãÒÀÀµ¹Øϵ£¬»¹ÐèÒª°²×°ÏÂÁÐÈí¼þ°ü£º\n"
 "\n"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "ÐèÒªÁíÍâµÄÈí¼þ°ü"
+msgid "Add..."
+msgstr "Ìí¼Ó..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some packages can't be removed"
-msgstr "ÓÐЩÈí¼þ°üÎÞ·¨É¾³ý"
+msgid "Unable to create medium."
+msgstr "ÎÞ·¨´´½¨½éÖÊ¡£"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Removing these packages would break your system, sorry:\n"
+"The installation is finished; %s.\n"
 "\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
 msgstr ""
-"¶Ô²»Æð£¬É¾³ýÕâЩÈí¼þ°ü½«¿ÉÄܻٻµÄúµÄϵͳ£º\n"
+"°²×°Íê³É£»%s¡£\n"
 "\n"
+"һЩÅäÖÃÎļþ±»±£´æΪ¡°.rpmnew¡±»ò¡°.rpmsave¡±£¬\n"
+"ÔÚÖ´ÐвÙ×÷ÒÔÇ°£¬ÄúÐèÒª¼ì²éһϣº"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"ΪÁËÂú×ãËùÓеÄÒÀÀµ¹Øϵ£¬ÐèҪɾ³ýÏÂÁÐÈí¼þ°ü£º\n"
-"\n"
+msgid "Browse..."
+msgstr "ä¯ÀÀ..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "ÁíÍâһЩÈí¼þ°üÐèҪɾ³ý"
+msgid "Some packages can't be removed"
+msgstr "ÓÐЩÈí¼þ°üÎÞ·¨É¾³ý"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "More information on package..."
-msgstr "¸ÃÈí¼þ°üµÄ¸ü¶àÐÅÏ¢..."
+msgid "Info..."
+msgstr "ÐÅÏ¢..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Information on packages"
-msgstr "¸ÃÈí¼þ°üµÄÐÅÏ¢"
+msgid "You need to insert the medium to continue"
+msgstr "Äú±ØÐë²åÈë½éÖʲÅÄܼÌÐø"
 
-#. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "More info"
-msgstr "¸ü¶àÐÅÏ¢"
+msgid "Copying file for media `%s'..."
+msgstr "ÕýÔÚ¸´ÖÆÔ´¡°%s¡±µÄÎļþ..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Addable"
-msgstr "¿ÉÌí¼Ó"
+msgid "Remove"
+msgstr "жÔØ"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Upgradable"
-msgstr "¿ÉÉý¼¶"
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Èí¼þ°ü°²×°"
 
 #: ../rpmdrake:1
-#, c-format
-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 ""
-"¸üÐÂÁбíΪ¿Õ¡£ÕâÒâζ×Å¿ÉÄÜÄúËù°²×°µÄÈí¼þ°üûÓÐÏàÓ¦µÄ¸üУ¬\n"
-"»òÕßÄúÒѾ­°²×°ÁËÈ«²¿¸üС£"
+#, fuzzy, c-format
+msgid "by media repository"
+msgstr "°´ÕÕÀ´Ô´¿âÅÅÁÐ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "No update"
-msgstr "ûÓиüÐÂ"
+msgid "No mirror"
+msgstr "ûÓоµÏñ"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
-msgstr "£¨ÎÞ£©"
+msgid "You need to fill up at least the two first entries."
+msgstr "ÄúÖÁÉÙÒªÌîдͷÁ½Ïî¡£"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "ÕýÔÚÁгöÈí¼þ°ü£¬ÇëÉÔºò..."
+msgid "Install"
+msgstr "°²×°"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "unknown package "
-msgstr "δ֪Èí¼þ°ü"
+msgid "Japan"
+msgstr "ÈÕ±¾"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "ÐèÒªÏÂÁÐÈí¼þ°üÖ®Ò»£º"
+msgid "Do nothing"
+msgstr "²»×öÈκÎÊÂ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "ÇëÑ¡Ôñ"
+msgid "No update"
+msgstr "ûÓиüÐÂ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Description: "
+msgstr "ÃèÊö£º"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Not selected"
-msgstr "δѡÖÐ"
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr ""
+"¾¯¸æ£ºÄúÊÔͼÌí¼ÓµÄÈí¼þ°üÌ«¶à£¬ÓпÉÄÜÔÚ°²×°µÄ¹ý³ÌÖе¼ÖÂÊ£Óà´Å\n"
+"ÅÌ¿Õ¼ä¸æóÀ£»ÕâÊǺÜΣÏյģ¬ÄúÓ¦µ±Ð¡ÐIJÙ×÷¡£\n"
+"\n"
+"ÄúÕæµÄÏëÒª°²×°ËùÓÐÑ¡ÖеÄÈí¼þ°üÂð£¿"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected"
-msgstr "Ñ¡ÖÐ"
+msgid "Name: "
+msgstr "Ãû³Æ£º"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results"
-msgstr "ËÑË÷½á¹û"
+msgid "Inspect..."
+msgstr "¼ì²é..."
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing media \"%s\":"
+msgstr "±à¼­À´Ô´¡°%s¡±£º"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Stop"
-msgstr "Í£Ö¹"
+msgid "No package found for installation."
+msgstr "ûÓпɰ²×°µÄÈí¼þ°ü¡£"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "ÕýÔÚËÑË÷£¬ÇëÉÔºò..."
+msgid "Australia"
+msgstr "°Ä´óÀûÑÇ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results (none)"
-msgstr "ËÑË÷½á¹û£¨ÎÞ£©"
+msgid "Installation finished"
+msgstr "°²×°Íê³É"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Other"
-msgstr "ÆäËû"
+msgid "by update availability"
+msgstr "°´ÕÕÊÇ·ñ¿ÉÓÃÅÅÁÐ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Welcome to the packages source editor!\n"
-"\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
-msgstr ""
-"»¶Ó­Ê¹ÓÃÈí¼þ°üÔ´±à¼­Æ÷£¡\n"
-"\n"
-"±¾¹¤¾ß½«°ïÖúÄúÅäÖÃÏëÒªÔÚÄúµÄµçÄÔÉÏËùʹÓõÄÈí¼þ°üÀ´Ô´¡£ÕâЩÀ´Ô´½«ÔÚ°²×°ÐÂ\n"
-"Èí¼þ°ü»òÖ´ÐиüÐÂʱʹÓá£"
+msgid "Poland"
+msgstr "²¨À¼"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
-msgstr "±£´æ²¢Í˳ö"
+msgid "Version: "
+msgstr "°æ±¾£º"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Proxy..."
-msgstr "´úÀí·þÎñÆ÷..."
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "ÔڵǼ´úÀí·þÎñÆ÷ʱ£¬Äú¿ÉÄÜÒªÖ¸¶¨Óû§ÃûºÍÃÜÂ룺"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Update..."
-msgstr "¸üÐÂ..."
+msgid "Upgradable"
+msgstr "¿ÉÉý¼¶"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Add..."
-msgstr "Ìí¼Ó..."
+msgid " done."
+msgstr " Íê³É¡£"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Edit"
-msgstr "±à¼­"
+msgid "Software Packages Installation"
+msgstr "Èí¼þ°ü°²×°"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Source"
-msgstr "À´Ô´"
+msgid "Additional packages needed"
+msgstr "ÐèÒªÁíÍâµÄÈí¼þ°ü"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Enabled?"
-msgstr "ÒÑÆôÓã¿"
+msgid "Bugfixes updates"
+msgstr "ȱÏÝÐÞÕý¸üÐÂ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Configure sources"
-msgstr "ÅäÖÃÀ´Ô´"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "ÏÂÔØ¡°%s¡±£¬Ê£Óàʱ¼ä£º%s£¬Ëٶȣº%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Password:"
-msgstr "ÃÜÂ룺"
+msgid "Germany"
+msgstr "µÂ¹ú"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "User:"
-msgstr "Óû§Ãû£º"
+msgid "Russia"
+msgstr "¶íÂÞ˹"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "ÔڵǼ´úÀí·þÎñÆ÷ʱ£¬Äú¿ÉÄÜÒªÖ¸¶¨Óû§ÃûºÍÃÜÂ룺"
+msgid "Norway"
+msgstr "ŲÍþ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "´úÀí·þÎñÆ÷Ö÷»úÃû£º"
+msgid "Problem during installation"
+msgstr "ÔÚ°²×°¹ý³ÌÖз¢ÉúÎÊÌâ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
-msgstr ""
-"Èç¹ûÄúÐèÒªÓôúÀí·þÎñÆ÷£¬ÇëÊäÈëÖ÷»úÃûºÍ¶Ë¿Ú£¨Óï·¨£º<proxyhost[:port]>£©£º"
+msgid "Search"
+msgstr "ËÑË÷"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure proxies"
-msgstr "ÅäÖôúÀí·þÎñÆ÷"
+#, fuzzy, c-format
+msgid "Edit a media"
+msgstr "±à¼­À´Ô´"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "ÕýÔÚ¸üнéÖÊ£¬ÇëÉÔºò..."
+msgid "Czech Republic"
+msgstr "½Ý¿Ë¹²ºÍ¹ú"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "Òª±£´æ¸Ä±ä£¬Äú±ØÐëÔÚÇý¶¯Æ÷ÖвåÈë½éÖÊ¡£"
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "Äú±ØÐë²åÈë½éÖʲÅÄܼÌÐø"
+msgid "Stop"
+msgstr "Í£Ö¹"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Save changes"
-msgstr "±£´æÐÞ¸Ä"
+msgid "Update"
+msgstr "¸üÐÂ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Ïà¶Ô synthesis/hdlist µÄ·¾¶£º"
+msgid "Please wait, removing packages..."
+msgstr "ÕýÔÚɾ³ýÈí¼þ°ü£¬ÇëÉÔºò..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "Normal information"
+msgstr "Õý³£ÐÅÏ¢"
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "±à¼­À´Ô´¡°%s¡±£º"
+#: ../rpmdrake:1
+#, c-format
+msgid "Media: "
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Edit a source"
-msgstr "±à¼­À´Ô´"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "ÕýÔÚɾ³ý½éÖÊ£¬ÇëÉÔºò..."
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Ñ¡ÖÐÈí¼þ£º%d MB / Ê£Óà´ÅÅ̿ռ䣺%d MB"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Type of source:"
-msgstr "À´Ô´ÀàÐÍ£º"
+msgid "Media"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Ìí¼ÓÒ»¸öÀ´Ô´£º"
+msgid "Spain"
+msgstr "Î÷°àÑÀ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
-msgstr "ÒѾ­ÓиÃÃû³ÆµÄ½éÖÊ£¬ÄúÕæµÄÏëÒªÌæ»»Âð£¿"
+msgid "Normal updates"
+msgstr "Õý³£¸üÐÂ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "ÄúÖÁÉÙÒªÌîдͷÁ½Ïî¡£"
+msgid "by selection state"
+msgstr "°´ÕÕÑ¡Ôñ״̬ÅÅÁÐ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Name:"
-msgstr "Ãû³Æ£º"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "ÕýÔÚ´Ó MandrakeSoft ÍøÕ¾ÏÂÔؾµÏñÕ¾µãµÄµØÖ·£¬ÇëÉÔºò¡£"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -955,141 +886,148 @@ msgid "Login:"
 msgstr "µÇ¼Ãû£º"
 
 #: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Adding a media:"
+msgstr "Ìí¼ÓÒ»¸öÀ´Ô´£º"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr "Ñ¡Ôñ¾µÏñ..."
+msgid "Austria"
+msgstr "°ÂµØÀû"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
-msgstr "ä¯ÀÀ..."
+msgid "Fatal error"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Path or mount point:"
-msgstr "·¾¶»ò×°Ôص㣺"
+msgid "Update..."
+msgstr "¸üÐÂ..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "¿ÉÒƶ¯É豸"
+msgid "Starting download of `%s'..."
+msgstr "¿ªÊ¼ÏÂÔØ¡°%s¡±..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "HTTP ·þÎñÆ÷"
+msgid "(none)"
+msgstr "£¨ÎÞ£©"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "FTP server"
-msgstr "FTP ·þÎñÆ÷"
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
+"¶Ô²»Æð£¬É¾³ýÕâЩÈí¼þ°ü½«¿ÉÄܻٻµÄúµÄϵͳ£º\n"
+"\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Path:"
-msgstr "·¾¶£º"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "±¾»úÎļþ"
+msgid "Currently installed version: "
+msgstr "µ±Ç°°²×°µÄ°æ±¾£º"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add a source"
-msgstr "Ìí¼ÓÒ»¸öÀ´Ô´"
+msgid "Other"
+msgstr "ÆäËû"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr "ÎÞ·¨¸üнéÖÊ£»¸Ã½éÖʽ«±»×Ô¶¯Í£Óá£"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "¸üÐÂÔ­Òò£º"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to create medium."
-msgstr "ÎÞ·¨´´½¨½éÖÊ¡£"
+msgid "Please choose the desired mirror."
+msgstr "ÇëÑ¡Ôñϲ»¶µÄ¾µÏñÕ¾µã¡£"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "¸üÐÂ"
+msgid "Edit"
+msgstr "±à¼­"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Ñ¡ÔñÒª¸üеÄÔ´½éÖÊ£º"
+msgid "Please wait, finding available packages..."
+msgstr "ÕýÔÚÑ°ÕÒ¿ÉÓõÄÈí¼þ°ü£¬ÇëÉÔºò..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "ÕýÔÚ¸üнéÖÊ£¬ÇëÉÔºò..."
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Ïà¶Ô synthesis/hdlist µÄ·¾¶£º"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " failed!"
-msgstr " ʧ°Ü£¡"
+msgid "Search results (none)"
+msgstr "ËÑË÷½á¹û£¨ÎÞ£©"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid " done."
-msgstr " Íê³É¡£"
+msgid "Danmark"
+msgstr "µ¤Âó"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "ÏÂÔØ¡°%s¡±£¬Ëٶȣº%s"
+msgid "China"
+msgstr "Öйú"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "ÏÂÔØ¡°%s¡±£¬Ê£Óàʱ¼ä£º%s£¬Ëٶȣº%s"
+msgid "United States"
+msgstr "ÃÀ¹ú"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Starting download of `%s'..."
-msgstr "¿ªÊ¼ÏÂÔØ¡°%s¡±..."
+msgid "changes:"
+msgstr "¸ü¸Ä:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "ÕýÔÚ¼ì²éÔ´¡°%s¡±µÄ¾àÀëÎļþ..."
+msgid "Some additional packages need to be removed"
+msgstr "ÁíÍâһЩÈí¼þ°üÐèҪɾ³ý"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "ÕýÔÚ¼ì²éÔ´¡°%s¡±µÄÎļþ..."
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "ÕýÔÚ¸´ÖÆÔ´¡°%s¡±µÄÎļþ..."
+msgid "No"
+msgstr "·ñ"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure medias"
+msgstr "ÅäÖÃÀ´Ô´"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a media"
+msgstr "Ìí¼ÓÒ»¸öÀ´Ô´"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Please choose the desired mirror."
-msgstr "ÇëÑ¡Ôñϲ»¶µÄ¾µÏñÕ¾µã¡£"
+msgid "Summary: "
+msgstr "ͻ񻣼"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
-msgstr ""
-"ÕÒ²»µ½ÈκÎÊʺϵľµÏñ¡£\n"
-"´ËÎÊÌâ¿ÉÄÜÓкܶàÔ­Òò£»×î³£¼ûµÄ¾ÍÊÇÄúµÄ´¦ÀíÆ÷¼Ü¹¹²»Îª Mandrake\n"
-"Linux ¹Ù·½¸üÐÂËùÖ§³Ö¡£"
+msgid "Canada"
+msgstr "¼ÓÄôó"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No mirror"
-msgstr "ûÓоµÏñ"
+msgid "Greece"
+msgstr "Ï£À°"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1106,178 +1044,240 @@ msgstr ""
 "ÄúµÄÍøÂç»ò MandrakeSoft ÍøÕ¾¿ÉÄܲ»¿ÉÓá£\n"
 "ÇëÉÔºóÔÙÊÔ¡£"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
-msgstr "ÏÂÔسö´í"
+msgid "Unable to get source packages, sorry. %s"
+msgstr "¶Ô²»Æð£¬ÎÞ·¨µÃµ½Ô´Èí¼þ°ü¡£%s"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr "ÕýÔÚ´Ó MandrakeSoft ÍøÕ¾ÏÂÔؾµÏñÕ¾µãµÄµØÖ·£¬ÇëÉÔºò¡£"
+msgid "Path:"
+msgstr "·¾¶£º"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"ÐèÒªÁ¬½Ó MandrakeSoft ÍøÕ¾²ÅÄÜ»ñµÃ¾µÏñÁÐ±í¡£\n"
-"Çë¼ì²éÄúµÄÍøÂçÊÇ·ñÔËתÕý³£¡£\n"
-"\n"
-"È·¶¨¼ÌÐøÂð£¿"
+msgid "Problem during removal"
+msgstr "ÔÚɾ³ý¹ý³ÌÖз¢ÉúÎÊÌâ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United States"
-msgstr "ÃÀ¹ú"
+msgid "Selected"
+msgstr "Ñ¡ÖÐ"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "Öйú"
+msgid "Netherlands"
+msgstr "ºÉÀ¼"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Ó¢¹ú"
+msgid "Addable"
+msgstr "¿ÉÌí¼Ó"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Öйų́Íå"
+msgid "(Not available)"
+msgstr "£¨²»¿ÉÓã©"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
+msgstr ""
+"¶Ô²»Æ𣬲»ÄÜÑ¡ÔñÏÂÁÐÈí¼þ°ü£º\n"
+"\n"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Sweden"
-msgstr "Èðµä"
+msgid "Not selected"
+msgstr "δѡÖÐ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Russia"
-msgstr "¶íÂÞ˹"
+msgid "Software Packages Removal"
+msgstr "Èí¼þ°üɾ³ý"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Portugal"
-msgstr "ÆÏÌÑÑÀ"
+msgid "Sweden"
+msgstr "Èðµä"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
-msgstr "²¨À¼"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
+msgstr ""
+"\n"
+"\n"
+"±¨¸æµÄ´íÎó£º\n"
+"%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Norway"
-msgstr "ŲÍþ"
+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 ""
+"¸üÐÂÁбíΪ¿Õ¡£ÕâÒâζ×Å¿ÉÄÜÄúËù°²×°µÄÈí¼þ°üûÓÐÏàÓ¦µÄ¸üУ¬\n"
+"»òÕßÄúÒѾ­°²×°ÁËÈ«²¿¸üС£"
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Netherlands"
-msgstr "ºÉÀ¼"
+#, fuzzy, c-format
+msgid "Examining file of media `%s'..."
+msgstr "ÕýÔÚ¼ì²éÔ´¡°%s¡±µÄÎļþ..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Korea"
-msgstr "º«¹ú"
+msgid "Download of `%s', speed:%s"
+msgstr "ÏÂÔØ¡°%s¡±£¬Ëٶȣº%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "ÈÕ±¾"
+msgid "One of the following packages is needed:"
+msgstr "ÐèÒªÏÂÁÐÈí¼þ°üÖ®Ò»£º"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Italy"
-msgstr "Òâ´óÀû"
+msgid "Quit"
+msgstr "Í˳ö"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Israel"
-msgstr "ÒÔÉ«ÁÐ"
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"ÎÒÐèÒªÁ¬½Ó¾µÏñ²ÅÄÜ»ñµÃ×îеĸüÐÂÈí¼þ°ü¡£\n"
+"Çë¼ì²éÄúµÄÍøÂçÊÇ·ñÔËתÕý³£¡£\n"
+"\n"
+"È·¶¨¼ÌÐøÂð£¿"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update media(s)"
+msgstr "¸üÐÂÈí¼þÔ´"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Greece"
-msgstr "Ï£À°"
+msgid "Ok"
+msgstr "È·¶¨"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "France"
-msgstr "·¨¹ú"
+msgid "Please wait, adding medium..."
+msgstr "ÕýÔÚÌí¼Ó½éÖÊ£¬ÇëÉÔºò..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "·ÒÀ¼"
+msgid "Unable to get source packages."
+msgstr "Ô´Èí¼þ°üδÕÒµ½¡£"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Spain"
-msgstr "Î÷°àÑÀ"
+msgid "Too many packages are selected"
+msgstr "Ñ¡ÖеİüÌ«¶à"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"»¶Ó­Ê¹ÓÃÈí¼þ°üÔ´±à¼­Æ÷£¡\n"
+"\n"
+"±¾¹¤¾ß½«°ïÖúÄúÅäÖÃÏëÒªÔÚÄúµÄµçÄÔÉÏËùʹÓõÄÈí¼þ°üÀ´Ô´¡£ÕâЩÀ´Ô´½«ÔÚ°²×°ÐÂ\n"
+"Èí¼þ°ü»òÖ´ÐиüÐÂʱʹÓá£"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Danmark"
-msgstr "µ¤Âó"
+msgid "%s conflicts with %s"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "µÂ¹ú"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"»¶Ó­Ê¹Óà MandrakeUpdate ×Ô¶¯¸üй¤¾ß£¡\n"
+"\n"
+"±¾¹¤¾ß½«°ïÖúÄúΪÄúµÄµçÄÔÖа²×°¸üеÄÈí¼þ°ü¡£"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
-msgstr "½Ý¿Ë¹²ºÍ¹ú"
+msgid "Mandrake choices"
+msgstr "Mandrake ¾«Ñ¡"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "¸ç˹´ïÀè¼Ó"
+msgid "Changelog:\n"
+msgstr "¸üÐÂÈÕÖ¾£º\n"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "¼ÓÄôó"
+msgid "Korea"
+msgstr "º«¹ú"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Brazil"
-msgstr "°ÍÎ÷"
+msgid "Removable device"
+msgstr "¿ÉÒƶ¯É豸"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "±ÈÀûʱ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "°Ä´óÀûÑÇ"
+msgid "Change medium"
+msgstr "¸ü»»½éÖÊ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "°ÂµØÀû"
+msgid "Mandrake Update"
+msgstr "Mandrake ¸üÐÂ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
-msgstr "ÐÅÏ¢..."
+msgid "by size"
+msgstr "°´ÕÕ´óСÅÅÁÐ"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "·ñ"
+msgid "FTP server"
+msgstr "FTP ·þÎñÆ÷"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "ÊÇ"
+msgid "Files:\n"
+msgstr "Îļþ£º\n"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr "ÎÞ·¨¸üнéÖÊ£»¸Ã½éÖʽ«±»×Ô¶¯Í£Óá£"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -1550,6 +1550,12 @@ msgstr "ɾ³ýÈí¼þ"
 msgid "Software Sources Manager"
 msgstr "Èí¼þÔ´¹ÜÀíÆ÷"
 
+#~ msgid "Source: "
+#~ msgstr "À´Ô´£º"
+
+#~ msgid "Source"
+#~ msgstr "À´Ô´"
+
 #~ msgid ""
 #~ "some packages failed to install\n"
 #~ "correctly"
@@ -1582,9 +1588,6 @@ msgstr "Èí¼þÔ´¹ÜÀíÆ÷"
 #~ "\n"
 #~ "ÄúÊÇ·ñÏëÒª³¢ÊÔÁíÍâµÄ¾µÏñ£¿"
 
-#~ msgid "Error adding update medium"
-#~ msgstr "Ìí¼Ó¸üнéÖʳö´í"
-
 #~ msgid "Please wait, contacting mirror to initialize updates packages."
 #~ msgstr "ÕýÔÚÁ¬½Ó¾µÏñÒÔ±ã³õʼ»¯¸üÐÂÈí¼þ°ü£¬ÇëÉÔºò¡£"
 
diff --git a/po/zh_CN.pom b/po/zh_CN.pom
index 780a5e60..310b67c9 100644
--- a/po/zh_CN.pom
+++ b/po/zh_CN.pom
@@ -1,15 +1,15 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 msgid "Server"
-msgstr "·þÎñÆ÷"
+msgstr "�务器"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 msgid "Development"
-msgstr "¿ª·¢Æ½Ì¨"
+msgstr "开�平�"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Office Workstation"
-msgstr "°ì¹«¹¤×÷Õ¾"
+msgstr "办公工作站"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -17,128 +17,128 @@ msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
 msgstr ""
-"°ì¹«³ÌÐò£º×Ö´¦Àí£¨kword¡¢abiword£©£¬µç×Ó±í¸ñ£¨kspread¡¢gnumeric£©pdf ÔĶÁÆ÷µÈ"
+"办公程�：字处�（kword�abiword），电�表格（kspread�gnumeric）pdf 阅读器等"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Game station"
-msgstr "ÓÎÏ·¹¤×÷Õ¾"
+msgstr "游�工作站"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "ÓÎÏ·³ÌÐò£º½Ö»ú¡¢ÆåÅÌ¡¢Õ½ÂԵȵÈ"
+msgstr "游�程�：街机�棋盘�战略等等"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Multimedia station"
-msgstr "¶àýÌ幤×÷Õ¾"
+msgstr "多媒体工作站"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Sound and video playing/editing programs"
-msgstr "ÉùÒôºÍÊÓƵ²¥·Å/±à¼­³ÌÐò"
+msgstr "声音和视频播放/编辑程�"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Internet station"
-msgstr "Internet ¹¤×÷Õ¾"
+msgstr "Internet 工作站"
 
 # 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 "ÉÏÍø¹¤¾ß£¬ÈçÊÕ·¢µç×ÓÓʼþ¼°ÐÂÎÅ×飨pine, mutt, tin..£©£¬ä¯ÀÀÍøÕ¾"
+msgstr "上网工具，如收�电�邮件�新闻组（pine, mutt, tin..），�览网站"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Network Computer (client)"
-msgstr "ÍøÂç¼ÆËã»ú£¨¿Í»§¶Ë£©"
+msgstr "网络计算机（客户端）"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Clients for different protocols including ssh"
-msgstr "SSH µÈЭÒé¿Í»§¶Ë"
+msgstr "SSH 等�议客户端"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Configuration"
-msgstr "ÅäÖÃ"
+msgstr "�置"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Tools to ease the configuration of your computer"
-msgstr "¼ò»¯¼ÆËã»úÅäÖõŤ¾ß"
+msgstr "简化计算机�置的工具"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Scientific Workstation"
-msgstr "¿Æѧ¼ÆË㹤×÷Õ¾"
+msgstr "科学计算工作站"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Scientific applications such as gnuplot"
-msgstr "Ïñ gnuplot ÕâÑùµÄ¿ÆѧӦÓóÌÐò"
+msgstr "� gnuplot 这样的科学应用程�"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Console Tools"
-msgstr "¿ØÖÆ̨¹¤¾ß"
+msgstr "控制�工具"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Editors, shells, file tools, terminals"
-msgstr "±à¼­Æ÷£¬shell£¬Îļþ¹¤¾ß£¬ÖÕ¶Ë"
+msgstr "编辑器，shell，文件工具，终端"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "KDE Workstation"
-msgstr "KDE ¹¤×÷Õ¾"
+msgstr "KDE 工作站"
 
 # 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 "KDE ×ÀÃæ»·¾³£¬»ù±¾µÄͼÐλ·¾³ºÍÒ»×éÅäÌ׵Ť¾ß"
+msgstr "KDE 桌�环境，基本的图形环境和一组�套的工具"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Gnome Workstation"
-msgstr "Gnome ¹¤×÷Õ¾"
+msgstr "Gnome 工作站"
 
 # 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 "Å䱸ÁËÓû§ÓÑÉƵÄÓ¦ÓóÌÐòÓë×ÀÃ湤¾ßµÄͼÐλ·¾³"
+msgstr "�备了用户�善的应用程�与桌�工具的图形环境"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Other Graphical Desktops"
-msgstr "ÆäËüͼÐÎ×ÀÃæ"
+msgstr "其它图形桌�"
 
 # 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 µÈ"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm ç­‰"
 
 # 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ºÍC++¿ª·¢¿â£¬³ÌÐò¼°Í·Îļþ"
+msgstr "C和C++开�库，程��头文件"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Documentation"
-msgstr "Îĵµ"
+msgstr "文档"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Books and Howto's on Linux and Free Software"
-msgstr "ÓÐ¹Ø Linux ºÍ×ÔÓÉÈí¼þµÄÊé¼®ºÍÖ¸ÄÏ"
+msgstr "有关 Linux 和自由软件的书�和指�"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -148,7 +148,7 @@ msgstr "LSB"
 # 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¡£µÚÈý·½Ó¦ÓóÌÐòÖ§³Ö"
+msgstr "Linux Standard Base。第三方应用程�支�"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -158,37 +158,37 @@ msgstr "Web/FTP"
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Apache, Pro-ftpd"
-msgstr "Apache ºÍ Pro-ftpd"
+msgstr "Apache 和 Pro-ftpd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Mail"
-msgstr "Óʼþ"
+msgstr "邮件"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Postfix mail server"
-msgstr "Postfix Óʼþ·þÎñÆ÷"
+msgstr "Postfix 邮件�务器"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Database"
-msgstr "Êý¾Ý¿â"
+msgstr "数�库"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL »ò MySQL Êý¾Ý¿â·þÎñ"
+msgstr "PostgreSQL 或 MySQL 数�库�务"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Firewall/Router"
-msgstr "·À»ðǽ/·ÓÉÆ÷"
+msgstr "防�墙/路由器"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Internet gateway"
-msgstr "Internet Íø¹Ø"
+msgstr "Internet 网关"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -198,20 +198,20 @@ msgstr "DNS/NIS"
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Domain Name and Network Information Server"
-msgstr "ÓòÃûºÍÍøÂçÐÅÏ¢·þÎñ DNS/NIS"
+msgstr "域�和网络信��务 DNS/NIS"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Network Computer server"
-msgstr "ÍøÂç¼ÆËã»ú NC ·þÎñÆ÷"
+msgstr "网络计算机 NC �务器"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS ·þÎñÆ÷£¬SMB ·þÎñÆ÷£¬´úÀí·þÎñÆ÷£¬SSH ·þÎñÆ÷"
+msgstr "NFS �务器，SMB �务器，代��务器，SSH �务器"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr "Ò»×éÉÏÍø¹¤¾ß£¬ÓÃÓÚÊÕ·¢ÓʼþºÍÐÂÎÅ£¬»òÕßä¯ÀÀÍøÕ¾"
+msgstr "一组上网工具，用于收�邮件和新闻，或者�览网站"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index f959a3aa..f0b446b6 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: 2002-08-25 06:10+0800\n"
 "Last-Translator: Kenduest Lee <kenduest@i18n.linux.org.tw>\n"
 "Language-Team: Chinese <zh-l10n@linux.org.tw>\n"
@@ -15,16 +15,20 @@ msgstr ""
 "Content-Type: text/plain; charset=big5\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"±z­nÄ~Äò¶Ü¡H"
+msgid "Enabled?"
+msgstr "¶}±Ò"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "¸ô®|©Î¬O±¾¸üÂI¡G"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Portugal"
+msgstr "°ð¸¹¡G"
 
 #: ../rpmdrake:1
 #, c-format
@@ -41,61 +45,105 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"Åwªï¨Ó¨ì®M¥ó§ó·sµ{¦¡!\n"
-"±µ¤U¨Óµ{¦¡±N·|¤Þ¾É§A§¹¦¨®M¥ó§ó·s»P¦w¸Ë¡C"
+msgid "by group"
+msgstr "¨Ì¸s²Õ¤ÀÃþ"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Name:"
+msgstr "¦WºÙ"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Italy"
+msgstr "¦w¸Ë"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "¦p¦ó¤â°Ê¿ï¾Ü±z»Ý­nªº¬M®g¯¸¥x"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL¡G"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "¬Y¨Ç®M¥ó»Ý­n¶¶«K²¾°£"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
+msgstr "§ó¦h¸Ó®M¥ó¸ê°T..."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "¬O"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Welcome to the software removal tool!\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
 msgstr ""
-"Åwªï¨Ó¨ì®M¥ó²¾°£µ{¦¡!\n"
+"¥Ñ©ó¬Û¨Ì©Êªº­n¨D¡A¤U­±ªº®M¥ó±N·|¨ú®ø¿ï¨ú¥H«K©ó¯à°÷Ä~Äò¶i¦æ¤U¥h¡G\n"
 "\n"
-"±µ¤U¨Óµ{¦¡±N·|¤Þ¾É§A§¹¦¨²¾°£±z»{¬°¤£»Ý­nªº®M¥ó¶µ¥Ø¡C"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"¦w¸Ë®M¥ó®Éµo¥Í¤F¤U­±ªº¿ù»~¡G\n"
-"\n"
-"%s"
+msgid "everything was installed correctly"
+msgstr "©Ò¦³¶µ¥Ø¤w¸g³£¦w¸Ë¦¨¥\¤F¡C"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Problem during removal"
-msgstr "¦w¸Ë®Éµo¥Í°ÝÃD"
+msgid "%s KB"
+msgstr "%.1f KB"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, removing packages..."
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"½Ðµy­Ô\n"
-"±Æ§Ç®M¥ó"
+"±z¤w¸g¤â°Ê¿ï¾Ü±z»Ý­nªº¬M®g¯¸¥x¤F¡A«Øij±z½Ðµy«á¤â°Ê°õ¦æ\n"
+"®M¥ó¨Ó·½ºÞ²z­û¡A°w¹ï±zªº¬M®g¯¸¥x¥t¥~¥[¤J¡u¦w¥þ­×¥¿¡v¶µ¥Ø¡C\n"
+"\n"
+"§¹¦¨«á¡A½Ð­«·s±Ò°Ê MandrakeUpdate µ{¦¡¡C"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, reading packages database..."
+#, c-format
+msgid ""
+"Welcome to the software removal tool!\n"
+"\n"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
 msgstr ""
-"½Ðµy­Ô\n"
-"±Æ§Ç®M¥ó"
+"Åwªï¨Ó¨ì®M¥ó²¾°£µ{¦¡!\n"
+"\n"
+"±µ¤U¨Óµ{¦¡±N·|¤Þ¾É§A§¹¦¨²¾°£±z»{¬°¤£»Ý­nªº®M¥ó¶µ¥Ø¡C"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "¬°¤F¯à°÷Àx¦sÅܧó¡A½Ð¸m¤J¸Ó´C¤¶¸Ë¸m«á©óºÏºÐ¾÷Ä~Äò¡C"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Àx¦s¨ÃÂ÷¶}"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"There was a problem during the installation:\n"
+"There was a problem during the removal of packages:\n"
 "\n"
 "%s"
 msgstr ""
@@ -105,80 +153,71 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Installation failed"
-msgstr "¥þ³¡¦w¸Ë"
+msgid "Size: "
+msgstr "¤j¤p"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "¥¿¦b·Ç³Æ¦w¸Ë"
+msgid "Security updates"
+msgstr "Åã¥Ü¦w¥þ§ó·s®M¥ó"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "¥¿¦b·Ç³Æ¦w¸Ë"
+msgid "Already existing update medias"
+msgstr "·s¼W§ó·s´C¤¶®Éµo¥Í¿ù»~"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "¤w¸g¦¨¥\¦a¦w¸Ë±z»Ý­nªº®M¥ó¡C"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Everything installed successfully"
-msgstr "©Ò¦³¶µ¥Ø¤w¸g³£¦w¸Ë¦¨¥\¤F¡C"
-
-#: ../rpmdrake:1
-#, c-format
-msgid ""
-"The installation is finished; %s.\n"
-"\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
-msgstr ""
-"¤w¸g§¹¦¨¦w¸Ë %s ®M¥ó¤F¡C\n"
-"\n"
-"½Ðª`·N¤@¤U¡A¸Ó®M¥ó¥i¯à¥t¥~²£¥Í¤F '.rpmnew' ·sª©¥»³]©wÀɮסA\n"
-"©ÎªÌ¬O§â­ì¥»³]©wÀÉ®×­«·s©R¦W¬° '.rpmsave'¡A¬°¤F¯à°÷Åýµ{¦¡\n"
-"¯à°÷¥¿±`°õ¦æ¤u§@¡A±z»Ý­nÀ˵ø¤U­±ªº¨BÆJ¡G"
+msgid "Maximum information"
+msgstr "§¹¾ã¸ê°T"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "everything was installed correctly"
-msgstr "©Ò¦³¶µ¥Ø¤w¸g³£¦w¸Ë¦¨¥\¤F¡C"
+msgid "Proxy..."
+msgstr "¿ù»~..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "¦w¸Ë®Éµo¥Í°ÝÃD"
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
+msgstr ""
+"¦w¸Ë¥¢±Ñ¡C¦w¸Ëµ{¦¡§ä¤£¨ì¤@¨Ç­n¦w¸Ë¤Wªºµ{¦¡®M¥ó¡C\n"
+"¤]³\¬O¨t²Î¸ê®Æ®w¤Ó¤F¡A½Ð¥ý§ó·s¸ê®Æ®w«á¦AÄ~Äò¡C"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "¥¿¦b¦w¸Ë®M¥ó '%s (%s/%s)..."
+msgid "United Kingdom"
+msgstr "Áp¦X°ê"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "¥¿¦b·Ç³Æ¦w¸Ë"
+#, c-format
+msgid "in names"
+msgstr "¨Ì¦WºÙ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
+"I can't find any suitable mirror.\n"
 "\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
+"¦w¸Ëµ{¦¡§ä¤£¨ì¾A¦Xªº¬M®g¯¸¥x¡C\n"
+"\n"
+"·|µo¥Í³o­Ó°ÝÃDªº±¡ªp¬Û·í¦h¡A¤ñ¤è Mandrake Linux\n"
+"§ó·s¯¸¥x¥Ø«e©|¤£¤ä´©±z¥Ø«e¥Îªº¾÷¾¹¥­¥x¡C"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"¦w¸Ë¥¢±Ñ¡C¦w¸Ëµ{¦¡§ä¤£¨ì¤@¨Ç­n¦w¸Ë¤Wªºµ{¦¡®M¥ó¡C\n"
-"¤]³\¬O¨t²Î¸ê®Æ®w¤Ó¤F¡A½Ð¥ý§ó·s¸ê®Æ®w«á¦AÄ~Äò¡C"
+msgid "Remove .%s"
+msgstr "²¾°£ .%s"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "ªâÄõ"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -195,205 +234,275 @@ msgstr ""
 "\n"
 "±z½T©w­nÄ~Äò¶Ü¡H"
 
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Examining distant file of media `%s'..."
+msgstr ""
+
 #: ../rpmdrake:1
 #, c-format
 msgid "Verifying packages signatures..."
 msgstr ""
 
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "France"
+msgstr "±j­¢"
+
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "¥¿¦b¤U¸ü¡u%s¡v(%s/%s)..."
+msgid "More info"
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Cancel"
-msgstr "¨ú®ø"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"±z­nÄ~Äò¶Ü¡H"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Ok"
-msgstr "½T©w"
+msgid "Reload the packages list"
+msgstr "­«·s¸ü¤J®M¥ó²M³æ"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "¿ï¾Ü¬M®g¦a§}..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "½Ð¸m¤J´C¤¶¦WºÙ¬° \"%s\" ªº¶µ¥Ø©ñ¸m©ó %s ¸Ë¸m"
+msgid "Some packages can't be installed"
+msgstr "®M¥ó '%s' µLªk³Q¦w¸Ë\n"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "¥¿¦b·Ç³Æ¦w¸Ë"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Change medium"
-msgstr "Åܧó´C¤¶"
+msgid "All packages,"
+msgstr "©Ò¦³®M¥ó¡A"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Type of media:"
+msgstr "¨Ó·½Ãþ§O¡G"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "ªì©l¤Æ¤¤..."
+msgid "in files"
+msgstr "¨ÌÀÉ®×"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "¤w¸g¦¨¥\¦a¦w¸Ë±z»Ý­nªº®M¥ó¡C"
+
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "¥¿¦b·Ç³Æ¦w¸Ë"
+msgid "Proxy hostname:"
+msgstr "¨Ï¥ÎªÌ¦WºÙ (¥N²z¦øªA¾¹)¡G"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "¥»¾÷ÀÉ®×"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr "¥¿¦bÀˬd %s"
+
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "©êºp¡A±z»Ý­n¨ã³Æ root Åv­­¨­¥÷¤~¥i¥H¶i¦æ®M¥ó¦w¸Ë¡C"
+msgid "Israel"
+msgstr "¦w¸Ë"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unable to get source packages."
-msgstr "¿ï¾Ü®M¥ó"
+msgid "Help"
+msgstr "/»¡©ú (_H)"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Inspect..."
-msgstr "Àˬd..."
+msgid "HTTP server"
+msgstr "HTTP ¥D¾÷"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Installation finished"
-msgstr "¤w¦w¸Ë"
+msgid "Installation failed"
+msgstr "¥þ³¡¦w¸Ë"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "¨S¦³¶i¦æ¥ô¦ó°Ê§@"
+msgid "Use .%s as main file"
+msgstr "¨Ï¥Î .%s ¬°¥D­nÀÉ®×"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "¨Ï¥Î .%s ¬°¥D­nÀÉ®×"
+msgid "Search results"
+msgstr "·j´Mµ²ªG"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid " failed!"
+msgstr "¨ÌÀÉ®×"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
+msgstr "¤Ú¦è"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"¸Ó´C¤¶¸Ë¸m¶µ¥Ø¤w¸g¦s¦b¤F¡A\n"
+"±z½T©w­n¸m´«­ì¥»¶µ¥Ø¶Ü¡H"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Remove .%s"
-msgstr "²¾°£ .%s"
+msgid "Find:"
+msgstr "´M§ä¡G"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "changes:"
-msgstr "Àx¦sÅܧó"
+#, c-format
+msgid "All packages, alphabetical"
+msgstr "©Ò¦³®M¥ó¡A¨Ì·Ó¦r¥À¶¶§Ç¤ÀÃþ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "¥¿¦bÀˬd %s"
+msgid "Please wait, searching..."
+msgstr "½Ðµy­Ô¡A·j´M¤¤..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, finding available packages..."
+msgid "Please wait, reading packages database..."
 msgstr ""
 "½Ðµy­Ô\n"
 "±Æ§Ç®M¥ó"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Please wait, adding medium..."
-msgstr "½Ðµy«á¡A¥¿¦b¥[¤J´C¤¶¨Ó·½..."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "¤£¸Ô"
 
 #: ../rpmdrake:1
-#, c-format
-msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Sources Manager, and then add a `Security\n"
-"updates' source.\n"
-"\n"
-"Then, restart MandrakeUpdate."
-msgstr ""
-"±z¤w¸g¤â°Ê¿ï¾Ü±z»Ý­nªº¬M®g¯¸¥x¤F¡A«Øij±z½Ðµy«á¤â°Ê°õ¦æ\n"
-"®M¥ó¨Ó·½ºÞ²z­û¡A°w¹ï±zªº¬M®g¯¸¥x¥t¥~¥[¤J¡u¦w¥þ­×¥¿¡v¶µ¥Ø¡C\n"
-"\n"
-"§¹¦¨«á¡A½Ð­«·s±Ò°Ê MandrakeUpdate µ{¦¡¡C"
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "½Ð¸m¤J´C¤¶¦WºÙ¬° \"%s\" ªº¶µ¥Ø©ñ¸m©ó %s ¸Ë¸m"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "¦p¦ó¤â°Ê¿ï¾Ü±z»Ý­nªº¬M®g¯¸¥x"
+msgid "Reset the selection"
+msgstr "­«¸m¿ï¨ú¶µ¥Ø"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
 msgstr ""
+"¦pªG±z»Ý­n³z¹L¥N²z¦øªA¾¹³s½u¡A½Ð¿é¤J¸Ó¥D¾÷¦WºÙ»P³sµ²°ð°ð¸¹(¤ñ¤è proxy.hinet."
+"net:80)¡G"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Already existing update sources"
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
 msgstr ""
+"¬°¤F­nº¡¨¬¬Û¨Ì©Ê»Ý¨D¡A³o¨Ç®M¥ó»Ý­n³Q²¾°£¡G\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
+msgid "Costa Rica"
+msgstr "­ô´µ¤j¾¤¥["
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
+"There was a problem during the installation:\n"
 "\n"
-"Is it ok to continue?"
+"%s"
 msgstr ""
-"¦w¸Ëµ{¦¡»Ý­n³s½u¨ì¬M®g¯¸¥x¥H«K©ó¨ú¦^³Ì·sªº§ó·s®M¥ó¡C\n"
-"½Ð½T©w±z¥Ø«eªººô¸ô¯à°÷¥¿±`³s½u¨ì¥~­±¡C\n"
+"¦w¸Ë®M¥ó®Éµo¥Í¤F¤U­±ªº¿ù»~¡G\n"
 "\n"
-"±z²{¦b­nÄ~Äò¶Ü¡H"
+"%s"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Please wait, removing medium..."
+msgstr "½Ðµy«á¡A¥¿¦b²¾°£´C¤¶¨Ó·½..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Àɮ׿ù»~"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "±K½X¡G"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "¥xÆW"
+
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "¥¿¦b·Ç³Æ¦w¸Ë"
+msgid "User:"
+msgstr "¨Ï¥ÎªÌ¦WºÙ¡G"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr "½Ðµy«á¡A§ó·s´C¤¶¤¤..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Mandrake Update"
-msgstr "MandrakeUpdate ½s¦n³]©w"
+msgid "Please wait, listing packages..."
+msgstr ""
+"½Ðµy­Ô\n"
+"±Æ§Ç®M¥ó"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Software Packages Removal"
-msgstr "²¾°£®M¥óµ{¦¡"
+#, fuzzy, c-format
+msgid "Information on packages"
+msgstr "¿ï¾Ü®M¥ó"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "Â÷¶}"
+msgid "Cancel"
+msgstr "¨ú®ø"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "¦w¸Ë"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Remove"
-msgstr "²¾°£"
+msgid "Everything installed successfully"
+msgstr "©Ò¦³¶µ¥Ø¤w¸g³£¦w¸Ë¦¨¥\¤F¡C"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Help"
-msgstr "/»¡©ú (_H)"
+msgid "Select the media(s) you wish to update:"
+msgstr "½Ð¿ï¾Ü±z­n§ó·sªº¨Ó·½¡G"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search"
-msgstr "´M§ä"
+msgid "Please wait, updating media..."
+msgstr "½Ðµy«á¡A§ó·s´C¤¶¤¤..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "´M§ä¡G"
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -411,159 +520,186 @@ msgstr ""
 "±z½T©w­nÄ~Äò¶Ü¡H"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "in descriptions"
+msgstr "´y­z"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "¬Y¨Ç®M¥ó»Ý­n¶¶«K²¾°£"
+msgid "Configure proxies"
+msgstr "³]©w¥N²z¦øªA¾¹"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
 "\n"
-"Do you really want to install all the selected packages?"
+"Is it ok to continue?"
 msgstr ""
-"ĵ§i¡G ±z¿ï¨ú¤F³\¦h­n¦w¸Ë§ó·sªº®M¥ó¡A¤£¹L±zªººÏºÐªÅ¶¡\n"
-"¦ü¥G¤w¸g¤£¼Å¨Ï¥Î¡A«Øij±z¥ý¾ã²z®¿¥X¥i¥ÎªºªÅ¶¡¦A¶i¦æ¤U­±\n"
-"ªº¦w¸Ë¡A¥HÁקK¥ô¦ó°ÝÃDµo¥Í¡C\n"
-"±z½T©wÁÙ¬O­n¦w¸Ë±z©Ò¿ï¨úªº®M¥ó¶Ü¡H"
+"¦w¸Ëµ{¦¡»Ý­n³s½u¨ì MandrakeSoft Á`³¡¨ú¦^¬M®g¯¸¥xªº²M³æÀɮסC\n"
+"½Ð½T©w±z¥Ø«eºô¸ô¯à°÷¥¿±`³s½u¥X¥h¡C\n"
+"\n"
+"±z­nÄ~Äò¶Ü¡H"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "¿ï¨ú¤Ó¦h¤F®M¥ó¶µ¥Ø"
+msgid "Please choose"
+msgstr "½Ð¿ï¾Ü"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Maximum information"
-msgstr "§¹¾ã¸ê°T"
+#, fuzzy, c-format
+msgid "Selected size: %d MB"
+msgstr "¿ï¾Ü¤F %d ­Ó®M¥ó¡G%.1f MB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Normal information"
-msgstr "¤@¯ë¸ê°T"
+msgid "Initializing..."
+msgstr "ªì©l¤Æ¤¤..."
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update source(s)"
-msgstr "§ó·s¨Ó·½"
+msgid "Save changes"
+msgstr "Àx¦sÅܧó"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "­«·s¸ü¤J®M¥ó²M³æ"
+msgid "Error during download"
+msgstr "¤U¸üµo¥Í¿ù»~"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reset the selection"
-msgstr "­«¸m¿ï¨ú¶µ¥Ø"
+#, fuzzy, c-format
+msgid "Package installation..."
+msgstr "¥¿¦b·Ç³Æ¦w¸Ë"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "¨ÌÀÉ®×"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "in descriptions"
-msgstr "´y­z"
+msgid "Importance: "
+msgstr "­«­n©Ê¡G "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "¨Ì¦WºÙ"
+msgid ""
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
+msgstr ""
+"¬°¤F¯à°÷º¡¨¬¬Û¨Ì©Êªº­n¨D¡A¤U­±ªº®M¥ó¤]¥²¶·¤@¦P¦w¸Ë¤W¡G\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by update availability"
-msgstr "¨Ì¥i¨Ñ§ó·s¤ÀÃþ"
+msgid "Add..."
+msgstr "·s¼W..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by source repository"
-msgstr "¨Ì¨Ó·½­ÜÀx¤ÀÃþ"
+msgid "Unable to create medium."
+msgstr "µLªk«Ø¥ß´C¤¶¶µ¥Ø¡C"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by selection state"
-msgstr "¨Ì¿ï¾Üª¬ºA¤ÀÃþ"
+msgid ""
+"The installation is finished; %s.\n"
+"\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
+msgstr ""
+"¤w¸g§¹¦¨¦w¸Ë %s ®M¥ó¤F¡C\n"
+"\n"
+"½Ðª`·N¤@¤U¡A¸Ó®M¥ó¥i¯à¥t¥~²£¥Í¤F '.rpmnew' ·sª©¥»³]©wÀɮסA\n"
+"©ÎªÌ¬O§â­ì¥»³]©wÀÉ®×­«·s©R¦W¬° '.rpmsave'¡A¬°¤F¯à°÷Åýµ{¦¡\n"
+"¯à°÷¥¿±`°õ¦æ¤u§@¡A±z»Ý­nÀ˵ø¤U­±ªº¨BÆJ¡G"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by size"
-msgstr "¨Ì¤j¤p¤ÀÃþ"
+msgid "Browse..."
+msgstr "ÂsÄý..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "®M¥ó '%s' µLªk³Q¦w¸Ë\n"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by group"
-msgstr "¨Ì¸s²Õ¤ÀÃþ"
+msgid "Info..."
+msgstr "¸ê°T..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "All packages,"
-msgstr "©Ò¦³®M¥ó¡A"
+msgid "You need to insert the medium to continue"
+msgstr "½Ð´¡¤J´C¤¶¸Ë¸m«áÄ~Äò"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "©Ò¦³®M¥ó¡A¨Ì·Ó¦r¥À¶¶§Ç¤ÀÃþ"
+msgid "Copying file for media `%s'..."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Mandrake ¤ÀÃþ"
+msgid "Remove"
+msgstr "²¾°£"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Normal updates"
-msgstr "¥¿±`§ó·s"
+msgid "Preparing packages installation..."
+msgstr "¥¿¦b·Ç³Æ¦w¸Ë"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Bugfixes updates"
-msgstr "Åã¥Ü­×¥¿¿ù»~ªº§ó·s®M¥ó"
+msgid "by media repository"
+msgstr "¨Ì¨Ó·½­ÜÀx¤ÀÃþ"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Security updates"
-msgstr "Åã¥Ü¦w¥þ§ó·s®M¥ó"
+msgid "No mirror"
+msgstr "¬M®g¡G"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Description: "
-msgstr "´y­z"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to fill up at least the two first entries."
+msgstr "±z¦Ü¤Ö»Ý­n¿é¤J«e­±¨â­Ó¶µ¥Ø¡C"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reason for update: "
-msgstr "§ó·sªº­ì¦]¡G "
+msgid "Install"
+msgstr "¦w¸Ë"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Summary: "
-msgstr "ºK­n"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Japan"
+msgstr "¤é¥»"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Importance: "
-msgstr "­«­n©Ê¡G "
+msgid "Do nothing"
+msgstr "¨S¦³¶i¦æ¥ô¦ó°Ê§@"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "%s KB"
-msgstr "%.1f KB"
+msgid "No update"
+msgstr "§ó·s"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Size: "
-msgstr "¤j¤p"
+msgid "Description: "
+msgstr "´y­z"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Version: "
-msgstr "ª©¥»¡G"
+#, c-format
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr ""
+"ĵ§i¡G ±z¿ï¨ú¤F³\¦h­n¦w¸Ë§ó·sªº®M¥ó¡A¤£¹L±zªººÏºÐªÅ¶¡\n"
+"¦ü¥G¤w¸g¤£¼Å¨Ï¥Î¡A«Øij±z¥ý¾ã²z®¿¥X¥i¥ÎªºªÅ¶¡¦A¶i¦æ¤U­±\n"
+"ªº¦w¸Ë¡A¥HÁקK¥ô¦ó°ÝÃDµo¥Í¡C\n"
+"±z½T©wÁÙ¬O­n¦w¸Ë±z©Ò¿ï¨úªº®M¥ó¶Ü¡H"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -572,82 +708,63 @@ msgstr "¦WºÙ¡G %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "¥Ø«e¤w¦w¸Ëªºª©¥»¡G"
+msgid "Inspect..."
+msgstr "Àˬd..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Source: "
-msgstr "¨Ó·½"
+msgid "Editing media \"%s\":"
+msgstr "½s¿è¨Ó·½ \"%s\"¡G"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "(Not available)"
-msgstr "(µLªk¨Ï¥Î)"
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "¥¿¦b·Ç³Æ¦w¸Ë"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Åܧó¬ö¿ý¡G\n"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Files:\n"
-msgstr "/ÀÉ®× (_F)"
+msgid "Australia"
+msgstr "¿D¬w"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Selected size: %d MB"
-msgstr "¿ï¾Ü¤F %d ­Ó®M¥ó¡G%.1f MB"
+msgid "Installation finished"
+msgstr "¤w¦w¸Ë"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "¤w¿ï¾Ü¡G%d MB / ¥i¥ÎºÏºÐªÅ¶¡¡G%d MB"
+msgid "by update availability"
+msgstr "¨Ì¥i¨Ñ§ó·s¤ÀÃþ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
-msgstr ""
-"¥Ñ©ó¬Û¨Ì©Êªº­n¨D¡A¤U­±ªº®M¥ó±N·|¨ú®ø¿ï¨ú¥H«K©ó¯à°÷Ä~Äò¶i¦æ¤U¥h¡G\n"
-"\n"
+msgid "Poland"
+msgstr "ªiÄõ"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr ""
-"©êºp¡A¤U­±ªº®M¥ó¶µ¥Ø±N¤£¯à°÷³Q¿ï¨ú¡G\n"
-"\n"
+msgid "Version: "
+msgstr "ª©¥»¡G"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr " »P %s-%s-%s ¨R¬ð"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "±z»Ý­n«ü©w¨Ï¥ÎªÌ±b¸¹/±K½X¡A¥H«K©ó¯à°÷¨Ï¥Î¥N²z¦øªA¾¹»{ÃÒ¡G"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "®M¥ó '%s' µLªk³Q¦w¸Ë\n"
+msgid "Upgradable"
+msgstr "§ó·s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
+msgid " done."
 msgstr ""
-"¬°¤F¯à°÷º¡¨¬¬Û¨Ì©Êªº­n¨D¡A¤U­±ªº®M¥ó¤]¥²¶·¤@¦P¦w¸Ë¤W¡G\n"
-"\n"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Software Packages Installation"
+msgstr "¥¿¦b·Ç³Æ¦w¸Ë"
 
 #: ../rpmdrake:1
 #, c-format
@@ -656,636 +773,519 @@ msgstr "»Ý­nÃB¥~ªº®M¥ó¶µ¥Ø"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "®M¥ó '%s' µLªk³Q¦w¸Ë\n"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr "©êºp¡A­Y¬O²¾°£¤U­±³o¨Ç®M¥ó¥i¯à·|Åý±zªº¨t²Î¥X¿ù¡G\n"
+msgid "Bugfixes updates"
+msgstr "Åã¥Ü­×¥¿¿ù»~ªº§ó·s®M¥ó"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
+msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
-"¬°¤F­nº¡¨¬¬Û¨Ì©Ê»Ý¨D¡A³o¨Ç®M¥ó»Ý­n³Q²¾°£¡G\n"
-"\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "¬°¤F¥i¥H¥þ­±¹B§@¥¿±`³o¨ÇÃB¥~ªº®M¥ó¥²¶·¤@¦P¦w¸Ë"
+msgid "Germany"
+msgstr "¼w°ê"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "More information on package..."
-msgstr "§ó¦h¸Ó®M¥ó¸ê°T..."
+msgid "Russia"
+msgstr "Ĭ«X"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Information on packages"
-msgstr "¿ï¾Ü®M¥ó"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
+msgstr "®¿«Â"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
-#, c-format
-msgid "More info"
-msgstr ""
+#, fuzzy, c-format
+msgid "Problem during installation"
+msgstr "¦w¸Ë®Éµo¥Í°ÝÃD"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Addable"
-msgstr "¥i¨Ñ¥[¤J"
+msgid "Search"
+msgstr "´M§ä"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Upgradable"
-msgstr "§ó·s"
+msgid "Edit a media"
+msgstr "½s¿è®M¥ó¨Ó·½"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
+msgstr "±¶§J¦@©M°ê"
 
 #: ../rpmdrake:1
 #, c-format
 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."
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
 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:1
-#, fuzzy, c-format
-msgid "No update"
-msgstr "§ó·s"
+#, c-format
+msgid "Stop"
+msgstr "°±¤î"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(none)"
-msgstr "(µL)"
+msgid "Update"
+msgstr "§ó·s"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, listing packages..."
+msgid "Please wait, removing packages..."
 msgstr ""
 "½Ðµy­Ô\n"
 "±Æ§Ç®M¥ó"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "¤£¸Ô"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "±N»Ý­n¤U¦Cªº¨ä¤¤¤§¤@®M¥ó¡G"
+msgid "Normal information"
+msgstr "¤@¯ë¸ê°T"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "½Ð¿ï¾Ü"
+msgid "Media: "
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr "°»´ú¨ì¬Û½Ä¬ðªº¸ê°T"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "¥¿¦b¤U¸ü¡u%s¡v(%s/%s)..."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Selected"
-msgstr ""
-"¥þ\n"
-"¿ï "
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "¤w¿ï¾Ü¡G%d MB / ¥i¥ÎºÏºÐªÅ¶¡¡G%d MB"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search results"
-msgstr "·j´Mµ²ªG"
+msgid "Media"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Stop"
-msgstr "°±¤î"
+msgid "Spain"
+msgstr "¦è¯Z¤ú"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Please wait, searching..."
-msgstr "½Ðµy­Ô¡A·j´M¤¤..."
+#, fuzzy, c-format
+msgid "Normal updates"
+msgstr "¥¿±`§ó·s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results (none)"
-msgstr "·j´Mµ²ªG (µL¥ô¦ó²Å¦Xªº¶µ¥Ø)"
+msgid "by selection state"
+msgstr "¨Ì¿ï¾Üª¬ºA¤ÀÃþ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Other"
-msgstr "¨ä¥L"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "½Ðµy«á¡A¥¿¦b¥Ñ MandrakeSoft Á`³¡¨ú¦^¬M®g¯¸¥x²M³æ¡C"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the packages source editor!\n"
-"\n"
-"This tool will help you configure the packages sources you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
-msgstr ""
-"Åwªï¨Ó¨ì®M¥ó¨Ó·½½s¿èµ{¦¡!\n"
-"\n"
-"±µ¤U¨Óµ{¦¡±N·|¤Þ¾É§A§¹¦¨½s¿è®M¥ó¨Ó·½ªº¶µ¥Ø¡A\n"
-"¥H«K©ó´£¨Ñ±z¯à°÷¨Ï¥Î±z©Ò³]©wªº¶µ¥Ø¶i¦æ³nÅ骺¦w¸Ë»P§ó·s¡C"
+msgid "Login:"
+msgstr "µn¤J¡G"
 
 #: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Adding a media:"
+msgstr "·s¼W¨Ó·½¡G"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Save and quit"
-msgstr "Àx¦s¨ÃÂ÷¶}"
+msgid "Austria"
+msgstr "¶ø¦a§Q"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "¿ù»~..."
+msgid "Fatal error"
+msgstr "Àɮ׿ù»~"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Update..."
 msgstr "§ó·s"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add..."
-msgstr "·s¼W..."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Edit"
-msgstr "½s¿è"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Source"
-msgstr "¨Ó·½"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "¶}±Ò"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure sources"
-msgstr "³]©w®M¥ó¨Ó·½¦ì¸m¡H"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Password:"
-msgstr "±K½X¡G"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "User:"
-msgstr "¨Ï¥ÎªÌ¦WºÙ¡G"
+msgid "Starting download of `%s'..."
+msgstr "½T»{ '%s' ®M¥óªºÃ±¦W¸ê°T"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "±z»Ý­n«ü©w¨Ï¥ÎªÌ±b¸¹/±K½X¡A¥H«K©ó¯à°÷¨Ï¥Î¥N²z¦øªA¾¹»{ÃÒ¡G"
+msgid "(none)"
+msgstr "(µL)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy hostname:"
-msgstr "¨Ï¥ÎªÌ¦WºÙ (¥N²z¦øªA¾¹)¡G"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
 msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
-msgstr ""
-"¦pªG±z»Ý­n³z¹L¥N²z¦øªA¾¹³s½u¡A½Ð¿é¤J¸Ó¥D¾÷¦WºÙ»P³sµ²°ð°ð¸¹(¤ñ¤è proxy.hinet."
-"net:80)¡G"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure proxies"
-msgstr "³]©w¥N²z¦øªA¾¹"
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr "©êºp¡A­Y¬O²¾°£¤U­±³o¨Ç®M¥ó¥i¯à·|Åý±zªº¨t²Î¥X¿ù¡G\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "½Ðµy«á¡A§ó·s´C¤¶¤¤..."
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "¥¿¦b¦w¸Ë®M¥ó '%s (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "¬°¤F¯à°÷Àx¦sÅܧó¡A½Ð¸m¤J¸Ó´C¤¶¸Ë¸m«á©óºÏºÐ¾÷Ä~Äò¡C"
+msgid "Currently installed version: "
+msgstr "¥Ø«e¤w¦w¸Ëªºª©¥»¡G"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "½Ð´¡¤J´C¤¶¸Ë¸m«áÄ~Äò"
+msgid "Other"
+msgstr "¨ä¥L"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "Àx¦sÅܧó"
+msgid "Reason for update: "
+msgstr "§ó·sªº­ì¦]¡G "
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "synthesis/hdlist Àɮתº¬Û¹ï¸ô®|¡G"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Please choose the desired mirror."
+msgstr ""
+"½Ðµy­Ô\n"
+"¥¿¦b¨ú¦^¬M®g¦a§}ªº²M³æ"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "URL:"
-msgstr "URL¡G"
+msgid "Edit"
+msgstr "½s¿è"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "½s¿è¨Ó·½ \"%s\"¡G"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Edit a source"
-msgstr "½s¿è®M¥ó¨Ó·½"
+msgid "Please wait, finding available packages..."
+msgstr ""
+"½Ðµy­Ô\n"
+"±Æ§Ç®M¥ó"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "½Ðµy«á¡A¥¿¦b²¾°£´C¤¶¨Ó·½..."
+msgid "Relative path to synthesis/hdlist:"
+msgstr "synthesis/hdlist Àɮתº¬Û¹ï¸ô®|¡G"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Type of source:"
-msgstr "¨Ó·½Ãþ§O¡G"
+msgid "Search results (none)"
+msgstr "·j´Mµ²ªG (µL¥ô¦ó²Å¦Xªº¶µ¥Ø)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Adding a source:"
-msgstr "·s¼W¨Ó·½¡G"
+msgid "Danmark"
+msgstr "¤¦³Á"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
-msgstr ""
-"¸Ó´C¤¶¸Ë¸m¶µ¥Ø¤w¸g¦s¦b¤F¡A\n"
-"±z½T©w­n¸m´«­ì¥»¶µ¥Ø¶Ü¡H"
+msgid "China"
+msgstr "¤¤°ê¤j³°"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "±z¦Ü¤Ö»Ý­n¿é¤J«e­±¨â­Ó¶µ¥Ø¡C"
+msgid "United States"
+msgstr "¬ü°ê"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Name:"
-msgstr "¦WºÙ"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Login:"
-msgstr "µn¤J¡G"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Choose a mirror..."
-msgstr "¿ï¾Ü¬M®g¦a§}..."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Browse..."
-msgstr "ÂsÄý..."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Path or mount point:"
-msgstr "¸ô®|©Î¬O±¾¸üÂI¡G"
+msgid "changes:"
+msgstr "Àx¦sÅܧó"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Removable device"
-msgstr "¥i²¾°£¸Ë¸m"
+msgid "Some additional packages need to be removed"
+msgstr "¬°¤F¥i¥H¥þ­±¹B§@¥¿±`³o¨ÇÃB¥~ªº®M¥ó¥²¶·¤@¦P¦w¸Ë"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "HTTP ¥D¾÷"
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "FTP ¥D¾÷"
+msgid "No"
+msgstr "§_"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Path:"
-msgstr "°ð¸¹¡G"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Local files"
-msgstr "¥»¾÷ÀÉ®×"
+msgid "Configure medias"
+msgstr "³]©w®M¥ó¨Ó·½¦ì¸m¡H"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Add a source"
+msgid "Add a media"
 msgstr "·s¼W¨Ó·½¡G"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr "µLªk§ó·s´C¤¶¡A¸Ó¶µ¥Ø±N·|¼È®É¦Û°ÊÃö³¬¡C"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Unable to create medium."
-msgstr "µLªk«Ø¥ß´C¤¶¶µ¥Ø¡C"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Update"
-msgstr "§ó·s"
+msgid "Summary: "
+msgstr "ºK­n"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "½Ð¿ï¾Ü±z­n§ó·sªº¨Ó·½¡G"
+msgid "Canada"
+msgstr "¥[®³¤j"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "½Ðµy«á¡A§ó·s´C¤¶¤¤..."
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid " failed!"
-msgstr "¨ÌÀÉ®×"
+msgid "Greece"
+msgstr "§Æþ"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid " done."
+msgid ""
+"There was an error downloading the mirrors list:\n"
+"\n"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
+"¨ú¦^¬M®g¯¸¥x²M³æ®Éµo¥Í¿ù»~¡G\n"
+"\n"
+"%s\n"
+"¤]³\¬Oºô¸ô³s½u¥¢±Ñ¡A©ÎªÌ¬O MandrakeSoft ¯¸¥x¼È®ÉµLªkÁpô¤W¡A\n"
+"½Ðµy«á¦A¸Õ¡C"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Download of `%s', speed:%s"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr "©êºp¡A±z»Ý­n¨ã³Æ root Åv­­¨­¥÷¤~¥i¥H¶i¦æ®M¥ó¦w¸Ë¡C"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Path:"
+msgstr "°ð¸¹¡G"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "½T»{ '%s' ®M¥óªºÃ±¦W¸ê°T"
+msgid "Problem during removal"
+msgstr "¦w¸Ë®Éµo¥Í°ÝÃD"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Examining distant file of source `%s'..."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Selected"
 msgstr ""
+"¥þ\n"
+"¿ï "
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr ""
+msgid "Netherlands"
+msgstr "²üÄõ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr ""
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Please choose the desired mirror."
-msgstr ""
-"½Ðµy­Ô\n"
-"¥¿¦b¨ú¦^¬M®g¦a§}ªº²M³æ"
+msgid "Addable"
+msgstr "¥i¨Ñ¥[¤J"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
-msgstr ""
-"¦w¸Ëµ{¦¡§ä¤£¨ì¾A¦Xªº¬M®g¯¸¥x¡C\n"
-"\n"
-"·|µo¥Í³o­Ó°ÝÃDªº±¡ªp¬Û·í¦h¡A¤ñ¤è Mandrake Linux\n"
-"§ó·s¯¸¥x¥Ø«e©|¤£¤ä´©±z¥Ø«e¥Îªº¾÷¾¹¥­¥x¡C"
+msgid "(Not available)"
+msgstr "(µLªk¨Ï¥Î)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No mirror"
-msgstr "¬M®g¡G"
-
-#: ../rpmdrake.pm:1
-#, c-format
 msgid ""
-"There was an error downloading the mirrors list:\n"
+"Sorry, the following package(s) can't be selected:\n"
 "\n"
 "%s\n"
-"The network, or MandrakeSoft website, are maybe unavailable.\n"
-"Please try again later."
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
 msgstr ""
-"¨ú¦^¬M®g¯¸¥x²M³æ®Éµo¥Í¿ù»~¡G\n"
+"©êºp¡A¤U­±ªº®M¥ó¶µ¥Ø±N¤£¯à°÷³Q¿ï¨ú¡G\n"
 "\n"
-"%s\n"
-"¤]³\¬Oºô¸ô³s½u¥¢±Ñ¡A©ÎªÌ¬O MandrakeSoft ¯¸¥x¼È®ÉµLªkÁpô¤W¡A\n"
-"½Ðµy«á¦A¸Õ¡C"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Not selected"
+msgstr "°»´ú¨ì¬Û½Ä¬ðªº¸ê°T"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
-msgstr "¤U¸üµo¥Í¿ù»~"
+msgid "Software Packages Removal"
+msgstr "²¾°£®M¥óµ{¦¡"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr "½Ðµy«á¡A¥¿¦b¥Ñ MandrakeSoft Á`³¡¨ú¦^¬M®g¯¸¥x²M³æ¡C"
+msgid "Sweden"
+msgstr "·ç¨å"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
 "\n"
-"Is it ok to continue?"
-msgstr ""
-"¦w¸Ëµ{¦¡»Ý­n³s½u¨ì MandrakeSoft Á`³¡¨ú¦^¬M®g¯¸¥xªº²M³æÀɮסC\n"
-"½Ð½T©w±z¥Ø«eºô¸ô¯à°÷¥¿±`³s½u¥X¥h¡C\n"
 "\n"
-"±z­nÄ~Äò¶Ü¡H"
+"Error(s) reported:\n"
+"%s"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United States"
-msgstr "¬ü°ê"
+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 ""
+"§ó·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.pm:1
 #, c-format
-msgid "China"
-msgstr "¤¤°ê¤j³°"
+msgid "Examining file of media `%s'..."
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Áp¦X°ê"
+msgid "Download of `%s', speed:%s"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "¥xÆW"
+msgid "One of the following packages is needed:"
+msgstr "±N»Ý­n¤U¦Cªº¨ä¤¤¤§¤@®M¥ó¡G"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Sweden"
-msgstr "·ç¨å"
+msgid "Quit"
+msgstr "Â÷¶}"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Russia"
-msgstr "Ĭ«X"
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"¦w¸Ëµ{¦¡»Ý­n³s½u¨ì¬M®g¯¸¥x¥H«K©ó¨ú¦^³Ì·sªº§ó·s®M¥ó¡C\n"
+"½Ð½T©w±z¥Ø«eªººô¸ô¯à°÷¥¿±`³s½u¨ì¥~­±¡C\n"
+"\n"
+"±z²{¦b­nÄ~Äò¶Ü¡H"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Portugal"
-msgstr "°ð¸¹¡G"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Poland"
-msgstr "ªiÄõ"
+msgid "Update media(s)"
+msgstr "§ó·s¨Ó·½"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Norway"
-msgstr "®¿«Â"
+msgid "Ok"
+msgstr "½T©w"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Netherlands"
-msgstr "²üÄõ"
+msgid "Please wait, adding medium..."
+msgstr "½Ðµy«á¡A¥¿¦b¥[¤J´C¤¶¨Ó·½..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Korea"
-msgstr "±j­¢"
+msgid "Unable to get source packages."
+msgstr "¿ï¾Ü®M¥ó"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "¤é¥»"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Italy"
-msgstr "¦w¸Ë"
+msgid "Too many packages are selected"
+msgstr "¿ï¨ú¤Ó¦h¤F®M¥ó¶µ¥Ø"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Israel"
-msgstr "¦w¸Ë"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Greece"
-msgstr "§Æþ"
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"Åwªï¨Ó¨ì®M¥ó¨Ó·½½s¿èµ{¦¡!\n"
+"\n"
+"±µ¤U¨Óµ{¦¡±N·|¤Þ¾É§A§¹¦¨½s¿è®M¥ó¨Ó·½ªº¶µ¥Ø¡A\n"
+"¥H«K©ó´£¨Ñ±z¯à°÷¨Ï¥Î±z©Ò³]©wªº¶µ¥Ø¶i¦æ³nÅ骺¦w¸Ë»P§ó·s¡C"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "France"
-msgstr "±j­¢"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Finland"
-msgstr "ªâÄõ"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Spain"
-msgstr "¦è¯Z¤ú"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Danmark"
-msgstr "¤¦³Á"
+msgid "%s conflicts with %s"
+msgstr " »P %s-%s-%s ¨R¬ð"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "¼w°ê"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Åwªï¨Ó¨ì®M¥ó§ó·sµ{¦¡!\n"
+"±µ¤U¨Óµ{¦¡±N·|¤Þ¾É§A§¹¦¨®M¥ó§ó·s»P¦w¸Ë¡C"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
-msgstr "±¶§J¦@©M°ê"
+msgid "Mandrake choices"
+msgstr "Mandrake ¤ÀÃþ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "­ô´µ¤j¾¤¥["
+msgid "Changelog:\n"
+msgstr "Åܧó¬ö¿ý¡G\n"
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Canada"
-msgstr "¥[®³¤j"
+#, fuzzy, c-format
+msgid "Korea"
+msgstr "±j­¢"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Brazil"
-msgstr "¤Ú¦è"
+msgid "Removable device"
+msgstr "¥i²¾°£¸Ë¸m"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "¤ñ§Q®É"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "¿D¬w"
+msgid "Change medium"
+msgstr "Åܧó´C¤¶"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Austria"
-msgstr "¶ø¦a§Q"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mandrake Update"
+msgstr "MandrakeUpdate ½s¦n³]©w"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
-msgstr "¸ê°T..."
+msgid "by size"
+msgstr "¨Ì¤j¤p¤ÀÃþ"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "§_"
+msgid "FTP server"
+msgstr "FTP ¥D¾÷"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Files:\n"
+msgstr "/ÀÉ®× (_F)"
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Yes"
-msgstr "¬O"
+#, fuzzy, c-format
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr "µLªk§ó·s´C¤¶¡A¸Ó¶µ¥Ø±N·|¼È®É¦Û°ÊÃö³¬¡C"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -1560,6 +1560,13 @@ msgstr "²¾°£®M¥ó"
 msgid "Software Sources Manager"
 msgstr "®M¥ó¨Ó·½ºÞ²z­û"
 
+#, fuzzy
+#~ msgid "Source: "
+#~ msgstr "¨Ó·½"
+
+#~ msgid "Source"
+#~ msgstr "¨Ó·½"
+
 #~ msgid ""
 #~ "some packages failed to install\n"
 #~ "correctly"
@@ -1592,9 +1599,6 @@ msgstr "®M¥ó¨Ó·½ºÞ²z­û"
 #~ "\n"
 #~ "±z­n¥t¥~¹Á¸Õ¨Ï¥Î¨ä¥L§ó·s¯¸¥x¶Ü¡H"
 
-#~ msgid "Error adding update medium"
-#~ msgstr "·s¼W§ó·s´C¤¶®Éµo¥Í¿ù»~"
-
 #~ msgid "Please wait, contacting mirror to initialize updates packages."
 #~ msgstr "½Ðµy«á¡A¥¿³s½u¨ì¬M®g¯¸¥xªì©lµe´£¨Ñ§ó·sªº®M¥ó¶µ¥Ø¡C"
 
diff --git a/rpmdrake b/rpmdrake
index 33c2e5ec..d6eab5bc 100755
--- a/rpmdrake
+++ b/rpmdrake
@@ -508,7 +508,7 @@ or you already installed all of them."));
 				     my @files = ([ N("Files:\n"), $tag_tag ], [ $pkgs->{$key}{files} || N("(Not available)"), $tag_fix ]);
 				     my @chglo = ([ N("Changelog:\n"), $tag_tag ], @{$pkgs->{$key}{changelog} || [[ N("(Not available)") ]]});
 				     my @source_info = ($MODE eq 'remove' || !@$max_info_in_descr ? ()
-							: ([ N("Source: "), $tag_tag ],
+							: ([ N("Media: "), $tag_tag ],
 							   [ pkg2medium($pkgs->{$key}{pkg}, $urpm)->{name} ], [ "\n" ],
 							   [ N("Currently installed version: "), $tag_tag ],
 							   [ find_installed_version($pkgs->{$key}{pkg}) ], [ "\n" ]));
@@ -619,7 +619,7 @@ or you already installed all of them."));
 	my $radio_by;
 	my @advanced_modes = ([ 'by_group', N("by group"), 0 ], [ 'by_size', N("by size"), 1 ],
 			      [ 'by_selection', N("by selection state"), 1 ]);
-	$MODE eq 'install' and push @advanced_modes, ([ 'by_source', N("by source repository"), 0 ], [ 'by_presence', N("by update availability"), 0 ]);
+	$MODE eq 'install' and push @advanced_modes, ([ 'by_source', N("by media repository"), 0 ], [ 'by_presence', N("by update availability"), 0 ]);
 	foreach (@advanced_modes) {
 	    my ($capt_mode, $capt_flat) = ($_->[0], $_->[2]);
 	    $advanced_menu->append(gtksignal_connect(gtkshow(Gtk2::MenuItem->new_with_label($_->[1])),
@@ -652,7 +652,7 @@ or you already installed all of them."));
 
     my $menu_treeview = Gtk2::Menu->new;
     my @menu_treeview_actions = ([ 'reset_selection', N("Reset the selection") ], [ 'reload_pkg', N("Reload the packages list") ]);
-    $MODE ne 'remove' and push @menu_treeview_actions, [ 'update_sources', N("Update source(s)") ];
+    $MODE ne 'remove' and push @menu_treeview_actions, [ 'update_sources', N("Update media(s)") ];
     foreach (@menu_treeview_actions) {
 	my ($action, $text) = @$_;
 	my %action2fun; %action2fun = (
@@ -813,10 +813,10 @@ Is it ok to continue?"), yesno => 1) or myexit(-1);
 	    }
 	} else {
             if (any { $_->{update} } @{$urpm->{media}}) {
-                interactive_msg_(N("Already existing update sources"),
-N("You already have at least one update source configured, but
+                interactive_msg_(N("Already existing update medias"),
+N("You already have at least one update media configured, but
 all of them are currently disabled. You should run the Software
-Sources Manager to enable at least one (check it in the Enabled?
+Medias Manager to enable at least one (check it in the Enabled?
 column).
 
 Then, restart MandrakeUpdate.", $update_name));
@@ -827,8 +827,8 @@ Then, restart MandrakeUpdate.", $update_name));
 	    my $m = choose_mirror();
 	    $m or interactive_msg_(N("How to choose manually your mirror"),
 N("You may also choose your desired mirror manually: to do so,
-launch the Software Sources Manager, and then add a `Security
-updates' source.
+launch the Software Medias Manager, and then add a `Security
+updates' media.
 
 Then, restart MandrakeUpdate.", $update_name)), myexit(-1);
 	    my ($r) = cat_('/etc/mandrake-release') =~ /release\s(\S+)/;
@@ -1020,7 +1020,7 @@ sub perform_installation {  #- (partially) duplicated from /usr/sbin/urpmi :-(
         foreach (@rpms_install, @rpms_upgrade) {
             m|^/| && ! -e $_ or next;
             interactive_msg_(N("Installation failed"),
-                             N("Installation failed, some files are missing.\nYou may want to update your sources database.") .
+                             N("Installation failed, some files are missing.\nYou may want to update your medias database.") .
                              (@error_msgs ? N("\n\nError(s) reported:\n%s", join("\n", @error_msgs)) : ''));
             goto return_with_error;
         }
diff --git a/rpmdrake.pm b/rpmdrake.pm
index e17cc93c..a82371e6 100644
--- a/rpmdrake.pm
+++ b/rpmdrake.pm
@@ -353,13 +353,13 @@ sub show_urpm_progress {
     $file =~ s|([^:]*://[^/:\@]*:)[^/:\@]*(\@.*)|$1xxxx$2|; #- if needed...
     if ($mode eq 'copy') {
 	$pb->set_fraction(0);
-	$label->set_label(N("Copying file for source `%s'...", $file));
+	$label->set_label(N("Copying file for media `%s'...", $file));
     } elsif ($mode eq 'parse') {
 	$pb->set_fraction(0);
-	$label->set_label(N("Examining file of source `%s'...", $file));
+	$label->set_label(N("Examining file of media `%s'...", $file));
     } elsif ($mode eq 'retrieve') {
 	$pb->set_fraction(0);
-	$label->set_label(N("Examining distant file of source `%s'...", $file));
+	$label->set_label(N("Examining distant file of media `%s'...", $file));
     } elsif ($mode eq 'start') {
 	$pb->set_fraction(0);
 	$label->set_label(N("Starting download of `%s'...", $file));
@@ -391,11 +391,11 @@ sub update_sources {
 
 sub update_sources_interactive {
     my ($urpm, %opts) = @_;
-    my $w = ugtk2->new(N("Update source(s)"), grab => 1, center => 1, %opts);
+    my $w = ugtk2->new(N("Update media(s)"), grab => 1, center => 1, %opts);
     my @buttons;
     gtkadd($w->{window},
 	   gtkpack__(Gtk2::VBox->new(0,5),
-		     Gtk2::Label->new(N("Select the source(s) you wish to update:")),
+		     Gtk2::Label->new(N("Select the media(s) you wish to update:")),
 		     (@buttons = map { Gtk2::CheckButton->new($_->{name}) } @{$urpm->{media}}),
 		     Gtk2::HSeparator->new,
 		     gtkpack(create_hbox(),
diff --git a/rpmdrake.spec b/rpmdrake.spec
index 6209f19f..feef572a 100644
--- a/rpmdrake.spec
+++ b/rpmdrake.spec
@@ -57,8 +57,8 @@ title="Install Software" longtitle="A graphical front end for installing package
 title="Remove Software" longtitle="A graphical front end for removing packages"
 ?package(%{name}): command="/usr/sbin/MandrakeUpdate" needs="x11" section="Configuration/Packaging" icon="mandrakeupdate.png" \
 title="Mandrake Update" longtitle="A graphical front end for software updates"
-?package(%{name}): command="/usr/sbin/edit-urpm-sources.pl" needs="x11" section="Configuration/Packaging" icon="edit-urpm-sources.png" \
-title="Software Sources Manager" longtitle="A graphical front end to add/remove/edit sources for installing packages"
+?package(%{name}): command="/usr/sbin/edit-urpm-medias" needs="x11" section="Configuration/Packaging" icon="edit-urpm-sources.png" \
+title="Software Medias Manager" longtitle="A graphical front end to add/remove/edit medias for installing packages"
 EOF
 
 mkdir -p $RPM_BUILD_ROOT{%{_miconsdir},%{_liconsdir}}
@@ -86,7 +86,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING AUTHORS
 %{_sbindir}/rpmdrake*
 %{_sbindir}/MandrakeUpdate
-%{_sbindir}/edit-urpm-sources.pl
+%{_sbindir}/edit-urpm-*
 %{_bindir}/*
 %{_datadir}/%{name}/compss*
 %{_datadir}/%{name}/desktop
@@ -109,6 +109,8 @@ rm -rf $RPM_BUILD_ROOT
   an error
 - fix #3908 (garbage chars displayed as date in changelog entries in
   removal mode)
+- substitute references to "sources" by now talking about "medias",
+  should be more understandable and more consistent with urpmi
 
 * Mon May 12 2003 Guillaume Cottenceau <gc@mandrakesoft.com> 2.1-19mdk
 - obsolete grpmi by gurpm.pm (from urpmi) sharing code between gurpmi