updated pot file

56 files changed, 40187 insertions, 39987 deletions

diff --git a/po/af.po b/po/af.po
index 3ef6cd43..2213a4e0 100644
--- a/po/af.po
+++ b/po/af.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grpmi\n"
-"POT-Creation-Date: 2003-05-02 20:15+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+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,21 +16,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KTranslator v 0.6.0\n"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr ""
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Path or mount point:"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Portugal"
-msgstr "Poort:"
-
 #: ../rpmdrake:1
 #, c-format
 msgid ""
@@ -43,140 +36,125 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
 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 "How to choose manually your mirror"
-msgstr ""
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "URL:"
+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
-#, c-format
-msgid "Some packages need to be removed"
-msgstr ""
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr "Installasievoorbereiding"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Already existing update sources"
-msgstr ""
+#, fuzzy, c-format
+msgid "Problem during removal"
+msgstr "Daar was probleme tydens installasie"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "More information on package..."
+#, fuzzy, c-format
+msgid "Please wait, removing packages..."
 msgstr ""
+"Wag asb.\n"
+"Pakkette word sorteer"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Yes"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, reading packages database..."
 msgstr ""
+"Wag asb.\n"
+"Pakkette word sorteer"
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"There was a problem during the installation:\n"
 "\n"
-msgstr ""
+"%s"
+msgstr "Installasievoorbereiding"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "everything was installed correctly"
-msgstr ""
+#, fuzzy, c-format
+msgid "Installation failed"
+msgstr "Geïnstalleer"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "%s KB"
-msgstr "%.1f KB"
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "Installasievoorbereiding"
 
 #: ../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 ""
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "Installasievoorbereiding"
 
-#: ../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 "All requested packages were installed successfully."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
+msgid "Everything installed successfully"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"The installation is finished; %s.\n"
 "\n"
-"%s"
-msgstr "Installasievoorbereiding"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Size: "
-msgstr "Grootte"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Security updates"
-msgstr "Vertoon slegs sekuriteitsopgraderings"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
+msgid "everything was installed correctly"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Fout..."
+msgid "Problem during installation"
+msgstr "Daar was probleme tydens installasie"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
+msgid "Installing package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Configure sources"
-msgstr ""
-"Dateer\n"
-"media op"
+msgid "Preparing packages installation..."
+msgstr "Installasievoorbereiding"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
 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."
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
 msgstr ""
 
 #: ../rpmdrake:1
@@ -186,379 +164,348 @@ msgid ""
 "\n"
 "%s\n"
 "\n"
-"\\Do you want to continue installation?"
+"Do you want to continue installation?"
 msgstr ""
 
-#
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Remove .%s"
-msgstr "Verwyder media"
-
-#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Source"
-msgstr "Bron"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Finland"
+msgid "Verifying packages signatures..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
+msgid "Downloading package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "France"
-msgstr "Afdwing"
-
-#. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "More info"
-msgstr ""
+msgid "Cancel"
+msgstr "Kanselleer"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
+msgid "Ok"
+msgstr "OK"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reload the packages list"
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
+msgid "Change medium"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Adding a source:"
-msgstr "Media"
-
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Pakket kan nie installeer word nie"
+msgid "Initializing..."
+msgstr "Installering:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
+msgid "Package installation..."
 msgstr "Installasievoorbereiding"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "All packages,"
-msgstr " Pakkette:"
+#, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr ""
 
-#
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "in files"
-msgstr "Plaaslik"
+msgid "Unable to get source packages."
+msgstr "Kies u pakkette"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
+msgid "Inspect..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Installation finished"
+msgstr "Geïnstalleer"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Do nothing"
+msgstr "CUPS word gelaai"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
+msgid "Use .%s as main file"
 msgstr ""
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Update source(s)"
-msgstr "Dateer media op"
+msgid "Remove .%s"
+msgstr "Verwyder media"
 
-#
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Local files"
-msgstr "Plaaslik"
+msgid "changes:"
+msgstr " Pakkette:"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspecting %s"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Israel"
-msgstr "Installering:"
-
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Help"
-msgstr "/_Help"
+msgid "Please wait, finding available packages..."
+msgstr ""
+"Wag asb.\n"
+"Pakkette word sorteer"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "HTTP server"
+#
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, adding medium..."
 msgstr ""
+"Wag asb.\n"
+"Media word sorteer"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"Welcome to the packages source editor!\n"
+"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"
-"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 ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Geïnstalleer"
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
+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 ""
 
 #: ../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 "Brazil"
+msgid "Already existing update sources"
 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?"
+"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
 #, c-format
-msgid "Find:"
+msgid "A fatal error occurred: %s."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
+msgid "Fatal error"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, searching..."
-msgstr ""
-"Wag asb.\n"
-"Pakkette word verwyder"
+msgid "Software Packages Installation"
+msgstr "Installasievoorbereiding"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, reading packages database..."
+msgid "Mandrake Update"
+msgstr "Normale opdaterings"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
 msgstr ""
-"Wag asb.\n"
-"Pakkette word sorteer"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Verlaat"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "unknown package "
-msgstr "Kan nie pakket oopmaak nie"
+msgid "Install"
+msgstr "Geïnstalleer"
+
+#
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Remove"
+msgstr "Verwyder drukker"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Help"
+msgstr "/_Help"
 
+#
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr ""
+msgid "Search"
+msgstr "Soek"
 
-#: ../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 "Find:"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"The following packages have to be removed for others to be upgraded:\n"
 "\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
-"Om alle afhanklikhede te bevredig moet hierdie\n"
-"pakkette verwyder word:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
+msgid "Some packages need to be removed"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"There was a problem during the installation:\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"
-"%s"
-msgstr "Installasievoorbereiding"
-
-#
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Please wait, removing medium..."
+"Do you really want to install all the selected packages?"
 msgstr ""
-"Wag asb.\n"
-"Media word sorteer"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "Wagwoord:"
+msgid "Too many packages are selected"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
+msgid "Maximum information"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Taiwan"
-msgstr "Latvies"
+msgid "Normal information"
+msgstr "Normale opdaterings"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update source(s)"
+msgstr "Dateer media op"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "User:"
+msgid "Reload the packages list"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
 msgstr ""
 
 #
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, updating medium..."
-msgstr ""
-"Wag asb.\n"
-"Media word sorteer"
+msgid "in files"
+msgstr "Plaaslik"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, listing packages..."
-msgstr ""
-"Wag asb.\n"
-"Pakkette word sorteer"
+msgid "in descriptions"
+msgstr "Beskrywings"
 
 #: ../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 "in names"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Information on packages"
-msgstr "Kan nie pakket oopmaak nie"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Cancel"
-msgstr "Kanselleer"
+msgid "by update availability"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
+msgid "by source repository"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Please wait, updating media..."
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
 msgstr ""
-"Wag asb.\n"
-"Media word sorteer"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
+msgid "by size"
 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 "by group"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "in descriptions"
-msgstr "Beskrywings"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Configure proxies"
-msgstr ""
-"Dateer\n"
-"media op"
+msgid "All packages,"
+msgstr " Pakkette:"
 
-#: ../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 "All packages, alphabetical"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
+msgid "Mandrake choices"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Selected size: %d MB"
-msgstr "%d geselekteerde pakkette: %.1fMB"
+msgid "Normal updates"
+msgstr "Normale opdaterings"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Add a source"
-msgstr "Media"
+msgid "Bugfixes updates"
+msgstr "Vertoon foutkorreksiegraderings"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Initializing..."
-msgstr "Installering:"
+msgid "Security updates"
+msgstr "Vertoon slegs sekuriteitsopgraderings"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Save changes"
-msgstr "Pakkette:"
+msgid "Description: "
+msgstr "Beskrywings"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
+msgid "Reason for update: "
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Installasievoorbereiding"
+msgid "Summary: "
+msgstr "Opsomming"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -566,639 +513,701 @@ msgid "Importance: "
 msgstr "Belangrikhied: %s"
 
 #: ../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 "%s KB"
+msgstr "%.1f KB"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add..."
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Size: "
+msgstr "Grootte"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Unable to create medium."
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Version: "
+msgstr "Weergawe:"
 
 #: ../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 ""
+#, fuzzy, c-format
+msgid "Name: "
+msgstr "Naam: %s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
+msgid "Currently installed version: "
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "Pakket kan nie installeer word nie"
+msgid "Source: "
+msgstr "Bron"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
+msgid "(Not available)"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
+msgid "Changelog:\n"
 msgstr ""
 
-#
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Remove"
-msgstr "Verwyder drukker"
+msgid "Files:\n"
+msgstr "/_Lêer"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Installasievoorbereiding"
+msgid "Selected size: %d MB"
+msgstr "%d geselekteerde pakkette: %.1fMB"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No mirror"
-msgstr "spieël"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "%d geselekteerde pakkette: %.1f MB"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Install"
-msgstr "Geïnstalleer"
-
-#: ../rpmdrake.pm:1
 #, c-format
-msgid "Japan"
+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 "Do nothing"
-msgstr "CUPS word gelaai"
-
-#
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "No update"
-msgstr "Doen opdaterings"
+msgid "%s conflicts with %s"
+msgstr "bots met %s-%s-%s"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Description: "
-msgstr "Beskrywings"
+msgid "Some packages can't be installed"
+msgstr "Pakket kan nie installeer word nie"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
 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 "Additional packages needed"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Name: "
-msgstr "Naam: %s"
+msgid "Some packages can't be removed"
+msgstr "Pakket kan nie installeer word nie"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Installasievoorbereiding"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Australia"
-msgstr "Australia"
+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:"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation finished"
-msgstr "Geïnstalleer"
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
+msgid "More information on package..."
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Poland"
-msgstr "Yslandies"
-
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Version: "
-msgstr "Weergawe:"
+msgid "Information on packages"
+msgstr "Kan nie pakket oopmaak nie"
 
-#: ../edit-urpm-sources.pl:1
+#. -PO: Keep it short, this is gonna be on a button
+#: ../rpmdrake:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
+msgid "More info"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Editing source \\\"%s\\\":"
-msgstr "Media"
+msgid "Addable"
+msgstr ""
+"Installeer\n"
+"geselekteer"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Upgradable"
 msgstr "Opgradeer"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " done."
+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:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Installasievoorbereiding"
+msgid "No update"
+msgstr "Doen opdaterings"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining file of source `%s'..."
+msgid "(none)"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Additional packages needed"
+#, fuzzy, c-format
+msgid "Please wait, listing packages..."
 msgstr ""
+"Wag asb.\n"
+"Pakkette word sorteer"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Bugfixes updates"
-msgstr "Vertoon foutkorreksiegraderings"
+msgid "unknown package "
+msgstr "Kan nie pakket oopmaak nie"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
+#: ../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
 #, c-format
-msgid "Germany"
-msgstr "Duitsland"
+msgid "Please choose"
+msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Russia"
-msgstr "Asie"
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Norway"
-msgstr "Norweegs"
+msgid "Not selected"
+msgstr "bots met %s-%s-%s"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Daar was probleme tydens installasie"
+msgid "Selected"
+msgstr "Kies geen"
 
-#
 #: ../rpmdrake:1
-#, c-format
-msgid "Search"
-msgstr "Soek"
-
-#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Edit a source"
-msgstr "Media"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Czech Republic"
-msgstr ""
+msgid "Search results"
+msgstr "Soek"
 
 #: ../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, removing packages..."
+msgid "Please wait, searching..."
 msgstr ""
 "Wag asb.\n"
-"Pakkette word sorteer"
+"Pakkette word verwyder"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Normal information"
-msgstr "Normale opdaterings"
+msgid "Search results (none)"
+msgstr "Soek"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
+msgid "Other"
+msgstr "Ander"
+
+#: ../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 ""
 
-#: ../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"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Spain"
-msgstr "Spaans"
+msgid "Proxy..."
+msgstr "Fout..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Normal updates"
-msgstr "Normale opdaterings"
+msgid "Update..."
+msgstr "Opgradeer"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by selection state"
+msgid "Add..."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgid "Edit"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Login:"
-msgstr "Inteken:"
+msgid "Source"
+msgstr "Bron"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Austria"
-msgstr "Australia"
+msgid "Configure sources"
+msgstr ""
+"Dateer\n"
+"media op"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Fatal error"
-msgstr ""
+msgid "Password:"
+msgstr "Wagwoord:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
+msgid "User:"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Update..."
-msgstr "Opgradeer"
-
-#: ../rpmdrake.pm:1
 #, c-format
-msgid "Starting download of `%s'..."
+msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
+msgid "Proxy hostname:"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure proxies"
 msgstr ""
+"Dateer\n"
+"media op"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Currently installed version: "
+#
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, updating medium..."
 msgstr ""
+"Wag asb.\n"
+"Media word sorteer"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Other"
-msgstr "Ander"
+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 "Reason for update: "
+msgid "You need to insert the medium to continue"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Please choose the desired mirror."
+msgid "Save changes"
+msgstr "Pakkette:"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
 msgstr ""
-"Wag asb.\n"
-"Die spieëllys word afgehaal"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit"
+msgid "URL:"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Please wait, finding available packages..."
+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
+#, fuzzy, c-format
+msgid "Please wait, removing medium..."
 msgstr ""
 "Wag asb.\n"
-"Pakkette word sorteer"
+"Media word sorteer"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Type of source:"
+msgstr "Tipes media:"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Adding a source:"
+msgstr "Media"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../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
 #, fuzzy, c-format
-msgid "Search results (none)"
-msgstr "Soek"
+msgid "Name:"
+msgstr "Naam"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Danmark"
-msgstr ""
+msgid "Login:"
+msgstr "Inteken:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "China"
+msgid "Choose a mirror..."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "United States"
+msgid "Browse..."
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "changes:"
-msgstr " Pakkette:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Some additional packages need to be removed"
+msgid "Removable device"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "HTTP server"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
+msgid "FTP server"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Summary: "
-msgstr "Opsomming"
+msgid "Path:"
+msgstr "Poort:"
 
-#: ../rpmdrake.pm:1
+#
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Canada"
-msgstr "Kanadees (Quebec)"
+msgid "Local files"
+msgstr "Plaaslik"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Greece"
-msgstr "Grieks"
+msgid "Add a source"
+msgstr "Media"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"There was an error downloading the mirrors list:\n"
+"Unable to update medium; it will be automatically disabled.\n"
 "\n"
-"%s\n"
-"The network, or MandrakeSoft website, are maybe unavailable.\n"
-"Please try again later."
+"Errors:\n"
+"%s"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Source: "
-msgstr "Bron"
-
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
+msgid "Unable to create medium."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to get source packages, sorry. %s"
+msgid "Update"
+msgstr "Opgradeer"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Select the source(s) you wish to update:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Path:"
-msgstr "Poort:"
+msgid "Please wait, updating media..."
+msgstr ""
+"Wag asb.\n"
+"Media word sorteer"
 
-#: ../rpmdrake:1
+#
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Problem during removal"
-msgstr "Daar was probleme tydens installasie"
+msgid " failed!"
+msgstr "Plaaslik"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by source repository"
+msgid " done."
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Selected"
-msgstr "Kies geen"
-
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Netherlands"
+msgid "Download of `%s', speed:%s"
 msgstr ""
 
-#
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Addable"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
-"Installeer\n"
-"geselekteer"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
+msgid "Starting download of `%s'..."
 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 "Examining distant file of source `%s'..."
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr "bots met %s-%s-%s"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Examining file of source `%s'..."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
+msgid "Copying file for source `%s'..."
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Sweden"
-msgstr "Sien"
+msgid "Please choose the desired mirror."
+msgstr ""
+"Wag asb.\n"
+"Die spieëllys word afgehaal"
 
-#: ../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
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "No mirror"
+msgstr "spieël"
+
+#: ../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."
+"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
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr ""
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "One of the following packages is needed:"
+msgid "Error during download"
 msgstr ""
-"Om alle afhanklikhede te bevredig moet hierdie\n"
-"pakkette verwyder word:"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "Verlaat"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
+"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 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "OK"
+msgid "United States"
+msgstr ""
 
-#
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Please wait, adding medium..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
 msgstr ""
-"Wag asb.\n"
-"Media word sorteer"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr ""
+
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Type of source:"
-msgstr "Tipes media:"
+msgid "Taiwan"
+msgstr "Latvies"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Sweden"
+msgstr "Sien"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Russia"
+msgstr "Asie"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Portugal"
+msgstr "Poort:"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Poland"
+msgstr "Yslandies"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Norway"
+msgstr "Norweegs"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \\\"%s\\\" on device [%s]"
+msgid "Netherlands"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Unable to get source packages."
-msgstr "Kies u pakkette"
+msgid "Korea"
+msgstr "Afdwing"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Too many packages are selected"
+msgid "Japan"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "bots met %s-%s-%s"
+msgid "Italy"
+msgstr "Installering:"
 
-#: ../rpmdrake:1
+#: ../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
 #, 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 "Finland"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Spain"
+msgstr "Spaans"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
+msgid "Danmark"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Germany"
+msgstr "Duitsland"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
+msgid "Costa Rica"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Korea"
-msgstr "Afdwing"
+msgid "Canada"
+msgstr "Kanadees (Quebec)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
+msgid "Brazil"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1206,38 +1215,29 @@ msgstr ""
 msgid "Belgium"
 msgstr "Belgies"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Change medium"
-msgstr ""
+msgid "Australia"
+msgstr "Australia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Mandrake Update"
-msgstr "Normale opdaterings"
+msgid "Austria"
+msgstr "Australia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by size"
+msgid "Info..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
+msgid "No"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Files:\n"
-msgstr "/_Lêer"
-
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
+msgid "Yes"
 msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:86
diff --git a/po/ar.po b/po/ar.po
index f238f901..31d77c77 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grpmi\n"
-"POT-Creation-Date: 2003-05-02 20:15+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+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,20 +13,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "متاح؟"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Path or mount point:"
-msgstr "المسار أو نقطة التحميل:"
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Portugal"
-msgstr "البرتغال"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"هل من الممكن المتابعة؟"
 
 #: ../rpmdrake:1
 #, c-format
@@ -45,59 +41,104 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-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"
+"جهازك."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Name:"
-msgstr "الإسم:"
+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.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Italy"
-msgstr "تثبيت"
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"كان هناك خطأ أثناء تثبيت الحزم:\n"
+"\n"
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "كي�ية اختيار المرآة يدوياً"
+msgid "Problem during removal"
+msgstr "ظهرت مشاكل أثناء الحذ�"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "العنوان:"
+msgid "Please wait, removing packages..."
+msgstr "انتظر من �ضلك, جاري ازالة الحزم..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "بعض الحزم يجب ازالتها"
+msgid "Please wait, reading packages database..."
+msgstr "انتظر من �ضلك, جاري قراءة قاعدة بيانات الحزم..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Already existing update sources"
+#, 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 "جاري تحضير الحزم للتثبيت..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "More information on package..."
-msgstr "معلومات أكثر حول الحزمة..."
+msgid "All requested packages were installed successfully."
+msgstr "تم تثبيت كل الحزم المطلوبة بنجاح."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "نعم"
+msgid "Everything installed successfully"
+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 ""
-"نظرا للاعتمادات, �إن الحزمة/الحزم التالية يجب أن\n"
-"الرجوع عن اختيارها الآن:\n"
+"انتهى التثبيت; %s.\n"
 "\n"
+"تم انشاء بعض مل�ات التهيئة مثل `.rpmnew' أو `.rpmsave',\n"
+"يمكنك الآن التحقق من بعضها لكي تقوم بالمطلوب منها:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -105,488 +146,502 @@ msgid "everything was installed correctly"
 msgstr "تم تثبيت كل شئ بنجاح"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during installation"
+msgstr "ظهرت مشاكل أثناء التثبيت"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "جاري تثبيت الحزمة `%s' (%s/%s)..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+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."
+"\n"
+"Error(s) reported:\n"
+"%s"
 msgstr ""
-"أهلا بك �ي أداة ازالة البرامج.\n"
 "\n"
-"هذه الأداة ستسمح لك باختيار البرامج التي تريد ازالتها\n"
-"من جهازك."
+"\n"
+"الأخطاء المقررة:\n"
+"%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 "لكي يتم ح�ظ التغييرات, تحتاج الى ادخال الوسيط �ي السواقة."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Save and quit"
-msgstr "اح�ظ و اخرج"
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
+msgstr ""
+"�شل التثبيت, بعض المل�ات م�قودة.\n"
+"ربما تحتاج الى تحديث �اعدة بيانات المصادر."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"The following packages have bad signatures:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"كان هناك خطأ أثناء تثبيت الحزم:\n"
+"يجب ازالة الحزم التالية لكي تتم ترقية الحزم الأخرى:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"هل من الممكن المتابعة؟"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Size: "
-msgstr "الحجم: "
+msgid "Verifying packages signatures..."
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Security updates"
-msgstr "تحديثات أمنية"
+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 "الغاء"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl: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]"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "أقضى المعلومات"
+msgid "Change medium"
+msgstr "غير الوسيط"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, c-format
+msgid "Initializing..."
+msgstr "جاري البدء..."
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "خطأ..."
+msgid "Package installation..."
+msgstr "جاري تحضير الحزم للتثبيت..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr "آس�, يجب عليك أن تكون مستخدم جذر لتثبيت الحزم."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "المملكة المتحدة"
+msgid "Unable to get source packages."
+msgstr "تعذر الحصول على الحزم المصدرية"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure sources"
-msgstr "تهيئة المصادر"
+msgid "Inspect..."
+msgstr "تحقَّق..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "�ي الأسماء"
+msgid "Installation finished"
+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 ""
-"تعذر ايجاد أي مرآة مناسبة.\n"
-"\n"
-"قد تكون هناك أسباب عديدة لهذه المشكلة: السبب الأكثر حدوثاً هو\n"
-":أن يكون نوع المعالج الخاص بك غير مدعوم\n"
-"من تحديثات Mandrake Linux الرسمية."
+msgid "Do nothing"
+msgstr "لا ت�عل شيئاً"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
-"\n"
-"\\Do you want to continue installation?"
-msgstr ""
-"يجب ازالة الحزم التالية لكي تتم ترقية الحزم الأخرى:\n"
-"\n"
-"%s\n"
-"\n"
-"هل من الممكن المتابعة؟"
+#, c-format
+msgid "Use .%s as main file"
+msgstr "استخدم .%s كمل� رئيسي"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Remove .%s"
 msgstr "احذ� .%s"
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Source"
-msgstr "اجبار"
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "�نلندا"
+msgid "changes:"
+msgstr "التغييرات:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "France"
-msgstr "اجبار"
+msgid "Inspecting %s"
+msgstr "جاري التحقق من %s"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "More info"
-msgstr "مزيد من المعلومات"
+#, c-format
+msgid "Please wait, finding available packages..."
+msgstr "اتنظر من �ضلك, جاري ايجاد الحزم المتو�رة..."
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
+msgid "Please wait, adding medium..."
+msgstr "انتظر من �ضلك, جاري اضا�ة الوسيط..."
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"%s\n"
+"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"
-"Is it ok to continue?"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"%s\n"
+"يمكنك أيضا اختيار المرآة يدويا: لعمل ذلك,\n"
+"قم بتشغيل مدير مصادر البرمجيات, ثم أض� مصدر 'تحديثات\n"
+"أمنية'.\n"
 "\n"
-"هل من الممكن المتابعة؟"
+"ثم أعد تشغيل أداة تحديث Mandrake."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "أعد تحميل قائمة الحزم"
+msgid "How to choose manually your mirror"
+msgstr "كي�ية اختيار المرآة يدوياً"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr "اختار المرآة..."
+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 ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Adding a source:"
-msgstr "جاري اضا�ة مصدر"
+msgid "Already existing update sources"
+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?"
+msgstr ""
+"أحتاج للإتصال بالمرآة للحصول على أخر حزم التحديثات.\n"
+"�ضلاً تأكد من أن الشبكة الخاصة بك تعمل حالياً.\n"
+"\n"
+"هل من الممكن المتابعة؟"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "لا يمكن تثبيت الحزمة"
+msgid "Fatal error"
+msgstr "خطأ �ي المل�"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
+msgid "Software Packages Installation"
 msgstr "جاري تحضير الحزم للتثبيت..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages,"
-msgstr "كل الحزم,"
+msgid "Mandrake Update"
+msgstr "تحديث Mandrake"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "�ي المل�ات"
+msgid "Software Packages Removal"
+msgstr "حذ� حزم البرامج"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "تم تثبيت كل الحزم المطلوبة بنجاح."
+msgid "Quit"
+msgstr "خروج"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "اسم مستضي� البروكسي"
+msgid "Install"
+msgstr "تثبيت"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update source(s)"
-msgstr "حدّث المصدر/المصادر"
+msgid "Remove"
+msgstr "احذ�"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "مل�ات محلية"
+msgid "Help"
+msgstr "مساعدة"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "جاري التحقق من %s"
+msgid "Search"
+msgstr "ابحث"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Israel"
-msgstr "تثبيت"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "ابحث عن:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Help"
-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"
+"هل من الممكن المتابعة؟"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "خادم HTTP"
+msgid "Some packages need to be removed"
+msgstr "بعض الحزم يجب ازالتها"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"Welcome to the packages source editor!\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"
-"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."
+"Do you really want to install all the selected packages?"
 msgstr ""
-"أهلا بك �ي محرر مصادر الحزم!\n"
+"تحذير: يبدو أنك تحاول تثبيت الكثير من الحزم\n"
+"بحيث يمكن ألا تكون هناك مساحة �ارغة على القرص\n"
+"أثناء أو بعد تثبيت الحزم, هذا �ي منتهى الخطورة\n"
+"و يجب أخذه �ي الإعتبار بحذر.\n"
 "\n"
-"هذه الأداة ستساعدك على تهيئة مصادر الحزم التي قد تريد استخدامها على\n"
-"حاسوبك. عندها ستكون هذه المصادر موجودة لتثبيت حزم برمجية جديدة\n"
-"أو لعمل التحديثات."
+"هل تريد �علا تثبيت الحزم؟"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "تثبيت الكل"
+#, c-format
+msgid "Too many packages are selected"
+msgstr "تم اختيار حزم كثيرة"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "استخدم .%s كمل� رئيسي"
+msgid "Maximum information"
+msgstr "أقضى المعلومات"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results"
-msgstr "نتائج البحث"
+msgid "Normal information"
+msgstr "معلومات عادية"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, c-format
-msgid " failed!"
-msgstr " �شل!"
+msgid "Update source(s)"
+msgstr "حدّث المصدر/المصادر"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Brazil"
-msgstr "البرازيل"
+msgid "Reload the packages list"
+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 "Reset the selection"
+msgstr "أعد الإختيار من جديد"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "ابحث عن:"
+msgid "in files"
+msgstr "�ي المل�ات"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "كل الحزم, أبجدياً"
+msgid "in descriptions"
+msgstr "�ي الوص�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "انتظر من �ضلك, جاري البحث..."
+msgid "in names"
+msgstr "�ي الأسماء"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "انتظر من �ضلك, جاري قراءة قاعدة بيانات الحزم..."
+msgid "by update availability"
+msgstr "بتواجد التحديث"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "لم يمكن �تح الحزمة"
+#, c-format
+msgid "by source repository"
+msgstr "بمخزن المصدر"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "أعد الإختيار من جديد"
+msgid "by selection state"
+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 ""
-"اذا كنت تحتاج الى بروكسي, أدخل اسم المستضي� و المن�ذ (على الشكل التالي: <اسم "
-"المستضي�[:المن�ذ[>):"
+msgid "by size"
+msgstr "بالحجم"
 
 #: ../rpmdrake: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 "by group"
+msgstr "بالمجموعة"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "كوستاريكا"
+msgid "All packages,"
+msgstr "كل الحزم,"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"كان هناك خطأ أثناء تثبيت الحزم:\n"
-"\n"
-"%s"
-
-#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "انتظر من �ضلك, جاري اضا�ة الوسيط...."
+msgid "All packages, alphabetical"
+msgstr "كل الحزم, أبجدياً"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "كلمة المرور:"
+msgid "Mandrake choices"
+msgstr "اختيارات Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "جاري اختبار المل� البعيد للمصدر `%s'..."
+msgid "Normal updates"
+msgstr "تحديثات عادية"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "تايوان"
+msgid "Bugfixes updates"
+msgstr "تحديثات ازالة العيوب"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "User:"
-msgstr "اسم المستخدم:"
+msgid "Security updates"
+msgstr "تحديثات أمنية"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "انتظر من �ضلك, جاري تحديث الوسيط..."
+msgid "Description: "
+msgstr "وص�:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "انتظر من �ضلك, جاري سرد الحزم..."
+msgid "Reason for update: "
+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 ""
+msgid "Summary: "
+msgstr "نبذة: "
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Information on packages"
-msgstr "لم يمكن �تح الحزمة"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Cancel"
-msgstr "الغاء"
+msgid "Importance: "
+msgstr "الأهمية: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "تم تثبيت كل شئ بنجاح"
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "انتظر من �ضلك, جاري تحديث الوسائط..."
+msgid "Size: "
+msgstr "الحجم: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Version: "
+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 "Name: "
+msgstr "الإسم: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "�ي الوص�"
+msgid "Currently installed version: "
+msgstr "الإصدار المثبت حالياً:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Source: "
+msgstr "اجبار"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "تهيئة البروكسي"
+msgid "(Not available)"
+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 "Changelog:\n"
+msgstr "سحل التغييرات:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "�ضلاً اختر"
+msgid "Files:\n"
+msgstr "المل�ات:\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "الحجم المختار: %d ميغابايت"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add a source"
-msgstr "أض� مصدر"
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "جاري البدء..."
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "تم اختيار: %d ميغابايت / المساحة المتو�رة �ي القرص: %d ميغابايت"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "اح�ظ التغييرات"
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
+msgstr ""
+"نظرا للاعتمادات, �إن الحزمة/الحزم التالية يجب أن\n"
+"الرجوع عن اختيارها الآن:\n"
+"\n"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Error during download"
-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:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "جاري تحضير الحزم للتثبيت..."
+msgid "%s conflicts with %s"
+msgstr "تتعارض مع"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Importance: "
-msgstr "الأهمية: "
+#, fuzzy, c-format
+msgid "Some packages can't be installed"
+msgstr "لا يمكن تثبيت الحزمة"
 
 #: ../rpmdrake:1
 #, c-format
@@ -599,83 +654,77 @@ msgstr ""
 "التالية:\n"
 "\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "أض�..."
+msgid "Additional packages needed"
+msgstr "هناك حزم اضا�ية مطلوبة"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Unable to create medium."
-msgstr "تعذر انشاء الوسيط"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "لا يمكن تثبيت الحزمة"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Removing these packages would break your system, sorry:\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"
-"يمكنك الآن التحقق من بعضها لكي تقوم بالمطلوب منها:"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Browse..."
-msgstr "استعرض..."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "لا يمكن تثبيت الحزمة"
-
-#: ../rpmdrake.pm:1
 #, c-format
-msgid "Info..."
-msgstr "معلومات..."
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
+"نظرا للاعتمادات, �إن الحزمة/الحزم التالية يجب أن\n"
+"تحذ�:\n"
+"\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "تحتاج الى ادخال الوسيط للمتابعة"
+msgid "Some additional packages need to be removed"
+msgstr "هذه الحزم الاضا�ية يجب أن تحذ�"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "احذ�"
+msgid "More information on package..."
+msgstr "معلومات أكثر حول الحزمة..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "جاري تحضير الحزم للتثبيت..."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "No mirror"
-msgstr "لا مرايا"
+msgid "Information on packages"
+msgstr "لم يمكن �تح الحزمة"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "يجب عليك ملء الحقلين الأولين على الأقل."
+#. -PO: Keep it short, this is gonna be on a button
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "More info"
+msgstr "مزيد من المعلومات"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "تثبيت"
+msgid "Addable"
+msgstr "قابلة للإضا�ة"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "اليابان"
+msgid "Upgradable"
+msgstr "قابلة للترقية"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-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:1
 #, c-format
@@ -684,343 +733,374 @@ msgstr "لا تحديث"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Description: "
-msgstr "وص�:"
+msgid "(none)"
+msgstr "(لا شئ)"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"�شل التثبيت, بعض المل�ات م�قودة.\n"
-"ربما تحتاج الى تحديث �اعدة بيانات المصادر."
+msgid "Please wait, listing packages..."
+msgstr "انتظر من �ضلك, جاري سرد الحزم..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "unknown package "
+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?"
-msgstr ""
-"تحذير: يبدو أنك تحاول تثبيت الكثير من الحزم\n"
-"بحيث يمكن ألا تكون هناك مساحة �ارغة على القرص\n"
-"أثناء أو بعد تثبيت الحزم, هذا �ي منتهى الخطورة\n"
-"و يجب أخذه �ي الإعتبار بحذر.\n"
-"\n"
-"هل تريد �علا تثبيت الحزم؟"
+msgid "One of the following packages is needed:"
+msgstr "أحد هذه الحزم مطلوب:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "الإسم: "
+msgid "Please choose"
+msgstr "�ضلاً اختر"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "تحقَّق..."
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "جاري تحضير الحزم للتثبيت..."
+msgid "Not selected"
+msgstr "تم ايجاد تعارضات"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "أوستراليا"
+msgid "Selected"
+msgstr "مختار"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation finished"
-msgstr "انتهى التثبيت"
+msgid "Search results"
+msgstr "نتائج البحث"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
-msgstr "بتواجد التحديث"
+msgid "Stop"
+msgstr "ق�"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
-msgstr "بولندا"
+msgid "Please wait, searching..."
+msgstr "انتظر من �ضلك, جاري البحث..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Version: "
-msgstr "الإصدار: "
+msgid "Search results (none)"
+msgstr "نتائج البحث (لا شئ)"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "أخرى"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "يجب عليك تحديد امس مستخدم/كلمة مرور للمصادقة �ي البروكسي:"
+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 "Editing source \\\"%s\\\":"
-msgstr "جاري تحرير المصدر \"%s\":"
+msgid "Proxy..."
+msgstr "خطأ..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Upgradable"
-msgstr "قابلة للترقية"
+msgid "Update..."
+msgstr "حدّث..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid " done."
-msgstr " تم."
+msgid "Add..."
+msgstr "أض�..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "حرّر"
+
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "جاري تحضير الحزم للتثبيت..."
+msgid "Source"
+msgstr "اجبار"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "جاري اختبار المل� للمصدر `%s'..."
+msgid "Enabled?"
+msgstr "متاح؟"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "هناك حزم اضا�ية مطلوبة"
+msgid "Configure sources"
+msgstr "تهيئة المصادر"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "تحديثات ازالة العيوب"
+msgid "Password:"
+msgstr "كلمة المرور:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "تنزيل `%s', الوقت المتبقي:%s, السرعة:%s"
+msgid "User:"
+msgstr "اسم المستخدم:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Germany"
-msgstr "ألمانيا"
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "يجب عليك تحديد امس مستخدم/كلمة مرور للمصادقة �ي البروكسي:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Russia"
-msgstr "روسيا"
+msgid "Proxy hostname:"
+msgstr "اسم مستضي� البروكسي"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Norway"
-msgstr "النرويج"
+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
+#, c-format
+msgid "Configure proxies"
+msgstr "تهيئة البروكسي"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search"
-msgstr "ابحث"
+msgid "Please wait, updating medium..."
+msgstr "انتظر من �ضلك, جاري تحديث الوسيط..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit a source"
-msgstr "تحرير مصدر"
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "لكي يتم ح�ظ التغييرات, تحتاج الى ادخال الوسيط �ي السواقة."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Czech Republic"
-msgstr "جمهورية التشيك"
+msgid "You need to insert the medium to continue"
+msgstr "تحتاج الى ادخال الوسيط للمتابعة"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Stop"
-msgstr "ق�"
+msgid "Save changes"
+msgstr "اح�ظ التغييرات"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "حدّث"
+msgid "Relative path to synthesis/hdlist:"
+msgstr "المسار الى مل� التخليق أو hdlist:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "انتظر من �ضلك, جاري ازالة الحزم..."
+msgid "URL:"
+msgstr "العنوان:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing source \"%s\":"
+msgstr "جاري تحرير المصدر \"%s\":"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal information"
-msgstr "معلومات عادية"
+msgid "Edit a source"
+msgstr "تحرير مصدر"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "جاري تنزيل الحزمة `%s' (%s/%s)..."
+msgid "Please wait, removing medium..."
+msgstr "انتظر من �ضلك, جاري اضا�ة الوسيط...."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "تم اختيار: %d ميغابايت / المساحة المتو�رة �ي القرص: %d ميغابايت"
+msgid "Type of source:"
+msgstr "نوع المصدر:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Spain"
-msgstr "أسبانيا"
+msgid "Adding a source:"
+msgstr "جاري اضا�ة مصدر"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
-msgstr "تحديثات عادية"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr "هناك وسيط بهذا الإسم مسبقاً, هل تريد استبداله �علاً؟"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by selection state"
-msgstr "بحالة الإختيار"
+msgid "You need to fill up at least the two first entries."
+msgstr "يجب عليك ملء الحقلين الأولين على الأقل."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr "انتظر من �ضلك, جاري تنزيل عناوين المرايا من موقع MandrakeSoft"
+msgid "Name:"
+msgstr "الإسم:"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "اسم الدخول:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Austria"
-msgstr "النمسا"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Fatal error"
-msgstr "خطأ �ي المل�"
+msgid "Choose a mirror..."
+msgstr "اختار المرآة..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "اختر المصدر/المصادر التي تريد تحديثها:"
+msgid "Browse..."
+msgstr "استعرض..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update..."
-msgstr "حدّث..."
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "جاري التأكد من توقيع `%s'..."
+msgid "Path or mount point:"
+msgstr "المسار أو نقطة التحميل:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
-msgstr "(لا شئ)"
+msgid "Removable device"
+msgstr "الأجهزة القابلة للإزالة"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
-"ازالة هذه الحزم قد تكسر نظامك, عذراً:\n"
-"\n"
+msgid "HTTP server"
+msgstr "خادم HTTP"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "جاري تثبيت الحزمة `%s' (%s/%s)..."
+msgid "FTP server"
+msgstr "خادم FTP"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "الإصدار المثبت حالياً:"
+msgid "Path:"
+msgstr "المسار:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Other"
-msgstr "أخرى"
+msgid "Local files"
+msgstr "مل�ات محلية"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reason for update: "
-msgstr "سبب التحديث:"
+msgid "Add a source"
+msgstr "أض� مصدر"
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Please choose the desired mirror."
-msgstr "�ضلاً اختر المرآة المطلوبة."
+#, fuzzy, c-format
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr "تعذر تحديث الوسيط;  سيتم تعطيله آلياً"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "حرّر"
+msgid "Unable to create medium."
+msgstr "تعذر انشاء الوسيط"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, finding available packages..."
-msgstr "اتنظر من �ضلك, جاري ايجاد الحزم المتو�رة..."
+msgid "Update"
+msgstr "حدّث"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "المسار الى مل� التخليق أو hdlist:"
+msgid "Select the source(s) you wish to update:"
+msgstr "اختر المصدر/المصادر التي تريد تحديثها:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results (none)"
-msgstr "نتائج البحث (لا شئ)"
+msgid "Please wait, updating media..."
+msgstr "انتظر من �ضلك, جاري تحديث الوسائط..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Danmark"
-msgstr "الدنمارك"
+msgid " failed!"
+msgstr " �شل!"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "الصين"
+msgid " done."
+msgstr " تم."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United States"
-msgstr "الولايات المتحدة"
+msgid "Download of `%s', speed:%s"
+msgstr "تنزيل `%s', السرعة:%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "changes:"
-msgstr "التغييرات:"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "تنزيل `%s', الوقت المتبقي:%s, السرعة:%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "جاري التأكد من توقيع `%s'..."
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "هذه الحزم الاضا�ية يجب أن تحذ�"
+msgid "Examining distant file of source `%s'..."
+msgstr "جاري اختبار المل� البعيد للمصدر `%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Examining file of source `%s'..."
+msgstr "جاري اختبار المل� للمصدر `%s'..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No"
-msgstr "لا"
+msgid "Copying file for source `%s'..."
+msgstr "جاري نسخ المل� للمصدر `%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Summary: "
-msgstr "نبذة: "
+msgid "Please choose the desired mirror."
+msgstr "�ضلاً اختر المرآة المطلوبة."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "كندا"
+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.pm:1
 #, c-format
-msgid "Greece"
-msgstr "اليونان"
+msgid "No mirror"
+msgstr "لا مرايا"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1037,258 +1117,178 @@ msgstr ""
 "الشبكة, أو موقع MandrakeSoft قد يكون غير موجود.\n"
 "�ضلا حاول مرة أخرى �ي وقت لاحق."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Source: "
-msgstr "اجبار"
-
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "جاري نسخ المل� للمصدر `%s'..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "آس�, يجب عليك أن تكون مستخدم جذر لتثبيت الحزم."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Path:"
-msgstr "المسار:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Problem during removal"
-msgstr "ظهرت مشاكل أثناء الحذ�"
+msgid "Error during download"
+msgstr "خطأ أثناء التنزيل"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by source repository"
-msgstr "بمخزن المصدر"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "انتظر من �ضلك, جاري تنزيل عناوين المرايا من موقع MandrakeSoft"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Selected"
-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 للحصول على قائمة المرايا.\n"
+"�ضلاً تأكد من أن الشبكة الخاصة بك تعمل حالياً.\n"
+"\n"
+"هل من الممكن المتابعة؟"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Netherlands"
-msgstr "هولندا"
+msgid "United States"
+msgstr "الولايات المتحدة"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "قابلة للإضا�ة"
+msgid "China"
+msgstr "الصين"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
-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:1
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr "تم ايجاد تعارضات"
+msgid "United Kingdom"
+msgstr "المملكة المتحدة"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "حذ� حزم البرامج"
+msgid "Taiwan"
+msgstr "تايوان"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Sweden"
 msgstr "السويد"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
-msgstr ""
-"\n"
-"\n"
-"الأخطاء المقررة:\n"
-"%s"
+msgid "Russia"
+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."
-msgstr ""
-"قائمة التحديث �ارغة. هذا إما يعني أنه\n"
-"لا توجد تحديثات للحزم الموجودة على جهازك,\n"
-"أو أنك قمت بتثبيت كل التحديثات مسبقا."
+msgid "Portugal"
+msgstr "البرتغال"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "تنزيل `%s', السرعة:%s"
+msgid "Poland"
+msgstr "بولندا"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "أحد هذه الحزم مطلوب:"
+msgid "Norway"
+msgstr "النرويج"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "خروج"
+msgid "Netherlands"
+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?"
-msgstr ""
-"أحتاج للإتصال بالمرآة للحصول على أخر حزم التحديثات.\n"
-"�ضلاً تأكد من أن الشبكة الخاصة بك تعمل حالياً.\n"
-"\n"
-"هل من الممكن المتابعة؟"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Korea"
+msgstr "اجبار"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "موا�ق"
+msgid "Japan"
+msgstr "اليابان"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Please wait, adding medium..."
-msgstr "انتظر من �ضلك, جاري اضا�ة الوسيط..."
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Italy"
+msgstr "تثبيت"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Israel"
+msgstr "تثبيت"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "نوع المصدر:"
+msgid "Greece"
+msgstr "اليونان"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Please insert the medium named \\\"%s\\\" on device [%s]"
-msgstr "�ضلاً أدخل الوسيط المسمى \"%s\" الى الجهاز [%s]"
+msgid "France"
+msgstr "اجبار"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to get source packages."
-msgstr "تعذر الحصول على الحزم المصدرية"
+msgid "Finland"
+msgstr "�نلندا"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "تم اختيار حزم كثيرة"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "تتعارض مع"
+msgid "Spain"
+msgstr "أسبانيا"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Danmark"
+msgstr "الدنمارك"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "اختيارات Mandrake"
+msgid "Germany"
+msgstr "ألمانيا"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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"
-"ثم أعد تشغيل أداة تحديث Mandrake."
+msgid "Czech Republic"
+msgstr "جمهورية التشيك"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "سحل التغييرات:\n"
+msgid "Costa Rica"
+msgstr "كوستاريكا"
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Korea"
-msgstr "اجبار"
+#, c-format
+msgid "Canada"
+msgstr "كندا"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "الأجهزة القابلة للإزالة"
+msgid "Brazil"
+msgstr "البرازيل"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "بلجيكا"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Change medium"
-msgstr "غير الوسيط"
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "تحديث Mandrake"
+msgid "Australia"
+msgstr "أوستراليا"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by size"
-msgstr "بالحجم"
+msgid "Austria"
+msgstr "النمسا"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "خادم FTP"
+msgid "Info..."
+msgstr "معلومات..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Files:\n"
-msgstr "المل�ات:\n"
+msgid "No"
+msgstr "لا"
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr "تعذر تحديث الوسيط;  سيتم تعطيله آلياً"
+#, c-format
+msgid "Yes"
+msgstr "نعم"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
diff --git a/po/az.po b/po/az.po
index d26078b3..3732b01d 100644
--- a/po/az.po
+++ b/po/az.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grpmi 7.2\n"
-"POT-Creation-Date: 2003-05-02 20:15+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+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,21 +14,14 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Enabled?"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
 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 ""
@@ -41,141 +34,127 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Name:"
-msgstr "Ad"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Italy"
-msgstr "QurulmuÅŸlar"
-
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
+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 "URL:"
-msgstr "URL:"
-
 #: ../rpmdrake:1
-#, c-format
-msgid "Some packages need to be removed"
+#, 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"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Already existing update sources"
-msgstr ""
+#, fuzzy, c-format
+msgid "Problem during removal"
+msgstr "Qurma əsnasında problemlər oldu"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "More information on package..."
-msgstr ""
+#, fuzzy, c-format
+msgid "Please wait, removing packages..."
+msgstr "Xahiş edirik rpm paketləri çıxardana qədər gözləyin"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "Bəli"
+msgid "Please wait, reading packages database..."
+msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"There was a problem during the installation:\n"
 "\n"
+"%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 "Installation failed"
+msgstr "Qurula Bilən"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "%s KB"
-msgstr "%s KB"
+#, fuzzy, c-format
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "Paketlər yükləmə üçün hazırlanır..."
 
 #: ../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 ""
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "Paketlər yükləmə üçün hazırlanır..."
 
-#: ../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 "All requested packages were installed successfully."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
+msgid "Everything installed successfully"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"The installation is finished; %s.\n"
 "\n"
-"%s"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
 msgstr ""
-"Paketlər quraşdırılırkən xəta yarandı:\n"
-"\n"
-"%s"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-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"
+msgid "everything was installed correctly"
+msgstr "Paket onsuz da quruludur"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Maximum information"
-msgstr ""
-
-#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Xəta..."
+msgid "Problem during installation"
+msgstr "Qurma əsnasında problemlər oldu"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Birləşmiş Krallıq"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Quraşdırılan paket `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Configure sources"
-msgstr "Mənbəni quraq?"
+msgid "Preparing packages installation..."
+msgstr "Paketlər yükləmə üçün hazırlanır..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
 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."
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
 msgstr ""
 
 #: ../rpmdrake:1
@@ -185,7 +164,7 @@ msgid ""
 "\n"
 "%s\n"
 "\n"
-"\\Do you want to continue installation?"
+"Do you want to continue installation?"
 msgstr ""
 "Bu fayl hökmsüzdür:\n"
 "\n"
@@ -194,1033 +173,1054 @@ msgstr ""
 "Yenə də bu paketi keçib davam etmək istəyirsiniz?"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Remove .%s"
-msgstr "Çıxardıla Bilən"
-
-#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Source"
-msgstr "Qaynaq"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Finland"
-msgstr "Axtar:"
+msgid "Verifying packages signatures..."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "`%s' Paketi endirilir (%s/%s)..."
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "France"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
 msgstr "Ləğv et"
 
-#. -PO: Keep it short, this is gonna be on a button
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "Oldu"
+
 #: ../rpmdrake:1
 #, c-format
-msgid "More info"
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
+msgid "Change medium"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Reload the packages list"
-msgstr "%s paketi imzalanmayıb"
+#, c-format
+msgid "Initializing..."
+msgstr "Qurulur..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Choose a mirror..."
-msgstr "�ksi seçin:"
+msgid "Package installation..."
+msgstr "Paketlər yükləmə üçün hazırlanır..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Adding a source:"
-msgstr ""
-"Lütfən Gözləyin\n"
-"Mənbə əlavə edilir"
+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."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "`%s' paketi qurula bilmir\n"
+msgid "Unable to get source packages."
+msgstr "Çox pis, oxuna bilməyən və ya tapılmayan paketlər"
 
 #: ../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 "Inspect..."
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "All packages,"
-msgstr "o paket, o bayt"
+msgid "Installation finished"
+msgstr "Qurula Bilən"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "in files"
-msgstr "Yerli"
+msgid "Do nothing"
+msgstr "amma oxşamır"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
+msgid "Use .%s as main file"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Proxy hostname:"
-msgstr "Vəkil verici istifadəçi adı:"
-
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Update source(s)"
-msgstr "Mənbələri Düzəlt"
+msgid "Remove .%s"
+msgstr "Çıxardıla Bilən"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Local files"
-msgstr "Yerli"
+msgid "changes:"
+msgstr "Paketlər"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspecting %s"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Israel"
-msgstr "QurulmuÅŸlar"
+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
+#, fuzzy, c-format
+msgid "Please wait, adding medium..."
+msgstr "Asılılıqlar yoxlanılır..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Help"
-msgstr "Yardım"
+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 ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
+msgid "How to choose manually your mirror"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"Welcome to the packages source editor!\n"
+"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"
-"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 ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Qurula Bilən"
+#, c-format
+msgid "Already existing update sources"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
+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
-#, fuzzy, c-format
-msgid "Search results"
-msgstr "Axtarış Nəticələri"
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid " failed!"
-msgstr "Yerli"
+msgid "Fatal error"
+msgstr "Fayl xətası"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Brazil"
-msgstr "Braziliya"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Software Packages Installation"
+msgstr "Paketlər yükləmə üçün hazırlanır..."
 
-#: ../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 "Mandrake Update"
 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 "Find:"
-msgstr "Axtar:"
+msgid "Quit"
+msgstr "Çıx"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr ""
+msgid "Install"
+msgstr "Qurulur"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Please wait, searching..."
-msgstr "Xahiş edirik rpm paketləri çıxardana qədər gözləyin"
+msgid "Remove"
+msgstr "Çıxardıla Bilən"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr ""
+msgid "Help"
+msgstr "Yardım"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "unknown package "
-msgstr "`%s' paketi açıla bilmir\n"
+msgid "Search"
+msgstr "Axtarış Nəticələri"
 
 #: ../rpmdrake:1
 #, c-format
-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 ""
+msgid "Find:"
+msgstr "Axtar:"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\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.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Kosta Rika"
+msgid "Some packages need to be removed"
+msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"There was a problem during the installation:\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"
-"%s"
+"Do you really want to install all the selected packages?"
 msgstr ""
-"Paketlər quraşdırılırkən xəta yarandı:\n"
-"\n"
-"%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, removing medium..."
-msgstr "Asılılıqlar yoxlanılır..."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Password:"
-msgstr "Parol:"
+msgid "Too many packages are selected"
+msgstr "Paketlər onsuz da quruludur"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
+msgid "Maximum information"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Taiwan"
-msgstr "Tayland"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "User:"
-msgstr "İstifadəçi adı:"
+msgid "Normal information"
+msgstr "normal güncəlləmələr"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Please wait, updating medium..."
-msgstr "Asılılıqlar yoxlanılır..."
+msgid "Update source(s)"
+msgstr "Mənbələri Düzəlt"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, listing packages..."
-msgstr "Xahiş edirik rpm paketləri çıxardana qədər gözləyin"
+msgid "Reload the packages list"
+msgstr "%s paketi imzalanmayıb"
 
 #: ../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
 #, fuzzy, c-format
-msgid "Information on packages"
-msgstr "Paket açıla bilmir"
+msgid "in files"
+msgstr "Yerli"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Cancel"
-msgstr "Ləğv et"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "in descriptions"
+msgstr "Ä°zahatlar"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
+msgid "in names"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Please wait, updating media..."
-msgstr "Asılılıqlar yoxlanılır..."
-
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
+msgid "by update availability"
 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 "by source repository"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "in descriptions"
-msgstr "Ä°zahatlar"
+#, c-format
+msgid "by selection state"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Configure proxies"
-msgstr "Mənbəni quraq?"
+msgid "by size"
+msgstr "Dərinliklər"
 
-#: ../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 "by group"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Please choose"
-msgstr ""
+#, fuzzy, c-format
+msgid "All packages,"
+msgstr "o paket, o bayt"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
+msgid "All packages, alphabetical"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Add a source"
-msgstr ""
-"Lütfən Gözləyin\n"
-"Mənbə əlavə edilir"
+msgid "Mandrake choices"
+msgstr "MandrakeUpdate"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Initializing..."
-msgstr "Qurulur..."
+#, fuzzy, c-format
+msgid "Normal updates"
+msgstr "normal güncəlləmələr"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Save changes"
-msgstr "Paketlər"
+msgid "Bugfixes updates"
+msgstr "Təhlükəsizlik güncəlləmələri"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Error during download"
-msgstr "Endirərkən xəta"
+msgid "Security updates"
+msgstr "Təhlükəsizlik güncəlləmələri"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Paketlər yükləmə üçün hazırlanır..."
+msgid "Description: "
+msgstr "Ä°zahatlar"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Importance: "
+msgid "Reason for update: "
 msgstr ""
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Summary: "
+msgstr "Qısaca"
+
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
+msgid "Importance: "
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr ""
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unable to create medium."
-msgstr "Raport faylı yaradıla bilmir, çıxılır.\n"
+msgid "Size: "
+msgstr "Böyüklük"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Version: "
+msgstr "Buraxılış:"
 
 #: ../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 ""
+msgid "Name: "
+msgstr "Ad: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
+msgid "Currently installed version: "
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "`%s' paketi qurula bilmir\n"
+msgid "Source: "
+msgstr "Qaynaq"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
+msgid "(Not available)"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
+msgid "Changelog:\n"
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Remove"
-msgstr "Çıxardıla Bilən"
-
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Paketlər yükləmə üçün hazırlanır..."
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "No mirror"
-msgstr "Xətasz"
+msgid "Files:\n"
+msgstr "/_Fayl"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
+msgid "Selected size: %d MB"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Qurulur"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "Yaponiya"
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
+msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Do nothing"
-msgstr "amma oxşamır"
+#, 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 "No update"
-msgstr "normal güncəlləmələr"
+msgid "%s conflicts with %s"
+msgstr "bununla toqquÅŸur"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Description: "
-msgstr "Ä°zahatlar"
+msgid "Some packages can't be installed"
+msgstr "`%s' paketi qurula bilmir\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
 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 "Additional packages needed"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Name: "
-msgstr "Ad: "
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "`%s' paketi qurula bilmir\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Paketlər yükləmə üçün hazırlanır..."
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Australia"
-msgstr "serial"
+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:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Installation finished"
-msgstr "Qurula Bilən"
+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:1
 #, c-format
-msgid "by update availability"
+msgid "More information on package..."
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Poland"
-msgstr "PolÅŸa"
-
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Version: "
-msgstr "Buraxılış:"
+msgid "Information on packages"
+msgstr "Paket açıla bilmir"
 
-#: ../edit-urpm-sources.pl:1
+#. -PO: Keep it short, this is gonna be on a button
+#: ../rpmdrake:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
+msgid "More info"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Editing source \\\"%s\\\":"
-msgstr "Mənbələri Düzəlt"
+#: ../rpmdrake:1
+#, c-format
+msgid "Addable"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Upgradable"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " done."
+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:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Paketlər yükləmə üçün hazırlanır..."
+msgid "No update"
+msgstr "normal güncəlləmələr"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr ""
+msgid "(none)"
+msgstr "(heç biri)"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Additional packages needed"
-msgstr ""
+#, 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 "Bugfixes updates"
-msgstr "Təhlükəsizlik güncəlləmələri"
+msgid "unknown package "
+msgstr "`%s' paketi açıla bilmir\n"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
+msgid "One of the following packages is needed:"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Germany"
-msgstr "Almanca"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please choose"
+msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Russia"
-msgstr "Rusca"
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Norway"
-msgstr "Norveçcə"
+msgid "Not selected"
+msgstr "Toqquşmalar tapıldı"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Qurma əsnasında problemlər oldu"
+msgid "Selected"
+msgstr "Hamısını Seç"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Search"
+msgid "Search results"
 msgstr "Axtarış Nəticələri"
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Edit a source"
-msgstr "Mənbələri Düzəlt"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Czech Republic"
-msgstr "Çex Respublikası"
-
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Stop"
 msgstr "Sektor"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Update"
-msgstr "Güncəllə"
-
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, removing packages..."
+msgid "Please wait, searching..."
 msgstr "Xahiş edirik rpm paketləri çıxardana qədər gözləyin"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Normal information"
-msgstr "normal güncəlləmələr"
+msgid "Search results (none)"
+msgstr "Axtarış Nəticələri"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "`%s' Paketi endirilir (%s/%s)..."
+msgid "Other"
+msgstr "Digər"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
+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 ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Spain"
-msgstr "Ä°spaniya"
+msgid "Save and quit"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Normal updates"
-msgstr "normal güncəlləmələr"
+msgid "Proxy..."
+msgstr "Xəta..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by selection state"
+msgid "Update..."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgid "Add..."
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Login:"
-msgstr "giriÅŸ:"
+#, c-format
+msgid "Edit"
+msgstr "Düzəlt"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Austria"
-msgstr "serial"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Source"
+msgstr "Qaynaq"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Fayl xətası"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl: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 "Configure sources"
+msgstr "Mənbəni quraq?"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update..."
-msgstr ""
+msgid "Password:"
+msgstr "Parol:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "`%s' paketinin imzası yoxlanır..."
+msgid "User:"
+msgstr "İstifadəçi adı:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
-msgstr "(heç biri)"
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Proxy hostname:"
+msgstr "Vəkil verici istifadəçi adı:"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
 msgstr ""
 
-#: ../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 "Configure proxies"
+msgstr "Mənbəni quraq?"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Currently installed version: "
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, updating medium..."
+msgstr "Asılılıqlar yoxlanılır..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Other"
-msgstr "Digər"
+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 "Reason for update: "
+msgid "You need to insert the medium to continue"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Please choose the desired mirror."
-msgstr ""
-"Lütfən Gözləyin\n"
-"�ks siyahısı alınır"
+msgid "Save changes"
+msgstr "Paketlər"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "hdlist-in nisbi cığırı: "
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit"
-msgstr "Düzəlt"
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Please wait, finding available packages..."
-msgstr "mövcud paketlərin siyahısını yenidən yüklə"
+msgid "Editing source \"%s\":"
+msgstr "Mənbələri Düzəlt"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "hdlist-in nisbi cığırı: "
+msgid "Edit a source"
+msgstr "Mənbələri Düzəlt"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Search results (none)"
-msgstr "Axtarış Nəticələri"
+msgid "Please wait, removing medium..."
+msgstr "Asılılıqlar yoxlanılır..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Danmark"
+msgid "Type of source:"
+msgstr "Mənbə növü:"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Adding a source:"
 msgstr ""
+"Lütfən Gözləyin\n"
+"Mənbə əlavə edilir"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "China"
-msgstr "Çin"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "United States"
-msgstr "Birləşmiş Ştatlar"
+msgid "You need to fill up at least the two first entries."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "changes:"
-msgstr "Paketlər"
+msgid "Name:"
+msgstr "Ad"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Some additional packages need to be removed"
+msgid "Login:"
+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..."
 msgstr ""
-"İşlərin düzgün getməyi üçün burdakı əlavə proqram tə'minatlarına ehtiyac "
-"vardır:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Path or mount point:"
+msgstr "bağlama nöqtəsi:"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Removable device"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "Xeyir"
+msgid "HTTP server"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Summary: "
-msgstr "Qısaca"
+msgid "Path:"
+msgstr "cığır:"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Canada"
-msgstr "Kanada"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Local files"
+msgstr "Yerli"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Greece"
-msgstr "Yunanca"
+msgid "Add a source"
+msgstr ""
+"Lütfən Gözləyin\n"
+"Mənbə əlavə edilir"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"There was an error downloading the mirrors list:\n"
+"Unable to update medium; it will be automatically disabled.\n"
 "\n"
-"%s\n"
-"The network, or MandrakeSoft website, are maybe unavailable.\n"
-"Please try again later."
+"Errors:\n"
+"%s"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Source: "
-msgstr "Qaynaq"
+msgid "Unable to create medium."
+msgstr "Raport faylı yaradıla bilmir, çıxılır.\n"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr ""
+msgid "Update"
+msgstr "Güncəllə"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Select the source(s) you wish to update:"
+msgstr ""
+"Xahiş edirik, güncəlləmək\n"
+"istədiyiniz mənbəni seçin"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Path:"
-msgstr "cığır:"
+msgid "Please wait, updating media..."
+msgstr "Asılılıqlar yoxlanılır..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Problem during removal"
-msgstr "Qurma əsnasında problemlər oldu"
+msgid " failed!"
+msgstr "Yerli"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by source repository"
+msgid " done."
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Selected"
-msgstr "Hamısını Seç"
-
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Netherlands"
-msgstr "Hollandiya"
+msgid "Download of `%s', speed:%s"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
+msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "`%s' paketinin imzası yoxlanır..."
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
+msgid "Examining distant file of source `%s'..."
 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 "Examining file of source `%s'..."
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr "Toqquşmalar tapıldı"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Software Packages Removal"
-msgstr " Proqram Tə'minatı İdarəçisi "
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Copying file for source `%s'..."
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Sweden"
-msgstr "İsveçcə"
+msgid "Please choose the desired mirror."
+msgstr ""
+"Lütfən Gözləyin\n"
+"�ks siyahısı alınır"
 
-#: ../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
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "No mirror"
+msgstr "Xətasz"
+
+#: ../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."
+"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
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr ""
+msgid "Error during download"
+msgstr "Endirərkən xəta"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Quit"
-msgstr "Çıx"
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
+"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 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "Oldu"
+msgid "United States"
+msgstr "Birləşmiş Ştatlar"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
+msgstr "Çin"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr "Birləşmiş Krallıq"
+
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Please wait, adding medium..."
-msgstr "Asılılıqlar yoxlanılır..."
+msgid "Taiwan"
+msgstr "Tayland"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Sweden"
+msgstr "İsveçcə"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Russia"
+msgstr "Rusca"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Portugal"
+msgstr "Qapı:"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "Mənbə növü:"
+msgid "Poland"
+msgstr "PolÅŸa"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Norway"
+msgstr "Norveçcə"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \\\"%s\\\" on device [%s]"
-msgstr ""
+msgid "Netherlands"
+msgstr "Hollandiya"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Unable to get source packages."
-msgstr "Çox pis, oxuna bilməyən və ya tapılmayan paketlər"
+msgid "Korea"
+msgstr "Daha Çox"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Japan"
+msgstr "Yaponiya"
+
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Too many packages are selected"
-msgstr "Paketlər onsuz da quruludur"
+msgid "Italy"
+msgstr "QurulmuÅŸlar"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "bununla toqquÅŸur"
+msgid "Israel"
+msgstr "QurulmuÅŸlar"
 
-#: ../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.pm:1
+#, fuzzy, c-format
+msgid "Greece"
+msgstr "Yunanca"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Mandrake choices"
-msgstr "MandrakeUpdate"
+msgid "France"
+msgstr "Ləğv et"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Finland"
+msgstr "Axtar:"
+
+#: ../rpmdrake.pm: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 "Spain"
+msgstr "Ä°spaniya"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
+msgid "Danmark"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Korea"
-msgstr "Daha Çox"
+msgid "Germany"
+msgstr "Almanca"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr ""
+msgid "Czech Republic"
+msgstr "Çex Respublikası"
+
+#: ../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 "Braziliya"
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Belgium"
 msgstr "Belçika dili"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Change medium"
-msgstr ""
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Mandrake Update"
-msgstr ""
-"Mandrake\n"
-"Güncəlləmə"
+msgid "Australia"
+msgstr "serial"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "by size"
-msgstr "Dərinliklər"
+msgid "Austria"
+msgstr "serial"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
+msgid "Info..."
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Files:\n"
-msgstr "/_Fayl"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
+msgstr "Xeyir"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr ""
+msgid "Yes"
+msgstr "Bəli"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
diff --git a/po/bg.po b/po/bg.po
index 8bc29259..1e77e4f4 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grpmi-bg\n"
-"POT-Creation-Date: 2003-05-02 20:15+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+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,20 +16,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "Äà ðàçðåøà?"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Path or mount point:"
-msgstr "Ïúò èëè òî÷êà íà ìîíòèðàíå:"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Portugal"
-msgstr "Ïîðò:"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -49,69 +42,16 @@ 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 "Already existing update sources"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "More information on package..."
-msgstr "Ïîâå÷å èíôîðìàöèÿ îò ïàêåò..."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Yes"
-msgstr "Äà"
-
-#: ../rpmdrake:1
-#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"Welcome to MandrakeUpdate!\n"
 "\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
 msgstr ""
-"Ïîðàäè çàâèñèìîñò, ñëåäíèòå ïàêåòè òðÿáâà äà áúäàò îòêàçàíè\n"
-"îò èçáîðà ñåãà:\n"
+"Äîáðå äîøëè â MandrakeÎáíîâÿâàíå!\n"
 "\n"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "everything was installed correctly"
-msgstr "âñè÷êè áÿõà èíñòàëèðàíè êîðåêòíî"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s KB"
-msgstr "%.1f KB"
+"Òîçè èíñòðóìåíò ùå âè ïîìîãíå äà èçáåðåòå îáíîâÿâàíå íà âàøèÿò ñîôòóåðr\n"
+"âúðõó ñèñòåìàòà."
 
 #: ../rpmdrake:1
 #, c-format
@@ -126,23 +66,40 @@ msgstr ""
 "Òîçè èíñòðóìåíò ùå âè ïîìîãíå äà èçáåðåòå êîè ñîôòóåðíè ïàêåòè ñêàòå äà\n"
 "èçòðèåòå îò ñèñòåìàòà."
 
-#: ../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."
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
 msgstr ""
-"Çà äà çàïàçèòå ïðîìåíèòå, âèå òðÿáâà ïúðâî äà ïîñòàâèòå èçòî÷íèêà â "
-"óñòðîéñòâîòî."
+"Ïîëó÷è ñå ãðåøêà ïî âðåìå íà èíñòàëàöèÿòà íà:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
-msgstr "Çàïèñâà è èçëèçà"
+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"
+"Ïàêåòèòå ñå ñîðòèðàò"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"There was a problem during the installation:\n"
 "\n"
 "%s"
 msgstr ""
@@ -152,57 +109,88 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Size: "
-msgstr "Ðàçìåð"
+msgid "Installation failed"
+msgstr "Èíñòàëèðàé âñè÷êî"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Security updates"
-msgstr "Îáíîâÿâàíèÿ ñâúðçàíè ñúñ ñèãóðíîñòòà"
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "Ïîäãîòâÿíå íà ïàêåòèòå çà èíñòàëàöèÿ"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "Ïîäãîòâÿíå íà ïàêåòèòå çà èíñòàëàöèÿ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "Ìàêñèìóì èíôîðìàöèÿ"
+msgid "All requested packages were installed successfully."
+msgstr "Âñè÷êè çàÿâåíè ïàêåòè áÿõà èíñòàëèðàíè êîðåêòíî."
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Ãðåøêà..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr "Âñè÷êè áÿõà èíñòàëèðàíè êîðåêòíî"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-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"
+"Âèå òðÿáâà äà ïðåãëåäàòå íÿêîé îò òÿõ çà äà ïðåäïðèåìåòå äåéñòâèå:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure sources"
-msgstr "Êîíôèãóðèðàíå íà èçòî÷íèê"
+msgid "everything was installed correctly"
+msgstr "âñè÷êè áÿõà èíñòàëèðàíè êîðåêòíî"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during installation"
+msgstr "Ïîÿâèõà ñå ïðîáëåìè ïî âðåìå íà èíñòàëàöèÿòà"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "ïî èìåíà"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Èíñòàëèðàíå íà ïàêåò `%s' (%s/%s)..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Ïîäãîòâÿíå íà ïàêåòèòå çà èíñòàëàöèÿ"
+
+#: ../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 ""
 
 #: ../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"
 "\n"
-"\\Do you want to continue installation?"
+"Do you want to continue installation?"
 msgstr ""
 "Òîçè ôàéë íå å âàëèäåí:\n"
 "\n"
@@ -212,304 +200,197 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Ïðåìàõâà .%s"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Source"
-msgstr "Ñîðñ"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Finland"
-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 ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Ïðåçàðåæäà ñïèñúê ñ ïàêåòèòå"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "Èçòåãëÿíå íà ïàêåò `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr "Èçáåðåòå ñúðâúð:..."
+msgid "Cancel"
+msgstr "Îòêàç"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Äîáàâÿíå íà èçòî÷íèê:"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Ïàêåòúò íå ìîæå äà áúäå èíñòàëèðàí"
+msgid "Ok"
+msgstr "Äîáðå"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Ïîäãîòâÿíå íà ïàêåòèòå çà èíñòàëàöèÿ"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Ìîëÿ, ïîñòàâåòå èçòî÷íèê ñ èìå \"%s\" íà óñòðîéñòâî [%s]"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages,"
-msgstr "Âñè÷êè ïàêåòè,"
+msgid "Change medium"
+msgstr "Ñìåíÿ èçòî÷íèê"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "ïî ôàéëîâå"
+msgid "Initializing..."
+msgstr "Èíèöèàëèçàöèÿ:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Âñè÷êè çàÿâåíè ïàêåòè áÿõà èíñòàëèðàíè êîðåêòíî."
-
-#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Proxy hostname:"
-msgstr "Ïîòðåáèòåë çà ïðîêñè:"
-
-#: ../rpmdrake:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Update source(s)"
-msgstr "Îáíîâè èçòî÷íèöèòå"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Local files"
-msgstr "Ëîêàëíè ôàéëîâå"
+msgid "Package installation..."
+msgstr "Ïîäãîòâÿíå íà ïàêåòèòå çà èíñòàëàöèÿ"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Inspecting %s"
-msgstr "Ïðåãëåæäàì %s"
-
-#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Israel"
-msgstr "Èíñòàëàöèÿ"
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Òðÿáâà äà ñòå root, çà äà èíñòàëèðàòå ïàêåòè, ñúæàëÿâàì"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Help"
-msgstr "/_Ïîìîù"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "HTTP server"
-msgstr "HTTP ñåðâåð"
+msgid "Unable to get source packages."
+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 ""
+msgid "Inspect..."
+msgstr "Ïðåãëåæäà..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Èíñòàëèðàé âñè÷êî"
+msgid "Installation finished"
+msgstr "Èíñòàëèðàíè"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Èçïîëçâà .%s êàòî ãëàâåí ôàéë"
+msgid "Do nothing"
+msgstr "Íå ïðàâè íèùî"
 
 #: ../rpmdrake:1
 #, c-format
-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 ""
+msgid "Use .%s as main file"
+msgstr "Èçïîëçâà .%s êàòî ãëàâåí ôàéë"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Òúðñè:"
+msgid "Remove .%s"
+msgstr "Ïðåìàõâà .%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Âñè÷êè ïàêåòè ïî àçáó÷åí ðåä"
+msgid "changes:"
+msgstr "ïðîìåíè:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Ìîëÿ èç÷àêàéòå, òúðñÿ..."
+msgid "Inspecting %s"
+msgstr "Ïðåãëåæäàì %s"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, reading packages database..."
+msgid "Please wait, finding available packages..."
 msgstr ""
 "Ìîëà èç÷àêàéòå\n"
 "Ïàêåòèòå ñå ñîðòèðàò"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "Íåìîãà äà îòâîðÿ ïàêåòúò"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Reset the selection"
-msgstr "Íóëèðà èçáðàíîòî"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../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 wait, adding medium..."
 msgstr ""
-"Àêî ñå íóæäàåòå îò ïðîêñè, âúâåäåòå èìå íà õîñò è îïöèîíàëíî ïîðò (ñèíòàêñèñ:"
-"<proxyhost[:port]>):"
+"Ìîëÿ Èç÷àêàéòå\n"
+"Äîáàâÿ ñå èçòî÷íèê..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"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"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Êîñòà Ðèêà"
+msgid "How to choose manually your mirror"
+msgstr "Êàê äà èçáåðåòå ðú÷íî âàøèÿò îãëåäàëåí ñúðâúð"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"There was a problem during the installation:\n"
+"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"
-"%s"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"Ïîëó÷è ñå ãðåøêà ïî âðåìå íà èíñòàëàöèÿòà íà:\n"
-"\n"
-"%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing medium..."
+msgid "Already existing update sources"
 msgstr ""
-"Ìîëÿ Èç÷àêàéòå\n"
-"Ïðåìàõâà ñå èçòî÷íèê"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Password:"
-msgstr "Ïàðîëà:"
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
+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
 #, c-format
-msgid "Taiwan"
-msgstr "Òàéâàí"
+msgid "A fatal error occurred: %s."
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "User:"
-msgstr "Ïîòðåáèòåë:"
+msgid "Fatal error"
+msgstr "Ãðåøêà â ôàéë"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Please wait, updating medium..."
-msgstr ""
-"Ìîëÿ Èç÷àêàéòå\n"
-"Îáíîâÿâà ñå èíôîðìàöèÿòà çà òîçè èçòî÷íèê..."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Software Packages Installation"
+msgstr "Ïîäãîòâÿíå íà ïàêåòèòå çà èíñòàëàöèÿ"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, listing packages..."
-msgstr ""
-"Ìîëà èç÷àêàéòå\n"
-"Ïàêåòèòå ñå ñîðòèðàò"
+msgid "Mandrake Update"
+msgstr "MandrakeUpdate Íàñòðîéêè"
 
 #: ../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 "Software Packages Removal"
+msgstr "Èçòðèâàíå íà ïàêåòè"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Èçõîä"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Information on packages"
-msgstr "Íåìîãà äà îòâîðÿ ïàêåòúò"
+#, c-format
+msgid "Install"
+msgstr "Èíñòàëàöèÿ"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Cancel"
-msgstr "Îòêàç"
+msgid "Remove"
+msgstr "Èçòðèâà"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Everything installed successfully"
-msgstr "Âñè÷êè áÿõà èíñòàëèðàíè êîðåêòíî"
+#, fuzzy, c-format
+msgid "Help"
+msgstr "/_Ïîìîù"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Ìîëÿ, èç÷àêàéòå. Îáíîâÿâà ñå èçòî÷íèê..."
+msgid "Search"
+msgstr "Òúðñè"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Find:"
+msgstr "Òúðñè:"
 
 #: ../rpmdrake:1
 #, c-format
@@ -522,182 +403,155 @@ msgid ""
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "in descriptions"
-msgstr "Îïèñàíèÿ"
-
-#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Êîíôèãóðèðàíå íà ïðîêñèòà"
+msgid "Some packages need to be removed"
+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"
+"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"
-"Is it ok to continue?"
+"Do you really want to install all the selected packages?"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Ìîëÿ èçáåðåòå"
+msgid "Too many packages are selected"
+msgstr "Òâúðäå ìíîãî ïàêåòè ñà èçáðàíè"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Selected size: %d MB"
-msgstr "%d èçáðàíè ïàêåòè: %.1f MB"
+#, c-format
+msgid "Maximum information"
+msgstr "Ìàêñèìóì èíôîðìàöèÿ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add a source"
-msgstr "Äîáàâÿ íà èçòî÷íèê"
+msgid "Normal information"
+msgstr "Íîðìàëíà èíôîðìàöèÿ"
+
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update source(s)"
+msgstr "Îáíîâè èçòî÷íèöèòå"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "Èíèöèàëèçàöèÿ:"
+msgid "Reload the packages list"
+msgstr "Ïðåçàðåæäà ñïèñúê ñ ïàêåòèòå"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "Çàïàçâà ïðîìåíèòå"
+msgid "Reset the selection"
+msgstr "Íóëèðà èçáðàíîòî"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
-msgstr "Ãðåøêà ïðè èçòåãëÿíå"
+msgid "in files"
+msgstr "ïî ôàéëîâå"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Ïîäãîòâÿíå íà ïàêåòèòå çà èíñòàëàöèÿ"
+msgid "in descriptions"
+msgstr "Îïèñàíèÿ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Importance: "
-msgstr "Âàæíîñò: "
+msgid "in names"
+msgstr "ïî èìåíà"
 
 #: ../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 "by update availability"
+msgstr "ïî âúçìîæíîñò çà îáíîâÿâàíå"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "Äîáàâÿ..."
+msgid "by source repository"
+msgstr "ïî èçòî÷íèê íà ñúõðàíåíèå"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Unable to create medium."
-msgstr "Íåâúçìîæíîñò çà ñúçäàâàíå íà èçòî÷íèê."
+msgid "by selection state"
+msgstr "ïî ñúñòîÿíèå"
 
 #: ../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 ""
-"Èíñòàëèðàíåòî çàâúðøè; %s.\n"
-"\n"
-"Íÿêîé êîíôèãóðàöèîííè ôàéëîâå áÿõà ñúçäàäåíè êàòî .rpmnew' èëè `.rpmsave'.\n"
-"Âèå òðÿáâà äà ïðåãëåäàòå íÿêîé îò òÿõ çà äà ïðåäïðèåìåòå äåéñòâèå:"
+msgid "by size"
+msgstr "ïî ãîëåìèíà"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
-msgstr "Òúðñè..."
+msgid "by group"
+msgstr "ïî ãðóïà"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "Ïàêåòúò íå ìîæå äà áúäå èíñòàëèðàí"
-
-#: ../rpmdrake.pm:1
 #, c-format
-msgid "Info..."
-msgstr "Èíôîðìàöèÿ..."
+msgid "All packages,"
+msgstr "Âñè÷êè ïàêåòè,"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "Âèå òðÿáâà äà ïîñòàâèòå èçòî÷íèêà çà äà ïðîäúëæèòå"
+msgid "All packages, alphabetical"
+msgstr "Âñè÷êè ïàêåòè ïî àçáó÷åí ðåä"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "Èçòðèâà"
+msgid "Mandrake choices"
+msgstr "Ìàíäðåéê èçáðàíè"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Ïîäãîòâÿíå íà ïàêåòèòå çà èíñòàëàöèÿ"
+msgid "Normal updates"
+msgstr "Ñòàíäàðòíè Îáíîâÿâàíèÿ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No mirror"
-msgstr "ñúðâúð:"
+msgid "Bugfixes updates"
+msgstr "Îáíîâÿâàíèÿòà ñâúðçàíè ñúñ ïîäîáðåíèÿ"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Òðÿáâà äà ïîïúëíèòå ïîíå ïúðâèòå 2 òî÷êè."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Security updates"
+msgstr "Îáíîâÿâàíèÿ ñâúðçàíè ñúñ ñèãóðíîñòòà"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Install"
-msgstr "Èíñòàëàöèÿ"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Japan"
-msgstr "ßïîíèÿ"
+#, fuzzy, c-format
+msgid "Description: "
+msgstr "Îïèñàíèÿ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Íå ïðàâè íèùî"
+msgid "Reason for update: "
+msgstr "Ïðè÷èíà çà îáíîâÿâàíå: "
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No update"
-msgstr "Îáíîâè"
+msgid "Summary: "
+msgstr "Ðåçþìå"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "Âàæíîñò: "
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Description: "
-msgstr "Îïèñàíèÿ"
+msgid "%s KB"
+msgstr "%.1f KB"
 
 #: ../rpmdrake:1
-#, c-format
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"Èíñòàëèðàíåòî ïðîïàäíà, íÿêîé îò ôàéëîâåòå ëèïñâàò.\n"
-"Âèå òðÿáâà äà îáíîâèòå èçòî÷íèêà íà âàøàòà áàçà äàííè."
+#, fuzzy, c-format
+msgid "Size: "
+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?"
-msgstr ""
+#, fuzzy, c-format
+msgid "Version: "
+msgstr "Âåðñèÿ:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -706,68 +560,84 @@ msgstr "Èìå: %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "Ïðåãëåæäà..."
+msgid "Currently installed version: "
+msgstr "Òåêóùî èíñòàëèðàíà âåðñèÿ: "
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Ïîäãîòâÿíå íà ïàêåòèòå çà èíñòàëàöèÿ"
+msgid "Source: "
+msgstr "Ñîðñ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Àâñòðàëèÿ"
+msgid "(Not available)"
+msgstr "(Íå å íàëè÷åí)"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Installation finished"
-msgstr "Èíñòàëèðàíè"
+msgid "Files:\n"
+msgstr "/_Ôàéë"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by update availability"
-msgstr "ïî âúçìîæíîñò çà îáíîâÿâàíå"
+#, fuzzy, c-format
+msgid "Selected size: %d MB"
+msgstr "%d èçáðàíè ïàêåòè: %.1f MB"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
-msgstr "Ïîëøà"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Èçáðàíè: %d ÌÁ / Ñâîáîäíî äèñêîâî ïðîñòðàíñòâî: %d ÌÁ"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Version: "
-msgstr "Âåðñèÿ:"
-
-#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "Âèå òðÿáâà äà çàäàäåòå èìå/ïàðîëà çà èäåíòèôèêàöèÿ ïðåä ïðîêñèòî:"
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
+msgstr ""
+"Ïîðàäè çàâèñèìîñò, ñëåäíèòå ïàêåòè òðÿáâà äà áúäàò îòêàçàíè\n"
+"îò èçáîðà ñåãà:\n"
+"\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Editing source \\\"%s\\\":"
-msgstr "Ðåäàêòèðàíå íà èçòî÷íèê \"%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:1
 #, fuzzy, c-format
-msgid "Upgradable"
-msgstr "Îáíîâÿâàíå"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid " done."
-msgstr ""
+msgid "%s conflicts with %s"
+msgstr "âëèçà â êîíôëèêò ñ"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Ïîäãîòâÿíå íà ïàêåòèòå çà èíñòàëàöèÿ"
+msgid "Some packages can't be installed"
+msgstr "Ïàêåòúò íå ìîæå äà áúäå èíñòàëèðàí"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining file of source `%s'..."
+msgid ""
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
 msgstr ""
+"Çà äà ñå çàäîâîëÿò çàâèñèìîñòèòå, ñëåäíèòå ïàêåòè òðÿáâà ñúùî\n"
+"äà áúäàò èíñòàëèðàíè:\n"
+"\n"
 
 #: ../rpmdrake:1
 #, c-format
@@ -776,495 +646,625 @@ msgstr "Òðÿáâà äîïúëíèòåëíè ïàêåòè"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Bugfixes updates"
-msgstr "Îáíîâÿâàíèÿòà ñâúðçàíè ñúñ ïîäîáðåíèÿ"
+msgid "Some packages can't be removed"
+msgstr "Ïàêåòúò íå ìîæå äà áúäå èíñòàëèðàí"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
 msgstr ""
+"Ïðåìàõâàíåòî íà òåçè ïàêåòè áè ðàçáèëî ñèñòåìàòà âè, ñúæàëÿâàì:\n"
+"\n"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "Ãåðìàíèÿ"
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
+"Çà äà ñå óäîâîëåòâîðÿò çàâèñèìîñòèòå,\n"
+"ñëåäíèòå ïàêåòè òðÿáâà áúäàò ïðåìàõíàòè:\n"
+"\n"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Russia"
-msgstr "Ðóñèÿ"
+msgid "Some additional packages need to be removed"
+msgstr "Íÿêîé äîïúëíèòåëíè ïàêåòè òðÿáâà äà ñå èçòðèÿò"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Norway"
-msgstr "Íîðâåãèÿ"
+msgid "More information on package..."
+msgstr "Ïîâå÷å èíôîðìàöèÿ îò ïàêåò..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Ïîÿâèõà ñå ïðîáëåìè ïî âðåìå íà èíñòàëàöèÿòà"
+msgid "Information on packages"
+msgstr "Íåìîãà äà îòâîðÿ ïàêåòúò"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
-#, c-format
-msgid "Search"
-msgstr "Òúðñè"
+#, fuzzy, c-format
+msgid "More info"
+msgstr "Ïîâå÷å èíôîðìàöèÿ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Edit a source"
-msgstr "Ðåäàêòèðàíå íà èçòî÷íèöè"
+msgid "Addable"
+msgstr "Âúçìîæíè çà äîáàâÿíå"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Czech Republic"
-msgstr "×åõèÿ"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Upgradable"
+msgstr "Îáíîâÿâàíå"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Stop"
-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
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "No update"
+msgstr "Îáíîâè"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Update"
-msgstr "Îáíîâÿâàíå"
+msgid "(none)"
+msgstr "(íÿìà)"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, removing packages..."
+msgid "Please wait, listing packages..."
 msgstr ""
 "Ìîëà èç÷àêàéòå\n"
 "Ïàêåòèòå ñå ñîðòèðàò"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Normal information"
-msgstr "Íîðìàëíà èíôîðìàöèÿ"
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "Íåìîãà äà îòâîðÿ ïàêåòúò"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Èçòåãëÿíå íà ïàêåò `%s' (%s/%s)..."
+msgid "One of the following packages is needed:"
+msgstr "Åäèí îò ñëåäíèòå ïàêåòè å íåîáõîäèì:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Èçáðàíè: %d ÌÁ / Ñâîáîäíî äèñêîâî ïðîñòðàíñòâî: %d ÌÁ"
+msgid "Please choose"
+msgstr "Ìîëÿ èçáåðåòå"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Spain"
-msgstr "Èñïàíèÿ"
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Normal updates"
-msgstr "Ñòàíäàðòíè Îáíîâÿâàíèÿ"
+msgid "Not selected"
+msgstr "Âúçíèêíàõà íåñúâìåñòèìîñòè"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Selected"
+msgstr ""
+"Èçáåðè\n"
+"âñè÷êè"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by selection state"
-msgstr "ïî ñúñòîÿíèå"
+msgid "Search results"
+msgstr "Ðåçóëòàò îò òúðñåíå"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
-"Ìîëÿ, ïî÷àêàéòå. Èçòåãëÿì îãëåäàëíèòå àäðåñè îò web ñàéòà íà MandrakeSoft."
+msgid "Stop"
+msgstr "Ñòîï"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Login:"
-msgstr "Ïîòðåáèòåëñêî èìå:"
+msgid "Please wait, searching..."
+msgstr "Ìîëÿ èç÷àêàéòå, òúðñÿ..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "Àâñòðèÿ"
+msgid "Search results (none)"
+msgstr "Ðåçóëòàò îò òúðñåíåòî (íÿìà)"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Ãðåøêà â ôàéë"
+#, c-format
+msgid "Other"
+msgstr "Äðóã"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Ìîëÿ èçáåðåòå èçòî÷íèöè êîèòî èñêàòå äà ñå ïîäíîâÿò:"
+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 ""
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Çàïèñâà è èçëèçà"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Proxy..."
+msgstr "Ãðåøêà..."
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Update..."
 msgstr "Îáíîâÿâàíå"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "Ïðîâåðêà íà ïîäïèñúò íà `%s'..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "Äîáàâÿ..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
-msgstr "(íÿìà)"
+msgid "Edit"
+msgstr "Ðåäàêòèðà"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
-"Ïðåìàõâàíåòî íà òåçè ïàêåòè áè ðàçáèëî ñèñòåìàòà âè, ñúæàëÿâàì:\n"
-"\n"
+msgid "Source"
+msgstr "Ñîðñ"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Èíñòàëèðàíå íà ïàêåò `%s' (%s/%s)..."
+msgid "Enabled?"
+msgstr "Äà ðàçðåøà?"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Òåêóùî èíñòàëèðàíà âåðñèÿ: "
+msgid "Configure sources"
+msgstr "Êîíôèãóðèðàíå íà èçòî÷íèê"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Other"
-msgstr "Äðóã"
+msgid "Password:"
+msgstr "Ïàðîëà:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "User:"
+msgstr "Ïîòðåáèòåë:"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Ïðè÷èíà çà îáíîâÿâàíå: "
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Âèå òðÿáâà äà çàäàäåòå èìå/ïàðîëà çà èäåíòèôèêàöèÿ ïðåä ïðîêñèòî:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Please choose the desired mirror."
+msgid "Proxy hostname:"
+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]>):"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit"
-msgstr "Ðåäàêòèðà"
+msgid "Configure proxies"
+msgstr "Êîíôèãóðèðàíå íà ïðîêñèòà"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, finding available packages..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
 msgstr ""
-"Ìîëà èç÷àêàéòå\n"
-"Ïàêåòèòå ñå ñîðòèðàò"
+"Ìîëÿ Èç÷àêàéòå\n"
+"Îáíîâÿâà ñå èíôîðìàöèÿòà çà òîçè èçòî÷íèê..."
+
+#: ../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"
+msgstr "Âèå òðÿáâà äà ïîñòàâèòå èçòî÷íèêà çà äà ïðîäúëæèòå"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save changes"
+msgstr "Çàïàçâà ïðîìåíèòå"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Ðåëàòèâåí ïúò äî äèðåêòîðèÿ èëè hdlist: "
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Ðåçóëòàò îò òúðñåíåòî (íÿìà)"
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Danmark"
-msgstr "Äàíèÿ"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing source \"%s\":"
+msgstr "Ðåäàêòèðàíå íà èçòî÷íèê \"%s\":"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "China"
-msgstr "Êèòàé"
+msgid "Edit a source"
+msgstr "Ðåäàêòèðàíå íà èçòî÷íèöè"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "United States"
-msgstr "ÑÀÙ"
+msgid "Please wait, removing medium..."
+msgstr ""
+"Ìîëÿ Èç÷àêàéòå\n"
+"Ïðåìàõâà ñå èçòî÷íèê"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "changes:"
-msgstr "ïðîìåíè:"
+msgid "Type of source:"
+msgstr "Òèï íà èçòî÷íèêà:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Íÿêîé äîïúëíèòåëíè ïàêåòè òðÿáâà äà ñå èçòðèÿò"
+msgid "Adding a source:"
+msgstr "Äîáàâÿíå íà èçòî÷íèê:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "Íå"
+msgid "You need to fill up at least the two first entries."
+msgstr "Òðÿáâà äà ïîïúëíèòå ïîíå ïúðâèòå 2 òî÷êè."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Summary: "
-msgstr "Ðåçþìå"
+msgid "Name:"
+msgstr "Èìå"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Canada"
-msgstr "Êàíàäà"
+msgid "Login:"
+msgstr "Ïîòðåáèòåëñêî èìå:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Greece"
-msgstr "Ãúðöèÿ"
+msgid "Choose a mirror..."
+msgstr "Èçáåðåòå ñúðâúð:..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl: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 ""
+msgid "Browse..."
+msgstr "Òúðñè..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Source: "
-msgstr "Ñîðñ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Ïúò èëè òî÷êà íà ìîíòèðàíå:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr ""
+msgid "Removable device"
+msgstr "Ïðåìåñòâàåìî óñòðîéñòâî"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Òðÿáâà äà ñòå root, çà äà èíñòàëèðàòå ïàêåòè, ñúæàëÿâàì"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "HTTP server"
+msgstr "HTTP ñåðâåð"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "FTP ñúðâúð"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Path:"
 msgstr "Ïîðò:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Problem during removal"
-msgstr "Ïîÿâèõà ñå ïðîáëåìè ïî âðåìå íà ïðåìàõâàíåòî"
+msgid "Local files"
+msgstr "Ëîêàëíè ôàéëîâå"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by source repository"
-msgstr "ïî èçòî÷íèê íà ñúõðàíåíèå"
+msgid "Add a source"
+msgstr "Äîáàâÿ íà èçòî÷íèê"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Selected"
-msgstr ""
-"Èçáåðè\n"
-"âñè÷êè"
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr "Íå ìîãà äà îáíîâÿ èçòî÷íèê; òîé ùå áúäå àâòîìàè÷íî çàáðàíåí."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Netherlands"
-msgstr "Õîëàíäèÿ"
+msgid "Unable to create medium."
+msgstr "Íåâúçìîæíîñò çà ñúçäàâàíå íà èçòî÷íèê."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "Âúçìîæíè çà äîáàâÿíå"
+msgid "Update"
+msgstr "Îáíîâÿâàíå"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
-msgstr "(Íå å íàëè÷åí)"
+msgid "Select the source(s) you wish to update:"
+msgstr "Ìîëÿ èçáåðåòå èçòî÷íèöè êîèòî èñêàòå äà ñå ïîäíîâÿò:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, updating media..."
+msgstr "Ìîëÿ, èç÷àêàéòå. Îáíîâÿâà ñå èçòî÷íèê..."
+
+#: ../rpmdrake.pm: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 " failed!"
+msgstr "ïî ôàéëîâå"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid " done."
 msgstr ""
-"Ñúæàëÿâàì, ñëåäíèòå ïàêåòè íå ìîãàò äà áúäàò èçáðàíè:\n"
-"\n"
 
-#: ../rpmdrake:1
+#: ../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"
+msgstr ""
+
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Not selected"
-msgstr "Âúçíèêíàõà íåñúâìåñòèìîñòè"
+msgid "Starting download of `%s'..."
+msgstr "Ïðîâåðêà íà ïîäïèñúò íà `%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Èçòðèâàíå íà ïàêåòè"
+msgid "Examining distant file of source `%s'..."
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Sweden"
-msgstr "Øâåöèÿ"
+msgid "Examining file of source `%s'..."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+msgid "Copying file for source `%s'..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Please choose the desired mirror."
+msgstr ""
+"Ìîëÿ èç÷àêàéòå\n"
+"Ïîëó÷âàì ñïèñúêà ñ îãëåäàëíè ñúðâúðè"
+
+#: ../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."
+"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 "ñúðâúð:"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%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:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Åäèí îò ñëåäíèòå ïàêåòè å íåîáõîäèì:"
+msgid "Error during download"
+msgstr "Ãðåøêà ïðè èçòåãëÿíå"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "Èçõîä"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
+"Ìîëÿ, ïî÷àêàéòå. Èçòåãëÿì îãëåäàëíèòå àäðåñè îò web ñàéòà íà MandrakeSoft."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
+"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 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "Äîáðå"
+msgid "United States"
+msgstr "ÑÀÙ"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr ""
-"Ìîëÿ Èç÷àêàéòå\n"
-"Äîáàâÿ ñå èçòî÷íèê..."
+msgid "China"
+msgstr "Êèòàé"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "Òèï íà èçòî÷íèêà:"
+msgid "United Kingdom"
+msgstr "Îáåäèíåíîòî êðàëñòâî"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please insert the medium named \\\"%s\\\" on device [%s]"
-msgstr "Ìîëÿ, ïîñòàâåòå èçòî÷íèê ñ èìå \"%s\" íà óñòðîéñòâî [%s]"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "Òàéâàí"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unable to get source packages."
-msgstr "Èçáåðåòå æåëàíèòå ïàêåòè"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "Øâåöèÿ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Òâúðäå ìíîãî ïàêåòè ñà èçáðàíè"
+msgid "Russia"
+msgstr "Ðóñèÿ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "âëèçà â êîíôëèêò ñ"
+msgid "Portugal"
+msgstr "Ïîðò:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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"
-"Òîçè èíñòðóìåíò ùå âè ïîìîãíå äà èçáåðåòå îáíîâÿâàíå íà âàøèÿò ñîôòóåðr\n"
-"âúðõó ñèñòåìàòà."
+msgid "Poland"
+msgstr "Ïîëøà"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Ìàíäðåéê èçáðàíè"
+msgid "Norway"
+msgstr "Íîðâåãèÿ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Netherlands"
+msgstr "Õîëàíäèÿ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Korea"
+msgstr "Èãíîðèðàé"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr ""
+msgid "Japan"
+msgstr "ßïîíèÿ"
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Korea"
+msgid "Italy"
+msgstr "Èíñòàëàöèÿ"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Israel"
+msgstr "Èíñòàëàöèÿ"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Ãúðöèÿ"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "France"
 msgstr "Èãíîðèðàé"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "Ïðåìåñòâàåìî óñòðîéñòâî"
+msgid "Finland"
+msgstr "Ôèíëàíäèÿ"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "Èñïàíèÿ"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
+msgstr "Äàíèÿ"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr "Ãåðìàíèÿ"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
+msgstr "×åõèÿ"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Costa Rica"
+msgstr "Êîñòà Ðèêà"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Canada"
+msgstr "Êàíàäà"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
+msgstr "Áðàçèëèÿ"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Áåëãèÿ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Change medium"
-msgstr "Ñìåíÿ èçòî÷íèê"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Mandrake Update"
-msgstr "MandrakeUpdate Íàñòðîéêè"
+msgid "Australia"
+msgstr "Àâñòðàëèÿ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by size"
-msgstr "ïî ãîëåìèíà"
+msgid "Austria"
+msgstr "Àâñòðèÿ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "FTP ñúðâúð"
+msgid "Info..."
+msgstr "Èíôîðìàöèÿ..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Files:\n"
-msgstr "/_Ôàéë"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
+msgstr "Íå"
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr "Íå ìîãà äà îáíîâÿ èçòî÷íèê; òîé ùå áúäå àâòîìàè÷íî çàáðàíåí."
+#, c-format
+msgid "Yes"
+msgstr "Äà"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
diff --git a/po/br.po b/po/br.po
index 23ecece9..7beffff4 100644
--- a/po/br.po
+++ b/po/br.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grpmi\n"
-"POT-Creation-Date: 2003-05-02 20:15+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+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,21 +14,14 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Enabled?"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
 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 ""
@@ -40,139 +33,122 @@ msgid ""
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "by group"
-msgstr "Strollad labour"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Name:"
-msgstr "Anv"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Italy"
-msgstr "Staliañ"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
+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 "Some packages need to be removed"
-msgstr "Ar pakadoù a-heul a zo war-nes bezañ staliet/lamet"
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr "Kudennoù ho staliadur"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Already existing update sources"
-msgstr ""
+#, fuzzy, c-format
+msgid "Problem during removal"
+msgstr "O prientiñ ar staliadur"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "More information on package..."
-msgstr "O klask ar pakadoù hegerz"
+msgid "Please wait, removing packages..."
+msgstr "Gortozit mar plij, o prientiñ ar staliadur"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Yes"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, reading packages database..."
+msgstr "Gortozit mar plij, o prientiñ ar staliadur"
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"There was a problem during the installation:\n"
 "\n"
-msgstr ""
+"%s"
+msgstr "Kudennoù ho staliadur"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "everything was installed correctly"
-msgstr ""
+#, fuzzy, c-format
+msgid "Installation failed"
+msgstr "Staliañ an holl"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "Kudennoù ho staliadur"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "Kudennoù ho staliadur"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
+msgid "All requested packages were installed successfully."
 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 "Everything installed successfully"
 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."
+"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
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
+msgid "everything was installed correctly"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
+msgid "Problem during installation"
 msgstr "Kudennoù ho staliadur"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Size: "
-msgstr "Ment"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Security updates"
-msgstr "Bremanaat Mandrake"
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Maximum information"
-msgstr "Diskouez titouroù"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Fazi..."
+msgid "Preparing packages installation..."
+msgstr "Kudennoù ho staliadur"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Configure sources"
-msgstr "Kefluniañ servijoù"
-
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "in names"
-msgstr "Anv ar domani"
-
-#: ../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."
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
 msgstr ""
 
 #: ../rpmdrake:1
@@ -182,1021 +158,1045 @@ msgid ""
 "\n"
 "%s\n"
 "\n"
-"\\Do you want to continue installation?"
+"Do you want to continue installation?"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Remove .%s"
-msgstr "Dibarzhoù ar voullerez lpd a-bell"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Source"
-msgstr "Dilec'hiañ"
-
-#: ../rpmdrake.pm:1
 #, c-format
-msgid "Finland"
+msgid "Verifying packages signatures..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
+msgid "Downloading package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "France"
-msgstr "Nullañ"
-
-#. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "More info"
-msgstr ""
+msgid "Cancel"
+msgstr "Nullañ"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
+msgid "Ok"
+msgstr "Mat eo"
 
 #: ../rpmdrake:1
 #, 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"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Lakait ur bladennig gwerc'h el lenner %s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Adding a source:"
-msgstr "Ouzhpennañ un arveriad"
+msgid "Change medium"
+msgstr "Kemmañ ar spister"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Ne m'eus ket gallet staliañ pakad"
+msgid "Initializing..."
+msgstr "Staliañ:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
+msgid "Package installation..."
 msgstr "Kudennoù ho staliadur"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "All packages,"
-msgstr " Pakadoù : "
+#, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "in files"
-msgstr "mkraid sac'het"
+#, c-format
+msgid "Unable to get source packages."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
+msgid "Inspect..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy hostname:"
-msgstr "Anv an ostiz a-bell"
+msgid "Installation finished"
+msgstr "Diuzit renkad ar staliadur"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Update source(s)"
-msgstr "Etre"
+msgid "Do nothing"
+msgstr "N'ev ket lodañ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "Restroù lec'hel"
+msgid "Use .%s as main file"
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Inspecting %s"
-msgstr "Adskrivañ %s"
+msgid "Remove .%s"
+msgstr "Dibarzhoù ar voullerez lpd a-bell"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Israel"
-msgstr "Staliañ"
+msgid "changes:"
+msgstr " Pakadoù : "
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Help"
-msgstr "/_Skoazell"
+msgid "Inspecting %s"
+msgstr "Adskrivañ %s"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "HTTP server"
-msgstr "Servijer HTTP"
+#: ../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..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, adding medium..."
+msgstr "Gortozit mar plij, o prientiñ ar staliadur"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"Welcome to the packages source editor!\n"
+"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"
-"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 ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Staliañ an holl"
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
+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 ""
 
 #: ../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"
+msgid "Already existing update sources"
 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?"
+"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
 #, c-format
-msgid "Find:"
+msgid "A fatal error occurred: %s."
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "All packages, alphabetical"
-msgstr ""
+#, fuzzy, c-format
+msgid "Fatal error"
+msgstr "Ne m'eus ket gallet skrivañ\n"
 
 #: ../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 "Please wait, reading packages database..."
-msgstr "Gortozit mar plij, o prientiñ ar staliadur"
+msgid "Mandrake Update"
+msgstr "MandrakeUpdate, doare 7.2\n"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "unknown package "
-msgstr "Ne m'eus ket gallet digeriñ pakad"
+msgid "Software Packages Removal"
+msgstr "Anv rannet"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Kuitaat"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "Staliañ"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Remove"
+msgstr "Dibarzhoù ar voullerez lpd a-bell"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Reset the selection"
-msgstr "Diuz pakadoù unan hag unan"
+msgid "Help"
+msgstr "/_Skoazell"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Search"
+msgstr "Klask"
+
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+msgid "Find:"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"The following packages have to be removed for others to be upgraded:\n"
 "\n"
-msgstr ""
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Costa Rica"
+"%s\n"
+"\n"
+"Is it ok to continue?"
 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"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"There was a problem during the installation:\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"
-"%s"
-msgstr "Kudennoù ho staliadur"
+"Do you really want to install all the selected packages?"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, removing medium..."
-msgstr "O termeniñ al live surentez"
+msgid "Too many packages are selected"
+msgstr "Hemañ a zo ur pakad ret, n'hell ket bezañ andiuzet"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Password:"
-msgstr "Tremenger"
+msgid "Maximum information"
+msgstr "Diskouez titouroù"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Normal information"
+msgstr "Diskouez titouroù"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Taiwan"
-msgstr "Iraniek"
+msgid "Update source(s)"
+msgstr "Etre"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "User:"
-msgstr "Anv arveriad"
+msgid "Reload the packages list"
+msgstr "Bremanaat pakadoù hep ken"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, updating medium..."
-msgstr "O termeniñ al live surentez"
+msgid "Reset the selection"
+msgstr "Diuz pakadoù unan hag unan"
 
 #: ../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 "in files"
+msgstr "mkraid sac'het"
 
 #: ../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 "in descriptions"
+msgstr "Deskrivadurioù"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Information on packages"
-msgstr "Ne m'eus ket gallet digeriñ pakad"
+msgid "in names"
+msgstr "Anv ar domani"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "Nullañ"
+msgid "by update availability"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
+msgid "by source repository"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, updating media..."
-msgstr "Gortozit mar plij, o prientiñ ar staliadur"
+msgid "by selection state"
+msgstr "Diuz pakadoù unan hag unan"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "by size"
+msgstr "Adventañ"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "by group"
+msgstr "Strollad labour"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "All packages,"
+msgstr " Pakadoù : "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
+msgid "All packages, alphabetical"
 msgstr ""
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mandrake choices"
+msgstr "MandrakeConsulting"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Normal updates"
+msgstr "Bremanaat Linux-Mandrake"
+
+#: ../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 "Bugfixes updates"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "in descriptions"
-msgstr "Deskrivadurioù"
+msgid "Security updates"
+msgstr "Bremanaat Mandrake"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Configure proxies"
-msgstr "Kefluniañ servijoù"
+msgid "Description: "
+msgstr "Deskrivadurioù"
 
-#: ../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 "Reason for update: "
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please choose"
-msgstr "Dibabit seurt ho logodenn, mar plij."
+msgid "Summary: "
+msgstr "Diverrañ"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Selected size: %d MB"
-msgstr "Ment : %d Ko\n"
+msgid "Importance: "
+msgstr "Talvoudegezh : %s\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Add a source"
-msgstr "Ouzhpennañ un arveriad"
+msgid "Size: "
+msgstr "Ment"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Initializing..."
-msgstr "Staliañ:"
+msgid "Version: "
+msgstr "Doare :"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Save changes"
-msgstr "Meuziad Lañsañ"
+msgid "Name: "
+msgstr "Anv : %s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
+msgid "Currently installed version: "
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Kudennoù ho staliadur"
+msgid "Source: "
+msgstr "Servijer"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Importance: "
-msgstr "Talvoudegezh : %s\n"
+msgid "(Not available)"
+msgstr "parzhadur hegerz ebet"
 
 #: ../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 "Changelog:\n"
+msgstr "Nullañ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Add..."
-msgstr "Ouzhpennañ"
+msgid "Files:\n"
+msgstr "/_Restr"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Selected size: %d MB"
+msgstr "Ment : %d Ko\n"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Unable to create medium."
+msgid "Selected: %d MB / Free disk space: %d MB"
 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 ""
 
-#: ../edit-urpm-sources.pl: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 "Ar pakadoù a-heul a zo war-nes bezañ distaliet"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
+msgid "%s conflicts with %s"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be removed"
+msgid "Some packages can't be installed"
 msgstr "Ne m'eus ket gallet staliañ pakad"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Info..."
-msgstr "Titouroù"
+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"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
+msgid "Additional packages needed"
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Remove"
-msgstr "Dibarzhoù ar voullerez lpd a-bell"
-
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Kudennoù ho staliadur"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "No mirror"
-msgstr "melezou :"
+msgid "Some packages can't be removed"
+msgstr "Ne m'eus ket gallet staliañ pakad"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Staliañ"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Japan"
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Do nothing"
-msgstr "N'ev ket lodañ"
+msgid "Some additional packages need to be removed"
+msgstr "Ar pakadoù a-heul a zo war-nes bezañ staliet/lamet"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No update"
-msgstr "Bremanaat Linux-Mandrake"
+msgid "More information on package..."
+msgstr "O klask ar pakadoù hegerz"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Description: "
-msgstr "Deskrivadurioù"
+msgid "Information on packages"
+msgstr "Ne m'eus ket gallet digeriñ pakad"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+msgid "More info"
 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?"
-msgstr ""
+#, fuzzy, c-format
+msgid "Addable"
+msgstr "Taolenn"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Name: "
-msgstr "Anv : %s"
+msgid "Upgradable"
+msgstr "Bremanaat"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
+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:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Kudennoù ho staliadur"
+msgid "No update"
+msgstr "Bremanaat Linux-Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Australia"
-msgstr "a-steud"
+msgid "(none)"
+msgstr "ebet"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Installation finished"
-msgstr "Diuzit renkad ar staliadur"
+msgid "Please wait, listing packages..."
+msgstr "Gortozit e-keit ha ma kerc'han roll ar pakadoù bremanaet, mar plij..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by update availability"
-msgstr ""
-
-#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Poland"
-msgstr "Islandek"
+msgid "unknown package "
+msgstr "Ne m'eus ket gallet digeriñ pakad"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Version: "
-msgstr "Doare :"
+msgid "One of the following packages is needed:"
+msgstr "Ar pakadoù a-heul a zo war-nes bezañ staliet/lamet"
 
-#: ../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 choose"
+msgstr "Dibabit seurt ho logodenn, mar plij."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Editing source \\\"%s\\\":"
-msgstr "Etre"
+msgid "rpmdrake"
+msgstr "Moullerez"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Upgradable"
-msgstr "Bremanaat"
+msgid "Not selected"
+msgstr "Lugerezh ar voullerez"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid " done."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Selected"
 msgstr ""
+"Diuz\n"
+"an holl"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Kudennoù ho staliadur"
+msgid "Search results"
+msgstr "Servijer DNS"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Examining file of source `%s'..."
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Stop"
+msgstr "Rann"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Additional packages needed"
-msgstr ""
+#, fuzzy, c-format
+msgid "Please wait, searching..."
+msgstr "Gortozit mar plij, o prientiñ ar staliadur"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Search results (none)"
+msgstr "Klask"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr ""
+msgid "Other"
+msgstr "All"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
+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 ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Germany"
-msgstr "Alaman"
+msgid "Save and quit"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Russia"
-msgstr "Rusiek"
+msgid "Proxy..."
+msgstr "Fazi..."
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Norway"
-msgstr "Norvegek"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Update..."
+msgstr "Bremanaat Linux-Mandrake"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Kudennoù ho staliadur"
+msgid "Add..."
+msgstr "Ouzhpennañ"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Search"
-msgstr "Klask"
+msgid "Edit"
+msgstr "Kuitaat"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Edit a source"
-msgstr "Etre"
+msgid "Source"
+msgstr "Dilec'hiañ"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Tchek"
+msgid "Enabled?"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Stop"
-msgstr "Rann"
+msgid "Configure sources"
+msgstr "Kefluniañ servijoù"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Update"
-msgstr "Bremanaat Linux-Mandrake"
+msgid "Password:"
+msgstr "Tremenger"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Please wait, removing packages..."
-msgstr "Gortozit mar plij, o prientiñ ar staliadur"
+msgid "User:"
+msgstr "Anv arveriad"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Normal information"
-msgstr "Diskouez titouroù"
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Ret eo deoc'h kaout ur parzhadur disloañ"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Proxy hostname:"
+msgstr "Anv an ostiz a-bell"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Spain"
-msgstr "Spagnol"
+msgid "Configure proxies"
+msgstr "Kefluniañ servijoù"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Normal updates"
-msgstr "Bremanaat Linux-Mandrake"
+msgid "Please wait, updating medium..."
+msgstr "O termeniñ al live surentez"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "by selection state"
-msgstr "Diuz pakadoù unan hag unan"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgid "You need to insert the medium to continue"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Save changes"
+msgstr "Meuziad Lañsañ"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Login:"
+msgid "Relative path to synthesis/hdlist:"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Austria"
-msgstr "Aostria"
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Ne m'eus ket gallet skrivañ\n"
+msgid "Editing source \"%s\":"
+msgstr "Etre"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Edit a source"
+msgstr "Etre"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Update..."
-msgstr "Bremanaat Linux-Mandrake"
+msgid "Please wait, removing medium..."
+msgstr "O termeniñ al live surentez"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Starting download of `%s'..."
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Type of source:"
+msgstr "Dibabit pakadoù da staliañ"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "(none)"
-msgstr "ebet"
+msgid "Adding a source:"
+msgstr "Ouzhpennañ un arveriad"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
+msgid "You need to fill up at least the two first entries."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Name:"
+msgstr "Anv"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
+msgid "Login:"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Other"
-msgstr "All"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Choose a mirror..."
+msgstr "Dibabit ur skramm"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reason for update: "
+msgid "Browse..."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Please choose the desired mirror."
-msgstr "Gortozit e-keit ha ma kerc'han roll ar melezourioù, mar plij..."
+msgid "Path or mount point:"
+msgstr "Poent marc'hañ : "
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Edit"
-msgstr "Kuitaat"
+msgid "Removable device"
+msgstr "Lemel ar steudad"
 
-#: ../rpmdrake:1
+#: ../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"
+
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Gortozit e-keit ha ma kerc'han roll ar pakadoù bremanaet, mar plij..."
+msgid "Path:"
+msgstr "Porzh :"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr ""
+msgid "Local files"
+msgstr "Restroù lec'hel"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Search results (none)"
-msgstr "Klask"
+msgid "Add a source"
+msgstr "Ouzhpennañ un arveriad"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Danmark"
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
+msgid "Unable to create medium."
 msgstr ""
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "United States"
-msgstr "Amerika"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "changes:"
-msgstr " Pakadoù : "
-
-#: ../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"
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "rpmdrake"
-msgstr "Moullerez"
+msgid "Update"
+msgstr "Bremanaat Linux-Mandrake"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No"
+msgid "Select the source(s) you wish to update:"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Summary: "
-msgstr "Diverrañ"
+msgid "Please wait, updating media..."
+msgstr "Gortozit mar plij, o prientiñ ar staliadur"
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Canada"
-msgstr "Kanadian (Kebek)"
+msgid " failed!"
+msgstr "mkraid sac'het"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Greece"
-msgstr "Gres"
+msgid " done."
+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 ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Source: "
-msgstr "Servijer"
-
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
+msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to get source packages, sorry. %s"
+msgid "Starting download of `%s'..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Path:"
-msgstr "Porzh :"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during removal"
-msgstr "O prientiñ ar staliadur"
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by source repository"
+msgid "Examining distant file of source `%s'..."
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Selected"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Examining file of source `%s'..."
 msgstr ""
-"Diuz\n"
-"an holl"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Netherlands"
-msgstr "Izelvroioù"
+msgid "Copying file for source `%s'..."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Addable"
-msgstr "Taolenn"
+msgid "Please choose the desired mirror."
+msgstr "Gortozit e-keit ha ma kerc'han roll ar melezourioù, mar plij..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "(Not available)"
-msgstr "parzhadur hegerz ebet"
+#: ../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
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
+msgid "No mirror"
+msgstr "melezou :"
+
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"There was an error downloading the mirrors list:\n"
 "\n"
 "%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr "Ar pakadoù a-heul a zo war-nes bezañ distaliet"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr "Lugerezh ar voullerez"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
+msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Software Packages Removal"
-msgstr "Anv rannet"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Sweden"
-msgstr "Suis"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../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"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"Is it ok to continue?"
 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 "United States"
+msgstr "Amerika"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
+msgid "United Kingdom"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Taiwan"
+msgstr "Iraniek"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "Kuitaat"
+msgid "Sweden"
+msgstr "Suis"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Russia"
+msgstr "Rusiek"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Portugal"
+msgstr "Porzh :"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Poland"
+msgstr "Islandek"
+
+#: ../rpmdrake.pm: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 "Norway"
+msgstr "Norvegek"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "Mat eo"
+msgid "Netherlands"
+msgstr "Izelvroioù"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Please wait, adding medium..."
-msgstr "Gortozit mar plij, o prientiñ ar staliadur"
+msgid "Korea"
+msgstr "Dilec'hiañ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Japan"
+msgstr ""
+
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Type of source:"
-msgstr "Dibabit pakadoù da staliañ"
+msgid "Italy"
+msgstr "Staliañ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Please insert the medium named \\\"%s\\\" on device [%s]"
-msgstr "Lakait ur bladennig gwerc'h el lenner %s"
+msgid "Israel"
+msgstr "Staliañ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to get source packages."
-msgstr ""
+msgid "Greece"
+msgstr "Gres"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Too many packages are selected"
-msgstr "Hemañ a zo ur pakad ret, n'hell ket bezañ andiuzet"
+msgid "France"
+msgstr "Nullañ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "%s conflicts with %s"
+msgid "Finland"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Spain"
+msgstr "Spagnol"
+
+#: ../rpmdrake.pm: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 "Danmark"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Mandrake choices"
-msgstr "MandrakeConsulting"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr "Alaman"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Czech Republic"
+msgstr "Tchek"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Changelog:\n"
-msgstr "Nullañ"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Costa Rica"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Korea"
-msgstr "Dilec'hiañ"
+msgid "Canada"
+msgstr "Kanadian (Kebek)"
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Removable device"
-msgstr "Lemel ar steudad"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Beljik"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Change medium"
-msgstr "Kemmañ ar spister"
+msgid "Australia"
+msgstr "a-steud"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Mandrake Update"
-msgstr "MandrakeUpdate, doare 7.2\n"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
+msgstr "Aostria"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "by size"
-msgstr "Adventañ"
+msgid "Info..."
+msgstr "Titouroù"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "Servijer FTP"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Files:\n"
-msgstr "/_Restr"
+msgid "No"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
+msgid "Yes"
 msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:86
diff --git a/po/bs.po b/po/bs.po
index befae003..28ecd2ed 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grpmi\n"
-"POT-Creation-Date: 2003-05-02 20:15+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+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,20 +13,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "Uklju�eno?"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../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:"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Želite li da nastavim?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -45,69 +41,16 @@ 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 "Already existing update sources"
-msgstr ""
-
-#: ../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 ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"Welcome to MandrakeUpdate!\n"
 "\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
 msgstr ""
-"Da bismo zadovoljili sve zavisnosti, sljedeće pakete trebate\n"
-"odzna�iti:\n"
+"Dobrodošli u MandrakeUpdate!\n"
 "\n"
-
-#: ../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"
+"Ovaj alat će vam pomoći da izaberete update koje želite instalirati na\n"
+"vaš ra�unar."
 
 #: ../rpmdrake:1
 #, c-format
@@ -122,17 +65,6 @@ msgstr ""
 "Ovaj alat će vam pomoći da izaberete koji softver želite ukloniti sa vašeg\n"
 "ra�unara."
 
-#: ../edit-urpm-sources.pl: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"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Save and quit"
-msgstr "Snimi i izađi"
-
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
@@ -146,376 +78,326 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Size: "
-msgstr "Veli�ina"
+msgid "Problem during removal"
+msgstr "Došlo je do problema prilikom instalacije"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Security updates"
-msgstr "Prikaži sigurnosne update"
+msgid "Please wait, removing packages..."
+msgstr ""
+"Molimo sa�ekajte\n"
+"Sortiram pakete"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Maximum information"
-msgstr "Maksimalne informacije"
+#, fuzzy, c-format
+msgid "Please wait, reading packages database..."
+msgstr ""
+"Molimo sa�ekajte\n"
+"Sortiram pakete"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Greška..."
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Došlo je do greške prilikom instalacije paketa:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "United Kingdom"
-msgstr "Ujedinjeno kraljevstvo"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Installation failed"
+msgstr "Instaliraj sve"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure sources"
-msgstr "Podesi izvore"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "Pripremam pakete za instalaciju..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "Pripremam pakete za instalaciju..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "u imenima"
+msgid "All requested packages were installed successfully."
+msgstr "Svi traženi paketi su uspješno instalirani."
 
-#: ../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 "Everything installed successfully"
+msgstr "Sve je uspješno instalirano"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
+"The installation is finished; %s.\n"
 "\n"
-"\\Do you want to continue installation?"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
 msgstr ""
-"Sljedeći paketi trebaju biti uklonjeni kako bi ostali bili unaprijeđeni:\n"
-"\n"
-"%s\n"
+"Instalacija je završena; %s.\n"
 "\n"
-"Mogu li nastaviti?"
+"Neke konfiguracione datoteke su napravljene, kao npr. `.rpmnew' ili `."
+"rpmsave',\n"
+"sada ih možete ispitati kako biste preduzeli neke akcije:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Ukloni .%s"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Source"
-msgstr "Izvor"
+msgid "everything was installed correctly"
+msgstr "sve je uspješno instalirano"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Finland"
-msgstr "Finska"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during installation"
+msgstr "Došlo je do problema prilikom instalacije"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Instaliram paket `%s' (%s/%s)..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "France"
-msgstr "Na silu"
+msgid "Preparing packages installation..."
+msgstr "Pripremam pakete za instalaciju..."
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "More info"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../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."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"The following packages have bad signatures:\n"
+"\n"
 "%s\n"
 "\n"
-"Is it ok to continue?"
+"Do you want to continue installation?"
 msgstr ""
+"Sljedeći paketi trebaju biti uklonjeni kako bi ostali bili unaprijeđeni:\n"
+"\n"
 "%s\n"
 "\n"
-"Želite li da nastavim?"
+"Mogu li nastaviti?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Ponovo u�itaj listu paketa"
+msgid "Verifying packages signatures..."
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr "Izaberite neki mirror..."
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "Downloadujem paket `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Dodajem izvor:"
+msgid "Cancel"
+msgstr "Odustani"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Paket ne može biti instaliran"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "Ok"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Pripremam pakete za instalaciju..."
+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 "All packages,"
-msgstr "Svi paketi,"
+msgid "Change medium"
+msgstr "Promjeni medij"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "u datotekama"
+msgid "Initializing..."
+msgstr "Inicijaliziram..."
 
 #: ../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 "Proxy hostname:"
-msgstr "Proxy korisni�ko ime:"
-
-#: ../rpmdrake:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Update source(s)"
-msgstr "Osvježi izvore"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Local files"
-msgstr "Lokalne datoteke"
+msgid "Package installation..."
+msgstr "Pripremam pakete za instalaciju..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Inspecting %s"
-msgstr "Ispitujem %s"
-
-#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Israel"
-msgstr "Instaliraj"
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Morate biti root da bi instalirali pakete, žalim."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Help"
-msgstr "/_Pomoć"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "HTTP server"
-msgstr "HTTP server"
+msgid "Unable to get source packages."
+msgstr "Izaberite pakete"
 
-#: ../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 ""
-"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 "Inspect..."
+msgstr "Ispitaj..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Instaliraj sve"
+msgid "Installation finished"
+msgstr "Instaliran"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Koristi .%s kao glavnu datoteku"
+msgid "Do nothing"
+msgstr "Ne radi ništa"
 
 #: ../rpmdrake:1
 #, c-format
-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?"
+msgid "Use .%s as main file"
+msgstr "Koristi .%s kao glavnu datoteku"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Pronađi:"
+msgid "Remove .%s"
+msgstr "Ukloni .%s"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "All packages, alphabetical"
-msgstr "Svi paketi, abecedno"
+#, fuzzy, c-format
+msgid "changes:"
+msgstr "Snimi izmjene"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Molim sa�ekajte, tražim..."
+msgid "Inspecting %s"
+msgstr "Ispitujem %s"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, reading packages database..."
+msgid "Please wait, finding available 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 "Reset the selection"
-msgstr "Poništi izbor"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"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]>):"
+msgid "Please wait, adding medium..."
+msgstr "Molim sa�ekajte, dodajem medij..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"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 ""
-"Da bismo zadovoljili sve zavisnosti, sljedeće pakete takođe treba\n"
-"ukloniti:\n"
+"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.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Kostarika"
+msgid "How to choose manually your mirror"
+msgstr "Kako da ru�no izaberete vaš mirror"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"There was a problem during the installation:\n"
+"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"
-"%s"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"Došlo je do greške prilikom instalacije paketa:\n"
-"\n"
-"%s"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Please wait, removing medium..."
-msgstr "Molim sa�ekajte, brišem medij..."
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "Å ifra:"
+msgid "Already existing update sources"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
+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
 #, c-format
-msgid "Taiwan"
-msgstr "Tajvan"
+msgid "A fatal error occurred: %s."
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "User:"
-msgstr "Korisni�ko ime:"
+msgid "Fatal error"
+msgstr "Greška u datoteci"
 
-#: ../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 "Software Packages Installation"
+msgstr "Pripremam pakete za instalaciju..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, listing packages..."
-msgstr ""
-"Molimo sa�ekajte\n"
-"Sortiram pakete"
+msgid "Mandrake Update"
+msgstr "MandrakeUpdate Opcije"
 
 #: ../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 "Software Packages Removal"
+msgstr "Uklanjanje softverskih paketa"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Izlaz"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Information on packages"
-msgstr "Ne mogu otvoriti paket"
+#, c-format
+msgid "Install"
+msgstr "Instaliraj"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Cancel"
-msgstr "Odustani"
+msgid "Remove"
+msgstr "Briši"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Everything installed successfully"
-msgstr "Sve je uspješno instalirano"
+#, fuzzy, c-format
+msgid "Help"
+msgstr "/_Pomoć"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Molim sa�ekajte, unaprjeđujem medije..."
+msgid "Search"
+msgstr "Pretraga"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Find:"
+msgstr "Pronađi:"
 
 #: ../rpmdrake:1
 #, c-format
@@ -533,193 +415,161 @@ msgstr ""
 "Mogu li nastaviti?"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "in descriptions"
-msgstr "Opisi"
-
-#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Konfiguriši proxije"
+msgid "Some packages need to be removed"
+msgstr "Neke pakete treba obrisati"
 
-#: ../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"
+"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"
-"Is it ok to continue?"
+"Do you really want to install all the selected packages?"
 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"
+"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"
-"Mogu li nastaviti?"
+"Želite li stvarno instalirati sve izabrane pakete?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Molim izaberite"
+msgid "Too many packages are selected"
+msgstr "Izabrano je previše paketa"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Selected size: %d MB"
-msgstr "%d izabranih paketa: %.1f MB"
+#, c-format
+msgid "Maximum information"
+msgstr "Maksimalne informacije"
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Add a source"
-msgstr "Dodajem izvor:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal information"
+msgstr "Normalne informacije"
+
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update source(s)"
+msgstr "Osvježi izvore"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "Inicijaliziram..."
+msgid "Reload the packages list"
+msgstr "Ponovo u�itaj listu paketa"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "Snimi izmjene"
+msgid "Reset the selection"
+msgstr "Poništi izbor"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
-msgstr "Greška prilikom downloada"
+msgid "in files"
+msgstr "u datotekama"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Pripremam pakete za instalaciju..."
+msgid "in descriptions"
+msgstr "Opisi"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Importance: "
-msgstr "Zna�aj: "
+msgid "in names"
+msgstr "u imenima"
 
 #: ../rpmdrake:1
 #, c-format
-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"
+msgid "by update availability"
+msgstr "po dostupnosti update-a"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "Dodaj..."
+msgid "by source repository"
+msgstr "po izvornom spremištu"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Unable to create medium."
-msgstr "Ne mogu kreirati medij."
+msgid "by selection state"
+msgstr "po stanju izabranosti"
 
 #: ../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 ""
-"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:"
+msgid "by size"
+msgstr "po veli�ini"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
-msgstr "Potraži..."
+msgid "by group"
+msgstr "po grupi"
 
 #: ../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 "Info..."
-msgstr "Info..."
+msgid "All packages,"
+msgstr "Svi paketi,"
 
-#: ../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 "All packages, alphabetical"
+msgstr "Svi paketi, abecedno"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "Briši"
+msgid "Mandrake choices"
+msgstr "Mandrake izbori"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Pripremam pakete za instalaciju..."
+msgid "Normal updates"
+msgstr "Normalni update"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No mirror"
-msgstr "mirror:"
+msgid "Bugfixes updates"
+msgstr "Prikaži ispravke grešaka"
 
-#: ../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 ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Security updates"
+msgstr "Prikaži sigurnosne update"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Install"
-msgstr "Instaliraj"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Japan"
-msgstr "Japan"
+#, fuzzy, c-format
+msgid "Description: "
+msgstr "Opisi"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Ne radi ništa"
+msgid "Reason for update: "
+msgstr "Razlog za update: "
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No update"
-msgstr "Izvrši update"
+msgid "Summary: "
+msgstr "Opis"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "Zna�aj: "
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Description: "
-msgstr "Opisi"
+msgid "%s KB"
+msgstr "%.1f KB"
 
 #: ../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."
+#, fuzzy, c-format
+msgid "Size: "
+msgstr "Veli�ina"
 
 #: ../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 ""
-"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?"
+#, fuzzy, c-format
+msgid "Version: "
+msgstr "Verzija:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -728,68 +578,84 @@ msgstr "Ime: %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "Ispitaj..."
+msgid "Currently installed version: "
+msgstr "Trenutno instalirana verzija: "
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Pripremam pakete za instalaciju..."
+msgid "Source: "
+msgstr "Izvor"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Australija"
+msgid "(Not available)"
+msgstr "(Nijedan nije dostupan)"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
+msgstr "Changelog:\n"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Installation finished"
-msgstr "Instaliran"
+msgid "Files:\n"
+msgstr "/_Datoteka"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by update availability"
-msgstr "po dostupnosti update-a"
+#, fuzzy, c-format
+msgid "Selected size: %d MB"
+msgstr "%d izabranih paketa: %.1f MB"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
-msgstr "Poljska"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Izabrano: %d MB / Slobodan prostor: %d MB"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Version: "
-msgstr "Verzija:"
-
-#: ../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."
+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"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Editing source \\\"%s\\\":"
-msgstr "Izmijena izvora \"%s\":"
+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"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Upgradable"
-msgstr "Update"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid " done."
-msgstr ""
+msgid "%s conflicts with %s"
+msgstr "je u konfliktu sa"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Pripremam pakete za instalaciju..."
+msgid "Some packages can't be installed"
+msgstr "Paket ne može biti instaliran"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining file of source `%s'..."
+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
 #, c-format
@@ -798,509 +664,643 @@ msgstr "Potrebni su dodatni paketi"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Bugfixes updates"
-msgstr "Prikaži ispravke grešaka"
+msgid "Some packages can't be removed"
+msgstr "Paket ne može biti instaliran"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
 msgstr ""
+"Žalim, uklanjanje ovog paketa bi izazvalo rušenje sistema:\n"
+"\n"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "Njema�ka"
+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.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Russia"
-msgstr "Rusija"
+msgid "Some additional packages need to be removed"
+msgstr "Potrebno je obrisati neke dodatne pakete"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Norway"
-msgstr "Norveška"
+msgid "More information on package..."
+msgstr "Više informacija o paketu..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Došlo je do problema prilikom instalacije"
+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 "Search"
-msgstr "Pretraga"
+msgid "More info"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Edit a source"
-msgstr "Izmijeni izvor"
+msgid "Addable"
+msgstr "Može se dodati"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Czech Republic"
-msgstr "Češka"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Upgradable"
+msgstr "Update"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Stop"
-msgstr "Stani"
+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
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "No update"
+msgstr "Izvrši update"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Update"
-msgstr "Update"
+msgid "(none)"
+msgstr "(ništa)"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, removing packages..."
+msgid "Please wait, listing packages..."
 msgstr ""
 "Molimo sa�ekajte\n"
 "Sortiram pakete"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Normal information"
-msgstr "Normalne informacije"
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "Ne mogu otvoriti paket"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Downloadujem paket `%s' (%s/%s)..."
+msgid "One of the following packages is needed:"
+msgstr "Potreban je jedan od sljedećih paketa:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Izabrano: %d MB / Slobodan prostor: %d MB"
+msgid "Please choose"
+msgstr "Molim izaberite"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Spain"
-msgstr "Å panija"
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Normal updates"
-msgstr "Normalni update"
+msgid "Not selected"
+msgstr "Otkriveni su konflikti"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Selected"
+msgstr ""
+"Izaberi\n"
+"sve"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by selection state"
-msgstr "po stanju izabranosti"
+msgid "Search results"
+msgstr "Rezultati pretrage"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr "Molim sa�ekajte, skidam adrese mirrora sa MandrakeSoft web stranice."
+msgid "Stop"
+msgstr "Stani"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Login:"
-msgstr "Login:"
+msgid "Please wait, searching..."
+msgstr "Molim sa�ekajte, tražim..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "Austrija"
+msgid "Search results (none)"
+msgstr "Rezultati pretrage (ništa)"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Greška u datoteci"
+#, c-format
+msgid "Other"
+msgstr "Ostalo"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Izaberite izvorne koje želite unaprijediti:"
+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."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Snimi i izađi"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Update..."
-msgstr "Update"
+msgid "Proxy..."
+msgstr "Greška..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "Provjeravam potpis `%s'..."
+msgid "Update..."
+msgstr "Update"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
-msgstr "(ništa)"
+msgid "Add..."
+msgstr "Dodaj..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
-"Žalim, uklanjanje ovog paketa bi izazvalo rušenje sistema:\n"
-"\n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "Izmjeni"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Instaliram paket `%s' (%s/%s)..."
+msgid "Source"
+msgstr "Izvor"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Trenutno instalirana verzija: "
+msgid "Enabled?"
+msgstr "Uklju�eno?"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Other"
-msgstr "Ostalo"
+msgid "Configure sources"
+msgstr "Podesi izvore"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Razlog za update: "
+msgid "Password:"
+msgstr "Å ifra:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Please choose the desired mirror."
-msgstr ""
-"Molimo sa�ekajte\n"
-"Skidam listu mirrora"
+msgid "User:"
+msgstr "Korisni�ko ime:"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit"
-msgstr "Izmjeni"
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Možete navesti korisni�ko ime / šifru za proxy identifikaciju."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Please wait, finding available packages..."
-msgstr ""
-"Molimo sa�ekajte\n"
-"Sortiram pakete"
+msgid "Proxy hostname:"
+msgstr "Proxy korisni�ko ime:"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Relativni put do synthesis/hdlist:"
+msgid ""
+"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
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Rezultati pretrage (ništa)"
+msgid "Configure proxies"
+msgstr "Konfiguriši proxije"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Danmark"
-msgstr "Danska"
+msgid "Please wait, updating medium..."
+msgstr "Molim sa�ekajte, osvježavam medij..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "China"
-msgstr "Kina"
+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"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "United States"
-msgstr "SAD"
+msgid "You need to insert the medium to continue"
+msgstr "Morate ubaciti medij u uređaj za nastavak"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "changes:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save changes"
 msgstr "Snimi izmjene"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Potrebno je obrisati neke dodatne pakete"
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Relativni put do synthesis/hdlist:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing source \"%s\":"
+msgstr "Izmijena izvora \"%s\":"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "Ne"
+msgid "Edit a source"
+msgstr "Izmijeni izvor"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Summary: "
-msgstr "Opis"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr "Molim sa�ekajte, brišem medij..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Canada"
-msgstr "Kanada"
+msgid "Type of source:"
+msgstr "Tip izvora:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Greece"
-msgstr "Gr�ka"
+msgid "Adding a source:"
+msgstr "Dodajem izvor:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl: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."
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 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."
+"Već postoji medij sa tim imenom, da li ga stvarno\n"
+"želite zamjeniti?"
 
-#: ../rpmdrake:1
+#: ../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."
+
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Source: "
-msgstr "Izvor"
+msgid "Name:"
+msgstr "Ime"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr ""
+msgid "Login:"
+msgstr "Login:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Morate biti root da bi instalirali pakete, žalim."
+#: ../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:"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Removable device"
+msgstr "Izmjenjivi uređaj"
+
+#: ../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"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Path:"
 msgstr "Port:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during removal"
-msgstr "Došlo je do problema prilikom instalacije"
-
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by source repository"
-msgstr "po izvornom spremištu"
+msgid "Local files"
+msgstr "Lokalne datoteke"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Selected"
-msgstr ""
-"Izaberi\n"
-"sve"
+msgid "Add a source"
+msgstr "Dodajem izvor:"
+
+#: ../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 osvježim medij; on će biti automatski isklju�en."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Netherlands"
-msgstr "Nizozemska"
+msgid "Unable to create medium."
+msgstr "Ne mogu kreirati medij."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "Može se dodati"
+msgid "Update"
+msgstr "Update"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
-msgstr "(Nijedan nije dostupan)"
+msgid "Select the source(s) you wish to update:"
+msgstr "Izaberite izvorne koje želite unaprijediti:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, updating media..."
+msgstr "Molim sa�ekajte, unaprjeđujem medije..."
+
+#: ../rpmdrake.pm: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 " failed!"
+msgstr "u datotekama"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid " done."
 msgstr ""
-"Žalim, sljedeće pakete ne možete izabrati:\n"
-"\n"
 
-#: ../rpmdrake:1
+#: ../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"
+msgstr ""
+
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Not selected"
-msgstr "Otkriveni su konflikti"
+msgid "Starting download of `%s'..."
+msgstr "Provjeravam potpis `%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Uklanjanje softverskih paketa"
+msgid "Examining distant file of source `%s'..."
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Sweden"
-msgstr "Å vedska"
+msgid "Examining file of source `%s'..."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+msgid "Copying file for source `%s'..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Please choose the desired mirror."
+msgstr ""
+"Molimo sa�ekajte\n"
+"Skidam listu mirrora"
+
+#: ../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."
+"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 ""
-"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."
+"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.pm:1
+#, fuzzy, c-format
+msgid "No mirror"
+msgstr "mirror:"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%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 ""
+"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:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Potreban je jedan od sljedećih paketa:"
+msgid "Error during download"
+msgstr "Greška prilikom downloada"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "Izlaz"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "Molim sa�ekajte, skidam adrese mirrora sa MandrakeSoft web stranice."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
+"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 ""
-"Moram kontaktirati mirror kako bi dobavio najnovije pakete\n"
-"za update. Molim provjerite da li je vaša mreža u funkciji.\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"
 "Mogu li nastaviti?"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid "United States"
+msgstr "SAD"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "Molim sa�ekajte, dodajem medij..."
+msgid "China"
+msgstr "Kina"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "Tip izvora:"
+msgid "United Kingdom"
+msgstr "Ujedinjeno kraljevstvo"
 
-#: ../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]"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "Tajvan"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unable to get source packages."
-msgstr "Izaberite pakete"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "Å vedska"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Izabrano je previše paketa"
+msgid "Russia"
+msgstr "Rusija"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "je u konfliktu sa"
+msgid "Portugal"
+msgstr "Port:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 će vam pomoći da izaberete update koje želite instalirati na\n"
-"vaš ra�unar."
+msgid "Poland"
+msgstr "Poljska"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Mandrake izbori"
+msgid "Norway"
+msgstr "Norveška"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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."
+msgid "Netherlands"
+msgstr "Nizozemska"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Korea"
+msgstr "Na silu"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Changelog:\n"
+msgid "Japan"
+msgstr "Japan"
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Korea"
+msgid "Italy"
+msgstr "Instaliraj"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Israel"
+msgstr "Instaliraj"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Gr�ka"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "France"
 msgstr "Na silu"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "Izmjenjivi uređaj"
+msgid "Finland"
+msgstr "Finska"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "Å panija"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
+msgstr "Danska"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr "Njema�ka"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
+msgstr "Češka"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Costa Rica"
+msgstr "Kostarika"
+
+#: ../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:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Change medium"
-msgstr "Promjeni medij"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Mandrake Update"
-msgstr "MandrakeUpdate Opcije"
+msgid "Australia"
+msgstr "Australija"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by size"
-msgstr "po veli�ini"
+msgid "Austria"
+msgstr "Austrija"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "FTP server"
+msgid "Info..."
+msgstr "Info..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Files:\n"
-msgstr "/_Datoteka"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
+msgstr "Ne"
 
 #: ../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 osvježim medij; on će biti automatski isklju�en."
+#, c-format
+msgid "Yes"
+msgstr "Da"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
diff --git a/po/ca.po b/po/ca.po
index 40abf712..80a3be30 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grpmi\n"
-"POT-Creation-Date: 2003-05-02 20:15+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+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,20 +16,16 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "Habilitat?"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../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:"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Esteu d'acord en continuar?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -49,70 +45,17 @@ 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 "Already existing update sources"
-msgstr ""
-
-#: ../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 ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"Welcome to MandrakeUpdate!\n"
 "\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
 msgstr ""
-"A causa de les dependències, els següent(s) paquet(s) s'han de "
-"deseleccionar\n"
-"ara:\n"
+"Benvinguts al MandrakeUpdate!\n"
 "\n"
-
-#: ../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"
+"Aquesta eina us ajudarà a escollir les actualitzacions que voleu instal·lar "
+"en el vostre\n"
+"ordinador."
 
 #: ../rpmdrake:1
 #, c-format
@@ -127,17 +70,6 @@ msgstr ""
 "Aqueta eina us ajudarà a escollir quin programari voleu eliminar del\n"
 "vostre ordinador."
 
-#: ../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 tal de desar els canvis, heu d'inserir el support en la unitat."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Save and quit"
-msgstr "Desa i surt"
-
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
@@ -151,376 +83,325 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Size: "
-msgstr "Mida"
+msgid "Problem during removal"
+msgstr "Hi ha hagut un problema durant la instal·lació"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Security updates"
-msgstr "Mostra les actualitzacions de seguretat"
+msgid "Please wait, removing packages..."
+msgstr ""
+"Si us plau, espereu\n"
+"S'estan ordenant els paquets"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Maximum information"
-msgstr "Màxima informació"
+#, 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
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Error..."
+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.pm:1
-#, c-format
-msgid "United Kingdom"
-msgstr "Regne Unit"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Installation failed"
+msgstr "Instal·la'ls tots"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure sources"
-msgstr "Configureu les fonts"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+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 "No package found for installation."
+msgstr "S'estan preparant els paquets per a la instal·lació..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "en noms"
+msgid "All requested packages were installed successfully."
+msgstr "Tots els paquets demanats s'han instal·lat correctament."
 
-#: ../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 ""
-"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."
+msgid "Everything installed successfully"
+msgstr "Tot s'ha instal·lat correctament"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
+"The installation is finished; %s.\n"
 "\n"
-"\\Do you want to continue installation?"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
 msgstr ""
-"S'han d'eliminar els següents paquets perquè altres siguin actualitzats:\n"
-"\n"
-"%s\n"
+"La instal·lació ha finalitzat; %s.\n"
 "\n"
-"Esteu d'acord en continuar?"
+"Alguns fitxers de configuració han estat creats com a `.rpmnew' or `."
+"rpmsave',\n"
+"ara podeu inspeccionar-los per a empendre accions:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Elimina .%s"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Source"
-msgstr "Font"
+msgid "everything was installed correctly"
+msgstr "tot s'ha instal·lat correctament"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Finland"
-msgstr "Finlàndia"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during installation"
+msgstr "Hi ha hagut problemes durant la instal·lació"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "S'està instal·lant el paquet '%s' (%s/%s)..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "France"
-msgstr "Imposa"
+msgid "Preparing packages installation..."
+msgstr "S'estan preparant els paquets per a la instal·lació..."
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "More info"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../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."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"The following packages have bad signatures:\n"
+"\n"
 "%s\n"
 "\n"
-"Is it ok to continue?"
+"Do you want to continue installation?"
 msgstr ""
+"S'han d'eliminar els següents paquets perquè altres siguin actualitzats:\n"
+"\n"
 "%s\n"
 "\n"
 "Esteu d'acord en continuar?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Recarrega la llista de paquets"
+msgid "Verifying packages signatures..."
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr "Escolliu una rèplica..."
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "S'està descarregant el paquet '%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Afegint una font:"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "No es pot instal·lar el paquet"
+msgid "Cancel"
+msgstr "Cancel·la"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "S'estan preparant els paquets per a la instal·lació..."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "D'acord"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "All packages,"
-msgstr "Paquets: "
+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 "in files"
-msgstr "en fitxers"
+msgid "Change medium"
+msgstr "Canvieu el suport"
 
 #: ../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 "Proxy hostname:"
-msgstr "Nom d'usuari del servidor intermediari:"
-
-#: ../rpmdrake:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Update source(s)"
-msgstr "Actualitza la(es) font(s)"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Local files"
-msgstr "Fitxers locals"
+msgid "Initializing..."
+msgstr "S'està inicialitzant..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Inspecting %s"
-msgstr "Inspeccionant %s"
-
-#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Israel"
-msgstr "Instal·lació"
+msgid "Package installation..."
+msgstr "S'estan preparant els paquets per a la instal·lació..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Help"
-msgstr "/_Ajuda"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "HTTP server"
-msgstr "Servidor HTTP"
-
-#: ../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 ""
-"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."
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Perdoneu, necessiteu ser root per instal·lar paquets."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Instal·la'ls tots"
+msgid "Unable to get source packages."
+msgstr "Trieu els paquets"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Utilitza .%s com a fitxer principal"
+msgid "Inspect..."
+msgstr "s'està inspeccionant..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Search results"
-msgstr "Resultats de la cerca"
-
-#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid " failed!"
-msgstr "en fitxers"
+msgid "Installation finished"
+msgstr "Instal·lat"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Brazil"
-msgstr "Brasil"
+msgid "Do nothing"
+msgstr "No facis res"
 
-#: ../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 ""
-"Ja hi ha un support amb aquest nom, realment\n"
-"voleu reemplaçar-lo?"
+msgid "Use .%s as main file"
+msgstr "Utilitza .%s com a fitxer principal"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Cerca:"
+msgid "Remove .%s"
+msgstr "Elimina .%s"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "All packages, alphabetical"
-msgstr "Tots els paquets, alfabèticament"
+#, fuzzy, c-format
+msgid "changes:"
+msgstr "Paquets: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Si us plau espereu, s'està buscant..."
+msgid "Inspecting %s"
+msgstr "Inspeccionant %s"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, reading packages database..."
+msgid "Please wait, finding available 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"
+"Si us plau, espereu mentre es cerca la llista de paquets d'actualització..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reset the selection"
-msgstr "Esborra la selecció"
+msgid "Please wait, adding medium..."
+msgstr "Si us plau espereu, s'està afegint el suport..."
 
-#: ../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 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 ""
-"Si necessiteu un servidor intermediari, entreu el nom de l'ordinador central "
-"i un port opcional (sintaxi: <proxyhost[:port]>):"
+"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
+msgid "How to choose manually your mirror"
+msgstr "Com escollir manualment la rèplica"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"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 ""
-"Per poder satisfer totes les dependències, els següent(s) paquet(s)\n"
-"cal que s'eliminin:\n"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Costa Rica"
+msgid "Already existing update sources"
+msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"There was a problem during the installation:\n"
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
 "\n"
-"%s"
+"Is it ok to continue?"
 msgstr ""
-"Hi ha hagut un error durant la instal·lació de paquets:\n"
+"Necessito contactar amb la rèplica per a obtenir les últimes\n"
+"actualitzacions de paquets. Comproveu que la xarxa funcioni ara.\n"
 "\n"
-"%s"
-
-#: ../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:"
+"Esteu d'acord en continuar?"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
+msgid "A fatal error occurred: %s."
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Taiwan"
-msgstr "Taiwan"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "User:"
-msgstr "Nom d'usuari:"
+msgid "Fatal error"
+msgstr "Error de fitxer"
 
-#: ../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 "Software Packages Installation"
+msgstr "S'estan preparant els paquets per a la instal·lació..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, listing packages..."
-msgstr ""
-"Si us plau, espereu\n"
-"S'estan ordenant els paquets"
+msgid "Mandrake Update"
+msgstr "Preferències del MandrakeUpdate"
 
 #: ../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 "Software Packages Removal"
+msgstr "Eliminació de Paquets de Programari"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Surt"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Information on packages"
-msgstr "No es pot obrir el paquet"
+#, c-format
+msgid "Install"
+msgstr "Instal·lació"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Cancel"
-msgstr "Cancel·la"
+msgid "Remove"
+msgstr "Suprimir"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Everything installed successfully"
-msgstr "Tot s'ha instal·lat correctament"
+#, fuzzy, c-format
+msgid "Help"
+msgstr "/_Ajuda"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Si us plau espereu, actualitzant dades..."
+msgid "Search"
+msgstr "Cerca"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Find:"
+msgstr "Cerca:"
 
 #: ../rpmdrake:1
 #, c-format
@@ -538,194 +419,161 @@ msgstr ""
 "Esteu d'acord en continuar?"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "in descriptions"
-msgstr "Descripcions"
-
-#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Configureu els servidors intermediaris(proxies)"
+msgid "Some packages need to be removed"
+msgstr "S'han d'eliminar alguns paquets"
 
-#: ../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"
+"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"
-"Is it ok to continue?"
+"Do you really want to install all the selected packages?"
 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"
+"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"
-"Esteu d'acord en continuar?"
+"Realment voleu instal·lar els paquets seleccionats?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Si us plau escolliu"
+msgid "Too many packages are selected"
+msgstr "S'han seleccionat massa paquets"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Selected size: %d MB"
-msgstr "%d paquets seleccionats: %.1f MB"
-
-#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Add a source"
-msgstr "Afegeix una font"
+msgid "Maximum information"
+msgstr "Màxima informació"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "S'està inicialitzant..."
+msgid "Normal information"
+msgstr "Informació normal"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Save changes"
-msgstr "Desa canvis"
+msgid "Update source(s)"
+msgstr "Actualitza la(es) font(s)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
-msgstr "S'ha produït un error durant la descàrrega"
+msgid "Reload the packages list"
+msgstr "Recarrega la llista de paquets"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Package installation..."
-msgstr "S'estan preparant els paquets per a la instal·lació..."
+#, c-format
+msgid "Reset the selection"
+msgstr "Esborra la selecció"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "in files"
+msgstr "en fitxers"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Importance: "
-msgstr "Importància: %s"
+msgid "in descriptions"
+msgstr "Descripcions"
 
 #: ../rpmdrake:1
 #, c-format
-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"
+msgid "in names"
+msgstr "en noms"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "Afegir..."
+msgid "by update availability"
+msgstr "per disponibilitat d'actualització"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Unable to create medium."
-msgstr "No es pot crear el support."
+msgid "by source repository"
+msgstr "per dipòsit de fonts"
 
 #: ../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 ""
-"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:"
+msgid "by selection state"
+msgstr "per estat de selecció"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
-msgstr "Navega..."
+msgid "by size"
+msgstr "per mida"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "No es pot instal·lar el paquet"
+#, c-format
+msgid "by group"
+msgstr "per grup"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Info..."
-msgstr "Informacions"
+msgid "All packages,"
+msgstr "Paquets: "
 
-#: ../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 "All packages, alphabetical"
+msgstr "Tots els paquets, alfabèticament"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "Suprimir"
+msgid "Mandrake choices"
+msgstr "Opcions de Mandrake"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "S'estan preparant els paquets per a la instal·lació..."
+msgid "Normal updates"
+msgstr "Actualitzacions normals"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No mirror"
-msgstr "rèplica:"
+msgid "Bugfixes updates"
+msgstr "Mostra les actualitzacions de reparació d'errors"
 
-#: ../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 ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Security updates"
+msgstr "Mostra les actualitzacions de seguretat"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Install"
-msgstr "Instal·lació"
+#, fuzzy, c-format
+msgid "Description: "
+msgstr "Descripcions"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "Japó"
+msgid "Reason for update: "
+msgstr "Rao d'actualització: "
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Do nothing"
-msgstr "No facis res"
+#, fuzzy, c-format
+msgid "Summary: "
+msgstr "Resum"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No update"
-msgstr "Realitza les actualitzacions"
+msgid "Importance: "
+msgstr "Importància: %s"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Description: "
-msgstr "Descripcions"
+msgid "%s KB"
+msgstr "%.1f KB"
 
 #: ../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."
+#, fuzzy, c-format
+msgid "Size: "
+msgstr "Mida"
 
 #: ../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 ""
-"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?"
+#, fuzzy, c-format
+msgid "Version: "
+msgstr "Versió:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -734,70 +582,85 @@ msgstr "Nom: %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "s'està inspeccionant..."
+msgid "Currently installed version: "
+msgstr "Versió actualment instal·lada: "
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "S'estan preparant els paquets per a la instal·lació..."
+msgid "Source: "
+msgstr "Font"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Austràlia"
+msgid "(Not available)"
+msgstr "(No disponible)"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
+msgstr "Changelog:\n"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Installation finished"
-msgstr "Instal·lat"
+msgid "Files:\n"
+msgstr "/_Fitxer"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by update availability"
-msgstr "per disponibilitat d'actualització"
+#, fuzzy, c-format
+msgid "Selected size: %d MB"
+msgstr "%d paquets seleccionats: %.1f MB"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
-msgstr "Polònia"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Seleccionats: %d MB / Espai lliure en disc: %d MB"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Version: "
-msgstr "Versió:"
-
-#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
 msgstr ""
-"Podeu especificar un usuari/contraenya en la autentificació del servidor "
-"intermediari:"
+"A causa de les dependències, els següent(s) paquet(s) s'han de "
+"deseleccionar\n"
+"ara:\n"
+"\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Editing source \\\"%s\\\":"
-msgstr "Editant les fonts \"%s\":"
+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"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Upgradable"
-msgstr "Actualitza"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid " done."
-msgstr ""
+msgid "%s conflicts with %s"
+msgstr "conflictes amb"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "S'estan preparant els paquets per a la instal·lació..."
+msgid "Some packages can't be installed"
+msgstr "No es pot instal·lar el paquet"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining file of source `%s'..."
+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
 #, c-format
@@ -806,506 +669,643 @@ msgstr "Es necessiten paquets addicionals"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Bugfixes updates"
-msgstr "Mostra les actualitzacions de reparació d'errors"
+msgid "Some packages can't be removed"
+msgstr "No es pot instal·lar el paquet"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "Alemanya"
+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
+#: ../rpmdrake:1
 #, c-format
-msgid "Russia"
-msgstr "Rússia"
+msgid "Some additional packages need to be removed"
+msgstr "Cal esborrar paquets addicionals"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Norway"
-msgstr "Noruega"
+msgid "More information on package..."
+msgstr "Més informació del paquet..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Hi ha hagut problemes durant la instal·lació"
+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 "Search"
-msgstr "Cerca"
+msgid "More info"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Edit a source"
-msgstr "Edita una font"
+msgid "Addable"
+msgstr "Afegible"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Czech Republic"
-msgstr "República Txeca"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Upgradable"
+msgstr "Actualitza"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Stop"
-msgstr "Para"
+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
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "No update"
+msgstr "Realitza les actualitzacions"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Update"
-msgstr "Actualitza"
+msgid "(none)"
+msgstr "(cap)"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, removing packages..."
+msgid "Please wait, listing packages..."
 msgstr ""
 "Si us plau, espereu\n"
 "S'estan ordenant els paquets"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Normal information"
-msgstr "Informació normal"
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "No es pot obrir el paquet"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "S'està descarregant el paquet '%s' (%s/%s)..."
+msgid "One of the following packages is needed:"
+msgstr "Es necessita un dels següents paquets:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Seleccionats: %d MB / Espai lliure en disc: %d MB"
+msgid "Please choose"
+msgstr "Si us plau escolliu"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Spain"
-msgstr "Espanya"
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Normal updates"
-msgstr "Actualitzacions normals"
+msgid "Not selected"
+msgstr "S'han detectat conflictes"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Selected"
+msgstr "No en seleccionis cap"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by selection state"
-msgstr "per estat de selecció"
+msgid "Search results"
+msgstr "Resultats de la cerca"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake: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 "Stop"
+msgstr "Para"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Login:"
-msgstr "Entrada:"
+msgid "Please wait, searching..."
+msgstr "Si us plau espereu, s'està buscant..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "Àustria"
+msgid "Search results (none)"
+msgstr "Resultats de la cerca (cap)"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Error de fitxer"
+#, c-format
+msgid "Other"
+msgstr "Altres"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Seleccioneu la(es) font(s) que voleu actualitzar:"
+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 ""
+"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."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Desa i surt"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Update..."
-msgstr "Actualitza"
+msgid "Proxy..."
+msgstr "Error..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "S'està verificant la signatura de '%s' ..."
+msgid "Update..."
+msgstr "Actualitza"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
-msgstr "(cap)"
+msgid "Add..."
+msgstr "Afegir..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
+msgid "Edit"
+msgstr "Edita"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "S'està instal·lant el paquet '%s' (%s/%s)..."
+msgid "Source"
+msgstr "Font"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Versió actualment instal·lada: "
+msgid "Enabled?"
+msgstr "Habilitat?"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Other"
-msgstr "Altres"
+msgid "Configure sources"
+msgstr "Configureu les fonts"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Rao d'actualització: "
+msgid "Password:"
+msgstr "Contrasenya:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Please choose the desired mirror."
-msgstr "Si us plau, seleccioneu una rèplica d'aquesta llista"
+msgid "User:"
+msgstr "Nom d'usuari:"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit"
-msgstr "Edita"
+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
+#: ../edit-urpm-sources.pl: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 "Proxy hostname:"
+msgstr "Nom d'usuari del servidor intermediari:"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Camí relatiu a la síntesi/hdlist: "
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"Si necessiteu un servidor intermediari, entreu el nom de l'ordinador central "
+"i un port opcional (sintaxi: <proxyhost[:port]>):"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Resultats de la cerca (cap)"
+msgid "Configure proxies"
+msgstr "Configureu els servidors intermediaris(proxies)"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Danmark"
-msgstr "Dinamarca"
+msgid "Please wait, updating medium..."
+msgstr "Si us plau, espereu, s'està actualitzant el suport..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "China"
-msgstr "Xina"
+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."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "United States"
-msgstr "Estats Units"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "changes:"
-msgstr "Paquets: "
+msgid "You need to insert the medium to continue"
+msgstr "Heu d'inserir el support per a continuar"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Cal esborrar paquets addicionals"
+msgid "Save changes"
+msgstr "Desa canvis"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Camí relatiu a la síntesi/hdlist: "
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "No"
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Summary: "
-msgstr "Resum"
+msgid "Editing source \"%s\":"
+msgstr "Editant les fonts \"%s\":"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Canada"
-msgstr "Canadà"
+msgid "Edit a source"
+msgstr "Edita una font"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Greece"
-msgstr "Grècia"
+msgid "Please wait, removing medium..."
+msgstr "Si us plau espereu, s'està afegint el suport..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of source:"
+msgstr "Tipus de font:"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Adding a source:"
+msgstr "Afegint una font:"
+
+#: ../edit-urpm-sources.pl: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."
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 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."
+"Ja hi ha un support amb aquest nom, realment\n"
+"voleu reemplaçar-lo?"
 
-#: ../rpmdrake:1
+#: ../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."
+
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Source: "
-msgstr "Font"
+msgid "Name:"
+msgstr "Nom"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr ""
+msgid "Login:"
+msgstr "Entrada:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Perdoneu, necessiteu ser root per instal·lar paquets."
+#: ../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:"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Removable device"
+msgstr "Dispositius extraïbles"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "HTTP server"
+msgstr "Servidor HTTP"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "Servidor FTP"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Path:"
 msgstr "Port:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during removal"
-msgstr "Hi ha hagut un problema durant la instal·lació"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "Fitxers locals"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by source repository"
-msgstr "per dipòsit de fonts"
+msgid "Add a source"
+msgstr "Afegeix una font"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Selected"
-msgstr "No en seleccionis cap"
+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 "Netherlands"
-msgstr "Paísos Baixos"
+msgid "Unable to create medium."
+msgstr "No es pot crear el support."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "Afegible"
+msgid "Update"
+msgstr "Actualitza"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
-msgstr "(No disponible)"
+msgid "Select the source(s) you wish to update:"
+msgstr "Seleccioneu la(es) font(s) que voleu actualitzar:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, updating media..."
+msgstr "Si us plau espereu, actualitzant dades..."
+
+#: ../rpmdrake.pm: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 " failed!"
+msgstr "en fitxers"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid " done."
 msgstr ""
-"Ho sento, no he pogut seleccionar els següent(s) paquet(s):\n"
-"\n"
 
-#: ../rpmdrake:1
+#: ../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"
+msgstr ""
+
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Not selected"
-msgstr "S'han detectat conflictes"
+msgid "Starting download of `%s'..."
+msgstr "S'està verificant la signatura de '%s' ..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Eliminació de Paquets de Programari"
+msgid "Examining distant file of source `%s'..."
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Sweden"
-msgstr "Suècia"
+msgid "Examining file of source `%s'..."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+msgid "Copying file for source `%s'..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 ""
-"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."
+"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 ""
-"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."
+"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.pm:1
+#, fuzzy, c-format
+msgid "No mirror"
+msgstr "rèplica:"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%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 ""
+"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:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Es necessita un dels següents paquets:"
+msgid "Error during download"
+msgstr "S'ha produït un error durant la descàrrega"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "Surt"
+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."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
+"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 rèplica per a obtenir les últimes\n"
-"actualitzacions de paquets. Comproveu que la xarxa funcioni ara.\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"
 "Esteu d'acord en continuar?"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "D'acord"
+msgid "United States"
+msgstr "Estats Units"
 
-#: ../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 "China"
+msgstr "Xina"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "Tipus de font:"
+msgid "United Kingdom"
+msgstr "Regne Unit"
 
-#: ../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.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "Taiwan"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unable to get source packages."
-msgstr "Trieu els paquets"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "Suècia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "S'han seleccionat massa paquets"
+msgid "Russia"
+msgstr "Rússia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "conflictes amb"
+msgid "Portugal"
+msgstr "Port:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 ""
-"Benvinguts al MandrakeUpdate!\n"
-"\n"
-"Aquesta eina us ajudarà a escollir les actualitzacions que voleu instal·lar "
-"en el vostre\n"
-"ordinador."
+msgid "Poland"
+msgstr "Polònia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Opcions de Mandrake"
+msgid "Norway"
+msgstr "Noruega"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 ""
-"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."
+msgid "Netherlands"
+msgstr "Paísos Baixos"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Korea"
+msgstr "Imposa"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Changelog:\n"
+msgid "Japan"
+msgstr "Japó"
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Korea"
+msgid "Italy"
+msgstr "Instal·lació"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Israel"
+msgstr "Instal·lació"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Grècia"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "France"
 msgstr "Imposa"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "Dispositius extraïbles"
+msgid "Finland"
+msgstr "Finlàndia"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Belgium"
-msgstr "Bèlgica"
+msgid "Spain"
+msgstr "Espanya"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Change medium"
-msgstr "Canvieu el suport"
+msgid "Danmark"
+msgstr "Dinamarca"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Mandrake Update"
-msgstr "Preferències del MandrakeUpdate"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr "Alemanya"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by size"
-msgstr "per mida"
+msgid "Czech Republic"
+msgstr "República Txeca"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "Servidor FTP"
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Files:\n"
-msgstr "/_Fitxer"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Canada"
+msgstr "Canadà"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
+msgstr "Brasil"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Belgium"
+msgstr "Bèlgica"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Australia"
+msgstr "Austràlia"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
+msgstr "Àustria"
 
 #: ../rpmdrake.pm: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."
+msgid "Info..."
+msgstr "Informacions"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
+msgstr "No"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Sí"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
diff --git a/po/cs.po b/po/cs.po
index 3e37728d..1a05eb51 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grpmi-cs\n"
-"POT-Creation-Date: 2003-05-02 20:15+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+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,20 +17,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-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
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Portugal"
-msgstr "Portugalsko"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Mohu pokra�ovat?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -50,59 +46,104 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-msgstr "podle skupiny"
+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."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Name:"
-msgstr "Jméno:"
+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.pm:1
-#, c-format
-msgid "Italy"
-msgstr "Itálie"
+#: ../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"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "Jak ru�ně vybrat vaše zrcadlo"
+msgid "Problem during removal"
+msgstr "Problém při odebírání"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "Please wait, removing packages..."
+msgstr "Prosím po�kejte, odebírám balí�ky..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Některé balí�ky musí být odebrány"
+msgid "Please wait, reading packages database..."
+msgstr "Prosím po�kejte, na�ítám databázi balí�ků..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Already existing update sources"
+#, 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
 #, c-format
-msgid "More information on package..."
-msgstr "Více informací o balí�ku..."
+msgid "Installation failed"
+msgstr "Instalace selhala"
 
-#: ../rpmdrake.pm:1
+#: ../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..."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "Ano"
+msgid "All requested packages were installed successfully."
+msgstr "Všechny požadované balí�ky byly uspěšně nainstalovány."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr "Všechno bylo úspěšně nainstalováno."
 
 #: ../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 ""
-"Kvůli jejich závislostem je třeba nyní zrušit výběr následujících\n"
-"balí�ků:\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
 #, fuzzy, c-format
@@ -110,490 +151,504 @@ 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 "%s KB"
-msgstr "%s kB"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Instaluji balí�ek `%s' (%s/%s)..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Připravuji balí�ky k instalaci..."
 
 #: ../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."
+"\n"
+"Error(s) reported:\n"
+"%s"
 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."
+"\n"
+"Nahlášené chyby:\n"
+"%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 "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"
+"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ů."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"The following packages have bad signatures:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"Při instalaci balí�ků došlo k chybě:\n"
+"Následující balí�ky musí být odebrány, aby jiné mohly být aktualizovány:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"Mohu pokra�ovat?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Size: "
-msgstr "Velikost: "
+msgid "Verifying packages signatures..."
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Security updates"
-msgstr "Bezpe�nostní aktualizace"
+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"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "Ok"
+
+#: ../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 "Maximum information"
-msgstr "VÅ¡echny informace"
+msgid "Change medium"
+msgstr "Změnit zdroj"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, c-format
+msgid "Initializing..."
+msgstr "Inicializuji..."
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Chyba..."
+msgid "Package installation..."
+msgstr "Připravuji balí�ky k instalaci..."
 
-#: ../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."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Velká Británie"
+msgid "Unable to get source packages."
+msgstr "Nelze získat balí�ky se zdroji."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure sources"
-msgstr "Nastavit zdroje"
+msgid "Inspect..."
+msgstr "Prozkoumat..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "v názvech"
+msgid "Installation finished"
+msgstr "Instalace dokon�ena"
 
-#: ../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 ""
-"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 "Do nothing"
+msgstr "Nedělat nic"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
-"\n"
-"\\Do you want to continue installation?"
-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?"
+#, c-format
+msgid "Use .%s as main file"
+msgstr "Použít .%s jako hlavní soubor"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Remove .%s"
 msgstr "Odebrat .%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Source"
-msgstr "Zdroj"
+msgid "changes:"
+msgstr "změny:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "Finsko"
+msgid "Inspecting %s"
+msgstr "Prohlížím %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
+msgid "Please wait, finding available packages..."
+msgstr "Prosím po�kejte, hledám dostupné balí�ky..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "France"
-msgstr "Francie"
+msgid "Please wait, adding medium..."
+msgstr "Prosím po�kejte, přidávám zdroj..."
 
-#. -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 ""
-"%s\n"
+"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"
-"Is it ok to continue?"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"%s\n"
+"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"
-"Mohu pokra�ovat?"
+"Poté znovu spusťte aplikaci MandrakeUpdate."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Znovu na�íst seznam balí�ků"
+msgid "How to choose manually your mirror"
+msgstr "Jak ru�ně vybrat vaše zrcadlo"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr "Vyberte zrcadlo..."
+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 ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Přidávám zdroj:"
+msgid "Already existing update sources"
+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?"
+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:1
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Balí�ek `%s' nelze nainstalovat\n"
+msgid "Fatal error"
+msgstr "Chyba souboru"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
+msgid "Software Packages Installation"
 msgstr "Připravuji balí�ky k instalaci..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages,"
-msgstr "Všechny balí�ky,"
+msgid "Mandrake Update"
+msgstr "Mandrake Update"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "v souborech"
+msgid "Software Packages Removal"
+msgstr "Odstranění balí�ků software"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Všechny požadované balí�ky byly uspěšně nainstalovány."
+msgid "Quit"
+msgstr "Konec"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "Název po�íta�e proxy:"
+msgid "Install"
+msgstr "Instalovat"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update source(s)"
-msgstr "Aktualizovat zdroj(e)"
+msgid "Remove"
+msgstr "Odstranit"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "Lokální soubory"
+msgid "Help"
+msgstr "Nápověda"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Prohlížím %s"
+msgid "Search"
+msgstr "Hledat"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Israel"
-msgstr "Izrael"
+msgid "Find:"
+msgstr "Najít:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Help"
-msgstr "Nápověda"
+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?"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "HTTP server"
+msgid "Some packages need to be removed"
+msgstr "Některé balí�ky musí být odebrány"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"Welcome to the packages source editor!\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"
-"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."
+"Do you really want to install all the selected packages?"
 msgstr ""
-"Vítejte do editoru zdrojů balí�ků!\n"
+"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"
-"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."
+"Opravdu chcete nainstalovat všechny vybrané balí�ky?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation failed"
-msgstr "Instalace selhala"
+msgid "Too many packages are selected"
+msgstr "Je vybráno příliš mnoho balí�ků"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Použít .%s jako hlavní soubor"
+msgid "Maximum information"
+msgstr "VÅ¡echny informace"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results"
-msgstr "Výsledky hledání"
+msgid "Normal information"
+msgstr "Běžné informace"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, c-format
-msgid " failed!"
-msgstr " selhalo!"
+msgid "Update source(s)"
+msgstr "Aktualizovat zdroj(e)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Brazil"
-msgstr "Brazílie"
+msgid "Reload the packages list"
+msgstr "Znovu na�íst seznam balí�ků"
 
-#: ../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 ""
-"Takto pojmenovaný zdroj již existuje, chcete\n"
-"jej opravdu nahradit?"
+msgid "Reset the selection"
+msgstr "Nulovat výběr"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Najít:"
+msgid "in files"
+msgstr "v souborech"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Všechny balí�ky, abecedně"
+msgid "in descriptions"
+msgstr "v popisech"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Prosím po�kejte, hledám..."
+msgid "in names"
+msgstr "v názvech"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Prosím po�kejte, na�ítám databázi balí�ků..."
+msgid "by update availability"
+msgstr "podle dostupnosti aktualizace"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "Nelze otevřít balí�ek `%s'\n"
+#, c-format
+msgid "by source repository"
+msgstr "podle umístění zdroje"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "Nulovat výběr"
+msgid "by selection state"
+msgstr "podle stavu výběru"
 
-#: ../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 ""
-"Pokud potřebujete proxy, zadejte název po�íta�e a volitelně port (ve tvaru "
-"<proxyhost[:port]>):"
+msgid "by size"
+msgstr "podle velikosti"
 
 #: ../rpmdrake: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 "by group"
+msgstr "podle skupiny"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Kostarika"
+msgid "All packages,"
+msgstr "Všechny balí�ky,"
 
 #: ../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"
-
-#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Prosím po�kejte, odstraňuji zdroj..."
+msgid "All packages, alphabetical"
+msgstr "Všechny balí�ky, abecedně"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "Heslo:"
+msgid "Mandrake choices"
+msgstr "Volby Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "Zkoumá se vzdálený soubor zdroje `%s'..."
+msgid "Normal updates"
+msgstr "Běžné aktualizace"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Taiwan"
+msgid "Bugfixes updates"
+msgstr "Opravy chyb"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "User:"
-msgstr "Uživatel:"
+msgid "Security updates"
+msgstr "Bezpe�nostní aktualizace"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Prosím po�kejte, aktualizuji zdroj..."
+msgid "Description: "
+msgstr "Popis: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Prosím po�kejte, vypisuji balí�ky..."
+msgid "Reason for update: "
+msgstr "Důvod pro aktualizaci: "
 
 #: ../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 "Summary: "
+msgstr "Shrnutí: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Information on packages"
-msgstr "Informace o balí�cích"
+msgid "Importance: "
+msgstr "Důležitost: "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "Zrušit"
+msgid "%s KB"
+msgstr "%s kB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Všechno bylo úspěšně nainstalováno."
+msgid "Size: "
+msgstr "Velikost: "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Prosím po�kejte, aktualizuji zdroje..."
+msgid "Version: "
+msgstr "Verze: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Name: "
+msgstr "Název: "
 
 #: ../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 "Currently installed version: "
+msgstr "Nyní nainstalovaná verze: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "v popisech"
+msgid "Source: "
+msgstr "Zdroj: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Nastavit proxy"
+msgid "(Not available)"
+msgstr "(Není k dispozici)"
 
-#: ../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 "Changelog:\n"
+msgstr "Změny:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Prosím vyberte"
+msgid "Files:\n"
+msgstr "Soubory:\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Velikost výběru: %d MB"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add a source"
-msgstr "Přidat zdroj"
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "Inicializuji..."
+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
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "Uložit změny"
+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"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Error during download"
-msgstr "Chyba při stahová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 ""
+"Promiňte, ale následující balí�ky nelze vybrat:\n"
+"\n"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Připravuji balí�ky k instalaci..."
+msgid "%s conflicts with %s"
+msgstr "je v konfliktu s"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Importance: "
-msgstr "Důležitost: "
+#, fuzzy, c-format
+msgid "Some packages can't be installed"
+msgstr "Balí�ek `%s' nelze nainstalovat\n"
 
 #: ../rpmdrake:1
 #, c-format
@@ -606,83 +661,77 @@ msgstr ""
 "balí�ky:\n"
 "\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "Přidat..."
+msgid "Additional packages needed"
+msgstr "Jsou potřeba další balí�ky"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Unable to create medium."
-msgstr "Nelze vytvořit zdroj."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "Balí�ek `%s' nelze nainstalovat\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Removing these packages would break your system, sorry:\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"
+"Odstranění těchto balí�ků by poškodilo váš systém, omlouváme se:\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:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
-msgstr "Probírat..."
+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
-#, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "Balí�ek `%s' nelze nainstalovat\n"
-
-#: ../rpmdrake.pm:1
 #, c-format
-msgid "Info..."
-msgstr "Informace..."
+msgid "Some additional packages need to be removed"
+msgstr "Je třeba odstranit některé další 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 "More information on package..."
+msgstr "Více informací o balí�ku..."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "Odstranit"
+msgid "Information on packages"
+msgstr "Informace o balí�cích"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Připravuji balí�ky k instalaci..."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "No mirror"
-msgstr "Není zrcadlo"
-
-#: ../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."
+msgid "More info"
+msgstr "Více informací"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Instalovat"
+msgid "Addable"
+msgstr "Lze přidat"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "Japonsko"
+msgid "Upgradable"
+msgstr "Lze aktualizovat"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Nedělat nic"
+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:1
 #, c-format
@@ -691,344 +740,376 @@ msgstr "Žádná aktualizace"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Description: "
-msgstr "Popis: "
+msgid "(none)"
+msgstr "(žádná)"
 
 #: ../rpmdrake: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ů."
+msgid "Please wait, listing packages..."
+msgstr "Prosím po�kejte, vypisuji balí�ky..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "Nelze otevřít balí�ek `%s'\n"
 
 #: ../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 "One of the following packages is needed:"
+msgstr "Je třeba jeden z následujících balí�ků:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "Název: "
+msgid "Please choose"
+msgstr "Prosím vyberte"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "Prozkoumat..."
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Připravuji balí�ky k instalaci..."
+msgid "Not selected"
+msgstr "Nalezeny konflikty"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Austrálie"
+msgid "Selected"
+msgstr "Vybraný"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation finished"
-msgstr "Instalace dokon�ena"
+msgid "Search results"
+msgstr "Výsledky hledání"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
-msgstr "podle dostupnosti aktualizace"
+msgid "Stop"
+msgstr "Stop"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
-msgstr "Polsko"
+msgid "Please wait, searching..."
+msgstr "Prosím po�kejte, hledám..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Version: "
-msgstr "Verze: "
+msgid "Search results (none)"
+msgstr "Výsledky hledání (žádné)"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Jiné"
 
 #: ../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:"
+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."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Uložit a ukon�it"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Editing source \\\"%s\\\":"
-msgstr "Upravuji zdroj \"%s\":"
+msgid "Proxy..."
+msgstr "Chyba..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Upgradable"
-msgstr "Lze aktualizovat"
+msgid "Update..."
+msgstr "Aktualizovat..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid " done."
-msgstr " hotovo."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Připravuji balí�ky k instalaci..."
+msgid "Add..."
+msgstr "Přidat..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "Zkoumá se soubor zdroje `%s'..."
+msgid "Edit"
+msgstr "Upravit"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "Jsou potřeba další balí�ky"
+msgid "Source"
+msgstr "Zdroj"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Opravy chyb"
+msgid "Enabled?"
+msgstr "Povolen?"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl: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 "Configure sources"
+msgstr "Nastavit zdroje"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Germany"
-msgstr "Německo"
+msgid "Password:"
+msgstr "Heslo:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Russia"
-msgstr "Rusko"
+msgid "User:"
+msgstr "Uživatel:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Norway"
-msgstr "Norsko"
+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:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Při instalaci nastaly problémy"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "Název po�íta�e proxy:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search"
-msgstr "Hledat"
+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]>):"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit a source"
-msgstr "Upravit zdroj"
+msgid "Configure proxies"
+msgstr "Nastavit proxy"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Česká republika"
+msgid "Please wait, updating medium..."
+msgstr "Prosím po�kejte, aktualizuji zdroj..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Stop"
-msgstr "Stop"
+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."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "Aktualizovat"
+msgid "You need to insert the medium to continue"
+msgstr "Chcete-li pokra�ovat, musíte vložit médium"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "Prosím po�kejte, odebírám balí�ky..."
+msgid "Save changes"
+msgstr "Uložit změny"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal information"
-msgstr "Běžné informace"
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Relativní cesta pro soubor hdlist nebo syntézu:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Stahuji balí�ek `%s' (%s/%s)..."
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing source \"%s\":"
+msgstr "Upravuji zdroj \"%s\":"
+
+#: ../edit-urpm-sources.pl: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 "Edit a source"
+msgstr "Upravit zdroj"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Spain"
-msgstr "Španělsko"
+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 "Type of source:"
+msgstr "Typ zdroje:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by selection state"
-msgstr "podle stavu výběru"
+msgid "Adding a source:"
+msgstr "Přidávám zdroj:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 msgstr ""
-"Prosím po�kejte, stahuji adresy zrcadel ze stránek spole�nosti MandrakeSoft."
+"Takto pojmenovaný zdroj již existuje, chcete\n"
+"jej opravdu nahradit?"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Login:"
-msgstr "Přihlášení:"
+msgid "You need to fill up at least the two first entries."
+msgstr "Musíte vyplnit alespoň první dvě polí�ka."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Austria"
-msgstr "Rakousko"
+msgid "Name:"
+msgstr "Jméno:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Chyba souboru"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
+msgstr "Přihlášení:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Vyberte zdroj(e), které si přejete aktualizovat:"
+msgid "Choose a mirror..."
+msgstr "Vyberte zrcadlo..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update..."
-msgstr "Aktualizovat..."
+msgid "Browse..."
+msgstr "Probírat..."
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "Kontroluji signaturu `%s'..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Cesta nebo přípojný bod:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
-msgstr "(žádná)"
+msgid "Removable device"
+msgstr "Vyjímatelné zařízení"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-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"
+msgid "HTTP server"
+msgstr "HTTP server"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Instaluji balí�ek `%s' (%s/%s)..."
+msgid "FTP server"
+msgstr "FTP server"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Nyní nainstalovaná verze: "
+msgid "Path:"
+msgstr "Cesta:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Other"
-msgstr "Jiné"
+msgid "Local files"
+msgstr "Lokální soubory"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Důvod pro aktualizaci: "
+msgid "Add a source"
+msgstr "Přidat zdroj"
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Please choose the desired mirror."
-msgstr "Vyberte prosím vhodné zrcadlo."
+#, 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."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "Upravit"
+msgid "Unable to create medium."
+msgstr "Nelze vytvořit zdroj."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Prosím po�kejte, hledám dostupné balí�ky..."
+msgid "Update"
+msgstr "Aktualizovat"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Relativní cesta pro soubor hdlist nebo syntézu:"
+msgid "Select the source(s) you wish to update:"
+msgstr "Vyberte zdroj(e), které si přejete aktualizovat:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Výsledky hledání (žádné)"
+msgid "Please wait, updating media..."
+msgstr "Prosím po�kejte, aktualizuji zdroje..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Danmark"
-msgstr "Dánsko"
+msgid " failed!"
+msgstr " selhalo!"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "Čína"
+msgid " done."
+msgstr " hotovo."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United States"
-msgstr "Spojené státy"
+msgid "Download of `%s', speed:%s"
+msgstr "Stahování `%s', rychlost: %s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "changes:"
-msgstr "změny:"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "Stahování `%s', zbývající �as: %s, rychlost: %s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "Kontroluji signaturu `%s'..."
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Je třeba odstranit některé další balí�ky"
+msgid "Examining distant file of source `%s'..."
+msgstr "Zkoumá se vzdálený soubor zdroje `%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Examining file of source `%s'..."
+msgstr "Zkoumá se soubor zdroje `%s'..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No"
-msgstr "Ne"
+msgid "Copying file for source `%s'..."
+msgstr "Kopíruje se soubor pro zdroj `%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Summary: "
-msgstr "Shrnutí: "
+msgid "Please choose the desired mirror."
+msgstr "Vyberte prosím vhodné zrcadlo."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "Kanada"
+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.pm:1
 #, c-format
-msgid "Greece"
-msgstr "Řecko"
+msgid "No mirror"
+msgstr "Není zrcadlo"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1045,260 +1126,179 @@ msgstr ""
 "Je možné, že síť nebo stránky spole�nosti MandrakeSoft nejsou k dispozici.\n"
 "Zkuste to prosím později."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Source: "
-msgstr "Zdroj: "
+msgid "Error during download"
+msgstr "Chyba při stahování"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "Kopíruje se soubor pro zdroj `%s'..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 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 "Path:"
-msgstr "Cesta:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Problem during removal"
-msgstr "Problém při odebírání"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "by source repository"
-msgstr "podle umístění zdroje"
+"Prosím po�kejte, stahuji adresy zrcadel ze stránek spole�nosti MandrakeSoft."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Selected"
-msgstr "Vybraný"
+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.pm:1
 #, c-format
-msgid "Netherlands"
-msgstr "Nizozemí"
+msgid "United States"
+msgstr "Spojené státy"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "Lze přidat"
+msgid "China"
+msgstr "Čína"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
-msgstr "(Není k dispozici)"
-
-#: ../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"
+msgid "United Kingdom"
+msgstr "Velká Británie"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Odstranění balí�ků software"
+msgid "Taiwan"
+msgstr "Taiwan"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Sweden"
 msgstr "Švédsko"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
-msgstr ""
-"\n"
-"\n"
-"Nahlášené chyby:\n"
-"%s"
+msgid "Russia"
+msgstr "Rusko"
 
-#: ../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."
-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 "Portugal"
+msgstr "Portugalsko"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "Stahování `%s', rychlost: %s"
+msgid "Poland"
+msgstr "Polsko"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Je třeba jeden z následujících balí�ků:"
+msgid "Norway"
+msgstr "Norsko"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "Konec"
+msgid "Netherlands"
+msgstr "Nizozemí"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 ""
-"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?"
+msgid "Korea"
+msgstr "Korea"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid "Japan"
+msgstr "Japonsko"
 
-#: ../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 "Italy"
+msgstr "Itálie"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "Typ zdroje:"
+msgid "Israel"
+msgstr "Izrael"
 
-#: ../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.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Řecko"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to get source packages."
-msgstr "Nelze získat balí�ky se zdroji."
+msgid "France"
+msgstr "Francie"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Je vybráno příliš mnoho balí�ků"
+msgid "Finland"
+msgstr "Finsko"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "je v konfliktu s"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "Španělsko"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Danmark"
+msgstr "Dánsko"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Volby Mandrake"
+msgid "Germany"
+msgstr "Německo"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 ""
-"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."
+msgid "Czech Republic"
+msgstr "Česká republika"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Změny:\n"
+msgid "Costa Rica"
+msgstr "Kostarika"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Korea"
-msgstr "Korea"
+msgid "Canada"
+msgstr "Kanada"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "Vyjímatelné zařízení"
+msgid "Brazil"
+msgstr "Brazílie"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Belgie"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Change medium"
-msgstr "Změnit zdroj"
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Mandrake Update"
+msgid "Australia"
+msgstr "Austrálie"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by size"
-msgstr "podle velikosti"
+msgid "Austria"
+msgstr "Rakousko"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "FTP server"
+msgid "Info..."
+msgstr "Informace..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Files:\n"
-msgstr "Soubory:\n"
+msgid "No"
+msgstr "Ne"
 
 #: ../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."
+#, c-format
+msgid "Yes"
+msgstr "Ano"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
diff --git a/po/cy.po b/po/cy.po
index f8b9e153..11de80d7 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grpmi 8.2\n"
-"POT-Creation-Date: 2003-05-02 20:15+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+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,20 +14,16 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "Galluogwyd?"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Path or mount point:"
-msgstr "Llwybr neu bwynt gosod:"
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Portugal"
-msgstr "Portiwgal"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Ydi hi'n iawn parhau?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -46,58 +42,103 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-msgstr "yn ôl grwp"
+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."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Name:"
-msgstr "Enw:"
+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.pm:1
-#, c-format
-msgid "Italy"
-msgstr "Yr Eidal"
+#: ../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"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "Sut i ddewis drych gyda llaw."
+msgid "Problem during removal"
+msgstr "Problem wrth dynnu"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "Please wait, removing packages..."
+msgstr "Arhoswch tynnu'r pecynnau..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Rhaid tynnu rhai pecynnau"
+msgid "Please wait, reading packages database..."
+msgstr "Arhoswch, darlen cronfa ddata'r pecynnau..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Already existing update sources"
+#, 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
 #, c-format
-msgid "More information on package..."
-msgstr "Rhagor o wybodaethar becyn..."
+msgid "Installation failed"
+msgstr "Methodd y gosodiad"
 
-#: ../rpmdrake.pm:1
+#: ../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"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "Iawn"
+msgid "All requested packages were installed successfully."
+msgstr "Gosodwyd pob pecyn angenrheidiol yn llwyddiannus."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr "Gosodwyd popeth yn llwyddiannus"
 
 #: ../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 ""
-"Oherwydd eu dibyniaethau, rhaid i'r pecyn(nau) canlynol gael\n"
-"eu dad-ddewis nawr:\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
 #, c-format
@@ -105,490 +146,495 @@ 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 "%s KB"
-msgstr "%s KB"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Gosod pecyn `%s' (%s/%s)..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Paratoi pecynnau i'w gosod"
 
 #: ../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."
+"\n"
+"Error(s) reported:\n"
+"%s"
 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."
+"\n"
+"Gwall(au) wedi eu hadrodd:\n"
+"%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 "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"
+"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."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"The following packages have bad signatures:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"Digwyddodd gwall wrth osod pecyn:\n"
+"Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"Ydi hi'n iawn parhau?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Size: "
-msgstr "Maint: "
+msgid "Verifying packages signatures..."
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Security updates"
-msgstr "Diweddariadau diogelwch"
+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"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "Iawn"
+
+#: ../rpmdrake:1
+#, 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 "Maximum information"
-msgstr "Gwybodath lawn"
+msgid "Change medium"
+msgstr "Newid cyfrwng"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, c-format
+msgid "Initializing..."
+msgstr "Ymgychwyn..."
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Gwall..."
+msgid "Package installation..."
+msgstr "Paratoi pecynnau i'w gosod"
 
-#: ../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."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Y Deyrnas Unideg"
+msgid "Unable to get source packages."
+msgstr "Methu estyn pecynnau ffynhonnell."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure sources"
-msgstr "Ffurfweddu'r ffynonellau"
+msgid "Inspect..."
+msgstr "Archwilio..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "enwau"
+msgid "Installation finished"
+msgstr "Gorffennodd y gosodiad"
 
-#: ../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 ""
-"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 "Do nothing"
+msgstr "Gwneud dim"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
-"\n"
-"\\Do you want to continue installation?"
-msgstr ""
-"Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
-"\n"
-"%s\n"
-"\n"
-"Ydi hi'n iawn parhau?"
+#, c-format
+msgid "Use .%s as main file"
+msgstr "Defnyddio .%s fel y brif ffeil"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Remove .%s"
 msgstr "Tynnu .%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Source"
-msgstr "Ffynhonell"
+msgid "changes:"
+msgstr "newidiadau:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "Ffindir"
+msgid "Inspecting %s"
+msgstr "Archwilio %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
+msgid "Please wait, finding available packages..."
+msgstr "Arhoswch, canfod pecynnau sydd ar gael..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "France"
-msgstr "Ffrainc"
+msgid "Please wait, adding medium..."
+msgstr "Arhoswch, ychwanegu cyfrwng..."
 
-#. -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 ""
-"%s\n"
+"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"
-"Is it ok to continue?"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"%s\n"
+"Cewch ddewis eich drych eich hun, i wneud hynny\n"
+"cychwynnwch y Rheolwr Ffynonellau Meddalwedd, ac ychwanegu\n"
+"ffynhonnell 'Diweddariadau Diogelwch'.\n"
 "\n"
-"Ydi hi'n iawn parhau?"
+"Yna ailgychwynnwch MandrakeUpdate."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Ail lwytho'r rhestr pecynnau"
+msgid "How to choose manually your mirror"
+msgstr "Sut i ddewis drych gyda llaw."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr "Dewis drych..."
+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 ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Ychwanegu ffynhonnell"
+msgid "Already existing update sources"
+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?"
+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:1
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Nid oes modd gosod pecyn '%s'\n"
+msgid "Fatal error"
+msgstr "Gwall ffeil"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
+msgid "Software Packages Installation"
 msgstr "Paratoi pecynnau i'w gosod"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages,"
-msgstr "Pob pecyn,"
+msgid "Mandrake Update"
+msgstr "Diweddaru Mandrake"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "mewn ffeiliau"
+msgid "Software Packages Removal"
+msgstr "Tynnu Pecynnau Meddalwedd"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Gosodwyd pob pecyn angenrheidiol yn llwyddiannus."
+msgid "Quit"
+msgstr "Gadael"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "Enw gwesteiwr y dirprwy:"
+msgid "Install"
+msgstr "Gosod"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update source(s)"
-msgstr "Diweddaru ffynonellau"
+msgid "Remove"
+msgstr "Tynnu"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "Ffeiliau lleol"
+msgid "Help"
+msgstr "Cymorth"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Archwilio %s"
+msgid "Search"
+msgstr "Chwilio"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Israel"
-msgstr "Israel"
+msgid "Find:"
+msgstr "Canfod:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Help"
-msgstr "Cymorth"
+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?"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "Gwasanaethwr HTTP"
+msgid "Some packages need to be removed"
+msgstr "Rhaid tynnu rhai pecynnau"
 
-#: ../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 ""
-"Croeso i'r golygydd ffynhonnell pecynnau!\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"
-"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."
+"Do you really want to install all the selected packages?"
+msgstr "Rhybudd:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation failed"
-msgstr "Methodd y gosodiad"
+msgid "Too many packages are selected"
+msgstr "Mae gormod o becynnau wedi eu dewis"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Defnyddio .%s fel y brif ffeil"
+msgid "Maximum information"
+msgstr "Gwybodath lawn"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results"
-msgstr "Canlyniadau'r chwilio"
+msgid "Normal information"
+msgstr "Gwybodaeth arferol"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, c-format
-msgid " failed!"
-msgstr " methwyd!"
+msgid "Update source(s)"
+msgstr "Diweddaru ffynonellau"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Brazil"
-msgstr "Brasil"
+msgid "Reload the packages list"
+msgstr "Ail lwytho'r rhestr pecynnau"
 
-#: ../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 ""
-"Mae yna gyfrwng o'r enw yna eisoes, hoffech chi\n"
-"ei amnewid?"
+msgid "Reset the selection"
+msgstr "Ailosod y dewis"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Canfod:"
+msgid "in files"
+msgstr "mewn ffeiliau"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Pob pecyn, trefn yr wyddor"
+msgid "in descriptions"
+msgstr "disgrifiadau"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Arhoswch, chwilio..."
+msgid "in names"
+msgstr "enwau"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Arhoswch, darlen cronfa ddata'r pecynnau..."
+msgid "by update availability"
+msgstr "yn ôl diweddariad"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "Methu agor pecyn `%s'\n"
+#, c-format
+msgid "by source repository"
+msgstr "yn ôl ffynhonnell eu tarddiad"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "Ailosod y dewis"
+msgid "by selection state"
+msgstr "yn ôl cyflwr dewis"
 
-#: ../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 ""
-"Os oes angen dirprwy arnoch, rhowch enw gwesteiwr a phorth dewisol "
-"(cystrawen: <proxyhost[:port]>):"
+msgid "by size"
+msgstr "yn ôl maint"
 
 #: ../rpmdrake: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 "by group"
+msgstr "yn ôl grwp"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Costa Rica"
+msgid "All packages,"
+msgstr "Pob pecyn,"
 
 #: ../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"
-
-#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Arhoswch, tynnu cyfrwng..."
+msgid "All packages, alphabetical"
+msgstr "Pob pecyn, trefn yr wyddor"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "Cyfrinair:"
+msgid "Mandrake choices"
+msgstr "Dewisiadau Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "Archwilio ffeil pell y ffynhonell '%s'..."
+msgid "Normal updates"
+msgstr "Diweddariadau arferol"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Taiwan"
+msgid "Bugfixes updates"
+msgstr "Diweddariad cywiro gwallau"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "User:"
-msgstr "Defnyddiwr:"
+msgid "Security updates"
+msgstr "Diweddariadau diogelwch"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Arhoswch, diweddaru'r cyfrwng..."
+msgid "Description: "
+msgstr "Disgrifiadau: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Arhoswch, rhestri pecynnau..."
+msgid "Reason for update: "
+msgstr "Rheswm am y diweddariad:"
 
 #: ../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 "Summary: "
+msgstr "Crynodeb: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Information on packages"
-msgstr "Gwybodaeth am becynnau"
+msgid "Importance: "
+msgstr "Pwysigrwydd: "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "Dileu"
+msgid "%s KB"
+msgstr "%s KB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Gosodwyd popeth yn llwyddiannus"
+msgid "Size: "
+msgstr "Maint: "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Arhoswch, diweddaru cyfrwng..."
+msgid "Version: "
+msgstr "Fersiwn: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Name: "
+msgstr "Enw: "
 
 #: ../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 "Currently installed version: "
+msgstr "Fersiwn sydd wedi ei osod ar hyn o bryd:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "disgrifiadau"
+msgid "Source: "
+msgstr "Ffynhonell: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Ffurfweddu'r dirprwyon"
+msgid "(Not available)"
+msgstr "(Dim ar gael)"
 
-#: ../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 "Changelog:\n"
+msgstr "Cofnod Newid:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Dewiswch"
+msgid "Files:\n"
+msgstr "Ffeiliau:\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Maint dewisiwyd: %d MB"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add a source"
-msgstr "Ychwanegu ffynhonnell"
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "Ymgychwyn..."
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Dewiswyd: %d MB / Lle gwag ar ddisg: %d MB"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "Cadw newidiadau"
+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"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Error during download"
-msgstr "Gwall wrth lwytho i lawr"
+#: ../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 "Package installation..."
-msgstr "Paratoi pecynnau i'w gosod"
+msgid "%s conflicts with %s"
+msgstr " gwrthdaro gyda"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Importance: "
-msgstr "Pwysigrwydd: "
+#, fuzzy, c-format
+msgid "Some packages can't be installed"
+msgstr "Nid oes modd gosod pecyn '%s'\n"
 
 #: ../rpmdrake:1
 #, c-format
@@ -601,83 +647,77 @@ msgstr ""
 "hefyd:\n"
 "\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "Ychwanegu..."
+msgid "Additional packages needed"
+msgstr "Pecynnau ychwanegol angenrheidiol"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Unable to create medium."
-msgstr "Methu creu cyfrwng."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "Nid oes modd gosod pecyn '%s'\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Removing these packages would break your system, sorry:\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"
+"Bydd tynnu'r pecynnau hyn yn torri eich system, sori\n"
 "\n"
-"Cafodd rhai ffeiliau ffurfweddu eu creu fel  `.rpmnew' neu `.rpmsave',\n"
-"mae modd eu harchwilio i weithredu arnynt:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
-msgstr "Pori..."
+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
-#, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "Nid oes modd gosod pecyn '%s'\n"
-
-#: ../rpmdrake.pm:1
 #, c-format
-msgid "Info..."
-msgstr "Gwybodaeth..."
+msgid "Some additional packages need to be removed"
+msgstr "Mae angen tynnu rhai pecynnau ychwanegol"
 
-#: ../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 "More information on package..."
+msgstr "Rhagor o wybodaethar becyn..."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "Tynnu"
+msgid "Information on packages"
+msgstr "Gwybodaeth am becynnau"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Paratoi pecynnau i'w gosod"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "No mirror"
-msgstr "Dim drych"
-
-#: ../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"
+msgid "More info"
+msgstr "Mwy o wybodaeth"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Gosod"
+msgid "Addable"
+msgstr "Ychwanegadwy"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "Siapan"
+msgid "Upgradable"
+msgstr "Diweddariadwy"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Gwneud dim"
+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:1
 #, c-format
@@ -686,338 +726,376 @@ msgstr "Dim diweddariad"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Description: "
-msgstr "Disgrifiadau: "
+msgid "(none)"
+msgstr "(dim)"
 
 #: ../rpmdrake: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."
+msgid "Please wait, listing packages..."
+msgstr "Arhoswch, rhestri pecynnau..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "Methu agor pecyn `%s'\n"
 
 #: ../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 "One of the following packages is needed:"
+msgstr "Mae angen un o'r pecynnau canlynol:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "Enw: "
+msgid "Please choose"
+msgstr "Dewiswch"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "Archwilio..."
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Paratoi pecynnau i'w gosod"
+msgid "Not selected"
+msgstr "Canfyddwyd gwrthdaro"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Awstralia"
+msgid "Selected"
+msgstr "Dewiswyd"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation finished"
-msgstr "Gorffennodd y gosodiad"
+msgid "Search results"
+msgstr "Canlyniadau'r chwilio"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
-msgstr "yn ôl diweddariad"
+msgid "Stop"
+msgstr "Atal"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
-msgstr "Gwlad Pwyl"
+msgid "Please wait, searching..."
+msgstr "Arhoswch, chwilio..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Version: "
-msgstr "Fersiwn: "
+msgid "Search results (none)"
+msgstr "Canlyniadau'r chwilio (dim)"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Arall"
 
 #: ../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:"
+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."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Cadw a gadael"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Editing source \\\"%s\\\":"
-msgstr "Golygu ffynhonnell \"%s\":"
+msgid "Proxy..."
+msgstr "Gwall..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Upgradable"
-msgstr "Diweddariadwy"
+msgid "Update..."
+msgstr "Diweddau..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid " done."
-msgstr " gorffen.."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Paratoi pecynnau i'w gosod"
+msgid "Add..."
+msgstr "Ychwanegu..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "Archwilio ffeil y ffynhonell '%s'..."
+msgid "Edit"
+msgstr "Golygu"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "Pecynnau ychwanegol angenrheidiol"
+msgid "Source"
+msgstr "Ffynhonell"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Diweddariad cywiro gwallau"
+msgid "Enabled?"
+msgstr "Galluogwyd?"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl: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 "Configure sources"
+msgstr "Ffurfweddu'r ffynonellau"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Germany"
-msgstr "Yr Almaen"
+msgid "Password:"
+msgstr "Cyfrinair:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Russia"
-msgstr "Rwsia"
+msgid "User:"
+msgstr "Defnyddiwr:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Norway"
-msgstr "Norwy"
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Mae modd i chi enwi defnyddiwr /cyfrinair ar gyfer dilysiad dirprwy:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Digwyddodd anhawster wrth osod"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "Enw gwesteiwr y dirprwy:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search"
-msgstr "Chwilio"
+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]>):"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit a source"
-msgstr "Golygu ffynhonnell"
+msgid "Configure proxies"
+msgstr "Ffurfweddu'r dirprwyon"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Gweriniaeth Tsiec"
+msgid "Please wait, updating medium..."
+msgstr "Arhoswch, diweddaru'r cyfrwng..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Stop"
-msgstr "Atal"
+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."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "Diweddaru"
+msgid "You need to insert the medium to continue"
+msgstr "Rhaid gosod y cyfrwng i mewn i barhau"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "Arhoswch tynnu'r pecynnau..."
+msgid "Save changes"
+msgstr "Cadw newidiadau"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal information"
-msgstr "Gwybodaeth arferol"
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Llwybr perthynol i synthesis/hdlist:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Llwytho pecyn `%s' (%s/%s) i lawr..."
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing source \"%s\":"
+msgstr "Golygu ffynhonnell \"%s\":"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Dewiswyd: %d MB / Lle gwag ar ddisg: %d MB"
+msgid "Edit a source"
+msgstr "Golygu ffynhonnell"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Spain"
-msgstr "Sbaen"
+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 "Type of source:"
+msgstr "Math o ffynonellau:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by selection state"
-msgstr "yn ôl cyflwr dewis"
+msgid "Adding a source:"
+msgstr "Ychwanegu ffynhonnell"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 msgstr ""
-"Arhoswch, llwytho i lawr cyfeiriaidau drychau o safle gwe MandrakeSoft."
+"Mae yna gyfrwng o'r enw yna eisoes, hoffech chi\n"
+"ei amnewid?"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Login:"
-msgstr "Mewngofnod:"
+msgid "You need to fill up at least the two first entries."
+msgstr "Mae angen llanw o leiaf y ddau gofnod cyntaf"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Austria"
-msgstr "Awstria"
+msgid "Name:"
+msgstr "Enw:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Gwall ffeil"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
+msgstr "Mewngofnod:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Dewiswch y ffynhonellau i'w diweddaru:"
+msgid "Choose a mirror..."
+msgstr "Dewis drych..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update..."
-msgstr "Diweddau..."
+msgid "Browse..."
+msgstr "Pori..."
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "Gwirio llofnod `%s'..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Llwybr neu bwynt gosod:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
-msgstr "(dim)"
+msgid "Removable device"
+msgstr "Dyfais symudol"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
-"Bydd tynnu'r pecynnau hyn yn torri eich system, sori\n"
-"\n"
+msgid "HTTP server"
+msgstr "Gwasanaethwr HTTP"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Gosod pecyn `%s' (%s/%s)..."
+msgid "FTP server"
+msgstr "Gwasanaethwr FTP"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Fersiwn sydd wedi ei osod ar hyn o bryd:"
+msgid "Path:"
+msgstr "Llwybr:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Other"
-msgstr "Arall"
+msgid "Local files"
+msgstr "Ffeiliau lleol"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Rheswm am y diweddariad:"
+msgid "Add a source"
+msgstr "Ychwanegu ffynhonnell"
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Please choose the desired mirror."
-msgstr "Dewiswch ddrych"
+#, 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."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "Golygu"
+msgid "Unable to create medium."
+msgstr "Methu creu cyfrwng."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Arhoswch, canfod pecynnau sydd ar gael..."
+msgid "Update"
+msgstr "Diweddaru"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Llwybr perthynol i synthesis/hdlist:"
+msgid "Select the source(s) you wish to update:"
+msgstr "Dewiswch y ffynhonellau i'w diweddaru:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Canlyniadau'r chwilio (dim)"
+msgid "Please wait, updating media..."
+msgstr "Arhoswch, diweddaru cyfrwng..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Danmark"
-msgstr "Denmarc"
+msgid " failed!"
+msgstr " methwyd!"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "Tseina"
+msgid " done."
+msgstr " gorffen.."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United States"
-msgstr "Yr Unod Daleithiau"
+msgid "Download of `%s', speed:%s"
+msgstr "Llwytho '%s' i lawr, cyflymdra:%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "changes:"
-msgstr "newidiadau:"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "Llwytho '%s' i lawr, amser yn weddill:%s, cyflymdra:%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "Gwirio llofnod `%s'..."
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Mae angen tynnu rhai pecynnau ychwanegol"
+msgid "Examining distant file of source `%s'..."
+msgstr "Archwilio ffeil pell y ffynhonell '%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Examining file of source `%s'..."
+msgstr "Archwilio ffeil y ffynhonell '%s'..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No"
-msgstr "Na"
+msgid "Copying file for source `%s'..."
+msgstr "Copïo ffeil fel ffynhonell '%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Summary: "
-msgstr "Crynodeb: "
+msgid "Please choose the desired mirror."
+msgstr "Dewiswch ddrych"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "Canada"
+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.pm:1
 #, c-format
-msgid "Greece"
-msgstr "Groeg"
+msgid "No mirror"
+msgstr "Dim drych"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1034,257 +1112,179 @@ msgstr ""
 "Nid yw'r rhwydwaith, neu safle MandrakeSoft, ar gael.\n"
 "Ceisiwch eto."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Source: "
-msgstr "Ffynhonell: "
-
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "Copïo ffeil fel ffynhonell '%s'..."
-
-#: ../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 "Path:"
-msgstr "Llwybr:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Problem during removal"
-msgstr "Problem wrth dynnu"
+msgid "Error during download"
+msgstr "Gwall wrth lwytho i lawr"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by source repository"
-msgstr "yn ôl ffynhonnell eu tarddiad"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
+"Arhoswch, llwytho i lawr cyfeiriaidau drychau o safle gwe MandrakeSoft."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Selected"
-msgstr "Dewiswyd"
+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.pm:1
 #, c-format
-msgid "Netherlands"
-msgstr "Yr Iseldiroedd"
+msgid "United States"
+msgstr "Yr Unod Daleithiau"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "Ychwanegadwy"
+msgid "China"
+msgstr "Tseina"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
-msgstr "(Dim ar gael)"
-
-#: ../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"
+msgid "United Kingdom"
+msgstr "Y Deyrnas Unideg"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Tynnu Pecynnau Meddalwedd"
+msgid "Taiwan"
+msgstr "Taiwan"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Sweden"
 msgstr "Sweden"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
-msgstr ""
-"\n"
-"\n"
-"Gwall(au) wedi eu hadrodd:\n"
-"%s"
+msgid "Russia"
+msgstr "Rwsia"
 
-#: ../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."
-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 "Portugal"
+msgstr "Portiwgal"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "Llwytho '%s' i lawr, cyflymdra:%s"
+msgid "Poland"
+msgstr "Gwlad Pwyl"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Mae angen un o'r pecynnau canlynol:"
+msgid "Norway"
+msgstr "Norwy"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "Gadael"
+msgid "Netherlands"
+msgstr "Yr Iseldiroedd"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 ""
-"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?"
+msgid "Korea"
+msgstr "Corea"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "Iawn"
+msgid "Japan"
+msgstr "Siapan"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "Arhoswch, ychwanegu cyfrwng..."
+msgid "Italy"
+msgstr "Yr Eidal"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "Math o ffynonellau:"
+msgid "Israel"
+msgstr "Israel"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please insert the medium named \\\"%s\\\" on device [%s]"
-msgstr "Rhowch gyfrwng \"%s\" ar ddyfais [%s]"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Groeg"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to get source packages."
-msgstr "Methu estyn pecynnau ffynhonnell."
+msgid "France"
+msgstr "Ffrainc"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Mae gormod o becynnau wedi eu dewis"
+msgid "Finland"
+msgstr "Ffindir"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr " gwrthdaro gyda"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "Sbaen"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Danmark"
+msgstr "Denmarc"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Dewisiadau Mandrake"
+msgid "Germany"
+msgstr "Yr Almaen"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 ""
-"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."
+msgid "Czech Republic"
+msgstr "Gweriniaeth Tsiec"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Cofnod Newid:\n"
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Korea"
-msgstr "Corea"
+msgid "Canada"
+msgstr "Canada"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "Dyfais symudol"
+msgid "Brazil"
+msgstr "Brasil"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Gwlad Belg"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Change medium"
-msgstr "Newid cyfrwng"
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Diweddaru Mandrake"
+msgid "Australia"
+msgstr "Awstralia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by size"
-msgstr "yn ôl maint"
+msgid "Austria"
+msgstr "Awstria"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "Gwasanaethwr FTP"
+msgid "Info..."
+msgstr "Gwybodaeth..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Files:\n"
-msgstr "Ffeiliau:\n"
+msgid "No"
+msgstr "Na"
 
 #: ../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."
+#, c-format
+msgid "Yes"
+msgstr "Iawn"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
diff --git a/po/da.po b/po/da.po
index 6b585928..972967c7 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2003-04-17 16:13+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+0200\n"
 "PO-Revision-Date: 2003-05-09 22:35+0200\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -108,8 +108,8 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Problem during installation"
-msgstr "Problem ved installationen"
+msgid "Installation failed"
+msgstr "Installationen mislykkedes"
 
 #: ../rpmdrake:1
 #, c-format
@@ -151,17 +151,18 @@ msgstr "alting blev installeret korrekt"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"some packages failed to install\n"
-"correctly"
-msgstr ""
-"visse pakker kunne ikke installeres\n"
-"korrekt"
+msgid "Problem during installation"
+msgstr "Problem ved installationen"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr "Vent venligst, fjerner pakker for at andre skal kunne opdateres..."
+msgid "Installing package `%s' (%s/%s)..."
+msgstr ""
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Installation af programpakker"
 
 #: ../rpmdrake:1
 #, c-format
@@ -186,9 +187,29 @@ msgstr ""
 "Du skal måske opdatere din kildedatabase."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"The following packages have bad signatures:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you want to continue installation?"
+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 "Installation failed"
-msgstr "Installationen mislykkedes"
+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
 #, c-format
@@ -212,23 +233,23 @@ msgstr "Skift media"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Desværre, kunne ikke hente kildepakker. %s"
+msgid "Initializing..."
+msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Unable to get source packages."
-msgstr "Kunne ikke hente kildepakker."
+#, fuzzy, c-format
+msgid "Package installation..."
+msgstr "Installation af programpakker"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A required program is missing (grpmi). Check your installation."
-msgstr "Et nødvendigt program mangler (grpmi). Tjek din installation."
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Desværre, kunne ikke hente kildepakker. %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Program missing"
-msgstr "Program mangler"
+msgid "Unable to get source packages."
+msgstr "Kunne ikke hente kildepakker."
 
 #: ../rpmdrake:1
 #, c-format
@@ -306,7 +327,8 @@ msgid ""
 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"
+"for programmelkilder for at aktivere mindst én. (Markér det i Aktiveret?-"
+"kolonnen\n"
 "\n"
 "Derefter skal MandrakeUpdate genstartes."
 
@@ -1286,6 +1308,267 @@ msgstr "Nej"
 msgid "Yes"
 msgstr "Ja"
 
+#: ../grpmi/curl_download/curl_download.xs:86
+msgid "Download directory does not exist"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:89
+#: ../grpmi/curl_download/curl_download.xs:213
+msgid "Out of memory\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:102
+msgid "Could not open output file in append mode"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:133
+msgid "Unsupported protocol\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:136
+msgid "Failed init\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:139
+msgid "Bad URL format\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:142
+msgid "Bad user format in URL\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:145
+msgid "Couldn't resolve proxy\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:148
+msgid "Couldn't resolve host\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:151
+msgid "Couldn't connect\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:154
+msgid "FTP unexpected server reply\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:157
+msgid "FTP access denied\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:160
+msgid "FTP user password incorrect\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:163
+msgid "FTP unexpected PASS reply\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:166
+msgid "FTP unexpected USER reply\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:169
+msgid "FTP unexpected PASV reply\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:172
+msgid "FTP unexpected 227 format\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:175
+msgid "FTP can't get host\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:178
+msgid "FTP can't reconnect\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:181
+msgid "FTP couldn't set binary\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:184
+msgid "Partial file\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:187
+msgid "FTP couldn't RETR file\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:190
+msgid "FTP write error\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:195
+msgid "FTP quote error\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:198
+msgid "HTTP not found\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:201
+#, fuzzy
+msgid "Write error\n"
+msgstr "fatal fejl"
+
+#: ../grpmi/curl_download/curl_download.xs:204
+msgid "User name illegally specified\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:207
+msgid "FTP couldn't STOR file\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:210
+#, fuzzy
+msgid "Read error\n"
+msgstr "fatal fejl"
+
+#: ../grpmi/curl_download/curl_download.xs:216
+msgid "Time out\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:219
+msgid "FTP couldn't set ASCII\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:222
+msgid "FTP PORT failed\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:225
+msgid "FTP couldn't use REST\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:228
+msgid "FTP couldn't get size\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:231
+msgid "HTTP range error\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:234
+msgid "HTTP POST error\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:237
+msgid "SSL connect error\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:240
+msgid "FTP bad download resume\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:243
+msgid "File couldn't read file\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:246
+msgid "LDAP cannot bind\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:249
+msgid "LDAP search failed\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:252
+msgid "Library not found\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:255
+msgid "Function not found\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:258
+msgid "Aborted by callback\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:261
+msgid "Bad function argument\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:264
+msgid "Bad calling order\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:267
+#, fuzzy
+msgid "HTTP Interface operation failed\n"
+msgstr "Installationen mislykkedes"
+
+#: ../grpmi/curl_download/curl_download.xs:270
+msgid "my_getpass() returns fail\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:273
+msgid "catch endless re-direct loops\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:276
+msgid "User specified an unknown option\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:279
+msgid "Malformed telnet option\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:282
+msgid "removed after 7.7.3\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:285
+msgid "peer's certificate wasn't ok\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:288
+msgid "when this is a specific error\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:291
+msgid "SSL crypto engine not found\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:294
+msgid "can not set SSL crypto engine as default\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:297
+msgid "failed sending network data\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:300
+msgid "failure in receiving network data\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:303
+msgid "share is in use\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:306
+msgid "problem with the local certificate\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:309
+msgid "couldn't use specified cipher\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:312
+msgid "problem with the CA cert (path?)\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:315
+msgid "Unrecognized transfer encoding\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:320
+#, c-format
+msgid "Unknown error code %d\n"
+msgstr ""
+
 #: data/rpmdrake.desktop.in.h:1
 msgid "Install Software"
 msgstr "Installér programmel"
@@ -1297,3 +1580,19 @@ msgstr "Fjern programmel"
 #: data/rpmdrake-sources.desktop.in.h:1
 msgid "Software Sources Manager"
 msgstr "Administration af programmelkilder"
+
+#~ msgid ""
+#~ "some packages failed to install\n"
+#~ "correctly"
+#~ msgstr ""
+#~ "visse pakker kunne ikke installeres\n"
+#~ "korrekt"
+
+#~ msgid "Please wait, removing packages to allow others to be upgraded..."
+#~ msgstr "Vent venligst, fjerner pakker for at andre skal kunne opdateres..."
+
+#~ msgid "A required program is missing (grpmi). Check your installation."
+#~ msgstr "Et nødvendigt program mangler (grpmi). Tjek din installation."
+
+#~ msgid "Program missing"
+#~ msgstr "Program mangler"
diff --git a/po/de.po b/po/de.po
index 0c07f17b..82eb1f69 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grpmi\n"
-"POT-Creation-Date: 2003-05-02 20:15+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+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,20 +14,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "Aktiviert?"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../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:"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Wollen Sie fortfahren?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -46,68 +42,16 @@ 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 "Already existing update sources"
-msgstr ""
-
-#: ../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 ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"Welcome to MandrakeUpdate!\n"
 "\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
 msgstr ""
-"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"
+"Willkommen zu MandrakeUpdate!\n"
+"\n"
+"Dieses Werkzeug möchte Ihnen ber der Entscheidung helfen, welche \n"
+"aktualisierten Pakete Sie installieren wollen."
 
 #: ../rpmdrake:1
 #, c-format
@@ -122,22 +66,40 @@ msgstr ""
 "Dieses Programm wird Ihnen helfen, die Softwarepakete auszuwählen,\n"
 "die Sie von Ihrem Rechner entfernen wollen.."
 
-#: ../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."
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
 msgstr ""
-"Un die Änderungen zu speichern, müssen Sie das Medium ins Laufwerk legen"
+"Während der Paketinstallation trat ein Fehler auf:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
-msgstr "Speichern und beenden"
+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"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"There was a problem during the installation:\n"
 "\n"
 "%s"
 msgstr ""
@@ -147,375 +109,296 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Size: "
-msgstr "Größe"
+msgid "Installation failed"
+msgstr "Alle Installieren"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Security updates"
-msgstr "Zeige Sicherheits-Aktualisierungen"
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "Paketinstallation vorbereiten ..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Maximum information"
-msgstr "Maximale Infonformationen"
-
-#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Fehler ..."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "United Kingdom"
-msgstr "Großbritannien"
+msgid "No package found for installation."
+msgstr "Paketinstallation vorbereiten ..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure sources"
-msgstr "Quellen einrichten"
+msgid "All requested packages were installed successfully."
+msgstr "Alle gewählten Pakete wurden erfolgreich installiert."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "in Namen"
+msgid "Everything installed successfully"
+msgstr "Alles erfolgreich installiert"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"I can't find any suitable mirror.\n"
+"The installation is finished; %s.\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."
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
 msgstr ""
-"Ich kan keinen passenden Paketserver finden.\n"
+"Die Installation ist abgeschlossen; %s.\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."
+"Einige Konfigurationsdateien wurden als „.rpmnew“ bzw. „.rpmsave“ angelegt. "
+"Sie kön diese nun genauer betrachten, um möglicherweise notwendige Aktionen "
+"vorzunehmen:"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "Alles korrekt installiert"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
-"\n"
-"\\Do you want to continue installation?"
-msgstr ""
-"Die Folgenden Pakete müssen entfernt weden, um andere zu aktualisieren:\n"
-"\n"
-"%s\n"
-"\n"
-"Soll ich fortfahren?"
+msgid "Problem during installation"
+msgstr "Währen der Installation sind Fehler aufgetreten."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Entferne .%s"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Installiere Paket „%s“ (%s/%s) ..."
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Source"
-msgstr "Quelle"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Paketinstallation vorbereiten ..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "Finland"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
+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."
 
-#: ../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 ""
+"The following packages have bad signatures:\n"
+"\n"
 "%s\n"
 "\n"
-"Is it ok to continue?"
+"Do you want to continue installation?"
 msgstr ""
+"Die Folgenden Pakete müssen entfernt weden, um andere zu aktualisieren:\n"
+"\n"
 "%s\n"
 "\n"
-"Wollen Sie fortfahren?"
+"Soll ich fortfahren?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Paketliste neu laden"
+msgid "Verifying packages signatures..."
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr "Wählen Sie einen Mirror ..."
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "Besorge Paket „%s“ (%s/%s) ..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Hinzufügen einer Quelle:"
+msgid "Cancel"
+msgstr "Abbruch"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Das Paket „%s“ kann nicht installiert werden\n"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "OK"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Paketinstallation vorbereiten ..."
+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 "All packages,"
-msgstr "Alle Pakete,"
+msgid "Change medium"
+msgstr "Medienwechsel"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "in Dateien"
+msgid "Initializing..."
+msgstr "Installierung ..."
 
 #: ../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 "Proxy hostname:"
-msgstr "Proxy Kennzeichen:"
-
-#: ../rpmdrake:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Update source(s)"
-msgstr "Quelle(n) aktualisieren"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Local files"
-msgstr "Lokale Dateien"
+msgid "Package installation..."
+msgstr "Paketinstallation vorbereiten ..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Inspecting %s"
-msgstr "Untersuche %s"
-
-#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Israel"
-msgstr "Installieren"
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Nur das privileg. Kennzeichen „root“ darf Pakete installieren."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Help"
-msgstr "/_Hilfe"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "HTTP server"
-msgstr "HTTP-Server"
+msgid "Unable to get source packages."
+msgstr "Wählen Sie Ihre Pakete"
 
-#: ../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 ""
-"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 "Inspect..."
+msgstr "Untersuche ..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Alle Installieren"
+msgid "Installation finished"
+msgstr "Installiert"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Verwende .%s als Hauptdatei"
+msgid "Do nothing"
+msgstr "Tue nichts"
 
 #: ../rpmdrake:1
 #, c-format
-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?"
+msgid "Use .%s as main file"
+msgstr "Verwende .%s als Hauptdatei"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Finden:"
+msgid "Remove .%s"
+msgstr "Entferne .%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Alle Pakete, alphabetisch sortiert"
+msgid "changes:"
+msgstr "Änderungen:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Bitte warten, ich suche ..."
+msgid "Inspecting %s"
+msgstr "Untersuche %s"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, reading packages database..."
+msgid "Please wait, finding available packages..."
 msgstr ""
 "Bitte warten\n"
 "Ich sortiere die Pakete"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "unbekannt"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Reset the selection"
-msgstr "Auswahl zurücksetzen"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"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]>):"
+msgid "Please wait, adding medium..."
+msgstr "Hinzufügen der Quelle, bitte warten ..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"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 ""
-"Um alle Abhängigkeiten gewährleisten zu können\n"
-"werden folgende Pakete gelöscht:\n"
+"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.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Costa Rica"
+msgid "How to choose manually your mirror"
+msgstr "Wie Sie Ihren Paketserver selbst auswählen"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"There was a problem during the installation:\n"
+"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"
-"%s"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"Während der Paketinstallation trat ein Fehler auf:\n"
-"\n"
-"%s"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Please wait, removing medium..."
-msgstr "Entfernen der Quelle, bitte warten ..."
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "Passwort:"
+msgid "Already existing update sources"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
+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 ""
+"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
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Taiwan"
+msgid "A fatal error occurred: %s."
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "User:"
-msgstr "Kennzeichen:"
+msgid "Fatal error"
+msgstr "Dateifehler"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Please wait, updating medium..."
-msgstr "Aktualisieren der Quelle, bitte warten ..."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Software Packages Installation"
+msgstr "Paketinstallation vorbereiten ..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, listing packages..."
-msgstr ""
-"Bitte warten\n"
-"Ich sortiere die Pakete"
+msgid "Mandrake Update"
+msgstr "Mandrake Update Voreinstellungen"
 
 #: ../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 "Software Packages Removal"
+msgstr "Softwarepakete-Entferner"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Beenden"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Information on packages"
-msgstr "Wählen Sie Ihre Pakete"
+#, c-format
+msgid "Install"
+msgstr "Installieren"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Cancel"
-msgstr "Abbruch"
+msgid "Remove"
+msgstr "Entfernen"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Everything installed successfully"
-msgstr "Alles erfolgreich installiert"
+#, fuzzy, c-format
+msgid "Help"
+msgstr "/_Hilfe"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Quellen aktualisieren, bitte warten ..."
+msgid "Search"
+msgstr "Suche"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Find:"
+msgstr "Finden:"
 
 #: ../rpmdrake:1
 #, c-format
@@ -533,193 +416,161 @@ msgstr ""
 "Soll ich fortfahren?"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "in descriptions"
-msgstr "Beschreibung"
-
-#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Proxy einrichten"
+msgid "Some packages need to be removed"
+msgstr "Einige Pakete müssen entfernt werden"
 
-#: ../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"
+"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"
-"Is it ok to continue?"
+"Do you really want to install all the selected packages?"
 msgstr ""
-"Ich muss die Liste der Paketserver von der MandrakeSoft Web-Seite\n"
-"laden. Stelen Sie sicher, dass Ihre Netzwerkverbindung besteht.\n"
+"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"
-"Soll ich fortfahren?"
+"Wollen Sie wirklich alle markierten Pakete installieren?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Bitte Wählen Sie"
+msgid "Too many packages are selected"
+msgstr "Zu viele Pakete ausgewählt"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Selected size: %d MB"
-msgstr "%d gewählte Pakete: %.1f MB"
+#, c-format
+msgid "Maximum information"
+msgstr "Maximale Infonformationen"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add a source"
-msgstr "Hinzufügen einer Quelle"
+msgid "Normal information"
+msgstr "Normale Informationen"
+
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update source(s)"
+msgstr "Quelle(n) aktualisieren"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "Installierung ..."
+msgid "Reload the packages list"
+msgstr "Paketliste neu laden"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "Änderungen speichern"
+msgid "Reset the selection"
+msgstr "Auswahl zurücksetzen"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
-msgstr "Fehler beim Besorgen"
+msgid "in files"
+msgstr "in Dateien"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Paketinstallation vorbereiten ..."
+msgid "in descriptions"
+msgstr "Beschreibung"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Importance: "
-msgstr "Wichtigkeit: "
+msgid "in names"
+msgstr "in Namen"
 
 #: ../rpmdrake:1
 #, c-format
-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"
+msgid "by update availability"
+msgstr "nach Verfügbarkeit"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "Hinzufügen ..."
+msgid "by source repository"
+msgstr "nach Quellen"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Unable to create medium."
-msgstr "Ich kann das Medium nicht anlegen."
+msgid "by selection state"
+msgstr "nach Auswahlstadium"
 
 #: ../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 ""
-"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:"
+msgid "by size"
+msgstr "nach Größe"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
-msgstr "Durchstöbern ..."
+msgid "by group"
+msgstr "nach Gruppen"
 
 #: ../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 "Info..."
-msgstr "Info ..."
+msgid "All packages,"
+msgstr "Alle Pakete,"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "Sie müssen das Medium einlegen, um fortfahren zu können"
+msgid "All packages, alphabetical"
+msgstr "Alle Pakete, alphabetisch sortiert"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "Entfernen"
+msgid "Mandrake choices"
+msgstr "Mandrake Auswahl"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Paketinstallation vorbereiten ..."
+msgid "Normal updates"
+msgstr "Normale Aktualisierungen"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No mirror"
-msgstr "Mirror:"
+msgid "Bugfixes updates"
+msgstr "Zeige Fehlerkorrekturen"
 
-#: ../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 ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Security updates"
+msgstr "Zeige Sicherheits-Aktualisierungen"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Install"
-msgstr "Installieren"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Japan"
-msgstr "Japan"
+#, fuzzy, c-format
+msgid "Description: "
+msgstr "Beschreibung"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Tue nichts"
+msgid "Reason for update: "
+msgstr "Aktualisierungsgründe:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No update"
-msgstr "Aktualisieren"
+msgid "Summary: "
+msgstr "Zusammenfassung"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "Wichtigkeit: "
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Description: "
-msgstr "Beschreibung"
+msgid "%s KB"
+msgstr "%.1f KB"
 
 #: ../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."
+#, fuzzy, c-format
+msgid "Size: "
+msgstr "Größe"
 
 #: ../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 ""
-"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?"
+#, fuzzy, c-format
+msgid "Version: "
+msgstr "Version:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -728,70 +579,83 @@ msgstr "Name: %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "Untersuche ..."
+msgid "Currently installed version: "
+msgstr "Momentan installierte Version:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Paketinstallation vorbereiten ..."
+msgid "Source: "
+msgstr "Quelle"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Australien"
+msgid "(Not available)"
+msgstr "(Nicht vorhanden)"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
+msgstr "ChangeLog:\n"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Installation finished"
-msgstr "Installiert"
+msgid "Files:\n"
+msgstr "/_Datei"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by update availability"
-msgstr "nach Verfügbarkeit"
+#, fuzzy, c-format
+msgid "Selected size: %d MB"
+msgstr "%d gewählte Pakete: %.1f MB"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
-msgstr "Polen"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Ausgewählt: %d MB / Freier Plattenplatz: %d MB"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Version: "
-msgstr "Version:"
-
-#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
 msgstr ""
-"Sie können auch ein Benutzerkennzeichen und Passwort für die "
-"Proxyauthentifizierung angeben:"
+"Um die Abhängigkeiten zu berücksichtigen, muss die Auswahl folgender\n"
+"Pakete zurüchgesetzt werden:\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Editing source \\\"%s\\\":"
-msgstr "Quelle „%s“ bearbeiten:"
+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:1
 #, fuzzy, c-format
-msgid "Upgradable"
-msgstr "Neue Version"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid " done."
-msgstr ""
+msgid "%s conflicts with %s"
+msgstr "wirft Konflikte auf mit"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Paketinstallation vorbereiten ..."
+msgid "Some packages can't be installed"
+msgstr "Das Paket „%s“ kann nicht installiert werden\n"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining file of source `%s'..."
+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
 #, c-format
@@ -800,508 +664,644 @@ msgstr "Es werden zusätzliche Pakete benötigt"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Bugfixes updates"
-msgstr "Zeige Fehlerkorrekturen"
+msgid "Some packages can't be removed"
+msgstr "Das Paket „%s“ kann nicht installiert werden\n"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
 msgstr ""
+"Entfernen dieser Pakete würde Ihr System unbrauchbar machen:\n"
+"\n"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "Deutschland"
+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.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Russia"
-msgstr "Russland"
+msgid "Some additional packages need to be removed"
+msgstr "Einige weitere Pakete müssen ebenfalls entfernt werden."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Norway"
-msgstr "Norwegen"
+msgid "More information on package..."
+msgstr "Mehr Paketinformationen ..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Währen der Installation sind Fehler aufgetreten."
+msgid "Information on packages"
+msgstr "Wählen Sie Ihre Pakete"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
-#, c-format
-msgid "Search"
-msgstr "Suche"
+#, fuzzy, c-format
+msgid "More info"
+msgstr "Weitere Infos"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Edit a source"
-msgstr "Quelle bearbeiten"
+msgid "Addable"
+msgstr "Verfügbar"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Czech Republic"
-msgstr "Tschechei"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Upgradable"
+msgstr "Neue Version"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Stop"
-msgstr "Stopp"
+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 ""
+"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
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "No update"
+msgstr "Aktualisieren"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Update"
-msgstr "Neue Version"
+msgid "(none)"
+msgstr "(keine)"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, removing packages..."
+msgid "Please wait, listing packages..."
 msgstr ""
 "Bitte warten\n"
 "Ich sortiere die Pakete"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Normal information"
-msgstr "Normale Informationen"
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "unbekannt"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Besorge Paket „%s“ (%s/%s) ..."
+msgid "One of the following packages is needed:"
+msgstr "Sie benötigen eines der folgenden Pakete:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Ausgewählt: %d MB / Freier Plattenplatz: %d MB"
+msgid "Please choose"
+msgstr "Bitte Wählen Sie"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Spain"
-msgstr "Spanien"
+msgid "rpmdrake"
+msgstr "RpmDrake"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Normal updates"
-msgstr "Normale Aktualisierungen"
+msgid "Not selected"
+msgstr "Konflikte gefunden"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Selected"
+msgstr ""
+"Alle\n"
+"auswählen"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by selection state"
-msgstr "nach Auswahlstadium"
+msgid "Search results"
+msgstr "Suchergebnisse"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr "Bitte Waten: Besorgen der Serverliste vom MandrakeSoft-Server ..."
+msgid "Stop"
+msgstr "Stopp"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Login:"
-msgstr "Login:"
+msgid "Please wait, searching..."
+msgstr "Bitte warten, ich suche ..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "Östereich"
+msgid "Search results (none)"
+msgstr "Suchergebnisse (keine)"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Dateifehler"
+#, c-format
+msgid "Other"
+msgstr "Sonstige"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Bitte wählen Sie die zu aktualisierenden Quelle(n):"
+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."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Speichern und beenden"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Proxy..."
+msgstr "Fehler ..."
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Update..."
 msgstr "Neue Version"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "Signatur von „%s“ überprüfen ..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "Hinzufügen ..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
-msgstr "(keine)"
+msgid "Edit"
+msgstr "Bearbeiten"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
-"Entfernen dieser Pakete würde Ihr System unbrauchbar machen:\n"
-"\n"
+msgid "Source"
+msgstr "Quelle"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Installiere Paket „%s“ (%s/%s) ..."
+msgid "Enabled?"
+msgstr "Aktiviert?"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Momentan installierte Version:"
+msgid "Configure sources"
+msgstr "Quellen einrichten"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Other"
-msgstr "Sonstige"
+msgid "Password:"
+msgstr "Passwort:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "User:"
+msgstr "Kennzeichen:"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Aktualisierungsgründe:"
+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.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Please choose the desired mirror."
+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]>):"
 msgstr ""
-"Bitte warten\n"
-"Ich besorge die Mirror Liste ..."
+"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 "Edit"
-msgstr "Bearbeiten"
+msgid "Configure proxies"
+msgstr "Proxy einrichten"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, finding available packages..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr "Aktualisieren der Quelle, bitte warten ..."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
 msgstr ""
-"Bitte warten\n"
-"Ich sortiere die Pakete"
+"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"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Relativer Pfad zur Synthesis- oder HD-Liste: "
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Suchergebnisse (keine)"
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Danmark"
-msgstr "Dänemark"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing source \"%s\":"
+msgstr "Quelle „%s“ bearbeiten:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "China"
-msgstr "China"
+msgid "Edit a source"
+msgstr "Quelle bearbeiten"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "United States"
-msgstr "Vereinigte Staaten"
+msgid "Please wait, removing medium..."
+msgstr "Entfernen der Quelle, bitte warten ..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "changes:"
-msgstr "Änderungen:"
+msgid "Type of source:"
+msgstr "Typ der Quelle:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Einige weitere Pakete müssen ebenfalls entfernt werden."
+msgid "Adding a source:"
+msgstr "Hinzufügen einer Quelle:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "rpmdrake"
-msgstr "RpmDrake"
+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.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "Nein"
+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
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Summary: "
-msgstr "Zusammenfassung"
+msgid "Name:"
+msgstr "Name"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Canada"
-msgstr "Kanada"
+msgid "Login:"
+msgstr "Login:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Greece"
-msgstr "Griechenland"
+msgid "Choose a mirror..."
+msgstr "Wählen Sie einen Mirror ..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl: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 ""
-"Es trat ein Fehler beim Besorgen der Serverliste auf:\n"
-"\n"
-"%s\n"
-"Bitte versuchen Sie es später erneut."
+msgid "Browse..."
+msgstr "Durchstöbern ..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Source: "
-msgstr "Quelle"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Pfad oder Einhängpunkt:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr ""
+msgid "Removable device"
+msgstr "Wechselmedium"
 
-#: ../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
+#, c-format
+msgid "HTTP server"
+msgstr "HTTP-Server"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "FTP-Server"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Path:"
 msgstr "Port:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Problem during removal"
-msgstr "Fehler beim Entfernen"
+msgid "Local files"
+msgstr "Lokale Dateien"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by source repository"
-msgstr "nach Quellen"
+msgid "Add a source"
+msgstr "Hinzufügen einer Quelle"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Selected"
-msgstr ""
-"Alle\n"
-"auswählen"
+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 "Netherlands"
-msgstr "Niederlande"
+msgid "Unable to create medium."
+msgstr "Ich kann das Medium nicht anlegen."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "Verfügbar"
+msgid "Update"
+msgstr "Neue Version"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
-msgstr "(Nicht vorhanden)"
+msgid "Select the source(s) you wish to update:"
+msgstr "Bitte wählen Sie die zu aktualisierenden Quelle(n):"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, updating media..."
+msgstr "Quellen aktualisieren, bitte warten ..."
+
+#: ../rpmdrake.pm: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 " failed!"
+msgstr "in Dateien"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid " done."
 msgstr ""
-"Die folgenden Pakete können nicht ausgewählt werden:\n"
-"\n"
 
-#: ../rpmdrake:1
+#: ../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"
+msgstr ""
+
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Not selected"
-msgstr "Konflikte gefunden"
+msgid "Starting download of `%s'..."
+msgstr "Signatur von „%s“ überprüfen ..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Softwarepakete-Entferner"
+msgid "Examining distant file of source `%s'..."
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Sweden"
-msgstr "Schweden"
+msgid "Examining file of source `%s'..."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+msgid "Copying file for source `%s'..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Please choose the desired mirror."
+msgstr ""
+"Bitte warten\n"
+"Ich besorge die Mirror Liste ..."
+
+#: ../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."
+"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 ""
-"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."
+"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.pm:1
+#, fuzzy, c-format
+msgid "No mirror"
+msgstr "Mirror:"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%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 ""
+"Es trat ein Fehler beim Besorgen der Serverliste auf:\n"
+"\n"
+"%s\n"
+"Bitte versuchen Sie es später erneut."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Sie benötigen eines der folgenden Pakete:"
+msgid "Error during download"
+msgstr "Fehler beim Besorgen"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "Beenden"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "Bitte Waten: Besorgen der Serverliste vom MandrakeSoft-Server ..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
+"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 ""
-"Ich muss Kontakt mit dem Paketserver aufnehmen, um die neuen Pakete\n"
-"zu besorgen. Stelen Sie sicher, dass Ihre Netzwerkverbindung besteht.\n"
+"Ich muss die Liste der Paketserver von der MandrakeSoft Web-Seite\n"
+"laden. Stelen Sie sicher, dass Ihre Netzwerkverbindung besteht.\n"
 "\n"
 "Soll ich fortfahren?"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "OK"
+msgid "United States"
+msgstr "Vereinigte Staaten"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "Hinzufügen der Quelle, bitte warten ..."
+msgid "China"
+msgstr "China"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "Typ der Quelle:"
+msgid "United Kingdom"
+msgstr "Großbritannien"
 
-#: ../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]."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "Taiwan"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unable to get source packages."
-msgstr "Wählen Sie Ihre Pakete"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "Schweden"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Zu viele Pakete ausgewählt"
+msgid "Russia"
+msgstr "Russland"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "wirft Konflikte auf mit"
+msgid "Portugal"
+msgstr "Port:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 ""
-"Willkommen zu MandrakeUpdate!\n"
-"\n"
-"Dieses Werkzeug möchte Ihnen ber der Entscheidung helfen, welche \n"
-"aktualisierten Pakete Sie installieren wollen."
+msgid "Poland"
+msgstr "Polen"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Mandrake Auswahl"
+msgid "Norway"
+msgstr "Norwegen"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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."
+msgid "Netherlands"
+msgstr "Niederlande"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Korea"
+msgstr "Forciert"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "ChangeLog:\n"
+msgid "Japan"
+msgstr "Japan"
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Korea"
+msgid "Italy"
+msgstr "Installieren"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Israel"
+msgstr "Installieren"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Griechenland"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "France"
 msgstr "Forciert"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "Wechselmedium"
+msgid "Finland"
+msgstr "Finland"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "Spanien"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
+msgstr "Dänemark"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr "Deutschland"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
+msgstr "Tschechei"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Costa Rica"
+msgstr "Costa Rica"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Canada"
+msgstr "Kanada"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
+msgstr "Brasilien"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Belgien"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Change medium"
-msgstr "Medienwechsel"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Mandrake Update"
-msgstr "Mandrake Update Voreinstellungen"
+msgid "Australia"
+msgstr "Australien"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by size"
-msgstr "nach Größe"
+msgid "Austria"
+msgstr "Östereich"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "FTP-Server"
+msgid "Info..."
+msgstr "Info ..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Files:\n"
-msgstr "/_Datei"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
+msgstr "Nein"
 
 #: ../rpmdrake.pm: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."
+#, c-format
+msgid "Yes"
+msgstr "Ja"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
diff --git a/po/el.po b/po/el.po
index c2139fb4..1dd24ec3 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grpmi\n"
-"POT-Creation-Date: 2003-05-02 20:15+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+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,20 +15,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "Åíåñãïðïßçóç;"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Path or mount point:"
-msgstr "ÈÝóç Þ óçìåßï ðñïóÜñôçóçò: "
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Portugal"
-msgstr "Ðïñôïãáëßá"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Íá óõíå÷éóôåß;"
 
 #: ../rpmdrake:1
 #, c-format
@@ -47,59 +43,104 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-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"
+"íá åãêáôáóôÞóåôå óôïí õðïëïãéóôÞ óáò."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Name:"
-msgstr "¼íïìá:"
+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.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Italy"
-msgstr "ÅãêáôÜóôáóç"
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"ÓõíÝâç Ýíá óöÜëìá êáôÜ ôçí åãêáôÜóôáóç ôùí ðáêÝôùí:\n"
+"\n"
+"%s"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "How to choose manually your mirror"
-msgstr "Ðùò íá äéáëÝîåôå ìüíïé óáò ôçí åíáëëáêôéêÞ óáò"
+#, fuzzy, c-format
+msgid "Problem during removal"
+msgstr "ÕðÞñîáí ðñïâëÞìáôá êáôÜ ôçí åãêáôÜóôáóç"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "Please wait, removing packages..."
+msgstr "Ðáñáêáëþ ðåñéìÝíåôå, áöáéñïýíôáé ôá ðáêÝôá..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "ÏñéóìÝíá ðáêÝôá ðñÝðåé íá áöáéñåèïýí"
+msgid "Please wait, reading packages database..."
+msgstr "Ðáñáêáëþ ðåñéìÝíåôå, äéáâÜæåôáé ç âÜóç äåäïìÝíùí ôùí ðáêÝôùí..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Already existing update sources"
+#, 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 "Ðñïåôïéìáóßá ðáêÝôùí ãéá åãêáôÜóôáóç..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "More information on package..."
-msgstr "Ðåñéóóüôåñåò ðëçñïöïñßåò ãéá ôï ðáêÝôï..."
+msgid "All requested packages were installed successfully."
+msgstr "¼ëá ôá æçôçèÝíôá ðáêÝôá åãêáôáóôÜèçêáí åðéôõ÷þò."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "Íáé"
+msgid "Everything installed successfully"
+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 ""
-"Ãéá íá éêáíïðïéçèïýí ïé åîáñôÞóåéò ôïõò ôá ðáñáêÜôù ðáêÝôá ðñÝðåé\n"
-"íá áðïåðéëåãïýí:\n"
+"Ç åãêáôÜóôáóç ôåëåßùóå %s.\n"
 "\n"
+"ÏñéóìÝíá áñ÷åßá ñýèìéóåùí äçìéïõñãÞèçêáí ùò `.rpmnew' Þ`.rpmsave',\n"
+"ßóùò íá ðñÝðåé íá ôá åëÝãîåôå ãéá íá åêôåëÝóåôå ïñéóìÝíåò åíÝñãåéåò:"
 
 #: ../rpmdrake:1
 #, c-format
@@ -107,491 +148,493 @@ msgid "everything was installed correctly"
 msgstr "üëá åãêáôáóôÜèçêáí óùóôÜ"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during installation"
+msgstr "ÕðÞñîáí ðñïâëÞìáôá êáôÜ ôçí åãêáôÜóôáóç"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "ÅãêáôÜóôáóç ðáêÝôïõ `%s' (%s/%s)..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+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 ""
-"Êáëþò ïñßóáôå óôï åñãáëåßï áöáßñåóçò ðñïãñáììÜôùí!\n"
 "\n"
-"Áõôü ôï åñãáëåßï èá óáò âïçèÞóåé íá åðéëÝîåôå ôï ðñüãñáììá ðïõ èÝëåôå\n"
-"íá áöáéñÝóåôå áðü ôïí õðïëïãéóôÞ óáò."
+"Error(s) reported:\n"
+"%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."
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
 msgstr ""
-"Ãéá íá áðïèçêåõôïýí ïé áëëáãÝò, èá ðñÝðåé íá åéóÜãåôå ôï ìÝóï óôïí ïäçãü."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Save and quit"
-msgstr "ÁðïèÞêåõóç êáé Ýîïäïò"
+"Ç åãêáôÜóôáóç áðÝôõ÷å, ïñéóìÝíá áñ÷åßá äåí õðÜñ÷ïõí.\n"
+"ºóùò íá ðñÝðåé íá áíáâáèìßóåôå ôçí âÜóç äåäïìÝíùí ôùí ðçãþí."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"The following packages have bad signatures:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"ÓõíÝâç Ýíá óöÜëìá êáôÜ ôçí åãêáôÜóôáóç ôùí ðáêÝôùí:\n"
+"Ôá ðáñáêÜôù ðáêÝôá ðñÝðåé íá áöáéñåèïýí ãéá íá áíáâáèìéóôïýí êÜðïéá Üëëá:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"Íá óõíå÷éóôåß;"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Size: "
-msgstr "ÌÝãåèïò: "
+msgid "Verifying packages signatures..."
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Security updates"
-msgstr "Áíáíåþóåéò Áóöáëåßáò"
+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 "Áêýñùóç"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "OK"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Ðáñáêáëþ åéóÜãåôå ôï ìÝóï ìå üíïìá \"%s\" óôç óõóêåõÞ [%s]"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "ÌÝãéóôåò ðëçñïöïñßåò"
+msgid "Change medium"
+msgstr "ÁëëáãÞ ìÝóïõ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, c-format
+msgid "Initializing..."
+msgstr "Áñ÷éêïðïßçóç..."
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "ÓöÜëìá..."
+msgid "Package installation..."
+msgstr "Ðñïåôïéìáóßá ðáêÝôùí ãéá åãêáôÜóôáóç..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr "ÐñÝðåé íá åßóôå root ãéá íá åãêáôáóôÞóåôå ðáêÝôá, óõãíþìç."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "ÇíùìÝíï Âáóßëåéï"
+msgid "Unable to get source packages."
+msgstr "Áäýíáôç ç ëÞøç ôùí ðçãáßùí ðáêÝôùí."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure sources"
-msgstr "Ñýèìéóç ðçãþí"
+msgid "Inspect..."
+msgstr "¸ëåã÷ïò..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "óôá ïíüìáôá"
+msgid "Installation finished"
+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 ""
-"Äåí ìðïñþ íá âñù êáôÜëëçëç åíáëëáêôéêÞ.\n"
-"\n"
-"Ïé ëüãïé ìðïñåß íá åßíáé ðïëëïß, ï óõíçèÝóôåñïò åßíáé üôáí äåí "
-"õðïóôçñßæåôáé\n"
-"ç áñ÷éôåêôïíéêÞ ôïõ åðåîåñãáóôÞ óáò áðü ôéò åðßóçìåò áíáâáèìßóåéò áðü ôï \n"
-"Mandrake Linux"
+msgid "Do nothing"
+msgstr "Íá ìç ãßíåé ôßðïôá"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
-"\n"
-"\\Do you want to continue installation?"
-msgstr ""
-"Ôá ðáñáêÜôù ðáêÝôá ðñÝðåé íá áöáéñåèïýí ãéá íá áíáâáèìéóôïýí êÜðïéá Üëëá:\n"
-"\n"
-"%s\n"
-"\n"
-"Íá óõíå÷éóôåß;"
+#, c-format
+msgid "Use .%s as main file"
+msgstr "×ñÞóç ôïõ .%s ùò êýñéï áñ÷åßï"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Remove .%s"
 msgstr "Áöáßñåóç.%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Source"
-msgstr "Åîáíáãêáóìüò"
+msgid "changes:"
+msgstr "ÁðïèÞêåõóç áëëáãþí"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "Öéíëáíäßá"
+msgid "Inspecting %s"
+msgstr "ÅëÝã÷åôáé ôï %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
+msgid "Please wait, finding available packages..."
+msgstr "Ðáñáêáëþ ðåñéìÝíåôå, áíáæçôïýíôáé ôá äéáèÝóéìá ðáêÝôá..."
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "France"
-msgstr "Åîáíáãêáóìüò"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, adding medium..."
+msgstr "Ðáñáêáëþ ðåñéìÝíåôå, ðñïóôßèåôáé ôï ìÝóï..."
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "More info"
+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."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Ðùò íá äéáëÝîåôå ìüíïé óáò ôçí åíáëëáêôéêÞ óáò"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"%s\n"
+"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"
-"Is it ok to continue?"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"%s\n"
-"\n"
-"Íá óõíå÷éóôåß;"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Reload the packages list"
-msgstr "Ôï ðáêÝôï %s äåí Ý÷åé õðïãñáöÞ"
+#, c-format
+msgid "Already existing update sources"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
-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"
+"\n"
+"Íá óõíå÷ßóù;"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Adding a source:"
-msgstr "ÐñïóèÞêç ðçãÞò:"
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Ôï ðáêÝôï `%s' äåí ìðïñåß íá åãêáôáóôáèåß\n"
+msgid "Fatal error"
+msgstr "ÓöÜëìá áñ÷åßïõ"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
+msgid "Software Packages Installation"
 msgstr "Ðñïåôïéìáóßá ðáêÝôùí ãéá åãêáôÜóôáóç..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages,"
-msgstr "¼ëá ôá ðáêÝôá,"
+msgid "Mandrake Update"
+msgstr "Mandrake Update"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "óôá áñ÷åßá"
+msgid "Software Packages Removal"
+msgstr "Áöáßñåóç ÐáêÝôùí Ëïãéóìéêïý"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "¼ëá ôá æçôçèÝíôá ðáêÝôá åãêáôáóôÜèçêáí åðéôõ÷þò."
+msgid "Quit"
+msgstr "¸îïäïò"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr ""
+msgid "Install"
+msgstr "ÅãêáôÜóôáóç"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update source(s)"
-msgstr "ÁíáíÝùóç ðçãÞò(þí)"
+msgid "Remove"
+msgstr "Áöáßñåóç"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "ÔïðéêÜ áñ÷åßá"
+msgid "Help"
+msgstr "ÂïÞèåéá"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "ÅëÝã÷åôáé ôï %s"
+msgid "Search"
+msgstr "ÁíáæÞôçóç"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Israel"
-msgstr "ÅãêáôÜóôáóç"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "Åýñåóç:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Help"
-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"
+"Íá óõíå÷éóôåß;"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "ÄéáêïìéóôÞò HTTP"
+msgid "Some packages need to be removed"
+msgstr "ÏñéóìÝíá ðáêÝôá ðñÝðåé íá áöáéñåèïýí"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"Welcome to the packages source editor!\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"
-"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."
+"Do you really want to install all the selected packages?"
 msgstr ""
-"Êáëþò ïñßóáôå óôïí åðåîåñãáóôÞ ôùí ðçãáßùí ðáêÝôùí!\n"
-"\n"
-"Áõôü ôï åñãáëåßï èá óáò âïçèÞóåé íá ñõèìßóåôå ôá ðçãáßá ðáêÝôá ðïõ èÝëåôå\n"
-"íá ÷ñçóéìïðïéÞóåôå óå áõôüí ôïí õðïëïãéóôÞ. '¸ðåéôá èá åßíáé äéáèÝóéìá íá \n"
-"åãêáôáóôáèïýí óáí íÝá ðáêÝôá Þ íá áíáâáèìßóåôå õðÜñ÷ïíôá ðáêÝôá."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Installation failed"
-msgstr "ÅãêáôÜóôáóç üëùí"
+msgid "Too many packages are selected"
+msgstr "ÏñéóìÝíá ðáêÝôá äåí ìðïñïýí íá åãêáôáóôáèïýí"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "×ñÞóç ôïõ .%s ùò êýñéï áñ÷åßï"
+msgid "Maximum information"
+msgstr "ÌÝãéóôåò ðëçñïöïñßåò"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results"
-msgstr "ÁðïôÝëåóìá ÁíáæÞôçóçò"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid " failed!"
-msgstr "óôá áñ÷åßá"
+msgid "Normal information"
+msgstr "ÊáíïíéêÝò ðëçñïöïñßåò"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Brazil"
-msgstr "Âñáæéëßá"
+msgid "Update source(s)"
+msgstr "ÁíáíÝùóç ðçãÞò(þí)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Reload the packages list"
+msgstr "Ôï ðáêÝôï %s äåí Ý÷åé õðïãñáöÞ"
+
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
+msgid "Reset the selection"
 msgstr ""
-"ÕðÜñ÷åé Þäç Ýíá ìÝóï ìå áõôü ôï üíïìá, åßóôå âÝâáéïé\n"
-"ãéá ôçí áíôéêáôÜóôáóÞ ôïõ;"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Åýñåóç:"
+msgid "in files"
+msgstr "óôá áñ÷åßá"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "¼ëá ôá ðáêÝôá, áëöáâçôéêÜ"
+msgid "in descriptions"
+msgstr "óôéò ðåñéãñáöÝò"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Ðáñáêáëþ ðåñéìÝíåôå, ãßíåôáé áíáæÞôçóç..."
+msgid "in names"
+msgstr "óôá ïíüìáôá"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Ðáñáêáëþ ðåñéìÝíåôå, äéáâÜæåôáé ç âÜóç äåäïìÝíùí ôùí ðáêÝôùí..."
+msgid "by update availability"
+msgstr "âÜóç äéáèåóéìüôçôáò áíáâÜèìéóçò"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "Áäõíáìßá áíïßãìáôïò ôïõ ðáêÝôïõ`%s'\n"
+#, c-format
+msgid "by source repository"
+msgstr "âÜóç áðïèçêåõìÝíùí ðçãþí"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr ""
+msgid "by selection state"
+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 ""
+msgid "by size"
+msgstr "âÜóç ìåãÝèïõò"
 
 #: ../rpmdrake: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 "by group"
+msgstr "âÜóç ïìÜäáò"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Êüóôá Ñßêá"
+msgid "All packages,"
+msgstr "¼ëá ôá ðáêÝôá,"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"ÓõíÝâç Ýíá óöÜëìá êáôÜ ôçí åãêáôÜóôáóç ôùí ðáêÝôùí:\n"
-"\n"
-"%s"
+#, c-format
+msgid "All packages, alphabetical"
+msgstr "¼ëá ôá ðáêÝôá, áëöáâçôéêÜ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Ðáñáêáëþ ðåñéìÝíåôå, áöáéñåßôáé ôï ìÝóï..."
+msgid "Mandrake choices"
+msgstr "ÅðéëïãÝò Mandrake"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "Êùäéêüò ðñüóâáóçò:"
+msgid "Normal updates"
+msgstr "ÊáíïíéêÝò áíáâáèìßóåéò"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr ""
+msgid "Bugfixes updates"
+msgstr "Áíáâáèìßóåéò äéïñèþóåùí"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Taiwan"
-msgstr "ÔáúâÜí"
+msgid "Security updates"
+msgstr "Áíáíåþóåéò Áóöáëåßáò"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Description: "
+msgstr "ÐåñéãñáöÞ"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "User:"
+msgid "Reason for update: "
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Ðáñáêáëþ ðåñéìÝíåôå, áíáíåþíåôáé ôï ìÝóï..."
+msgid "Summary: "
+msgstr "Óýíïøç: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Ðáñáêáëþ ðåñéìÝíåôå, ôáîéíïìïýíôáé ôá ðáêÝôá"
+msgid "Importance: "
+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 ""
+msgid "%s KB"
+msgstr "%s KB"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Information on packages"
-msgstr "Ðåñéóóüôåñåò ðëçñïöïñßåò ãéá ôï ðáêÝôï..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Cancel"
-msgstr "Áêýñùóç"
+msgid "Size: "
+msgstr "ÌÝãåèïò: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "¼ëá åãêáôáóôÜèçêáí åðéôõ÷þò"
+msgid "Version: "
+msgstr "¸êäïóç: "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Ðáñáêáëþ ðåñéìÝíåôå, áíáíåþíåôáé ôï ìÝóï..."
+msgid "Name: "
+msgstr "¼íïìá: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
+msgid "Currently installed version: "
 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"
-"Íá óõíå÷éóôåß;"
+#, fuzzy, c-format
+msgid "Source: "
+msgstr "Åîáíáãêáóìüò"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "óôéò ðåñéãñáöÝò"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Configure proxies"
-msgstr "Ñýèìéóç ðçãþí"
+msgid "(Not available)"
+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"
-"\n"
-"Íá óõíå÷éóôåß;"
+msgid "Changelog:\n"
+msgstr "ÁëëáãÝò:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Ðáñáêáëþ åðéëÝîôå"
+msgid "Files:\n"
+msgstr "¶ñ÷åßá:\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "ÅðéëåãìÝíï ìÝãåèïò: %d MB"
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Add a source"
-msgstr "ÐñïóèÞêç ðçãÞò:"
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "Áñ÷éêïðïßçóç..."
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "ÅðéëåãìÝíï: %d MB/ Åëåýèåñïò ÷þñïò óôïí äßóêï: %d MB"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "ÁðïèÞêåõóç áëëáãþí"
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
+msgstr ""
+"Ãéá íá éêáíïðïéçèïýí ïé åîáñôÞóåéò ôïõò ôá ðáñáêÜôù ðáêÝôá ðñÝðåé\n"
+"íá áðïåðéëåãïýí:\n"
+"\n"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Error during download"
-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:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Ðñïåôïéìáóßá ðáêÝôùí ãéá åãêáôÜóôáóç..."
+msgid "%s conflicts with %s"
+msgstr " óõãêñïýåôáé ìå"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Importance: "
-msgstr "Óðïõäáéüôçôá: "
+#, fuzzy, c-format
+msgid "Some packages can't be installed"
+msgstr "Ôï ðáêÝôï `%s' äåí ìðïñåß íá åãêáôáóôáèåß\n"
 
 #: ../rpmdrake:1
 #, c-format
@@ -604,83 +647,77 @@ msgstr ""
 " ôá ðáñáêÜôù ðáêÝôá:\n"
 "\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "ÐñïóèÞêç..."
+msgid "Additional packages needed"
+msgstr "Áðáéôïýíôáé åðéðëÝïí ðáêÝôá"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Unable to create medium."
-msgstr "Áäõíáìßá äçìéïõñãßáò ìÝóïõ."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "Ôï ðáêÝôï `%s' äåí ìðïñåß íá åãêáôáóôáèåß\n"
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Removing these packages would break your system, sorry:\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"
-"ßóùò íá ðñÝðåé íá ôá åëÝãîåôå ãéá íá åêôåëÝóåôå ïñéóìÝíåò åíÝñãåéåò:"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Browse..."
-msgstr "ÁíáæÞôçóç..."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "Ôï ðáêÝôï `%s' äåí ìðïñåß íá åãêáôáóôáèåß\n"
-
-#: ../rpmdrake.pm:1
 #, c-format
-msgid "Info..."
-msgstr "Ðëçñïöïñßåò..."
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
+"Ãéá íá éêáíïðïéçèïýí ïé åîáñôÞóåéò ôïõò ôá ðáñáêÜôù ðáêÝôá ðñÝðåé åðßóçò\n"
+"íá áöáéñåèïýí:\n"
+"\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "ÐñÝðåé íá åéóÜãåôå ôï ìÝóï ãéá íá óõíå÷ßóåôå"
+msgid "Some additional packages need to be removed"
+msgstr "ÏñéóìÝíá åðéðëÝïí ðáêÝôá ðñÝðåé íá áöáéñåèïýí"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "Áöáßñåóç"
+msgid "More information on package..."
+msgstr "Ðåñéóóüôåñåò ðëçñïöïñßåò ãéá ôï ðáêÝôï..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Ðñïåôïéìáóßá ðáêÝôùí ãéá åãêáôÜóôáóç..."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "No mirror"
-msgstr "×ùñßò åíáëëáêôéêÝò"
+msgid "Information on packages"
+msgstr "Ðåñéóóüôåñåò ðëçñïöïñßåò ãéá ôï ðáêÝôï..."
 
-#: ../edit-urpm-sources.pl:1
+#. -PO: Keep it short, this is gonna be on a button
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "ÐñÝðåé íá óõìðëçñþóåôå ôïõëÜ÷éóôïí ôá äýï ðñþôá ðåäßá."
+msgid "More info"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "ÅãêáôÜóôáóç"
+msgid "Addable"
+msgstr "ÐñïóôéèÝìåíá"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "Éáðùíßá"
+msgid "Upgradable"
+msgstr "Áíáâáèìßóéìá"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-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:1
 #, c-format
@@ -688,340 +725,377 @@ msgid "No update"
 msgstr "×ùñßò áíáâáèìßóåéò"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Description: "
-msgstr "ÐåñéãñáöÞ"
+#, c-format
+msgid "(none)"
+msgstr "(êáíÝíá)"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"Ç åãêáôÜóôáóç áðÝôõ÷å, ïñéóìÝíá áñ÷åßá äåí õðÜñ÷ïõí.\n"
-"ºóùò íá ðñÝðåé íá áíáâáèìßóåôå ôçí âÜóç äåäïìÝíùí ôùí ðçãþí."
+msgid "Please wait, listing packages..."
+msgstr "Ðáñáêáëþ ðåñéìÝíåôå, ôáîéíïìïýíôáé ôá ðáêÝôá"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "Áäõíáìßá áíïßãìáôïò ôïõ ðáêÝôïõ`%s'\n"
 
 #: ../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 ""
+msgid "One of the following packages is needed:"
+msgstr "¸íá áðü ôá ðáñáêÜôù ðáêÝôá áðáéôïýíôáé:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "¼íïìá: "
+msgid "Please choose"
+msgstr "Ðáñáêáëþ åðéëÝîôå"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "¸ëåã÷ïò..."
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Ðñïåôïéìáóßá ðáêÝôùí ãéá åãêáôÜóôáóç..."
+msgid "Not selected"
+msgstr "ÂñÝèçêáí óõãêñïýóåéò"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Áõóôñáëßá"
+msgid "Selected"
+msgstr "ÅðéëåãìÝíá"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation finished"
-msgstr "Ç åãêáôÜóôáóç ôåëåßùóå"
+msgid "Search results"
+msgstr "ÁðïôÝëåóìá ÁíáæÞôçóçò"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
-msgstr "âÜóç äéáèåóéìüôçôáò áíáâÜèìéóçò"
+msgid "Stop"
+msgstr "Ôåñìáôéóìüò"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
-msgstr "Ðïëùíßá"
+msgid "Please wait, searching..."
+msgstr "Ðáñáêáëþ ðåñéìÝíåôå, ãßíåôáé áíáæÞôçóç..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Version: "
-msgstr "¸êäïóç: "
+msgid "Search results (none)"
+msgstr "ÁðïôÝëåóìá ÁíáæÞôçóçò (êáíÝíá)"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "¶ëëá"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
+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 "Editing source \\\"%s\\\":"
-msgstr "Åðåîåñãáóßá ðçãÞò \"%s\":"
+msgid "Proxy..."
+msgstr "ÓöÜëìá..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Upgradable"
-msgstr "Áíáâáèìßóéìá"
+msgid "Update..."
+msgstr "ÁíáíÝùóç..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid " done."
-msgstr ""
+msgid "Add..."
+msgstr "ÐñïóèÞêç..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "Åðåîåñãáóßá"
+
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Ðñïåôïéìáóßá ðáêÝôùí ãéá åãêáôÜóôáóç..."
+msgid "Source"
+msgstr "Åîáíáãêáóìüò"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr ""
+msgid "Enabled?"
+msgstr "Åíåñãïðïßçóç;"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "Áðáéôïýíôáé åðéðëÝïí ðáêÝôá"
+msgid "Configure sources"
+msgstr "Ñýèìéóç ðçãþí"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Áíáâáèìßóåéò äéïñèþóåùí"
+msgid "Password:"
+msgstr "Êùäéêüò ðñüóâáóçò:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
+msgid "User:"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Germany"
-msgstr "Ãåñìáíßá"
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Russia"
-msgstr "Ñùóßá"
+msgid "Proxy hostname:"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Norway"
-msgstr "Íïñâçãßá"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "ÕðÞñîáí ðñïâëÞìáôá êáôÜ ôçí åãêáôÜóôáóç"
+msgid "Configure proxies"
+msgstr "Ñýèìéóç ðçãþí"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search"
-msgstr "ÁíáæÞôçóç"
+msgid "Please wait, updating medium..."
+msgstr "Ðáñáêáëþ ðåñéìÝíåôå, áíáíåþíåôáé ôï ìÝóï..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit a source"
-msgstr "Åðåîåñãáóßá ðçãÞò"
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr ""
+"Ãéá íá áðïèçêåõôïýí ïé áëëáãÝò, èá ðñÝðåé íá åéóÜãåôå ôï ìÝóï óôïí ïäçãü."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Ôóå÷ßá"
+msgid "You need to insert the medium to continue"
+msgstr "ÐñÝðåé íá åéóÜãåôå ôï ìÝóï ãéá íá óõíå÷ßóåôå"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Stop"
-msgstr "Ôåñìáôéóìüò"
+msgid "Save changes"
+msgstr "ÁðïèÞêåõóç áëëáãþí"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "ÁíáíÝùóç"
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Ó÷åôéêÞ èÝóç ôùí synthesis/hdlist: "
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "Ðáñáêáëþ ðåñéìÝíåôå, áöáéñïýíôáé ôá ðáêÝôá..."
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing source \"%s\":"
+msgstr "Åðåîåñãáóßá ðçãÞò \"%s\":"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal information"
-msgstr "ÊáíïíéêÝò ðëçñïöïñßåò"
+msgid "Edit a source"
+msgstr "Åðåîåñãáóßá ðçãÞò"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Ãßíåôáé ç ëÞøç ôïõ ðáêÝôïõ `%s' (%s/%s)..."
+msgid "Please wait, removing medium..."
+msgstr "Ðáñáêáëþ ðåñéìÝíåôå, áöáéñåßôáé ôï ìÝóï..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "ÅðéëåãìÝíï: %d MB/ Åëåýèåñïò ÷þñïò óôïí äßóêï: %d MB"
+msgid "Type of source:"
+msgstr "Ôýðïò ðçãÞò:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Spain"
-msgstr "Éóðáíßá"
+msgid "Adding a source:"
+msgstr "ÐñïóèÞêç ðçãÞò:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
-msgstr "ÊáíïíéêÝò áíáâáèìßóåéò"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"ÕðÜñ÷åé Þäç Ýíá ìÝóï ìå áõôü ôï üíïìá, åßóôå âÝâáéïé\n"
+"ãéá ôçí áíôéêáôÜóôáóÞ ôïõ;"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by selection state"
-msgstr "âÜóç êáôÜóôáóçò åðéëïãÞò"
+msgid "You need to fill up at least the two first entries."
+msgstr "ÐñÝðåé íá óõìðëçñþóåôå ôïõëÜ÷éóôïí ôá äýï ðñþôá ðåäßá."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
-"Ðáñáêáëþ ðåñéìÝíåôå ãßíåôáé ç ëÞøç ôùí äéåõèýíóåùí ôùí åíáëëáêôéêþí èÝóåùí "
-"áðü ôçí MandrakeSoft."
+msgid "Name:"
+msgstr "¼íïìá:"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "ÐñïóðÝëáóç:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Austria"
-msgstr "Áõóôñßá"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Fatal error"
-msgstr "ÓöÜëìá áñ÷åßïõ"
+msgid "Choose a mirror..."
+msgstr "ÅðéëÝîôå ìéá åíáëëáêôéêÞ..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "ÅðéëÝîôå ôéò ðçãÝò ðïõ èÝëåôå íá áíáíåþóåôå:"
+msgid "Browse..."
+msgstr "ÁíáæÞôçóç..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update..."
-msgstr "ÁíáíÝùóç..."
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "ÅðáëÞèåõóç õðïãñáöÞò ôïõ `%s'..."
+msgid "Path or mount point:"
+msgstr "ÈÝóç Þ óçìåßï ðñïóÜñôçóçò: "
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
-msgstr "(êáíÝíá)"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
-"Óõãíþìç, ç áöáßñåóç áõôþí ôùí ðáêÝôùí èá êáôáóôñÝøåé ôï óýóôçìÜ óáò:\n"
-"\n"
+msgid "Removable device"
+msgstr "Áöáéñïýìåíç óõóêåõÞ"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "ÅãêáôÜóôáóç ðáêÝôïõ `%s' (%s/%s)..."
+msgid "HTTP server"
+msgstr "ÄéáêïìéóôÞò HTTP"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
-msgstr ""
+msgid "FTP server"
+msgstr "ÄéáêïìéóôÞò FTP"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Other"
-msgstr "¶ëëá"
+msgid "Path:"
+msgstr "ÈÝóç:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reason for update: "
-msgstr ""
+msgid "Local files"
+msgstr "ÔïðéêÜ áñ÷åßá"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a source"
+msgstr "ÐñïóèÞêç ðçãÞò:"
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Please choose the desired mirror."
-msgstr "Ðáñáêáëþ åðéëÝîôå ôçí åðéèõìçôÞ åíáëëáêôéêÞ."
+#, fuzzy, c-format
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr "Áäõíáìßá áíáâÜèìéóçò ôïõ ìÝóïõ, èá áðåíåñãïðïéçèåß áõôüìáôá."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "Åðåîåñãáóßá"
+msgid "Unable to create medium."
+msgstr "Áäõíáìßá äçìéïõñãßáò ìÝóïõ."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Ðáñáêáëþ ðåñéìÝíåôå, áíáæçôïýíôáé ôá äéáèÝóéìá ðáêÝôá..."
+msgid "Update"
+msgstr "ÁíáíÝùóç"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Ó÷åôéêÞ èÝóç ôùí synthesis/hdlist: "
+msgid "Select the source(s) you wish to update:"
+msgstr "ÅðéëÝîôå ôéò ðçãÝò ðïõ èÝëåôå íá áíáíåþóåôå:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results (none)"
-msgstr "ÁðïôÝëåóìá ÁíáæÞôçóçò (êáíÝíá)"
+msgid "Please wait, updating media..."
+msgstr "Ðáñáêáëþ ðåñéìÝíåôå, áíáíåþíåôáé ôï ìÝóï..."
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid " failed!"
+msgstr "óôá áñ÷åßá"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Danmark"
-msgstr "Äáíßá"
+msgid " done."
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "Êßíá"
+msgid "Download of `%s', speed:%s"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United States"
-msgstr "ÇíùìÝíåò Ðïëéôåßåò ÁìåñéêÞò"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "changes:"
-msgstr "ÁðïèÞêåõóç áëëáãþí"
+msgid "Starting download of `%s'..."
+msgstr "ÅðáëÞèåõóç õðïãñáöÞò ôïõ `%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "ÏñéóìÝíá åðéðëÝïí ðáêÝôá ðñÝðåé íá áöáéñåèïýí"
+msgid "Examining distant file of source `%s'..."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Examining file of source `%s'..."
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No"
-msgstr "¼÷é"
+msgid "Copying file for source `%s'..."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Summary: "
-msgstr "Óýíïøç: "
+msgid "Please choose the desired mirror."
+msgstr "Ðáñáêáëþ åðéëÝîôå ôçí åðéèõìçôÞ åíáëëáêôéêÞ."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "ÊáíáäÜò"
+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.pm:1
 #, c-format
-msgid "Greece"
-msgstr "ÅëëÜäá"
+msgid "No mirror"
+msgstr "×ùñßò åíáëëáêôéêÝò"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1038,255 +1112,181 @@ msgstr ""
 "Ôï äßêôõï Þ ç éóôïóåëßäá ôçò MandrakeSoft ìðïñåß íá ìçí åßíáé äéáèÝóéìç.\n"
 "Ðáñáêáëþ ðñïóðáèÞóôå îáíÜ áñãüôåñá."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Source: "
-msgstr "Åîáíáãêáóìüò"
-
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr ""
-
-#: ../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 "ÈÝóç:"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during removal"
-msgstr "ÕðÞñîáí ðñïâëÞìáôá êáôÜ ôçí åãêáôÜóôáóç"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "by source repository"
-msgstr "âÜóç áðïèçêåõìÝíùí ðçãþí"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Selected"
-msgstr "ÅðéëåãìÝíá"
+msgid "Error during download"
+msgstr "ÓöÜëìá êáôÜ ôç ëÞøç"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Netherlands"
-msgstr "Ïëëáíäßá"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Addable"
-msgstr "ÐñïóôéèÝìåíá"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
+"Ðáñáêáëþ ðåñéìÝíåôå ãßíåôáé ç ëÞøç ôùí äéåõèýíóåùí ôùí åíáëëáêôéêþí èÝóåùí "
+"áðü ôçí MandrakeSoft."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
-msgstr "(Äåí åßíáé äéáèÝóéìï/ç)"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
 "\n"
-"%s"
+"Is it ok to continue?"
 msgstr ""
-"Óõãíþìç, ôá ðáñáêÜôù ðáêÝôá äåí ìðïñïýí íá åðéëåãïýí:\n"
+"ÐñÝðåé íá åðéêïéíùíÞóù ìå ôçí éóôïóåëßäá ôçò MandrakeSoft  ãéá íá ðÜñù\n"
+"ôçí ëßóôá ìå ôéò åíáëëáêôéêÝò äéåõèýíóåéò\n"
+"Ðáñáêáëþ åëÝãîôå üôé ôï äßêôõü óáò åßíáé åíåñãü\n"
 "\n"
+"Íá óõíå÷éóôåß;"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr "ÂñÝèçêáí óõãêñïýóåéò"
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Áöáßñåóç ÐáêÝôùí Ëïãéóìéêïý"
+msgid "United States"
+msgstr "ÇíùìÝíåò Ðïëéôåßåò ÁìåñéêÞò"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Sweden"
-msgstr "Óïõçäßá"
+msgid "China"
+msgstr "Êßíá"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
-msgstr ""
+msgid "United Kingdom"
+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."
-msgstr ""
-"Ç ëßóôá ìå ôéò áíáâáèìßóåéò åßíáé êåíÞ. Áõôü óçìáßíåé üôé Þ äåí \n"
-"õðÜñ÷ïõí äéáèÝóéìá ðáêÝôá ãéá áíáâÜèìéóç ãéá ôá åãêáôåóôçìÝíá\n"
-"ðáêÝôá ôïõ õðïëïãéóôÞ óáò Þ ôá Ý÷åôå Þäç áíáâáèìßóåé."
+msgid "Taiwan"
+msgstr "ÔáúâÜí"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr ""
+msgid "Sweden"
+msgstr "Óïõçäßá"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "¸íá áðü ôá ðáñáêÜôù ðáêÝôá áðáéôïýíôáé:"
+msgid "Russia"
+msgstr "Ñùóßá"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "¸îïäïò"
+msgid "Portugal"
+msgstr "Ðïñôïãáëßá"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 ""
-"ÐñÝðåé íá åðéêïéíùíÞóù ìå ôçí åíáëëáêôéêÞ ãéá íá ðÜñù ôéò \n"
-"ôåëåõôáßåò áíáâáèìßóåéò ðáêÝôùí. Ðáñáêáëþ åëÝãîôå üôé äßêôõï\n"
-"åßíáé åíåñãü\n"
-"\n"
-"Íá óõíå÷ßóù;"
+msgid "Poland"
+msgstr "Ðïëùíßá"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "OK"
+msgid "Norway"
+msgstr "Íïñâçãßá"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "Ðáñáêáëþ ðåñéìÝíåôå, ðñïóôßèåôáé ôï ìÝóï..."
+msgid "Netherlands"
+msgstr "Ïëëáíäßá"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Korea"
+msgstr "Åîáíáãêáóìüò"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "Ôýðïò ðçãÞò:"
+msgid "Japan"
+msgstr "Éáðùíßá"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Please insert the medium named \\\"%s\\\" on device [%s]"
-msgstr "Ðáñáêáëþ åéóÜãåôå ôï ìÝóï ìå üíïìá \"%s\" óôç óõóêåõÞ [%s]"
+msgid "Italy"
+msgstr "ÅãêáôÜóôáóç"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Israel"
+msgstr "ÅãêáôÜóôáóç"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to get source packages."
-msgstr "Áäýíáôç ç ëÞøç ôùí ðçãáßùí ðáêÝôùí."
+msgid "Greece"
+msgstr "ÅëëÜäá"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Too many packages are selected"
-msgstr "ÏñéóìÝíá ðáêÝôá äåí ìðïñïýí íá åãêáôáóôáèïýí"
+msgid "France"
+msgstr "Åîáíáãêáóìüò"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr " óõãêñïýåôáé ìå"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "Öéíëáíäßá"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Spain"
+msgstr "Éóðáíßá"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "ÅðéëïãÝò Mandrake"
+msgid "Danmark"
+msgstr "Äáíßá"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Germany"
+msgstr "Ãåñìáíßá"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "ÁëëáãÝò:\n"
+msgid "Czech Republic"
+msgstr "Ôóå÷ßá"
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Korea"
-msgstr "Åîáíáãêáóìüò"
+#, c-format
+msgid "Costa Rica"
+msgstr "Êüóôá Ñßêá"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "Áöáéñïýìåíç óõóêåõÞ"
+msgid "Canada"
+msgstr "ÊáíáäÜò"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Belgium"
-msgstr "ÂÝëãéï"
+msgid "Brazil"
+msgstr "Âñáæéëßá"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Change medium"
-msgstr "ÁëëáãÞ ìÝóïõ"
+msgid "Belgium"
+msgstr "ÂÝëãéï"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Mandrake Update"
+msgid "Australia"
+msgstr "Áõóôñáëßá"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by size"
-msgstr "âÜóç ìåãÝèïõò"
+msgid "Austria"
+msgstr "Áõóôñßá"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "ÄéáêïìéóôÞò FTP"
+msgid "Info..."
+msgstr "Ðëçñïöïñßåò..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Files:\n"
-msgstr "¶ñ÷åßá:\n"
+msgid "No"
+msgstr "¼÷é"
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr "Áäõíáìßá áíáâÜèìéóçò ôïõ ìÝóïõ, èá áðåíåñãïðïéçèåß áõôüìáôá."
+#, c-format
+msgid "Yes"
+msgstr "Íáé"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
diff --git a/po/eo.po b/po/eo.po
index ad666a43..394cd902 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grpmi\n"
-"POT-Creation-Date: 2003-05-02 20:15+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+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,21 +14,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Enabled?"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
 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 ""
@@ -41,141 +34,131 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
 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 "How to choose manually your mirror"
+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 "URL:"
-msgstr "URL:"
-
 #: ../rpmdrake:1
-#, c-format
-msgid "Some packages need to be removed"
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
 msgstr ""
+"Okazis eraro dum instalado de pakaĵoj:\n"
+"\n"
+"`%s'"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Already existing update sources"
-msgstr ""
+#, fuzzy, c-format
+msgid "Problem during removal"
+msgstr "Problemo okazis dum instalado"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "More information on package..."
+#, fuzzy, c-format
+msgid "Please wait, removing packages..."
 msgstr ""
+"Bonvole Atendu\n"
+"Mi ordigas la pakaĵojn"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Yes"
-msgstr "Jes"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, reading packages database..."
+msgstr ""
+"Bonvole Atendu\n"
+"Mi ordigas la pakaĵojn"
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"There was a problem during the installation:\n"
 "\n"
+"%s"
 msgstr ""
+"Okazis eraro dum instalado de pakaĵoj:\n"
+"\n"
+"`%s'"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "everything was installed correctly"
-msgstr "Pakaĵo estas jam instalata"
+msgid "Installation failed"
+msgstr "Instalu ĉio"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "%s KB"
-msgstr "%.1f KB"
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "Preparas pakaĵojn por instalado..."
 
 #: ../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 ""
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "Preparas pakaĵojn por instalado..."
 
-#: ../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 "All requested packages were installed successfully."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
+msgid "Everything installed successfully"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"The installation is finished; %s.\n"
 "\n"
-"%s"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
 msgstr ""
-"Okazis eraro dum instalado de pakaĵoj:\n"
-"\n"
-"`%s'"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Size: "
-msgstr "Grandeco"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Security updates"
-msgstr "Montru sekurecajn �isdatigojn"
+msgid "everything was installed correctly"
+msgstr "Pakaĵo estas jam instalata"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Maximum information"
-msgstr ""
-
-#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Eraro..."
+msgid "Problem during installation"
+msgstr "Problemo okazis dum instalado"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Unui�inta Regno"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Instalante pakaĵon `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Configure sources"
-msgstr "Ĉu konfiguri fonton?"
+msgid "Preparing packages installation..."
+msgstr "Preparas pakaĵojn por instalado..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
 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."
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
 msgstr ""
 
 #: ../rpmdrake:1
@@ -185,7 +168,7 @@ msgid ""
 "\n"
 "%s\n"
 "\n"
-"\\Do you want to continue installation?"
+"Do you want to continue installation?"
 msgstr ""
 "La sekva dosiero ne validas:\n"
 "\n"
@@ -194,366 +177,337 @@ msgstr ""
 "Ĉu vi deziras tamen daŭrigi (saltante tiun pakaĵon)?"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Remove .%s"
-msgstr "Deprenebla"
-
-#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Source"
-msgstr "Fonto"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Finland"
-msgstr "Trovu:"
+msgid "Verifying packages signatures..."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "De�utante pakaĵon '%s' (%s/%s)..."
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "France"
-msgstr "Devigu"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
+msgstr "Forigu"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "Jes"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "More info"
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
+msgid "Change medium"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Reload the packages list"
-msgstr "La pakaĵo %s ne estas subskribita"
+#, c-format
+msgid "Initializing..."
+msgstr "Inicanta..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Choose a mirror..."
-msgstr "Elektu vian spegulon:"
+msgid "Package installation..."
+msgstr "Preparas pakaĵojn por instalado..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Adding a source:"
-msgstr ""
-"Bonvole Atendu\n"
-"Aldonas fonton"
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Vi devas esti root por instali pakaĵojn, bedaŭrinde."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Pakaĵo  `%s'ne povas esti instalata\n"
+msgid "Unable to get source packages."
+msgstr "Elektu viajn pakaĵojn"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Preparas pakaĵojn por instalado..."
+#, c-format
+msgid "Inspect..."
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "All packages,"
-msgstr "0 pakaĵoj, 0 bitokoj"
+msgid "Installation finished"
+msgstr "Instalitaj"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "in files"
-msgstr "Loka"
+msgid "Do nothing"
+msgstr "sed ne konformanta(j)"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
+msgid "Use .%s as main file"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Proxy hostname:"
-msgstr "Salutnomo por prokura servilo:"
-
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Update source(s)"
-msgstr "Redaktu Fontojn"
+msgid "Remove .%s"
+msgstr "Deprenebla"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Local files"
-msgstr "Loka"
+msgid "changes:"
+msgstr "Pakaĵoj"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspecting %s"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Israel"
-msgstr "Instalu"
-
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Help"
-msgstr "/_Helpo"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "HTTP server"
+msgid "Please wait, finding available packages..."
 msgstr ""
+"Bonvole Atendu\n"
+"Mi ordigas la pakaĵojn"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, adding medium..."
+msgstr "Kontrolas dependaĵojn..."
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"Welcome to the packages source editor!\n"
+"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"
-"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 ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Instalu ĉio"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
+msgid "How to choose manually your mirror"
 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 "Brazil"
-msgstr "Brazilo"
+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 ""
 
-#: ../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 "Already existing update sources"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Trovu:"
+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
 #, c-format
-msgid "All packages, alphabetical"
+msgid "A fatal error occurred: %s."
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, searching..."
-msgstr "Bonvole atendu dum rpm-o malinstalas ĉi tiujn pakaĵojn:"
+msgid "Fatal error"
+msgstr "dosiera eraro"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, reading packages database..."
-msgstr ""
-"Bonvole Atendu\n"
-"Mi ordigas la pakaĵojn"
+msgid "Software Packages Installation"
+msgstr "Preparas pakaĵojn por instalado..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "unknown package "
-msgstr "nekonata"
+msgid "Mandrake Update"
+msgstr "MandrakeUpdate Preferoj"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Software Packages Removal"
+msgstr " ProgramarAdministrilo "
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reset the selection"
-msgstr ""
+msgid "Quit"
+msgstr "Forlasu"
 
-#: ../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 ""
+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"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Search"
+msgstr "serĉu"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "Trovu:"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
 "\n"
+"Is it ok to continue?"
 msgstr ""
-"Por plenumi ĉiujn el la dependaĵoj,\n"
-"ĉi tiuj pakaĵoj estos malinstalataj:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Kostariko"
+msgid "Some packages need to be removed"
+msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"There was a problem during the installation:\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"
-"%s"
+"Do you really want to install all the selected packages?"
 msgstr ""
-"Okazis eraro dum instalado de pakaĵoj:\n"
-"\n"
-"`%s'"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, removing medium..."
-msgstr "Kontrolas dependaĵojn..."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Password:"
-msgstr "Passvorto:"
+msgid "Too many packages are selected"
+msgstr "Pakaĵoj jam estas instalataj"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
+msgid "Maximum information"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Taiwan"
-msgstr "Tajlando"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "User:"
-msgstr "Salutnomo:"
+msgid "Normal information"
+msgstr "normaj �isdatigoj"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Please wait, updating medium..."
-msgstr "Kontrolas dependaĵojn..."
+msgid "Update source(s)"
+msgstr "Redaktu Fontojn"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, listing packages..."
-msgstr ""
-"Bonvole Atendu\n"
-"Mi ordigas la pakaĵojn"
+msgid "Reload the packages list"
+msgstr "La pakaĵo %s ne estas subskribita"
 
 #: ../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
 #, fuzzy, c-format
-msgid "Information on packages"
-msgstr "Elektu viajn pakaĵojn"
+msgid "in files"
+msgstr "Loka"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Cancel"
-msgstr "Forigu"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "in descriptions"
+msgstr "Priskriboj"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
+msgid "in names"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Please wait, updating media..."
-msgstr "Kontrolas dependaĵojn..."
-
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
+msgid "by update availability"
 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 "by source repository"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "in descriptions"
-msgstr "Priskriboj"
+#, c-format
+msgid "by selection state"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Configure proxies"
-msgstr "Ĉu konfiguri fonton?"
+msgid "by size"
+msgstr "Profunda grandeca"
 
-#: ../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 "by group"
 msgstr ""
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "All packages,"
+msgstr "0 pakaĵoj, 0 bitokoj"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
+msgid "All packages, alphabetical"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Selected size: %d MB"
-msgstr "%d elektitaj pakaĵoj: %.1f MB"
+msgid "Mandrake choices"
+msgstr "MandrakeÄœisdatigilo"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Add a source"
-msgstr ""
-"Bonvole Atendu\n"
-"Aldonas fonton"
+msgid "Normal updates"
+msgstr "Normalaj Äœisdatigoj"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Initializing..."
-msgstr "Inicanta..."
+#, fuzzy, c-format
+msgid "Bugfixes updates"
+msgstr "Montru cimo-riparajn �isdatigojn"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Save changes"
-msgstr "Pakaĵoj"
+msgid "Security updates"
+msgstr "Montru sekurecajn �isdatigojn"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Description: "
+msgstr "Priskriboj"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
-msgstr "Eraro dum de�utado"
+msgid "Reason for update: "
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Preparas pakaĵojn por instalado..."
+msgid "Summary: "
+msgstr "Resumo"
 
 #: ../rpmdrake:1
 #, c-format
@@ -561,672 +515,718 @@ msgid "Importance: "
 msgstr ""
 
 #: ../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 "%s KB"
+msgstr "%.1f KB"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add..."
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Size: "
+msgstr "Grandeco"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unable to create medium."
-msgstr "Ne povis krei raportdosieron, ĉesigas.\n"
+msgid "Version: "
+msgstr "Versio:"
 
 #: ../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 ""
+#, fuzzy, c-format
+msgid "Name: "
+msgstr "Nomo: %s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
+msgid "Currently installed version: "
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "Pakaĵo  `%s'ne povas esti instalata\n"
+msgid "Source: "
+msgstr "Fonto"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
+msgid "(Not available)"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
+msgid "Changelog:\n"
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Remove"
-msgstr "Malproksima printilo"
-
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Preparas pakaĵojn por instalado..."
+msgid "Files:\n"
+msgstr "/_Dosiero"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No mirror"
-msgstr "spegulo:"
+msgid "Selected size: %d MB"
+msgstr "%d elektitaj pakaĵoj: %.1f MB"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
+msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Instalu"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Japan"
-msgstr "Japanio"
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
+msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Do nothing"
-msgstr "sed ne konformanta(j)"
+#, 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 "No update"
-msgstr "Faru Äœisdatigojn"
+msgid "%s conflicts with %s"
+msgstr "konfliktas kun"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Description: "
-msgstr "Priskriboj"
+msgid "Some packages can't be installed"
+msgstr "Pakaĵo  `%s'ne povas esti instalata\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
 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 "Additional packages needed"
 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
 #, c-format
-msgid "Inspect..."
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Preparas pakaĵojn por instalado..."
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Australia"
-msgstr "seria"
+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:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Installation finished"
-msgstr "Instalitaj"
+msgid "Some additional packages need to be removed"
+msgstr "Vi devas instali ĉi tiujn pakaĵojn por ĉiuj bone funkcias:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
+msgid "More information on package..."
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Poland"
-msgstr "Pollando"
-
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Version: "
-msgstr "Versio:"
+msgid "Information on packages"
+msgstr "Elektu viajn pakaĵojn"
 
-#: ../edit-urpm-sources.pl:1
+#. -PO: Keep it short, this is gonna be on a button
+#: ../rpmdrake:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
+msgid "More info"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Editing source \\\"%s\\\":"
-msgstr "Redaktu Fontojn"
+#: ../rpmdrake:1
+#, c-format
+msgid "Addable"
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Upgradable"
 msgstr "Äœisdatigu"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " done."
+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:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Preparas pakaĵojn por instalado..."
+msgid "No update"
+msgstr "Faru Äœisdatigojn"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr ""
+msgid "(none)"
+msgstr "(nenio)"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Additional packages needed"
+#, fuzzy, c-format
+msgid "Please wait, listing packages..."
 msgstr ""
+"Bonvole Atendu\n"
+"Mi ordigas la pakaĵojn"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Bugfixes updates"
-msgstr "Montru cimo-riparajn �isdatigojn"
+msgid "unknown package "
+msgstr "nekonata"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
+msgid "One of the following packages is needed:"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Germany"
-msgstr "Germana"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Russia"
-msgstr "Rusa"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please choose"
+msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Norway"
-msgstr "Norvega"
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Problemo okazis dum instalado"
+msgid "Not selected"
+msgstr "Konfliktoj detektitaj"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Search"
-msgstr "serĉu"
+msgid "Selected"
+msgstr ""
+"Elektu\n"
+"ĉiujn"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Edit a source"
-msgstr "Redaktu Fontojn"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Czech Republic"
-msgstr "la Ĉeĥa Respubliko"
+msgid "Search results"
+msgstr "Serĉrezulto"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Stop"
 msgstr "Sektoro"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Update"
-msgstr "Äœisdatigu"
-
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, removing packages..."
-msgstr ""
-"Bonvole Atendu\n"
-"Mi ordigas la pakaĵojn"
+msgid "Please wait, searching..."
+msgstr "Bonvole atendu dum rpm-o malinstalas ĉi tiujn pakaĵojn:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Normal information"
-msgstr "normaj �isdatigoj"
+msgid "Search results (none)"
+msgstr "Serĉrezulto"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "De�utante pakaĵon '%s' (%s/%s)..."
+msgid "Other"
+msgstr "Alia"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
+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 ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Spain"
-msgstr "Hispanujo"
+msgid "Save and quit"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Normal updates"
-msgstr "Normalaj Äœisdatigoj"
+msgid "Proxy..."
+msgstr "Eraro..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Update..."
+msgstr "Äœisdatigu"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by selection state"
+msgid "Add..."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgid "Edit"
+msgstr "Redaktu"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Source"
+msgstr "Fonto"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Login:"
-msgstr "salutnomo:"
+msgid "Configure sources"
+msgstr "Ĉu konfiguri fonton?"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Austria"
-msgstr "seria"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "Passvorto:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Fatal error"
-msgstr "dosiera eraro"
+msgid "User:"
+msgstr "Salutnomo:"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Select the source(s) you wish to update:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
-"Bonvole elektu la fontojn\n"
-"vi deziras �isdatigi:"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Update..."
-msgstr "Äœisdatigu"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "Kontrolante la subskribon de '%s'..."
-
-#: ../rpmdrake:1
-#, c-format
-msgid "(none)"
-msgstr "(nenio)"
+msgid "Proxy hostname:"
+msgstr "Salutnomo por prokura servilo:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Instalante pakaĵon `%s' (%s/%s)..."
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure proxies"
+msgstr "Ĉu konfiguri fonton?"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Currently installed version: "
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, updating medium..."
+msgstr "Kontrolas dependaĵojn..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Other"
-msgstr "Alia"
+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 "Reason for update: "
+msgid "You need to insert the medium to continue"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Please choose the desired mirror."
-msgstr ""
-"Bonvole Atendu\n"
-"Mi prenas la liston de speguloj"
+msgid "Save changes"
+msgstr "Pakaĵoj"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "relativa vojo al hdlist: "
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit"
-msgstr "Redaktu"
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Please wait, finding available packages..."
-msgstr ""
-"Bonvole Atendu\n"
-"Mi ordigas la pakaĵojn"
+msgid "Editing source \"%s\":"
+msgstr "Redaktu Fontojn"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "relativa vojo al hdlist: "
+msgid "Edit a source"
+msgstr "Redaktu Fontojn"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Search results (none)"
-msgstr "Serĉrezulto"
+msgid "Please wait, removing medium..."
+msgstr "Kontrolas dependaĵojn..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Danmark"
+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"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "China"
-msgstr "Ĉinio"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "United States"
-msgstr "Usono"
+msgid "You need to fill up at least the two first entries."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "changes:"
-msgstr "Pakaĵoj"
+msgid "Name:"
+msgstr "Nomo"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl: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 "Login:"
+msgstr "salutnomo:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Choose a mirror..."
+msgstr "Elektu vian spegulon:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "Ne"
+msgid "Browse..."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Summary: "
-msgstr "Resumo"
+msgid "Path or mount point:"
+msgstr "surmetingo:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Canada"
-msgstr "Kanado"
+msgid "Removable device"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "HTTP server"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Greece"
-msgstr "Greka"
+msgid "Path:"
+msgstr "Pordo:"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Local files"
+msgstr "Loka"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a source"
+msgstr ""
+"Bonvole Atendu\n"
+"Aldonas fonton"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"There was an error downloading the mirrors list:\n"
+"Unable to update medium; it will be automatically disabled.\n"
 "\n"
-"%s\n"
-"The network, or MandrakeSoft website, are maybe unavailable.\n"
-"Please try again later."
+"Errors:\n"
+"%s"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Source: "
-msgstr "Fonto"
+msgid "Unable to create medium."
+msgstr "Ne povis krei raportdosieron, ĉesigas.\n"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr ""
+msgid "Update"
+msgstr "Äœisdatigu"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Vi devas esti root por instali pakaĵojn, bedaŭrinde."
+msgid "Select the source(s) you wish to update:"
+msgstr ""
+"Bonvole elektu la fontojn\n"
+"vi deziras �isdatigi:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Path:"
-msgstr "Pordo:"
+msgid "Please wait, updating media..."
+msgstr "Kontrolas dependaĵojn..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Problem during removal"
-msgstr "Problemo okazis dum instalado"
+msgid " failed!"
+msgstr "Loka"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by source repository"
+msgid " done."
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Selected"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Download of `%s', speed:%s"
 msgstr ""
-"Elektu\n"
-"ĉiujn"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Netherlands"
-msgstr "Nederlando"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "Kontrolante la subskribon de '%s'..."
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
+msgid "Examining distant file of source `%s'..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
+msgid "Examining file of source `%s'..."
 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 source `%s'..."
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-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"
+msgid "Please choose the desired mirror."
+msgstr ""
+"Bonvole Atendu\n"
+"Mi prenas la liston de speguloj"
 
-#: ../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
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "No mirror"
+msgstr "spegulo:"
+
+#: ../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."
+"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
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr ""
+msgid "Error during download"
+msgstr "Eraro dum de�utado"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Quit"
-msgstr "Forlasu"
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
+"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 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "Jes"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Please wait, adding medium..."
-msgstr "Kontrolas dependaĵojn..."
+msgid "United States"
+msgstr "Usono"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "Speco de fonto:"
+msgid "China"
+msgstr "Ĉinio"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \\\"%s\\\" on device [%s]"
-msgstr ""
+msgid "United Kingdom"
+msgstr "Unui�inta Regno"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Unable to get source packages."
-msgstr "Elektu viajn pakaĵojn"
+msgid "Taiwan"
+msgstr "Tajlando"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Too many packages are selected"
-msgstr "Pakaĵoj jam estas instalataj"
+msgid "Sweden"
+msgstr "Sveda"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "konfliktas kun"
+msgid "Russia"
+msgstr "Rusa"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Portugal"
+msgstr "Pordo:"
+
+#: ../rpmdrake.pm: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 ""
+msgid "Poland"
+msgstr "Pollando"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Mandrake choices"
-msgstr "MandrakeÄœisdatigilo"
+msgid "Norway"
+msgstr "Norvega"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Netherlands"
+msgstr "Nederlando"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Korea"
+msgstr "Devigu"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr ""
+msgid "Japan"
+msgstr "Japanio"
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Korea"
+msgid "Italy"
+msgstr "Instalu"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Israel"
+msgstr "Instalu"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Greece"
+msgstr "Greka"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "France"
 msgstr "Devigu"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Finland"
+msgstr "Trovu:"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
+msgid "Spain"
+msgstr "Hispanujo"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Belgium"
-msgstr "Belga"
+msgid "Germany"
+msgstr "Germana"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Change medium"
-msgstr ""
+msgid "Czech Republic"
+msgstr "la Ĉeĥa Respubliko"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Costa Rica"
+msgstr "Kostariko"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Canada"
+msgstr "Kanado"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
+msgstr "Brazilo"
+
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Mandrake Update"
-msgstr "MandrakeUpdate Preferoj"
+msgid "Belgium"
+msgstr "Belga"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "by size"
-msgstr "Profunda grandeca"
+msgid "Australia"
+msgstr "seria"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Austria"
+msgstr "seria"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
+msgid "Info..."
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Files:\n"
-msgstr "/_Dosiero"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
+msgstr "Ne"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr ""
+msgid "Yes"
+msgstr "Jes"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
diff --git a/po/es.po b/po/es.po
index 70990802..62964608 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grpmi\n"
-"POT-Creation-Date: 2003-05-02 20:15+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+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,20 +17,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-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
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Portugal"
-msgstr "Portugal"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"¿Desea continuar? "
 
 #: ../rpmdrake:1
 #, c-format
@@ -49,59 +45,104 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-msgstr "por grupo"
+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."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Name:"
-msgstr "Nombre:"
+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."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Italy"
-msgstr "Instalar"
+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"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "Cómo elegir manualmente su sitio de réplica"
+msgid "Problem during removal"
+msgstr "Problema durante la eliminación"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "Please wait, removing packages..."
+msgstr "Por favor espere, quitando paquetes..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Se necesita quitar algunos paquetes"
+msgid "Please wait, reading packages database..."
+msgstr "Por favor espere, leyendo la base de datos de paquetes..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Already existing update sources"
+#, 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..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "More information on package..."
-msgstr "Más información sobre el paquete..."
+msgid "All requested packages were installed successfully."
+msgstr "Se instalaron satisfactoriamente todos los paquetes pedidos."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "Sí"
+msgid "Everything installed successfully"
+msgstr "Se instaló todo satisfactoriamente"
 
 #: ../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 ""
-"Debido a sus dependencias, ahora se debe deseleccionar el o los\n"
-"paquetes siguientes:\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
 #, fuzzy, c-format
@@ -109,490 +150,505 @@ 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 "%s KB"
-msgstr "%s KB"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Instalando el paquete «%s» (%s/%s)..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Preparando paquetes para la instalació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."
+"\n"
+"Error(s) reported:\n"
+"%s"
 msgstr ""
-"¡Bienvenido a la herramienta para quitar software!\n"
 "\n"
-"Esta herramienta lo ayudará a elegir el software que desea quitar de su "
-"computadora."
+"\n"
+"Error(es) reportados:\n"
+"%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 "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"
+"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."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"The following packages have bad signatures:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"Hubo un error durante la instalación de los paquetes:\n"
+"Se tienen que quitar los paquetes siguientes para poder actualizar otros:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"¿Desea continuar?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Size: "
-msgstr "Tamaño: "
+msgid "Verifying packages signatures..."
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Security updates"
-msgstr "Actualizaciones de seguridad"
+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"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "Aceptar"
+
+#: ../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]"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "Información máxima"
+msgid "Change medium"
+msgstr "Cambiar el soporte"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, c-format
+msgid "Initializing..."
+msgstr "Inicializando..."
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Error..."
+msgid "Package installation..."
+msgstr "Preparando paquetes para la instalación..."
 
-#: ../rpmdrake.pm:1
+#: ../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 "United Kingdom"
-msgstr "Reino Unido"
+msgid "Unable to get source packages."
+msgstr "No se pueden obtener los paquetes de la fuente."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure sources"
-msgstr "Configurar fuentes"
+msgid "Inspect..."
+msgstr "Inspeccionar..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "en nombres"
+msgid "Installation finished"
+msgstr "Finalizó la instalación"
 
-#: ../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 ""
-"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 "Do nothing"
+msgstr "Hacer nada"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
-"\n"
-"\\Do you want to continue installation?"
-msgstr ""
-"Se tienen que quitar los paquetes siguientes para poder actualizar otros:\n"
-"\n"
-"%s\n"
-"\n"
-"¿Desea continuar?"
+#, c-format
+msgid "Use .%s as main file"
+msgstr "Usar .%s como archivo principal"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Remove .%s"
 msgstr "Quitar .%s"
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Source"
-msgstr "Forzar"
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "Finlandia"
+msgid "changes:"
+msgstr "cambios:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "France"
-msgstr "Forzar"
+msgid "Inspecting %s"
+msgstr "Inspeccionando %s"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "More info"
-msgstr "Más información"
+#, c-format
+msgid "Please wait, finding available packages..."
+msgstr "Por favor espere, encontrando los paquetes disponibles..."
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
+msgid "Please wait, adding medium..."
+msgstr "Por favor espere, agregando soporte..."
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"%s\n"
+"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"
-"Is it ok to continue?"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"%s\n"
+"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"
-"¿Desea continuar? "
+"Luego, vuelva a iniciar MandrakeUpdate."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Recargar la lista de paquetes"
+msgid "How to choose manually your mirror"
+msgstr "Cómo elegir manualmente su sitio de réplica"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr "Elija un sitio de réplica..."
+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 ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Agregando una fuente:"
+msgid "Already existing update sources"
+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?"
+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:1
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "El paquete «%s» no se puede instalar\n"
+msgid "Fatal error"
+msgstr "Error de archivo"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
+msgid "Software Packages Installation"
 msgstr "Preparando paquetes para la instalación..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages,"
-msgstr "Todos los paquetes,"
+msgid "Mandrake Update"
+msgstr "Actualización de Mandrake"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "en archivos"
+msgid "Software Packages Removal"
+msgstr "Quitar paquetes de software"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Se instalaron satisfactoriamente todos los paquetes pedidos."
+msgid "Quit"
+msgstr "Salir"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "Nombre de host del proxy:"
+msgid "Install"
+msgstr "Instalar"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update source(s)"
-msgstr "Actualizar fuente(s)"
+msgid "Remove"
+msgstr "Quitar"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "Archivos locales"
+msgid "Help"
+msgstr "Ayuda"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Inspeccionando %s"
+msgid "Search"
+msgstr "Buscar"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Israel"
-msgstr "Instalar"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "Encontrar:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Help"
-msgstr "Ayuda"
+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?"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "Servidor HTTP"
+msgid "Some packages need to be removed"
+msgstr "Se necesita quitar algunos paquetes"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"Welcome to the packages source editor!\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"
-"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."
+"Do you really want to install all the selected packages?"
 msgstr ""
-"¡Bienvenido al editor de fuentes de paquetes!\n"
+"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"
-"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."
+"¿Realmente quiere instalar los paquetes seleccionados?"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Instalar todo"
+#, c-format
+msgid "Too many packages are selected"
+msgstr "Se han seleccionado demasiados paquetes."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Usar .%s como archivo principal"
+msgid "Maximum information"
+msgstr "Información máxima"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results"
-msgstr "Resultados de la búsqueda"
+msgid "Normal information"
+msgstr "Información normal"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, c-format
-msgid " failed!"
-msgstr "¡falló!"
+msgid "Update source(s)"
+msgstr "Actualizar fuente(s)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Brazil"
-msgstr "Brasil"
+msgid "Reload the packages list"
+msgstr "Recargar la lista de paquetes"
 
-#: ../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 ""
-"Ya hay un soporte con ese nombre, ¿realmente\n"
-"desea reemplazarlo?"
+msgid "Reset the selection"
+msgstr "Reiniciar la selección"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Encontrar:"
+msgid "in files"
+msgstr "en archivos"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Todos los paquetes, alfabético"
+msgid "in descriptions"
+msgstr "en descripciones"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Por favor espere, buscando ..."
+msgid "in names"
+msgstr "en nombres"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Por favor espere, leyendo la base de datos de paquetes..."
+msgid "by update availability"
+msgstr "por disponibilidad de actualización"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "No se puede abrir el paquete «%s»\n"
+#, c-format
+msgid "by source repository"
+msgstr "por repositorio fuente"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "Reiniciar la selección"
+msgid "by selection state"
+msgstr "por estado de la selección"
 
-#: ../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 necesita un proxy, ingrese el nombre del host y un puerto opcional "
-"(sintaxis: <host_proxy[:puerto]>):"
+msgid "by size"
+msgstr "por tamaño"
 
 #: ../rpmdrake: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 "by group"
+msgstr "por grupo"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Costa Rica"
+msgid "All packages,"
+msgstr "Todos los 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"
-
-#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Por favor espere, quitando soporte..."
+msgid "All packages, alphabetical"
+msgstr "Todos los paquetes, alfabético"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "Contraseña:"
+msgid "Mandrake choices"
+msgstr "Selecciones de Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "Examinando archivo distante de fuente `%s'..."
+msgid "Normal updates"
+msgstr "Actualizaciones normales"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Taiwan"
+msgid "Bugfixes updates"
+msgstr "Actualizaciones que corrigen bugs"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "User:"
-msgstr "Usuario:"
+msgid "Security updates"
+msgstr "Actualizaciones de seguridad"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Por favor espere, actualizando soporte..."
+msgid "Description: "
+msgstr "Descripción: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Por favor espere, listando paquetes..."
+msgid "Reason for update: "
+msgstr "Razón para actualizar: "
 
 #: ../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 "Summary: "
+msgstr "Resumen: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Information on packages"
-msgstr "Información sobre paquetes"
+msgid "Importance: "
+msgstr "Importancia: "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "Cancelar"
+msgid "%s KB"
+msgstr "%s KB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Se instaló todo satisfactoriamente"
+msgid "Size: "
+msgstr "Tamaño: "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Por favor espere, actualizando soportes..."
+msgid "Version: "
+msgstr "Versión: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Name: "
+msgstr "Nombre: "
 
 #: ../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 "Currently installed version: "
+msgstr "Versión actualmente instalada: "
 
 #: ../rpmdrake:1
-#, c-format
-msgid "in descriptions"
-msgstr "en descripciones"
+#, fuzzy, c-format
+msgid "Source: "
+msgstr "Forzar"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Configurar proxies"
+msgid "(Not available)"
+msgstr "(No disponible)"
 
-#: ../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 "Changelog:\n"
+msgstr "Cambios:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Por favor, elija"
+msgid "Files:\n"
+msgstr "Archivos:\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Tamaño seleccionado: %d MB"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add a source"
-msgstr "Agregar una fuente"
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "Inicializando..."
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Seleccionado: %d MB / Disponible en disco: %d MB"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "Guardar cambios"
+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"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Error during download"
-msgstr "Error durante la descarga"
+#: ../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:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Preparando paquetes para la instalación..."
+msgid "%s conflicts with %s"
+msgstr "entra en conflicto con"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Importance: "
-msgstr "Importancia: "
+#, fuzzy, c-format
+msgid "Some packages can't be installed"
+msgstr "El paquete «%s» no se puede instalar\n"
 
 #: ../rpmdrake:1
 #, c-format
@@ -605,83 +661,77 @@ msgstr ""
 "paquetes siguientes:\n"
 "\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "Agregar..."
+msgid "Additional packages needed"
+msgstr "Se necesitan paquetes adicionales"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Unable to create medium."
-msgstr "No se puede crear el soporte."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "El paquete «%s» no se puede instalar\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Removing these packages would break your system, sorry:\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"
+"Eliminando estos paquetes podria estropear su sistema, lo siento:\n"
 "\n"
-"Algunos archivos de configuración se crearon como `.rpmnew' o `.rpmsave',\n"
-"ahora puede inspeccionar algunos para poder tomar acción:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
-msgstr "Examinar..."
+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
-#, 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 "Info..."
-msgstr "Info..."
+msgid "Some additional packages need to be removed"
+msgstr "Se necesitan quitar algunos paquetes adicionales"
 
-#: ../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 "More information on package..."
+msgstr "Más información sobre el paquete..."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "Quitar"
+msgid "Information on packages"
+msgstr "Información sobre paquetes"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Preparando paquetes para la instalación..."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "No mirror"
-msgstr "Sin sitio de réplica"
-
-#: ../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."
+msgid "More info"
+msgstr "Más información"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Instalar"
+msgid "Addable"
+msgstr "Agregable"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "Japón"
+msgid "Upgradable"
+msgstr "Actualizable"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Hacer nada"
+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:1
 #, c-format
@@ -690,348 +740,377 @@ msgstr "Sin actualizaciones"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Description: "
-msgstr "Descripción: "
+msgid "(none)"
+msgstr "(ninguno)"
 
 #: ../rpmdrake: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."
+msgid "Please wait, listing packages..."
+msgstr "Por favor espere, listando paquetes..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "No se puede abrir el paquete «%s»\n"
 
 #: ../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?"
+msgid "One of the following packages is needed:"
+msgstr "Se necesita uno de los paquetes siguientes:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "Nombre: "
+msgid "Please choose"
+msgstr "Por favor, elija"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "Inspeccionar..."
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Preparando paquetes para la instalación..."
+msgid "Not selected"
+msgstr "Conflictos detectados"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Australia"
+msgid "Selected"
+msgstr "Seleccionado"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation finished"
-msgstr "Finalizó la instalación"
+msgid "Search results"
+msgstr "Resultados de la búsqueda"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
-msgstr "por disponibilidad de actualización"
+msgid "Stop"
+msgstr "Detener"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
-msgstr "Polonia"
+msgid "Please wait, searching..."
+msgstr "Por favor espere, buscando ..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Version: "
-msgstr "Versión: "
+msgid "Search results (none)"
+msgstr "Resultados de la búsqueda (ninguno)"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Otro"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
+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 ""
-"Puede especificar un usuario/contraseña para la autenticación del proxy:"
+"¡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."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Guardar y salir"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Editing source \\\"%s\\\":"
-msgstr "Editando fuente \"%s\":"
+msgid "Proxy..."
+msgstr "Error..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Upgradable"
-msgstr "Actualizable"
+msgid "Update..."
+msgstr "Actualizar..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid " done."
-msgstr "hecho."
+msgid "Add..."
+msgstr "Agregar..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "Editar"
+
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Preparando paquetes para la instalación..."
+msgid "Source"
+msgstr "Forzar"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "Examinando archivo de fuente `%s'..."
+msgid "Enabled?"
+msgstr "¿Habilitada?"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "Se necesitan paquetes adicionales"
+msgid "Configure sources"
+msgstr "Configurar fuentes"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Actualizaciones que corrigen bugs"
+msgid "Password:"
+msgstr "Contraseña:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "Descarga de `%s', faltan:%s, velocidad:%s"
+msgid "User:"
+msgstr "Usuario:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Germany"
-msgstr "Alemania"
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+"Puede especificar un usuario/contraseña para la autenticación del proxy:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Russia"
-msgstr "Rusia"
+msgid "Proxy hostname:"
+msgstr "Nombre de host del proxy:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Norway"
-msgstr "Noruega"
+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
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Ocurrió un problema durante la instalación"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "Configurar proxies"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search"
-msgstr "Buscar"
+msgid "Please wait, updating medium..."
+msgstr "Por favor espere, actualizando soporte..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit a source"
-msgstr "Editar una fuente"
+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."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Czech Republic"
-msgstr "República Checa"
+msgid "You need to insert the medium to continue"
+msgstr "Necesita insertar el soporte para continuar"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Stop"
-msgstr "Detener"
+msgid "Save changes"
+msgstr "Guardar cambios"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "Actualizar"
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Ruta relativa de synthesis/hdlist:"
 
-#: ../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
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing source \"%s\":"
+msgstr "Editando fuente \"%s\":"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal information"
-msgstr "Información normal"
+msgid "Edit a source"
+msgstr "Editar una fuente"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Descargando el paquete «%s» (%s/%s)..."
+msgid "Please wait, removing medium..."
+msgstr "Por favor espere, quitando soporte..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Seleccionado: %d MB / Disponible en disco: %d MB"
+msgid "Type of source:"
+msgstr "Tipo de fuente:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Spain"
-msgstr "España"
+msgid "Adding a source:"
+msgstr "Agregando una fuente:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
-msgstr "Actualizaciones normales"
+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
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by selection state"
-msgstr "por estado de la selección"
+msgid "You need to fill up at least the two first entries."
+msgstr "Debe completar al menos las dos primeras entradas."
 
-#: ../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 "Name:"
+msgstr "Nombre:"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "Cuenta:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Austria"
-msgstr "Austria"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Error de archivo"
+msgid "Choose a mirror..."
+msgstr "Elija un sitio de réplica..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Seleccione la(s) fuente(s) que desea actualizar:"
+msgid "Browse..."
+msgstr "Examinar..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update..."
-msgstr "Actualizar..."
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "Verificando la firma de «%s»..."
+msgid "Path or mount point:"
+msgstr "Ruta o punto de montaje:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
-msgstr "(ninguno)"
+msgid "Removable device"
+msgstr "Dispositivo removible"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
-"Eliminando estos paquetes podria estropear su sistema, lo siento:\n"
-"\n"
+msgid "HTTP server"
+msgstr "Servidor HTTP"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Instalando el paquete «%s» (%s/%s)..."
+msgid "FTP server"
+msgstr "Servidor FTP"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Versión actualmente instalada: "
+msgid "Path:"
+msgstr "Ruta:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Other"
-msgstr "Otro"
+msgid "Local files"
+msgstr "Archivos locales"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Razón para actualizar: "
+msgid "Add a source"
+msgstr "Agregar una fuente"
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Please choose the desired mirror."
-msgstr "Por favor, elija el sitio de réplica deseado."
+#, 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."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "Editar"
+msgid "Unable to create medium."
+msgstr "No se puede crear el soporte."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Por favor espere, encontrando los paquetes disponibles..."
+msgid "Update"
+msgstr "Actualizar"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Ruta relativa de synthesis/hdlist:"
+msgid "Select the source(s) you wish to update:"
+msgstr "Seleccione la(s) fuente(s) que desea actualizar:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Resultados de la búsqueda (ninguno)"
+msgid "Please wait, updating media..."
+msgstr "Por favor espere, actualizando soportes..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Danmark"
-msgstr "Dinamarca"
+msgid " failed!"
+msgstr "¡falló!"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "China"
+msgid " done."
+msgstr "hecho."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United States"
-msgstr "Estados Unidos"
+msgid "Download of `%s', speed:%s"
+msgstr "Descarga de `%s', velocidad:%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "changes:"
-msgstr "cambios:"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "Descarga de `%s', faltan:%s, velocidad:%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "Verificando la firma de «%s»..."
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Se necesitan quitar algunos paquetes adicionales"
+msgid "Examining distant file of source `%s'..."
+msgstr "Examinando archivo distante de fuente `%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Examining file of source `%s'..."
+msgstr "Examinando archivo de fuente `%s'..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No"
-msgstr "No"
+msgid "Copying file for source `%s'..."
+msgstr "Copiando archivo para fuente `%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Summary: "
-msgstr "Resumen: "
+msgid "Please choose the desired mirror."
+msgstr "Por favor, elija el sitio de réplica deseado."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "Canadá"
+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.pm:1
 #, c-format
-msgid "Greece"
-msgstr "Grecia"
+msgid "No mirror"
+msgstr "Sin sitio de réplica"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1048,259 +1127,180 @@ msgstr ""
 "Tal vez no está disponible la red, o el sitio web de MandrakeSoft.\n"
 "Por favor, intente nuevamente más tarde."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Source: "
-msgstr "Forzar"
-
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "Copiando archivo para fuente `%s'..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Necesita ser root para instalar paquetes. Lo siento."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Path:"
-msgstr "Ruta:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Problem during removal"
-msgstr "Problema durante la eliminación"
+msgid "Error during download"
+msgstr "Error durante la descarga"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by source repository"
-msgstr "por repositorio fuente"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
+"Por favor espere, descargando las direcciones de los sitios de réplica desde "
+"el sitio web de MandrakeSoft."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Selected"
-msgstr "Seleccionado"
+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.pm:1
 #, c-format
-msgid "Netherlands"
-msgstr "Países Bajos"
+msgid "United States"
+msgstr "Estados Unidos"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "Agregable"
+msgid "China"
+msgstr "China"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
-msgstr "(No disponible)"
-
-#: ../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:1
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr "Conflictos detectados"
+msgid "United Kingdom"
+msgstr "Reino Unido"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Quitar paquetes de software"
+msgid "Taiwan"
+msgstr "Taiwan"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Sweden"
 msgstr "Suecia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
-msgstr ""
-"\n"
-"\n"
-"Error(es) reportados:\n"
-"%s"
+msgid "Russia"
+msgstr "Rusia"
 
-#: ../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."
-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 "Portugal"
+msgstr "Portugal"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "Descarga de `%s', velocidad:%s"
+msgid "Poland"
+msgstr "Polonia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Se necesita uno de los paquetes siguientes:"
+msgid "Norway"
+msgstr "Noruega"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "Salir"
+msgid "Netherlands"
+msgstr "Países Bajos"
 
-#: ../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 ""
-"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
+#, fuzzy, c-format
+msgid "Korea"
+msgstr "Forzar"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "Aceptar"
+msgid "Japan"
+msgstr "Japón"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Please wait, adding medium..."
-msgstr "Por favor espere, agregando soporte..."
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Italy"
+msgstr "Instalar"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Israel"
+msgstr "Instalar"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "Tipo de fuente:"
+msgid "Greece"
+msgstr "Grecia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "France"
+msgstr "Forzar"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to get source packages."
-msgstr "No se pueden obtener los paquetes de la fuente."
+msgid "Finland"
+msgstr "Finlandia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Se han seleccionado demasiados paquetes."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "entra en conflicto con"
+msgid "Spain"
+msgstr "España"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Danmark"
+msgstr "Dinamarca"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Selecciones de Mandrake"
+msgid "Germany"
+msgstr "Alemania"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 ""
-"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."
+msgid "Czech Republic"
+msgstr "República Checa"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Cambios:\n"
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Korea"
-msgstr "Forzar"
+#, c-format
+msgid "Canada"
+msgstr "Canadá"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "Dispositivo removible"
+msgid "Brazil"
+msgstr "Brasil"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Bélgica"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Change medium"
-msgstr "Cambiar el soporte"
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Actualización de Mandrake"
+msgid "Australia"
+msgstr "Australia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by size"
-msgstr "por tamaño"
+msgid "Austria"
+msgstr "Austria"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "Servidor FTP"
+msgid "Info..."
+msgstr "Info..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Files:\n"
-msgstr "Archivos:\n"
+msgid "No"
+msgstr "No"
 
 #: ../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."
+#, c-format
+msgid "Yes"
+msgstr "Sí"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
diff --git a/po/et.po b/po/et.po
index 8bc9938c..6b09e035 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grpmi-et\n"
-"POT-Creation-Date: 2003-05-02 20:15+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+0200\n"
 "PO-Revision-Date: 2003-01-19 17:54+0200\n"
 "Last-Translator: Marek Laane <bald@online.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -16,20 +16,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-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
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Portugal"
-msgstr "Portugal"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Kas jätkata?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -47,58 +43,102 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-msgstr "grupi järgi"
+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."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Name:"
-msgstr "Nimi:"
+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.pm:1
-#, c-format
-msgid "Italy"
-msgstr "Itaalia"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"Paigaldamisel juhtus järgmine viga:\n"
+"\n"
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "Kuidas valida peeglit käsitsi"
+msgid "Problem during removal"
+msgstr "Probleem eemaldamisel"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "Please wait, removing packages..."
+msgstr "Palun oodake, eemaldan pakette..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Mõned paketid tuleb eemaldada"
+msgid "Please wait, reading packages database..."
+msgstr "Palun oodake, loen pakettide andmebaasi..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Already existing update sources"
-msgstr "Olemasolevad uuenduste allikad"
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Paigaldamisel juhtus järgmine viga:\n"
+"\n"
+"%s"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Installation failed"
+msgstr "HTTP Interface operatsioon ebaõnnestus\n"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "Paigaldamiseks valmistumine..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "Paigaldamiseks valmistumine..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "More information on package..."
-msgstr "Rohkem infot paketi kohta..."
+msgid "All requested packages were installed successfully."
+msgstr "Kõik soovitud paketid said edukalt paigaldatud."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "Jah"
+msgid "Everything installed successfully"
+msgstr "Kõik paigaldati edukalt"
 
 #: ../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 ""
-"Sõltuvuste tõttu ei saa järgmisi pakette valida:\n"
+"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
 #, c-format
@@ -106,492 +146,511 @@ msgid "everything was installed correctly"
 msgstr "kõik paigaldati edukalt"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during installation"
+msgstr "Paigaldusel tekkisid probleemid"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Paigaldan paketti '%s' (%s/%s).."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Paigaldamiseks valmistumine..."
 
 #: ../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."
+"\n"
+"Error(s) reported:\n"
+"%s"
 msgstr ""
-"Tarkvara eemaldamine\n"
 "\n"
-"Selle tööriista abil saate valida eemaldatava tarkvara."
+"\n"
+"Anti teada viga(dest):\n"
+"%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 "Muutuste salvestamiseks tuleb andmekandja seadmesse sisestada."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Save and quit"
-msgstr "Salvesta ja välju"
+"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."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"The following packages have bad signatures:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"Paigaldamisel juhtus järgmine viga:\n"
+"Järgmised paketid tuleb eemaldada, et saaks teisi uuendada:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"Kas jätkata?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Size: "
-msgstr "Suurus: "
+msgid "Verifying packages signatures..."
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Security updates"
-msgstr "Turvaparandused"
+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
+#, c-format
+msgid "Ok"
+msgstr "Olgu"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Palun sisestage andmekandja nimega \"%s\" seadmesse [%s]"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "Maks. info"
+msgid "Change medium"
+msgstr "Muuda andmekandjat"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, c-format
+msgid "Initializing..."
+msgstr "Initsialiseerin.."
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Viga..."
+msgid "Package installation..."
+msgstr "Paigaldamiseks valmistumine..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Vabandust, pakette saab paigaldada ainult administraator."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Suurbritannia"
+msgid "Unable to get source packages."
+msgstr "Ei saa pakette kätte."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure sources"
-msgstr "Allikate seadistamine"
+msgid "Inspect..."
+msgstr "Uuri..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "nimedes"
+msgid "Installation finished"
+msgstr "Paigaldus lõpetatud"
 
-#: ../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 ""
-"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 "Do nothing"
+msgstr "Ära tee midagi"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
-"\n"
-"\\Do you want to continue installation?"
-msgstr ""
-"Järgmised paketid tuleb eemaldada, et saaks teisi uuendada:\n"
-"\n"
-"%s\n"
-"\n"
-"Kas jätkata?"
+#, c-format
+msgid "Use .%s as main file"
+msgstr ".%s kasutamine põhifailina"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Remove .%s"
 msgstr "Eemalda .%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Source"
-msgstr "Allikas"
+msgid "changes:"
+msgstr "muutused:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "Soome"
+msgid "Inspecting %s"
+msgstr "%s uurimine"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
+msgid "Please wait, finding available packages..."
+msgstr "Palun oodake, otsin kättesaadavaid pakette..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "France"
-msgstr "Prantsusmaa"
+msgid "Please wait, adding medium..."
+msgstr "Palun oodake, lisan andmekandja..."
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "More info"
-msgstr "Rohkem infot"
+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."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Kuidas valida peeglit käsitsi"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"%s\n"
+"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"
-"Is it ok to continue?"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"%s\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"
-"Kas jätkata?"
+"Seejärel käivitage Mandrake uuendused uuesti."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Pakettide nimekirja taaslaadimine"
+msgid "Already existing update sources"
+msgstr "Olemasolevad uuenduste allikad"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr "Valige peegel..."
+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?"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Allika lisamine:"
+msgid "A fatal error occurred: %s."
+msgstr "Tekkis saatuslik viga: %s."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Paketti '%s' ei saa paigaldada\n"
+msgid "Fatal error"
+msgstr "Faili viga"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
+msgid "Software Packages Installation"
 msgstr "Paigaldamiseks valmistumine..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages,"
-msgstr "Kõik paketid,"
+msgid "Mandrake Update"
+msgstr "Mandrake uuendused"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "failides"
+msgid "Software Packages Removal"
+msgstr "Pakettide eemaldamine"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Kõik soovitud paketid said edukalt paigaldatud."
+msgid "Quit"
+msgstr "Välju"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "Vahendaja masinanimi:"
+msgid "Install"
+msgstr "Paigalda"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update source(s)"
-msgstr "Allika(te) uuendamine"
+msgid "Remove"
+msgstr "Eemalda"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "Kohalikud failid"
+msgid "Help"
+msgstr "Abi"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "%s uurimine"
+msgid "Search"
+msgstr "Otsi"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Israel"
-msgstr "Iisrael"
+msgid "Find:"
+msgstr "Leia:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Help"
-msgstr "Abi"
+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?"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "HTTP server"
+msgid "Some packages need to be removed"
+msgstr "Mõned paketid tuleb eemaldada"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"Welcome to the packages source editor!\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"
-"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."
+"Do you really want to install all the selected packages?"
 msgstr ""
-"Tarkvara allikad\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"
-"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."
+"Kas soovite tõesti paigaldada kõik valitud paketid?"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "HTTP Interface operatsioon ebaõnnestus\n"
+#, c-format
+msgid "Too many packages are selected"
+msgstr "Valitud on liiga palju pakette"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr ".%s kasutamine põhifailina"
+msgid "Maximum information"
+msgstr "Maks. info"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results"
-msgstr "Otsingu tulemused"
+msgid "Normal information"
+msgstr "Tavainfo"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, c-format
-msgid " failed!"
-msgstr " ebaõnnestus!"
+msgid "Update source(s)"
+msgstr "Allika(te) uuendamine"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Brazil"
-msgstr "Brasiilia"
+msgid "Reload the packages list"
+msgstr "Pakettide nimekirja taaslaadimine"
 
-#: ../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 ""
-"Sellise nimega andmekandja on juba olemas, kas\n"
-"soovite tõesti selle asendada?"
+msgid "Reset the selection"
+msgstr "Valiku lähtestamine"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Leia:"
+msgid "in files"
+msgstr "failides"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Kõik paketid, tähestikuliselt"
+msgid "in descriptions"
+msgstr "kirjeldustes"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Palun oodake, otsin..."
+msgid "in names"
+msgstr "nimedes"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Palun oodake, loen pakettide andmebaasi..."
+msgid "by update availability"
+msgstr "uuenduse saadavuse järgi"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "Ei saa paketti '%s' avada\n"
+#, c-format
+msgid "by source repository"
+msgstr "andmekandja asukoha järgi"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "Valiku lähtestamine"
+msgid "by selection state"
+msgstr "valikustaatuse järgi"
 
-#: ../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 ""
-"Kui vajate vahendajat, sisestage masina nimi ja võimalusel port (süntaks: "
-"<vahendajamasin[:port]>):"
+msgid "by size"
+msgstr "suuruse järgi"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"Kõigi sõltuvuste rahuldamiseks eemaldatakse ka järgmised paketid:\n"
-"\n"
+msgid "by group"
+msgstr "grupi järgi"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Costa Rica"
+msgid "All packages,"
+msgstr "Kõik paketid,"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Paigaldamisel juhtus järgmine viga:\n"
-"\n"
-"%s"
-
-#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Palun oodake, eemaldan andmekandja..."
+msgid "All packages, alphabetical"
+msgstr "Kõik paketid, tähestikuliselt"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "Parool:"
+msgid "Mandrake choices"
+msgstr "Mandrake valikud"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "Kaugallikafaili `%s' uurimine..."
+msgid "Normal updates"
+msgstr "Uuendused"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Taiwan"
+msgid "Bugfixes updates"
+msgstr "Turvaparandused/uuendused"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "User:"
-msgstr "Kasutajanimi:"
+msgid "Security updates"
+msgstr "Turvaparandused"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Palun oodake, uuendan andmekandjat..."
+msgid "Description: "
+msgstr "Kirjeldus: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Palun oodake, koostan nimekirja..."
+msgid "Reason for update: "
+msgstr "Uuendamise põhjus:"
 
 #: ../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 "Summary: "
+msgstr "Kokkuvõte: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Information on packages"
-msgstr "Info pakettide kohta"
+msgid "Importance: "
+msgstr "Tähtsus: "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "Katkesta"
+msgid "%s KB"
+msgstr "%s KB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Kõik paigaldati edukalt"
+msgid "Size: "
+msgstr "Suurus: "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Palun oodake, uuendan andmekandjat..."
+msgid "Version: "
+msgstr "Versioon: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr "Tekkis saatuslik viga: %s."
+msgid "Name: "
+msgstr "Nimi: "
 
 #: ../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 ""
-"Järgmised paketid tuleb eemaldada, et saaks teisi uuendada:\n"
-"\n"
-"%s\n"
-"\n"
-"Kas jätkata?"
+msgid "Currently installed version: "
+msgstr "Praegu paigaldatud versioon:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "kirjeldustes"
+msgid "Source: "
+msgstr "Allikas:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Vahendajate seadistamine"
+msgid "(Not available)"
+msgstr "(kättesaamatu)"
 
-#: ../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 "Changelog:\n"
+msgstr "Muutuste logi:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Palun valige"
+msgid "Files:\n"
+msgstr "Failid:\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Valitud pakettide maht: %d MB"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add a source"
-msgstr "Lisa allikas"
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "Initsialiseerin.."
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Valitud: %d MB / Vaba kettapinda %d MB"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "Salvesta muutused"
+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"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
-msgstr "Viga allalaadimisel"
+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:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Paigaldamiseks valmistumine..."
+msgid "%s conflicts with %s"
+msgstr "vastuolu paketiga"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Importance: "
-msgstr "Tähtsus: "
+#, fuzzy, c-format
+msgid "Some packages can't be installed"
+msgstr "Paketti '%s' ei saa paigaldada\n"
 
 #: ../rpmdrake:1
 #, c-format
@@ -603,83 +662,76 @@ msgstr ""
 "Sõltuvuste rahuldamiseks tuleb paigaldada ka järgmised paketid:\n"
 "\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "Lisa..."
+msgid "Additional packages needed"
+msgstr "Vajalikud lisapaketid"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Unable to create medium."
-msgstr "Andmekandja loomine ebaõnnestus."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "Paketti '%s' ei saa paigaldada\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Removing these packages would break your system, sorry:\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"
+"Vabandan, aga nende pakettide eemaldamine võib halvata Teie süsteemi:\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:"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Browse..."
-msgstr "Sirvi..."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "Paketti '%s' ei saa paigaldada\n"
-
-#: ../rpmdrake.pm:1
 #, c-format
-msgid "Info..."
-msgstr "Info..."
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
+"Kõigi sõltuvuste rahuldamiseks eemaldatakse ka järgmised paketid:\n"
+"\n"
 
-#: ../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 "Some additional packages need to be removed"
+msgstr "Et kõik töötaks, on vaja lisaks eemaldada mõned paketid"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "Eemalda"
+msgid "More information on package..."
+msgstr "Rohkem infot paketi kohta..."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Paigaldamiseks valmistumine..."
-
-#: ../rpmdrake.pm:1
 #, c-format
-msgid "No mirror"
-msgstr "Peeglit ei leitud"
+msgid "Information on packages"
+msgstr "Info pakettide kohta"
 
-#: ../edit-urpm-sources.pl:1
+#. -PO: Keep it short, this is gonna be on a button
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Täitke vähemalt 2 esimest välja."
+msgid "More info"
+msgstr "Rohkem infot"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Paigalda"
+msgid "Addable"
+msgstr "Lisatavad"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "Jaapan"
+msgid "Upgradable"
+msgstr "Uuendatavad"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Ära tee midagi"
+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"
+"et Te olete need juba kõik paigaldanud."
 
 #: ../rpmdrake:1
 #, c-format
@@ -688,343 +740,379 @@ msgstr "Uuendusi ei ole"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Description: "
-msgstr "Kirjeldus: "
+msgid "(none)"
+msgstr "(puudub)"
 
 #: ../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 "Please wait, listing packages..."
+msgstr "Palun oodake, koostan nimekirja..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "Ei saa paketti '%s' avada\n"
 
 #: ../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 ""
-"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?"
+msgid "One of the following packages is needed:"
+msgstr "Vajalik on üks järgmistest pakettidest:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "Nimi: "
+msgid "Please choose"
+msgstr "Palun valige"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "Uuri..."
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Paigaldamiseks valmistumine..."
+msgid "Not selected"
+msgstr "Leiti konfliktid"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Austraalia"
+msgid "Selected"
+msgstr "Valitud"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation finished"
-msgstr "Paigaldus lõpetatud"
+msgid "Search results"
+msgstr "Otsingu tulemused"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
-msgstr "uuenduse saadavuse järgi"
+msgid "Stop"
+msgstr "Peata"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
-msgstr "Poola"
+msgid "Please wait, searching..."
+msgstr "Palun oodake, otsin..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Version: "
-msgstr "Versioon: "
+msgid "Search results (none)"
+msgstr "Otsingu tulemus (ei leitud)"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Muu"
 
 #: ../edit-urpm-sources.pl: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 ""
+"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 ""
+"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."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Salvesta ja välju"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Editing source \\\"%s\\\":"
-msgstr "Allika \"%s\" muutmine:"
+msgid "Proxy..."
+msgstr "Viga..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Upgradable"
-msgstr "Uuendatavad"
+msgid "Update..."
+msgstr "Uuenda..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid " done."
-msgstr " tehtud."
+msgid "Add..."
+msgstr "Lisa..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Paigaldamiseks valmistumine..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "Muuda"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "Allikafaili `%s' uurimine..."
+msgid "Source"
+msgstr "Allikas"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "Vajalikud lisapaketid"
+msgid "Enabled?"
+msgstr "Kas lubada?"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Turvaparandused/uuendused"
+msgid "Configure sources"
+msgstr "Allikate seadistamine"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "`%s' allalaadimine, aega jäänud:%s, kiirus:%s"
+msgid "Password:"
+msgstr "Parool:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Germany"
-msgstr "Saksamaa"
+msgid "User:"
+msgstr "Kasutajanimi:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Russia"
-msgstr "Venemaa"
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Vahendaja autentimiseks oleks tulus määrata kasutajanimi ja parool:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Norway"
-msgstr "Norra"
+msgid "Proxy hostname:"
+msgstr "Vahendaja masinanimi:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Paigaldusel tekkisid probleemid"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+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
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search"
-msgstr "Otsi"
+msgid "Configure proxies"
+msgstr "Vahendajate seadistamine"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit a source"
-msgstr "Allika muutmine"
+msgid "Please wait, updating medium..."
+msgstr "Palun oodake, uuendan andmekandjat..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Czech Republic"
-msgstr "TÅ¡ehhi Vabariik"
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "Muutuste salvestamiseks tuleb andmekandja seadmesse sisestada."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Stop"
-msgstr "Peata"
+msgid "You need to insert the medium to continue"
+msgstr "Jätkamiseks tuleb sisestada andmekandja"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "Uuenda"
+msgid "Save changes"
+msgstr "Salvesta muutused"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "Palun oodake, eemaldan pakette..."
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Suhteline tee synthesis/hdlist juurde:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal information"
-msgstr "Tavainfo"
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing source \"%s\":"
+msgstr "Allika \"%s\" muutmine:"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Laadin võrgust paketti '%s' (%s/%s).."
+msgid "Edit a source"
+msgstr "Allika muutmine"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Valitud: %d MB / Vaba kettapinda %d MB"
+msgid "Please wait, removing medium..."
+msgstr "Palun oodake, eemaldan andmekandja..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Spain"
-msgstr "Hispaania"
+msgid "Type of source:"
+msgstr "Andmekandja tüüp:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
-msgstr "Uuendused"
+msgid "Adding a source:"
+msgstr "Allika lisamine:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by selection state"
-msgstr "valikustaatuse järgi"
+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.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 "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:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Austria"
-msgstr "Austria"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Faili viga"
+msgid "Choose a mirror..."
+msgstr "Valige peegel..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Valige allikas (allikad), mida soovite uuendada:"
+msgid "Browse..."
+msgstr "Sirvi..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update..."
-msgstr "Uuenda..."
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "Kontrollin signatuuri paketil '%s'"
+msgid "Path or mount point:"
+msgstr "Otsingutee või haakepunkt:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
-msgstr "(puudub)"
+msgid "Removable device"
+msgstr "Eemaldatav seade"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl: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 "HTTP server"
+msgstr "HTTP server"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Paigaldan paketti '%s' (%s/%s).."
+msgid "FTP server"
+msgstr "FTP server"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Praegu paigaldatud versioon:"
+msgid "Path:"
+msgstr "Otsingutee:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Other"
-msgstr "Muu"
+msgid "Local files"
+msgstr "Kohalikud failid"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Uuendamise põhjus:"
+msgid "Add a source"
+msgstr "Lisa allikas"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Please choose the desired mirror."
-msgstr "Palun valige peegel."
+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"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "Muuda"
+msgid "Unable to create medium."
+msgstr "Andmekandja loomine ebaõnnestus."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Palun oodake, otsin kättesaadavaid pakette..."
+msgid "Update"
+msgstr "Uuenda"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Suhteline tee synthesis/hdlist juurde:"
+msgid "Select the source(s) you wish to update:"
+msgstr "Valige allikas (allikad), mida soovite uuendada:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Otsingu tulemus (ei leitud)"
+msgid "Please wait, updating media..."
+msgstr "Palun oodake, uuendan andmekandjat..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Danmark"
-msgstr "Taani"
+msgid " failed!"
+msgstr " ebaõnnestus!"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "Hiina"
+msgid " done."
+msgstr " tehtud."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United States"
-msgstr "USA"
+msgid "Download of `%s', speed:%s"
+msgstr "`%s' allalaadimine, kiirus:%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "changes:"
-msgstr "muutused:"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "`%s' allalaadimine, aega jäänud:%s, kiirus:%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "Kontrollin signatuuri paketil '%s'"
+
+#: ../rpmdrake.pm: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 "Examining distant file of source `%s'..."
+msgstr "Kaugallikafaili `%s' uurimine..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Examining file of source `%s'..."
+msgstr "Allikafaili `%s' uurimine..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No"
-msgstr "Ei"
+msgid "Copying file for source `%s'..."
+msgstr "Faili kopeerimine allikale `%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Summary: "
-msgstr "Kokkuvõte: "
+msgid "Please choose the desired mirror."
+msgstr "Palun valige peegel."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "Kanada"
+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."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Greece"
-msgstr "Kreeka"
+msgid "No mirror"
+msgstr "Peeglit ei leitud"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1041,266 +1129,178 @@ msgstr ""
 "Võrk või MandrakeSofti veebilehekülg ei pruugi olla saadaval.\n"
 "Palun proovige varsti uuesti."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Source: "
-msgstr "Allikas:"
-
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "Faili kopeerimine allikale `%s'..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Vabandust, pakette saab paigaldada ainult administraator."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Path:"
-msgstr "Otsingutee:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Problem during removal"
-msgstr "Probleem eemaldamisel"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "by source repository"
-msgstr "andmekandja asukoha järgi"
+msgid "Error during download"
+msgstr "Viga allalaadimisel"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Selected"
-msgstr "Valitud"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "Palun oodake, peeglite aadresse laetakse..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Netherlands"
-msgstr "Holland"
+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
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "Lisatavad"
+msgid "United States"
+msgstr "USA"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
-msgstr "(kättesaamatu)"
+msgid "China"
+msgstr "Hiina"
 
-#: ../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"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr "Leiti konfliktid"
+msgid "United Kingdom"
+msgstr "Suurbritannia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Pakettide eemaldamine"
+msgid "Taiwan"
+msgstr "Taiwan"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Sweden"
 msgstr "Rootsi"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
-msgstr ""
-"\n"
-"\n"
-"Anti teada viga(dest):\n"
-"%s"
+msgid "Russia"
+msgstr "Venemaa"
 
-#: ../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."
-msgstr ""
-"Uuenduste nimekiri on tühi. See tähendab, et Teie süsteemi\n"
-"paigaldatud pakettidele ei ole parajasti mingeid uuendusi või\n"
-"et Te olete need juba kõik paigaldanud."
+msgid "Portugal"
+msgstr "Portugal"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "`%s' allalaadimine, kiirus:%s"
+msgid "Poland"
+msgstr "Poola"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Vajalik on üks järgmistest pakettidest:"
+msgid "Norway"
+msgstr "Norra"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "Välju"
+msgid "Netherlands"
+msgstr "Holland"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Korea"
+msgstr "Korea"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "Olgu"
+msgid "Japan"
+msgstr "Jaapan"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "Palun oodake, lisan andmekandja..."
+msgid "Italy"
+msgstr "Itaalia"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "Andmekandja tüüp:"
+msgid "Israel"
+msgstr "Iisrael"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please insert the medium named \\\"%s\\\" on device [%s]"
-msgstr "Palun sisestage andmekandja nimega \"%s\" seadmesse [%s]"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Kreeka"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to get source packages."
-msgstr "Ei saa pakette kätte."
+msgid "France"
+msgstr "Prantsusmaa"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Valitud on liiga palju pakette"
+msgid "Finland"
+msgstr "Soome"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "vastuolu paketiga"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "Hispaania"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Danmark"
+msgstr "Taani"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Mandrake valikud"
+msgid "Germany"
+msgstr "Saksamaa"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Czech Republic"
+msgstr "TÅ¡ehhi Vabariik"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Muutuste logi:\n"
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Korea"
-msgstr "Korea"
+msgid "Canada"
+msgstr "Kanada"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "Eemaldatav seade"
+msgid "Brazil"
+msgstr "Brasiilia"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Belgia"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Change medium"
-msgstr "Muuda andmekandjat"
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Mandrake uuendused"
+msgid "Australia"
+msgstr "Austraalia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by size"
-msgstr "suuruse järgi"
+msgid "Austria"
+msgstr "Austria"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "FTP server"
+msgid "Info..."
+msgstr "Info..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Files:\n"
-msgstr "Failid:\n"
+msgid "No"
+msgstr "Ei"
 
 #: ../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"
+msgid "Yes"
+msgstr "Jah"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
diff --git a/po/eu.po b/po/eu.po
index 3ff66a58..9900ccf3 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grpmi 8.2\n"
-"POT-Creation-Date: 2003-05-02 20:15+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+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,20 +15,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "Gaitu?"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Path or mount point:"
-msgstr "bidea edo muntatze-puntua:"
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Portugal"
-msgstr "Portugal"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Jarraitu nahi dezaket?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -48,59 +44,105 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-msgstr "talde arabera"
+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."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Name:"
-msgstr "Izena:"
+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 ""
+"Ongi etorri software ezabapen tresnara!\n"
+"\n"
+"Tresna honek zure konputagailutik ezabatu nahi duzun softwarea aukeratzen\n"
+"lagunduko dizu."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Italy"
-msgstr "Instalatu"
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"Okerra jazo da paketeak instalatzerakoan:\n"
+"\n"
+"%s"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "How to choose manually your mirror"
-msgstr "Nola hautatu eskuz zure ispilua"
+#, fuzzy, c-format
+msgid "Problem during removal"
+msgstr "Arazoa instalatzerakoan"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URLa:"
+msgid "Please wait, removing packages..."
+msgstr "Itxaoin mesedez, paketeak ezabatzen..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Zenbait pakete ezabatu egin behar dira"
+msgid "Please wait, reading packages database..."
+msgstr "Itxoin mesedez, paketeen datubasea irakurtzen..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Already existing update sources"
+#, fuzzy, c-format
+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 "Installation failed"
+msgstr "Instalatu dena"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "Paketeak instalaziorako prestatzen..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "Paketeak instalaziorako prestatzen..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "More information on package..."
-msgstr "Paketeari buruzko informazio gehiago..."
+msgid "All requested packages were installed successfully."
+msgstr "Eskatutako pakete guztiak ondo instalatu dira."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "Bai"
+msgid "Everything installed successfully"
+msgstr "Guztia ondo instalatu da."
 
 #: ../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 ""
-"Dituzten menpekotasunengatik, ondorengo paketeak aukeratik kendu\n"
-"behar dira:\n"
+"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
 #, c-format
@@ -108,490 +150,497 @@ 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 "%s KB"
-msgstr "%s KB"
+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..."
 
 #: ../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 ""
-"Ongi etorri software ezabapen tresnara!\n"
 "\n"
-"Tresna honek zure konputagailutik ezabatu nahi duzun softwarea aukeratzen\n"
-"lagunduko dizu."
+"Error(s) reported:\n"
+"%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."
-msgstr "Aldaketak gorde daitezen, euskarria unitatean sartu behar duzu."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Save and quit"
-msgstr "Gorde eta irten"
+"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."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"The following packages have bad signatures:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"Okerra jazo da paketeak instalatzerakoan:\n"
+"Ondorengo paketeak ezabatu behar dira beste batzu eguneratu daitezen:\n"
 "\n"
-"%s"
+"%s\n"
+"Jarraitu dezaket?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Size: "
-msgstr "Neurria: "
+msgid "Verifying packages signatures..."
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Security updates"
-msgstr "Segurtasunaren eguneratzeak"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "`%s' (%s/%s) paketea jaisten ..."
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
+msgstr "Utzi"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "Ados"
+
+#: ../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 "Maximum information"
-msgstr "Informazio zabalenak"
+msgid "Change medium"
+msgstr "Aldatu euskarria"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, c-format
+msgid "Initializing..."
+msgstr "Hasieratzen..."
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Errorea..."
+msgid "Package installation..."
+msgstr "Paketeak instalaziorako prestatzen..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Barkatu, root izan behar duzu paketeak instalatzeko."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Erresuma Batua"
+msgid "Unable to get source packages."
+msgstr "Ezin dira sorburuko paketeak jaso."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure sources"
-msgstr "Sorburuak konfiguratu"
+msgid "Inspect..."
+msgstr "Ikertu..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "izenetan"
+msgid "Installation finished"
+msgstr "Instalazioa amaitu da"
 
-#: ../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 ""
-"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."
+msgid "Do nothing"
+msgstr "Ez egin ezer"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
-"\n"
-"\\Do you want to continue installation?"
-msgstr ""
-"Ondorengo paketeak ezabatu behar dira beste batzu eguneratu daitezen:\n"
-"\n"
-"%s\n"
-"Jarraitu dezaket?"
+#, c-format
+msgid "Use .%s as main file"
+msgstr "Erabili %s fitxategi nagusi gisa"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Remove .%s"
 msgstr "Ezabatu .%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Source"
-msgstr "Behartu"
+msgid "changes:"
+msgstr "Aldaketak gorde"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "Finlandia"
+msgid "Inspecting %s"
+msgstr "%s ikertzen"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
+msgid "Please wait, finding available packages..."
+msgstr "Itxoin mesedez, eskuratu daitezkeen paketeak bilatzen..."
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "France"
-msgstr "Behartu"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, adding medium..."
+msgstr "Itxoin mesedez, euskarria gehitzen..."
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "More info"
+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 ""
+"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 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Nola hautatu eskuz zure ispilua"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"%s\n"
+"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"
-"Is it ok to continue?"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"%s\n"
-"\n"
-"Jarraitu nahi dezaket?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Birzamatu paketeen zerrenda"
+msgid "Already existing update sources"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr "Aukeratu ispilua..."
+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 ""
+"MandrakeSoft webgunearekin arremanetan jarri behar dut eguneratze pakete "
+"berrienak jasotzeko.\n"
+"Mesedez ziurtatu zure sarea martxan dagoen.\n"
+"\n"
+"Jarraitu dezaket?"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Sorburua gehitzen:"
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Ezin da paketea instalatu"
+msgid "Fatal error"
+msgstr "Fitxategi okerra"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
+msgid "Software Packages Installation"
 msgstr "Paketeak instalaziorako prestatzen..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages,"
-msgstr "Pakete guztiak,"
+msgid "Mandrake Update"
+msgstr "Mandrake Eguneratu"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "fitxategitan"
+msgid "Software Packages Removal"
+msgstr "Software Paketeen Ezabaketa"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Eskatutako pakete guztiak ondo instalatu dira."
+msgid "Quit"
+msgstr "Irten"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "Proxy ostalari-izena:"
+msgid "Install"
+msgstr "Instalatu"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update source(s)"
-msgstr "Eguneratu sorburua(k)"
+msgid "Remove"
+msgstr "Ezabatu"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "Bertako fitxategiak"
+msgid "Help"
+msgstr "Laguntza"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "%s ikertzen"
+msgid "Search"
+msgstr "Bilatu"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Israel"
-msgstr "Instalatu"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "Aurkitu:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Help"
-msgstr "Laguntza"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Ondorengo paketeak ezabatu behar dira beste batzu eguneratu daitezen:\n"
+"\n"
+"%s\n"
+"Jarraitu dezaket?"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "HTTP zerbitzaria"
+msgid "Some packages need to be removed"
+msgstr "Zenbait pakete ezabatu egin behar dira"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"Welcome to the packages source editor!\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"
-"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."
+"Do you really want to install all the selected packages?"
 msgstr ""
-"Ongi etorri paketeen sorburu editorera!\n"
+"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"
-"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.."
+"Hautatutako pakete guztiak instalatu nahi dituzu?"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Instalatu dena"
+#, c-format
+msgid "Too many packages are selected"
+msgstr "Pakete gehiegi dago hautatuta"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Erabili %s fitxategi nagusi gisa"
+msgid "Maximum information"
+msgstr "Informazio zabalenak"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results"
-msgstr "Bilaketaren emaitzak"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid " failed!"
-msgstr "fitxategitan"
+msgid "Normal information"
+msgstr "Informazio arruntak"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Brazil"
-msgstr "Brasil"
+msgid "Update source(s)"
+msgstr "Eguneratu sorburua(k)"
 
-#: ../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 "Reload the packages list"
+msgstr "Birzamatu paketeen zerrenda"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Aurkitu:"
+msgid "Reset the selection"
+msgstr "Hautua berrezarri"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Pakete guztiak, alfabetikoki"
+msgid "in files"
+msgstr "fitxategitan"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Itxoin mesedez, bilatzen..."
+msgid "in descriptions"
+msgstr "deskribapenetan"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Itxoin mesedez, paketeen datubasea irakurtzen..."
+msgid "in names"
+msgstr "izenetan"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "Ezin da paketea ireki"
+#, c-format
+msgid "by update availability"
+msgstr "eguneratze eskuragarritasun arabera"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "Hautua berrezarri"
+msgid "by source repository"
+msgstr "sorburu gordailuaren arabera"
 
-#: ../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 "by selection state"
+msgstr "hautapenaren arabera"
 
 #: ../rpmdrake: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 "by size"
+msgstr "neurri arabera"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Costa Rica"
+msgid "by group"
+msgstr "talde arabera"
 
 #: ../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"
-
-#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Itxoin mesedez, euskarria ezabatzen..."
+msgid "All packages,"
+msgstr "Pakete guztiak,"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "Pasahitza:"
+msgid "All packages, alphabetical"
+msgstr "Pakete guztiak, alfabetikoki"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr ""
+msgid "Mandrake choices"
+msgstr "Mandrake aukerak"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Taiwan"
+msgid "Normal updates"
+msgstr "Eguneratze arruntak"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "User:"
-msgstr "Erabiltzailea:"
+msgid "Bugfixes updates"
+msgstr "Akatsak konpontzeko eguneratzeak"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Itxoin mesedez, euskarria eguneratzen..."
+msgid "Security updates"
+msgstr "Segurtasunaren eguneratzeak"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Itxoin, paketeak zerrendatzen..."
+msgid "Description: "
+msgstr "Deskribapena: "
 
 #: ../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 "Reason for update: "
+msgstr "Eguneratzeko arrazoia: "
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Information on packages"
-msgstr "Ezin da paketea ireki"
+#, c-format
+msgid "Summary: "
+msgstr "Laburpena: "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "Utzi"
+msgid "Importance: "
+msgstr "Garrantzia: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Guztia ondo instalatu da."
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Itxoin mesedez, euskarria eguneratzen..."
+msgid "Size: "
+msgstr "Neurria: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Version: "
+msgstr "Bertsioa: "
 
 #: ../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 ""
-"Ondorengo paketeak ezabatu behar dira beste batzu eguneratu daitezen:\n"
-"\n"
-"%s\n"
-"Jarraitu dezaket?"
+msgid "Name: "
+msgstr "Izena: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "deskribapenetan"
+msgid "Currently installed version: "
+msgstr "Orain instalatutako bertsioa: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Source: "
+msgstr "Behartu"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Proxyak konfiguratu"
+msgid "(Not available)"
+msgstr "(Ez dago eskuragarri)"
 
-#: ../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 webgunearekin arremanetan jarri behar dut ispilu zerrenda "
-"jasotzeko.\n"
-"Mesedez ziurtatu zure sarea martxan dagoen.\n"
-"\n"
-"Jarraitu dezaket?"
+msgid "Changelog:\n"
+msgstr "Aldakketa-Erregistroa:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Hautatu mesedez"
+msgid "Files:\n"
+msgstr "Fitxategiak:\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Aukeratutakoen neurria: %d MB"
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Add a source"
-msgstr "Sorburua gehitzen:"
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "Hasieratzen..."
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Aukeratutakoak: %d MB / Diskoan leku askea: %d MB"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "Aldaketak gorde"
+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"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Error during download"
-msgstr "Okerra jaisterakoan"
+#: ../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"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Paketeak instalaziorako prestatzen..."
+msgid "%s conflicts with %s"
+msgstr "honekin gatazka dauka"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Importance: "
-msgstr "Garrantzia: "
+#, fuzzy, c-format
+msgid "Some packages can't be installed"
+msgstr "Ezin da paketea instalatu"
 
 #: ../rpmdrake:1
 #, c-format
@@ -604,83 +653,75 @@ msgstr ""
 "behar dira:\n"
 "\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "Gehitu..."
+msgid "Additional packages needed"
+msgstr "Pakete osagarriak behar dira"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Unable to create medium."
-msgstr "Ezin da euskarria sortu."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "Ezin da paketea instalatu"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Removing these packages would break your system, sorry:\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:"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Browse..."
-msgstr "Aztertu..."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "Ezin da paketea instalatu"
-
-#: ../rpmdrake.pm:1
 #, c-format
-msgid "Info..."
-msgstr "Info..."
+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"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "Jarraitzeko euskarria sartu behar duzu"
+msgid "Some additional packages need to be removed"
+msgstr "Pakete osagarri batzu kendu behar dira"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "Ezabatu"
+msgid "More information on package..."
+msgstr "Paketeari buruzko informazio gehiago..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Paketeak instalaziorako prestatzen..."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "No mirror"
-msgstr "Ispilurik ez"
+msgid "Information on packages"
+msgstr "Ezin da paketea ireki"
 
-#: ../edit-urpm-sources.pl:1
+#. -PO: Keep it short, this is gonna be on a button
+#: ../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 "More info"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Instalatu"
+msgid "Addable"
+msgstr "Gehigarria"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "Japonia"
+msgid "Upgradable"
+msgstr "Eguneragarria"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Ez egin ezer"
+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 ""
+"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
@@ -689,341 +730,377 @@ msgstr "Eguneratzerik ez"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Description: "
-msgstr "Deskribapena: "
+msgid "(none)"
+msgstr "(bat ere ez)"
 
 #: ../rpmdrake: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 "Please wait, listing packages..."
+msgstr "Itxoin, paketeak zerrendatzen..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "Ezin da paketea ireki"
 
 #: ../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 ""
-"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?"
+msgid "One of the following packages is needed:"
+msgstr "Ondorengo paketeetako bat behar da:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "Izena: "
+msgid "Please choose"
+msgstr "Hautatu mesedez"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "Ikertu..."
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Paketeak instalaziorako prestatzen..."
+msgid "Not selected"
+msgstr "Gatazkak aurkitu dira"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Australia"
+msgid "Selected"
+msgstr "Hautatuta"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation finished"
-msgstr "Instalazioa amaitu da"
+msgid "Search results"
+msgstr "Bilaketaren emaitzak"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
-msgstr "eguneratze eskuragarritasun arabera"
+msgid "Stop"
+msgstr "Gelditu"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
-msgstr "Polonia"
+msgid "Please wait, searching..."
+msgstr "Itxoin mesedez, bilatzen..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Version: "
-msgstr "Bertsioa: "
+msgid "Search results (none)"
+msgstr "Bilaketaren emaitzak (batere ez)"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Beste bat"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "erabiltzaile/pasahitza zehaztu dezakezu proxy autentifikaziorako:"
+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.."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Gorde eta irten"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Editing source \\\"%s\\\":"
-msgstr "\"%s\" sorburua editatzen:"
+msgid "Proxy..."
+msgstr "Errorea..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Upgradable"
-msgstr "Eguneragarria"
+msgid "Update..."
+msgstr "Eguneratu..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid " done."
-msgstr ""
+msgid "Add..."
+msgstr "Gehitu..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "Editatu"
+
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Paketeak instalaziorako prestatzen..."
+msgid "Source"
+msgstr "Behartu"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr ""
+msgid "Enabled?"
+msgstr "Gaitu?"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "Pakete osagarriak behar dira"
+msgid "Configure sources"
+msgstr "Sorburuak konfiguratu"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Akatsak konpontzeko eguneratzeak"
+msgid "Password:"
+msgstr "Pasahitza:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr ""
+msgid "User:"
+msgstr "Erabiltzailea:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Germany"
-msgstr "Alemania"
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "erabiltzaile/pasahitza zehaztu dezakezu proxy autentifikaziorako:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Russia"
-msgstr "Errusia"
+msgid "Proxy hostname:"
+msgstr "Proxy ostalari-izena:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Norway"
-msgstr "Norvegia"
+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
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Arazoak izan dira instalazioan zehar"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "Proxyak konfiguratu"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search"
-msgstr "Bilatu"
+msgid "Please wait, updating medium..."
+msgstr "Itxoin mesedez, euskarria eguneratzen..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit a source"
-msgstr "Editatu sorburua"
+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."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Txekiar Errepublika"
+msgid "You need to insert the medium to continue"
+msgstr "Jarraitzeko euskarria sartu behar duzu"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Stop"
-msgstr "Gelditu"
+msgid "Save changes"
+msgstr "Aldaketak gorde"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "Eguneratu"
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Bide erlatiboa synthesis/hdlist-ekiko:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "Itxaoin mesedez, paketeak ezabatzen..."
+msgid "URL:"
+msgstr "URLa:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing source \"%s\":"
+msgstr "\"%s\" sorburua editatzen:"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal information"
-msgstr "Informazio arruntak"
+msgid "Edit a source"
+msgstr "Editatu sorburua"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "`%s' (%s/%s) paketea jaisten ..."
+msgid "Please wait, removing medium..."
+msgstr "Itxoin mesedez, euskarria ezabatzen..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Aukeratutakoak: %d MB / Diskoan leku askea: %d MB"
+msgid "Type of source:"
+msgstr "Sorburu-mota:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Spain"
-msgstr "Espainia"
+msgid "Adding a source:"
+msgstr "Sorburua gehitzen:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
-msgstr "Eguneratze arruntak"
+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?"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by selection state"
-msgstr "hautapenaren arabera"
+msgid "You need to fill up at least the two first entries."
+msgstr "Gutxienez lehenengo bi sarrerak bete behar dituzu."
 
-#: ../rpmdrake.pm: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 "Name:"
+msgstr "Izena:"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "Sarrera:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Austria"
-msgstr "Austria"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Fitxategi okerra"
+msgid "Choose a mirror..."
+msgstr "Aukeratu ispilua..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Hautatu eguneratu nahi dituzun sorburuak:"
+msgid "Browse..."
+msgstr "Aztertu..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update..."
-msgstr "Eguneratu..."
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "'%s'-ren sinadura egiaztatzen..."
+msgid "Path or mount point:"
+msgstr "bidea edo muntatze-puntua:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
-msgstr "(bat ere ez)"
+msgid "Removable device"
+msgstr "Gailu aldagarriak"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
+msgid "HTTP server"
+msgstr "HTTP zerbitzaria"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "'%s' (%s/%s) paketea instalatzen..."
+msgid "FTP server"
+msgstr "FTP zerbitzaria"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Orain instalatutako bertsioa: "
+msgid "Path:"
+msgstr "bidea:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Other"
-msgstr "Beste bat"
+msgid "Local files"
+msgstr "Bertako fitxategiak"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
-msgstr "Eguneratzeko arrazoia: "
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a source"
+msgstr "Sorburua gehitzen:"
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Please choose the desired mirror."
-msgstr "Mesedez hautatu nahi duzun ispilua."
+#, 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."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "Editatu"
+msgid "Unable to create medium."
+msgstr "Ezin da euskarria sortu."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Itxoin mesedez, eskuratu daitezkeen paketeak bilatzen..."
+msgid "Update"
+msgstr "Eguneratu"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Bide erlatiboa synthesis/hdlist-ekiko:"
+msgid "Select the source(s) you wish to update:"
+msgstr "Hautatu eguneratu nahi dituzun sorburuak:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Bilaketaren emaitzak (batere ez)"
+msgid "Please wait, updating media..."
+msgstr "Itxoin mesedez, euskarria eguneratzen..."
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid " failed!"
+msgstr "fitxategitan"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Danmark"
-msgstr "Danimarka"
+msgid " done."
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "Txina"
+msgid "Download of `%s', speed:%s"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United States"
-msgstr "Estatu Batuak"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "changes:"
-msgstr "Aldaketak gorde"
+msgid "Starting download of `%s'..."
+msgstr "'%s'-ren sinadura egiaztatzen..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Pakete osagarri batzu kendu behar dira"
+msgid "Examining distant file of source `%s'..."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Examining file of source `%s'..."
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No"
-msgstr "Ez"
+msgid "Copying file for source `%s'..."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Summary: "
-msgstr "Laburpena: "
+msgid "Please choose the desired mirror."
+msgstr "Mesedez hautatu nahi duzun ispilua."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "Kanada"
+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 ""
+"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."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Greece"
-msgstr "Grezia"
+msgid "No mirror"
+msgstr "Ispilurik ez"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1040,256 +1117,179 @@ msgstr ""
 "Sarea, edo MandrakeSoft webgunea ez daude eskuragarri seguraski.\n"
 "Mesedez saiatu berriro beranduago."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Source: "
-msgstr "Behartu"
-
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr ""
-
-#: ../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:"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during removal"
-msgstr "Arazoa instalatzerakoan"
+msgid "Error during download"
+msgstr "Okerra jaisterakoan"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by source repository"
-msgstr "sorburu gordailuaren arabera"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "Itxoin mesedez, ispiluen helbideak eskuratzen MandrakeSoft webgunetik."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Selected"
-msgstr "Hautatuta"
+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 webgunearekin arremanetan jarri behar dut ispilu zerrenda "
+"jasotzeko.\n"
+"Mesedez ziurtatu zure sarea martxan dagoen.\n"
+"\n"
+"Jarraitu dezaket?"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Netherlands"
-msgstr "Herbeherak"
+msgid "United States"
+msgstr "Estatu Batuak"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "Gehigarria"
+msgid "China"
+msgstr "Txina"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
-msgstr "(Ez dago eskuragarri)"
-
-#: ../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"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr "Gatazkak aurkitu dira"
+msgid "United Kingdom"
+msgstr "Erresuma Batua"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Software Paketeen Ezabaketa"
+msgid "Taiwan"
+msgstr "Taiwan"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Sweden"
 msgstr "Suedia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
-msgstr ""
+msgid "Russia"
+msgstr "Errusia"
 
-#: ../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."
-msgstr ""
-"Eguneratze zerrenda hutsik dago. Honek esan nahi du ez dagoela\n"
-"zure konputagailuan instalatutako paketeentzako eguneratzerik, edo\n"
-"guztiak instalatuta dauzkazula dagoeneko."
+msgid "Portugal"
+msgstr "Portugal"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr ""
+msgid "Poland"
+msgstr "Polonia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Ondorengo paketeetako bat behar da:"
+msgid "Norway"
+msgstr "Norvegia"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "Irten"
+msgid "Netherlands"
+msgstr "Herbeherak"
 
-#: ../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 ""
-"MandrakeSoft webgunearekin arremanetan jarri behar dut eguneratze pakete "
-"berrienak jasotzeko.\n"
-"Mesedez ziurtatu zure sarea martxan dagoen.\n"
-"\n"
-"Jarraitu dezaket?"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Korea"
+msgstr "Behartu"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "Ados"
+msgid "Japan"
+msgstr "Japonia"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Please wait, adding medium..."
-msgstr "Itxoin mesedez, euskarria gehitzen..."
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Italy"
+msgstr "Instalatu"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Israel"
+msgstr "Instalatu"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "Sorburu-mota:"
+msgid "Greece"
+msgstr "Grezia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Please insert the medium named \\\"%s\\\" on device [%s]"
-msgstr "Mesedez sartu \"%s\" izeneko euskarria [%s] gailuan"
+msgid "France"
+msgstr "Behartu"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to get source packages."
-msgstr "Ezin dira sorburuko paketeak jaso."
+msgid "Finland"
+msgstr "Finlandia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Pakete gehiegi dago hautatuta"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "honekin gatazka dauka"
+msgid "Spain"
+msgstr "Espainia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 ""
-"Ongi etorri MandrakeUpdatera!\n"
-"\n"
-"Tresna honek zure konputagailuan instalatu nahi dituzun eguneratzeak "
-"aukeratzen\n"
-"lagunduko dizu."
+msgid "Danmark"
+msgstr "Danimarka"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Mandrake aukerak"
+msgid "Germany"
+msgstr "Alemania"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 ""
-"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"
+msgid "Czech Republic"
+msgstr "Txekiar Errepublika"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Aldakketa-Erregistroa:\n"
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Korea"
-msgstr "Behartu"
+#, c-format
+msgid "Canada"
+msgstr "Kanada"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "Gailu aldagarriak"
+msgid "Brazil"
+msgstr "Brasil"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Belgika"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Change medium"
-msgstr "Aldatu euskarria"
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Mandrake Eguneratu"
+msgid "Australia"
+msgstr "Australia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by size"
-msgstr "neurri arabera"
+msgid "Austria"
+msgstr "Austria"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "FTP zerbitzaria"
+msgid "Info..."
+msgstr "Info..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Files:\n"
-msgstr "Fitxategiak:\n"
+msgid "No"
+msgstr "Ez"
 
 #: ../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."
+#, c-format
+msgid "Yes"
+msgstr "Bai"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
diff --git a/po/fi.po b/po/fi.po
index 9eb51109..5fa3b1a2 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,4 +1,4 @@
-# grpmi-fi.po - Finnish Translation
+# rpmdrake-fi.po - Finnish Translation
 #
 # Copyright (C) 2002,2003 Free Software Foundation, Inc.
 # Copyright (C) 2002 Mandrakesoft
@@ -7,34 +7,30 @@
 # Janne Puonti <janne.puonti@kolumbus.fi>, 2002.
 # Thomas Backlund <thomas.backlund@inritel.com>, 2002
 # Thomas Backlund <tmb@iki.fi>, 2003
+# Taisto Kuikka <69319@batman.jypoly.fi>, 2003
 #
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: grpmi-fi - MDK Release 9.1\n"
-"POT-Creation-Date: 2003-05-02 20:15+0200\n"
-"PO-Revision-Date: 2003-02-13 23:28+0200\n"
-"Last-Translator: Thomas Backlund <tmb@iki.fi>\n"
+"Project-Id-Version: rpmdrake-fi - MDK Release 9.1\n"
+"POT-Creation-Date: 2003-05-13 13:06+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.0.1\n"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-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
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Portugal"
-msgstr "Portugali"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Sopiiko että jatketaan?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -45,162 +41,154 @@ msgid ""
 "packages on CDROM or DVD. This tool will help you choose which software\n"
 "you want to install on your computer."
 msgstr ""
-"Tervetuloa Ohjelmisto Asennus ohjelmaan!\n"
+"Tervetuloa ohjelmiston asennusohjelmaan!\n"
 "\n"
 "Mandrake Linux järjestelmäsi tuo mukanaan tuhansittain ohjelmia\n"
-"CD tai DVD-levy(illä). Tämä ohjelma auttaa sinua valitsemaan\n"
-"ohjelmia joita halua asentaa tietokoneestasi."
+"CD- tai DVD-levy(i)llä. Tämä ohjelma auttaa sinua valitsemaan\n"
+"ohjelmia joita haluat asentaa tietokoneeseesi."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-msgstr "ryhmän mukaan"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Name:"
-msgstr "Nimi:"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Italy"
-msgstr "Asenna"
+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:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "Miten manuaalisesti valitset peilipalvelinta"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "URL:"
-msgstr "URL: "
+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
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Joitakin paketteja pitää poistaa "
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"Pakettien poistamisen aikana ilmeni ongelma:\n"
+"\n"
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Already existing update sources"
-msgstr ""
+msgid "Problem during removal"
+msgstr "Ongelma poistamisen aikana"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "More information on package..."
-msgstr "Lisätietoa paketista ..."
+msgid "Please wait, removing packages..."
+msgstr "Odota, paketteja poistetaan..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "Kyllä"
+msgid "Please wait, reading packages database..."
+msgstr "Odota, pakettitietokantaa luetaan..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"There was a problem during the installation:\n"
 "\n"
+"%s"
 msgstr ""
-"Riippuvuuksien takia, seuraavat paketit joudutaan\n"
-"poistaa valinnasta nyt:\n"
+"Pakettien asennuksen aikana ilmeni ongelma:\n"
 "\n"
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "everything was installed correctly"
-msgstr "Kaikki asennettiin oikein"
+msgid "Installation failed"
+msgstr "Asennus epäonnistui"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s Kt"
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "Ohittamaton virhe: pakettia ei löytynyt asennettavaksi, valitan."
 
 #: ../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 ""
-"Tervetuloa ohjelmistojen poistamisohjelmaan!\n"
-"\n"
-"Tämä ohjelma auttaa sinua valitsemaan ohjelmia joita haluat\n"
-"poistaa tietokoneestasi."
+msgid "No package found for installation."
+msgstr "Pakettia ei löytynyt asennettavaksi."
 
-#: ../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 "Tallentaaksesi muutokset, sinun pitää asettaa mediaa asemaan."
+msgid "All requested packages were installed successfully."
+msgstr "Kaikki haluamasi paketit asennettiin onnistuneesti."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
-msgstr "Tallenna ja lopeta"
+msgid "Everything installed successfully"
+msgstr "Kaikki asennettiin onnistuneesti"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"The installation is finished; %s.\n"
 "\n"
-"%s"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
 msgstr ""
-"Virhe pakettien asennuksessa:\n"
+"Asennus on valmis; %s.\n"
 "\n"
-"%s"
+"Jotkut asetustiedostot tallennettiin päätteellä '.rpmnew' tai '.rpmsave',\n"
+"voit tarkistaa ne ja tehdä tarvittavat muutokset:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Size: "
-msgstr "Koko: "
+msgid "everything was installed correctly"
+msgstr "Kaikki asennettiin oikein"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Security updates"
-msgstr "Tietoturva Päivitykset"
+msgid "Problem during installation"
+msgstr "Ongelma asennuksen aikana"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "Mahdollisimman paljon tietoa"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Virhe..."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "United Kingdom"
-msgstr "Iso-Britannia"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure sources"
-msgstr "Määrittele lähteet"
+msgid "Preparing packages installation..."
+msgstr "Ohjelmistopakettien asentaminen"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "nimeissä"
-
-#: ../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."
+"\n"
+"Error(s) reported:\n"
+"%s"
 msgstr ""
-"Yhtäkään sopivaa peilipalvelinta ei löydetty.\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"
-"virallisessa Mandrake-Linux päivityksissä."
+"\n"
+"Raportoidut virheet:\n"
+"%s"
+
+#: ../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."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -209,9 +197,9 @@ msgid ""
 "\n"
 "%s\n"
 "\n"
-"\\Do you want to continue installation?"
+"Do you want to continue installation?"
 msgstr ""
-"Seuraavat paketit pitää poistaa jotta muita voitaisi päivittää:\n"
+"Seuraavat paketit pitää poistaa jotta muita voitaisiin päivittää:\n"
 "\n"
 "%s\n"
 "\n"
@@ -219,378 +207,360 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Poista %s"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Source"
-msgstr "Pakota"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Finland"
-msgstr "Suomi"
+msgid "Verifying packages signatures..."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
+msgid "Downloading package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "France"
-msgstr "Pakota"
-
-#. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "More info"
-msgstr "Lisää tietoa"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
+msgstr "Peruuta"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"Sopiiko että jatketaan?"
+msgid "Ok"
+msgstr "OK"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Lataa listan paketeista uudelleen"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Ole hyvä ja aseta media nimeltä \"%s\" laitteeseen [%s]"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr "Valitse peilipalvelin ..."
+msgid "Change medium"
+msgstr "Vaihda mediaa"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Lisätään lähde"
+msgid "Initializing..."
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Pakettia '%s' ei voida asentaa\n"
+msgid "Package installation..."
+msgstr "Ohjelmistopakettien asentaminen"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Valmistelen paketteja asennettaviksi ..."
+#, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Lähdepakettien hakeminen epäonnistui, valitan. %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages,"
-msgstr "Kaikki paketit,"
+msgid "Unable to get source packages."
+msgstr "Lähdepakettien hakeminen epäonnistui."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "tiedostoissa"
+msgid "Inspect..."
+msgstr "Tarkista..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Kaikki haluamasi paketteja asennettiin onnistuneesti"
+msgid "Installation finished"
+msgstr "Asennus on valmis"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "Välityspalvelimen nimi:"
+msgid "Do nothing"
+msgstr "Jätä tekemättä"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Update source(s)"
-msgstr "Päivitä lähteet"
+msgid "Use .%s as main file"
+msgstr "Käytä .%s päätiedostona"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "Paikalliset tiedostot"
+msgid "Remove .%s"
+msgstr "Poista .%s"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "changes:"
+msgstr "muutokset:"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspecting %s"
 msgstr "Tarkistan %s"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Israel"
-msgstr "Asenna"
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Help"
-msgstr "Apua"
+msgid "Please wait, finding available packages..."
+msgstr "Odota, etsitään saatavilla olevia paketteja"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "HTTP server"
-msgstr "HTTP palvelin"
+msgid "Please wait, adding medium..."
+msgstr "Odota, mediaa lisätään..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"Welcome to the packages source editor!\n"
+"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"
-"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 ""
-"Tervetuloa pakettien lähteiden hallintaan!\n"
+"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"
-"Tämä työkalu auttaa sinua asettamaan pakettien lähteet jotka haluat\n"
-"käyttää tietokoneessasi. Sen jälkeen ne ovat käytettävissä jos haluat\n"
-"asentaa uusia paketteja tai päivittää olemassaolevat.."
+"Käynnistä Mandrake päivitys tämän jälkeen uudelleen.."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Asenna kaikki"
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Miten manuaalisesti valitset peilipalvelimen"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Käytä %s päätiedostona"
+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 ""
+"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 "Search results"
-msgstr "Haun tulokset"
+msgid "Already existing update sources"
+msgstr "Olemassaolevat päivityslähteet"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " failed!"
-msgstr " epäonnistui!"
+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
+#: ../rpmdrake:1
 #, c-format
-msgid "Brazil"
-msgstr "Brasilia"
+msgid "A fatal error occurred: %s."
+msgstr "Tapahtui ohittamaton virhe: %s."
 
-#: ../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 ""
-"Tuon niminen media on jo olemassa,\n"
-"Oletko varma että haluat korvata sen?"
+msgid "Fatal error"
+msgstr "Ohittamaton virhe"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Löydä:"
+msgid "Software Packages Installation"
+msgstr "Ohjelmistopakettien asentaminen"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Kaikki paketit, aakkosjärjestyksessä"
+msgid "Mandrake Update"
+msgstr "Mandrake päivitys"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Odota, etsitään ..."
+msgid "Software Packages Removal"
+msgstr "Ohjelmistopakettien poistaminen"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Poistu"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Odota, paketti-tietokanta luetaan ..."
+msgid "Install"
+msgstr "Asenna"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "Poista"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "Pakettia '%s' ei voida avata\n"
+#, c-format
+msgid "Help"
+msgstr "Apua"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "Palauta valinnat"
+msgid "Search"
+msgstr "Etsi"
 
-#: ../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älityspalvelimen, anna palvelimen nimi ja mahdollisesti "
-"portti (muodossa: <palvelinnimi[:portti]>):"
+msgid "Find:"
+msgstr "Hae:"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
 "\n"
+"Is it ok to continue?"
 msgstr ""
-"Riippuvuuksien takia, myös seuraavat paketit joudutaan poistaa:\n"
+"Seuraavat paketit pitää poistaa jotta muita voitaisiin päivittää:\n"
+"\n"
+"%s\n"
 "\n"
+"Sopiiko että jatkan?"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Costa Rica"
+msgid "Some packages need to be removed"
+msgstr "Joitakin paketteja pitää poistaa "
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"There was a problem during the installation:\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"
-"%s"
+"Do you really want to install all the selected packages?"
 msgstr ""
-"Virhe pakettien asennuksessa:\n"
+"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"
-"%s"
+"Oletko varma että haluat asentaa kaikki valitsemasi paketit?"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Odota, media poistetaan ..."
+msgid "Too many packages are selected"
+msgstr "Liian paljon paketteja valittu"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "Salasana:"
+msgid "Maximum information"
+msgstr "Mahdollisimman paljon tietoa"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "Tarkistan etätiedosto lähteestä `%s' ..."
+msgid "Normal information"
+msgstr "Tavallista tietoa"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Taiwan"
-msgstr "Taiwan"
+msgid "Update source(s)"
+msgstr "Päivitä lähteet"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "User:"
-msgstr "Käyttäjä:"
+msgid "Reload the packages list"
+msgstr "Lataa listan paketeista uudelleen"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Odota, päivitetään mediaa ..."
+msgid "Reset the selection"
+msgstr "Palauta valinnat"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Odota, listaan paketteja..."
+msgid "in files"
+msgstr "tiedostoissa"
 
 #: ../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 "in descriptions"
+msgstr "kuvauksissa"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Information on packages"
-msgstr "Lisätietoa paketista."
+msgid "in names"
+msgstr "nimissä"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "Peruuta"
+msgid "by update availability"
+msgstr "päivityksien mukaan"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Kaikki asennettiin onnistuneesti"
+msgid "by source repository"
+msgstr "lähteiden mukaan"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Odota, päivitetään media(t)..."
+msgid "by selection state"
+msgstr "valinnan mukaan"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "by size"
+msgstr "koon mukaan"
 
 #: ../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 ""
-"Seuraavat paketit pitää poistaa jotta muita voitaisi päivittää:\n"
-"\n"
-"%s\n"
-"\n"
-"Sopiiko että jatkan?"
+msgid "by group"
+msgstr "ryhmän mukaan"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "kuvauksissa"
+msgid "All packages,"
+msgstr "Kaikki paketit,"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Määrittele välityspalvelin"
+msgid "All packages, alphabetical"
+msgstr "Kaikki paketit, aakkosjärjestyksessä"
 
-#: ../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 ""
-"Tarvitsen ottaa yhteyttä MandrakeSoft:in webbisivustoon saadakseni\n"
-"listan peilipalvelimista. Varmistä että verkkoyhteyteytesi on avattu.\n"
-"\n"
-"Sopiiko että jatkan?"
+msgid "Mandrake choices"
+msgstr "Mandrake valinnat"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Ole hyvä ja valitse"
+msgid "Normal updates"
+msgstr "Tavalliset päivitykset"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "Valittu koko %d Mt"
+msgid "Bugfixes updates"
+msgstr "Virhekorjaukset"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Add a source"
-msgstr "Lisätään lähde"
+msgid "Security updates"
+msgstr "Tietoturvapäivitykset"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "Alustetaan ..."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Save changes"
-msgstr "Tallenna muutokset"
+msgid "Description: "
+msgstr "Kuvaus: "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
-msgstr "Virhe haettaessa tiedostoja"
+msgid "Reason for update: "
+msgstr "Syy päivitykseen: "
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Valmistelen paketteja asennettaviksi ..."
+#, c-format
+msgid "Summary: "
+msgstr "Yhteenveto: "
 
 #: ../rpmdrake:1
 #, c-format
@@ -599,896 +569,942 @@ msgstr "Tärkeys: "
 
 #: ../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 "%s KB"
+msgstr "%s kt"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "Lisää..."
+msgid "Size: "
+msgstr "Koko: "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Unable to create medium."
-msgstr "Median luonti epäonnistui."
+msgid "Version: "
+msgstr "Versio: "
 
 #: ../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 ""
-"Asennus on valmis, %s.\n"
-"\n"
-"Jotkut asetustiedostot tallennettin liitteellä '.rpmnew' tai '.rpmsave',\n"
-"voit tarkistaa ne ja tehdä tarvittavat muutokset:"
+msgid "Name: "
+msgstr "Nimi: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
-msgstr "Selaa..."
+msgid "Currently installed version: "
+msgstr "Asennettu versio: "
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "Pakettia '%s' ei voida asentaa\n"
+#, c-format
+msgid "Source: "
+msgstr "Lähde: "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
-msgstr "Tietoja..."
+msgid "(Not available)"
+msgstr "(Ei käytettävissä)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "Sinun pitää asettaa mediaa jatkaaksesi"
+msgid "Changelog:\n"
+msgstr "Muutosloki:\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "Poista"
+msgid "Files:\n"
+msgstr "Tiedostot:\n"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Valmistelen paketteja asennettaviksi ..."
+#, c-format
+msgid "Selected size: %d MB"
+msgstr "Valittujen koko: %d Mt"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "No mirror"
-msgstr "Ei peilipalvelinta"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Valitut: %d Mt / Vapaata levytilaa: %d Mt"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Sinun pitää täyttää ainakin kaksi ensimmäiset kohdat."
+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"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Asenna"
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
+msgstr ""
+"Valitan, seuraavia paketteja ei voida valita:\n"
+"\n"
+"%s\n"
+"\n"
+"Syy:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "Japani"
+msgid "%s conflicts with %s"
+msgstr "%s on ristiriidassa paketin %s kanssa"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Jätä tekemättä"
+msgid "Some packages can't be installed"
+msgstr "Joitakin paketteja ei voida asentaa"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "No update"
-msgstr "Ei päivitystä"
+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
 #, c-format
-msgid "Description: "
-msgstr "Kuvaus: "
+msgid "Additional packages needed"
+msgstr "Lisäpaketteja vaaditaan"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be removed"
+msgstr "Joitakin paketteja ei voida poistaa"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"Removing these packages would break your system, sorry:\n"
+"\n"
 msgstr ""
-"Asennus epäonnistui, joitakin paketteja puuttuu.\n"
-"Sinun kannattaisi päivittää lähdetietokantasi."
+"Näiden pakettien poistaminen rikkoisi järjestelmäsi, valitan:\n"
+"\n"
 
 #: ../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"
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\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 voi saada tilanpuutetta,\n"
-"joko asennuksen aikana, tai sen jälkeen; tämä on vaarallista\n"
-"ja pitäisi harkita kunnolla.\n"
+"Riippuvuuksien vuoksi myös seuraavat paketit joudutaan poistamaan:\n"
 "\n"
-"Oletko varma että haluat asentaa kaikki valitsemasi paketteja?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "Nimi: "
+msgid "Some additional packages need to be removed"
+msgstr "Joitakin paketteja pitää poistaa tämän lisäksi"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "Tarkista..."
+msgid "More information on package..."
+msgstr "Lisätietoa paketista..."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Valmistelen paketteja asennettaviksi ..."
-
-#: ../rpmdrake.pm:1
 #, c-format
-msgid "Australia"
-msgstr "Australia"
+msgid "Information on packages"
+msgstr "Lisätietoa paketista"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation finished"
-msgstr "Asennus on valmis"
+msgid "More info"
+msgstr "Lisää tietoa"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
-msgstr "päivityksien mukaan"
+msgid "Addable"
+msgstr "Lisättävissä"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
-msgstr "Puola"
+msgid "Upgradable"
+msgstr "Päivitettävissä"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Version: "
-msgstr "Versio: "
+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."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr ""
-"Voit haluttaessa antaa tunnus/salasanaa välityspalvelimen tunnistukseen:"
+msgid "No update"
+msgstr "Ei päivitystä"
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Editing source \\\"%s\\\":"
-msgstr "Muokataan lähde \"%s\":"
+#: ../rpmdrake:1
+#, c-format
+msgid "(none)"
+msgstr "(tyhjä)"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Upgradable"
-msgstr "Päivitettävissä"
+msgid "Please wait, listing packages..."
+msgstr "Odota, listaan paketteja..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " done."
-msgstr " valmis."
+msgid "unknown package "
+msgstr "tuntematon paketti "
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Valmistelen paketteja asennettaviksi ..."
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Yksi seuraavista paketista tarvitaan:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "Tarkistan tiedosto lähteestä `%s' ..."
+msgid "Please choose"
+msgstr "Ole hyvä ja valitse"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "Lisäpaketit vaaditaan"
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Virhekorjaukset / turvapäivitykset"
+msgid "Not selected"
+msgstr "Ei valittu"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "Lataan `%s', aikaa jäljellä:%s, nopeus:%s"
+msgid "Selected"
+msgstr "Valittu"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "Saksa"
+msgid "Search results"
+msgstr "Haun tulokset"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Russia"
-msgstr "Venäjä"
+msgid "Stop"
+msgstr "Pysäytä"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Norway"
-msgstr "Norja"
+msgid "Please wait, searching..."
+msgstr "Odota, etsitään..."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Ongelmia tapahtui asennuksen aikana"
+#, c-format
+msgid "Search results (none)"
+msgstr "Haun tulokset (ei mitään)"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search"
-msgstr "Etsi"
+msgid "Other"
+msgstr "Muu"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit a source"
-msgstr "Muokkaa lähteitä"
+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."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Tsekki"
+msgid "Save and quit"
+msgstr "Tallenna ja lopeta"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Stop"
-msgstr "Pysäytä"
+msgid "Proxy..."
+msgstr "Välityspalvelin..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "Päivitä"
+msgid "Update..."
+msgstr "Päivitä..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "Odota, paketteja poistetaan ..."
+msgid "Add..."
+msgstr "Lisää..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal information"
-msgstr "Tavallista tietoa"
+msgid "Edit"
+msgstr "Muokkaa"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Haetaan pakkaus '%s' ( %s/%s) ..."
+msgid "Source"
+msgstr "Lähde"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Valitut: %d Mt / Vapaa levytilaa: %d Mt."
+msgid "Enabled?"
+msgstr "Käytössä?"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Spain"
-msgstr "Espanaja"
+msgid "Configure sources"
+msgstr "Määrittele lähteet"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
-msgstr "Tavalliset päivitykset"
+msgid "Password:"
+msgstr "Salasana:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by selection state"
-msgstr "valinnan mukaan"
+msgid "User:"
+msgstr "Käyttäjä:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
-"Odota, haetaan lista peilipalvelimista MandrakeSoft:in webbisivustosta."
+"Voit halutessasi antaa tunnuksen/salasanan välityspalvelimen tunnistukseen:"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Login:"
-msgstr "Käyttäjätunnus:"
+msgid "Proxy hostname:"
+msgstr "Välityspalvelimen nimi:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Austria"
-msgstr "Itävalta"
+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]>):"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Tiedostovirhe"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "Määrittele välityspalvelin"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Valitse lähteet, jota haluat päivittää:"
+msgid "Please wait, updating medium..."
+msgstr "Odota, päivitetään mediaa..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update..."
-msgstr "Päivitä ..."
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "Tallentaaksesi muutokset sinun pitää asettaa media asemaan."
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "Varmistetaan '%s' allekirjoituksen ..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
+msgstr "Sinun pitää asettaa media jatkaaksesi"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
-msgstr "(tyhjä)"
+msgid "Save changes"
+msgstr "Tallenna muutokset"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
-"Näiden pakettien poisto rikkoisi järjestelmäsi, valitan:\n"
-"\n"
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Suhteellinen polku tiedostoon synthesis tai hdlist:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Asennetaan paketti '%s' (%s/%s) ..."
+msgid "URL:"
+msgstr "URL: "
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Asennettu versio"
+msgid "Editing source \"%s\":"
+msgstr "Muokataan lähdettä \"%s\":"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Other"
-msgstr "Muu"
+msgid "Edit a source"
+msgstr "Muokkaa lähdettä"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Syy päivitykseen: "
+msgid "Please wait, removing medium..."
+msgstr "Odota, mediaa poistetaan..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please choose the desired mirror."
-msgstr "Ole hyvä ja valitse haluttu peilipalvelin."
+msgid "Type of source:"
+msgstr "Lähteen tyyppi:"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit"
-msgstr "Muokkaa"
+msgid "Adding a source:"
+msgstr "Lisätään lähdettä:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Odota, etsitään saatavilla olevia paketteja"
+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?"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Relatiivinen polku tiedostoon synthesis tai hdlist : "
+msgid "You need to fill up at least the two first entries."
+msgstr "Sinun pitää täyttää ainakin kaksi ensimmäistä kohtaa."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Haun tulokset (ei mitään)"
+msgid "Name:"
+msgstr "Nimi:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Danmark"
-msgstr "Tanska"
+msgid "Login:"
+msgstr "Käyttäjätunnus:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "China"
-msgstr "Kiina"
+msgid "Choose a mirror..."
+msgstr "Valitse peilipalvelin..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "United States"
-msgstr "Yhdysvallat"
+msgid "Browse..."
+msgstr "Selaa..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "changes:"
-msgstr "muutokset:"
+msgid "Path or mount point:"
+msgstr "Polku tai liitoskohta: "
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Joitakin paketteja pitää poistaa tämän lisäksi"
+msgid "Removable device"
+msgstr "Siirrettävä laite"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "HTTP server"
+msgstr "HTTP palvelin"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "Ei"
+msgid "FTP server"
+msgstr "FTP palvelin"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Summary: "
-msgstr "Yhteenveto: "
+msgid "Path:"
+msgstr "Polku: "
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Canada"
-msgstr "Kanada"
+msgid "Local files"
+msgstr "Paikalliset tiedostot"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Greece"
-msgstr "Kreikka"
+msgid "Add a source"
+msgstr "Lisätään lähde"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"There was an error downloading the mirrors list:\n"
+"Unable to update medium; it will be automatically disabled.\n"
 "\n"
-"%s\n"
-"The network, or MandrakeSoft website, are maybe unavailable.\n"
-"Please try again later."
+"Errors:\n"
+"%s"
 msgstr ""
-"Sattui virhe haettaessa lista peilipalvelimista\n"
+"Median päivittäminen epäonnistui, poistetaan käytöstä automaattisesti.\n"
 "\n"
-"%s\n"
-"Verkkoyhteytesi, tai MandrakeSoft:in webbisivustoa ei ole saatavilla.\n"
-"Yritä myöhemmin uudelleen."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Source: "
-msgstr "Pakota"
+"Virheet:\n"
+"%s"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "Kopioin tiedosto lähteelle `%s'..."
+msgid "Unable to create medium."
+msgstr "Median luominen epäonnistui."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Sinun pitää olla 'root' asentaaksesi paketteja, valitan."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
+msgstr "Päivitä"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Path:"
-msgstr "Polku: "
+msgid "Select the source(s) you wish to update:"
+msgstr "Valitse lähteet, joita haluat päivittää:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Problem during removal"
-msgstr "Ongelmia poiston aikana"
+msgid "Please wait, updating media..."
+msgstr "Odota, päivitetään media(t)..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by source repository"
-msgstr "lähteiden mukaan"
+msgid " failed!"
+msgstr " epäonnistui!"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Selected"
-msgstr "Valittu"
+msgid " done."
+msgstr " valmis."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Netherlands"
-msgstr "Alankomaat"
+msgid "Download of `%s', speed:%s"
+msgstr "Lataan `%s', nopeus:%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "Lisättävissä"
+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 "(Not available)"
-msgstr "(Ei käytettävissä)"
+msgid "Starting download of `%s'..."
+msgstr "Aloitan `%s' lataamisen..."
 
-#: ../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 ""
-"Valitan, seuraavat paketit ei voida valita\n"
-"\n"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Examining distant file of source `%s'..."
+msgstr "Tarkistan etätiedostoa lähteestä `%s'..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr "Ristiriitaisuuksia löydetty"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Examining file of source `%s'..."
+msgstr "Tarkistan tiedostoa lähteestä `%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Ohjelmistopakettien Poistaminen"
+msgid "Copying file for source `%s'..."
+msgstr "Kopioin tiedostoa lähteelle `%s'..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Sweden"
-msgstr "Ruotsi"
+msgid "Please choose the desired mirror."
+msgstr "Ole hyvä ja valitse haluttu peilipalvelin."
 
-#: ../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 ""
+"Yhtäkään sopivaa peilipalvelinta ei löytynyt.\n"
 "\n"
-"\n"
-"Virhe(et) raportoitu:\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
+#: ../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."
-msgstr ""
-"Päivityslista on tyhjä. Tämä tarkoittaa joko ettei\n"
-"päivityksiä löydy, tai olet jo asentanut kaikki.\n"
-" "
+msgid "No mirror"
+msgstr "Ei peilipalvelinta"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "Lataan `%s', nopeus:%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 ""
+"Haettaessa listaa peilipalvelimista ilmeni virhe:\n"
+"\n"
+"%s\n"
+"Verkkoyhteytesi tai MandrakeSoft:n webbisivusto ei ole saatavilla.\n"
+"Yritä myöhemmin uudelleen."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Yksi seuraavista paketista tarvitaan:"
+msgid "Error during download"
+msgstr "Virhe latauksen aikana"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "Poistu"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "Odota, haetaan lista peilipalvelimista MandrakeSoft:n webbisivustosta."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
+"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 ""
-"Tarvitsen ottaa yhteyden peilipalvelimelle, saadaakseni viimeisimmät\n"
-"päivityspaketit. Varmista että verkkoyhteytesi on avattu.\n"
+"Peilipalvelinlistan saamiseksi tarvitaan ottaa yhteys MandrakeSoft:n\n"
+"webbisivustoon. Varmista että verkkoyhteytesi on avattu.\n"
 "\n"
 "Sopiiko että jatkan?"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid "United States"
+msgstr "Yhdysvallat"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "Odota, media lisätään ..."
+msgid "China"
+msgstr "Kiina"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "Lähteen tyyppi:"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please insert the medium named \\\"%s\\\" on device [%s]"
-msgstr "Ole hyvä ja asenna mediaa nimellä \"%s\" laitteessa [%s]"
+msgid "United Kingdom"
+msgstr "Iso-Britannia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to get source packages."
-msgstr "Lähdepakettien hakeminen epäonnistui."
+msgid "Taiwan"
+msgstr "Taiwan"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Liian paljon paketteja valittu"
+msgid "Sweden"
+msgstr "Ruotsi"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr " ristiriidassa paketin "
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
+msgstr "Venäjä"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 tietokoneestasi."
+msgid "Portugal"
+msgstr "Portugali"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Mandrake valinnat"
+msgid "Poland"
+msgstr "Puola"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 peilipalvelin manuaalisesti: tehdäksesi\n"
-"tämän, käynnistä 'Ohjelmisto Lähteiden Hallinta', lisää \n"
-"'Tietoturva Päivitykset' lähdettä.\n"
-"\n"
-"Sen jälkeen, käynnistä Mandrake Update uudelleen.."
+msgid "Norway"
+msgstr "Norja"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Muutosloki: \n"
+msgid "Netherlands"
+msgstr "Alankomaat"
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
+#, c-format
 msgid "Korea"
-msgstr "Pakota"
+msgstr "Korea"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "Siirrettävä laite"
+msgid "Japan"
+msgstr "Japani"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Belgium"
-msgstr "Belgia"
+msgid "Italy"
+msgstr "Italia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Change medium"
-msgstr "Muuta mediaa"
+msgid "Israel"
+msgstr "Israel"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Mandrake Päivitys"
+msgid "Greece"
+msgstr "Kreikka"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by size"
-msgstr "koon mukaan"
+msgid "France"
+msgstr "Ranska"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "FTP palvelin"
+msgid "Finland"
+msgstr "Suomi"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Files:\n"
-msgstr "Tiedostot: \n"
+msgid "Spain"
+msgstr "Espanja"
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
-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."
+#, c-format
+msgid "Danmark"
+msgstr "Tanska"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr "Saksa"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
+msgstr "Tsekki"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Costa Rica"
+msgstr "Costa Rica"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Canada"
+msgstr "Kanada"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
+msgstr "Brasilia"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Belgium"
+msgstr "Belgia"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Australia"
+msgstr "Australia"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
+msgstr "Itävalta"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Info..."
+msgstr "Tietoja..."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
+msgstr "Ei"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Kyllä"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
-msgstr "Hakemisto johon tallennetaan haettavat tiedostot ei ole olemassa"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:89
 #: ../grpmi/curl_download/curl_download.xs:213
 msgid "Out of memory\n"
-msgstr "Muisti loppu\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:102
 msgid "Could not open output file in append mode"
-msgstr "Tulostetiedosto ei voitu avata lisäämis-tilassa"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:133
 msgid "Unsupported protocol\n"
-msgstr "Protokollaa ei tueta\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:136
 msgid "Failed init\n"
-msgstr "Alustus epäonnistui\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:139
 msgid "Bad URL format\n"
-msgstr "Virheellinen URL-muoto\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:142
 msgid "Bad user format in URL\n"
-msgstr "Virheellinen käyttäjämuoto URL:issa\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:145
 msgid "Couldn't resolve proxy\n"
-msgstr "Välityspalvelinta ei löytynyt\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:148
 msgid "Couldn't resolve host\n"
-msgstr "Verkkoasemaa ei löytynyt\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:151
 msgid "Couldn't connect\n"
-msgstr "Yhteyden muodostaminen epäonnistui\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:154
 msgid "FTP unexpected server reply\n"
-msgstr "Omituinen vastaus Ftp-palvelimelta\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:157
 msgid "FTP access denied\n"
-msgstr "Ftp:n saanti estetty\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:160
 msgid "FTP user password incorrect\n"
-msgstr "Ftp-käyttäjän salasana väärä\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:163
 msgid "FTP unexpected PASS reply\n"
-msgstr "Omituinen PASS-vastaus Ftp:ltä\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:166
 msgid "FTP unexpected USER reply\n"
-msgstr "Omituinen USER-vastaus FTP:ltä\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:169
 msgid "FTP unexpected PASV reply\n"
-msgstr "Omituinen PASV-vastaus Ftp:ltä\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:172
 msgid "FTP unexpected 227 format\n"
-msgstr "Omituinen 227:n muoto Ftp:ltä\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:175
 msgid "FTP can't get host\n"
-msgstr "FTP ei löydä verkkoasemaa\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:178
 msgid "FTP can't reconnect\n"
-msgstr "FTP ei saa enää yhteyttä palvelimeen\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:181
 msgid "FTP couldn't set binary\n"
-msgstr "FTP ei voinut asettaa binääritilaa päälle\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:184
 msgid "Partial file\n"
-msgstr "Osittainen tiedosto\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:187
 msgid "FTP couldn't RETR file\n"
-msgstr "Ftp: tiedoston RETR epäonnistui\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:190
 msgid "FTP write error\n"
-msgstr "Ftp:n kirjoitusvirhe\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:195
 msgid "FTP quote error\n"
-msgstr "Ftp:n quote-virhe\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:198
 msgid "HTTP not found\n"
-msgstr "HTTP ei löytynyt\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:201
+#, fuzzy
 msgid "Write error\n"
-msgstr "Kirjoitusvirhe\n"
+msgstr "Ohittamaton virhe"
 
 #: ../grpmi/curl_download/curl_download.xs:204
 msgid "User name illegally specified\n"
-msgstr "Laittomasti määritelty käyttäjän nimi\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:207
 msgid "FTP couldn't STOR file\n"
-msgstr "ftp: tiedoston STOR epäonnistui\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:210
+#, fuzzy
 msgid "Read error\n"
-msgstr "Lukuvirhe\n"
+msgstr "Ohittamaton virhe"
 
 #: ../grpmi/curl_download/curl_download.xs:216
 msgid "Time out\n"
-msgstr "Aikaviive täynnä\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:219
 msgid "FTP couldn't set ASCII\n"
-msgstr "FTP ei voinut asettaa ASCII-tilaa päälle\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:222
 msgid "FTP PORT failed\n"
-msgstr "Ftp: PORT-toiminto epäonnistui\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:225
 msgid "FTP couldn't use REST\n"
-msgstr "FTP ei voinut käyttää REST-toimintoa\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:228
 msgid "FTP couldn't get size\n"
-msgstr "FTP ei saanut tiedoston kokoa\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:231
 msgid "HTTP range error\n"
-msgstr "Http-alueen virhe\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:234
 msgid "HTTP POST error\n"
-msgstr "Http: POST-virhe\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:237
 msgid "SSL connect error\n"
-msgstr "Virhe Ssl-yhteydessä\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:240
 msgid "FTP bad download resume\n"
-msgstr "Ftp: virheellinen imuroinnin jatkaminen\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:243
 msgid "File couldn't read file\n"
-msgstr "File ei voinut lukea tiedostoa\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:246
 msgid "LDAP cannot bind\n"
-msgstr "LDAP:iin ei voi yhdistää\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:249
 msgid "LDAP search failed\n"
-msgstr "LDAP-haku epäonnistui\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:252
 msgid "Library not found\n"
-msgstr "Kirjastoa ei löytynyt\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:255
 msgid "Function not found\n"
-msgstr "Funktiota ei löytynyt\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:258
 msgid "Aborted by callback\n"
-msgstr "Keskeytetty paluukutsulla\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:261
 msgid "Bad function argument\n"
-msgstr "Virheellinen parametri funktiossa\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:264
 msgid "Bad calling order\n"
-msgstr "Väärä soittamisjärjestys\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:267
+#, fuzzy
 msgid "HTTP Interface operation failed\n"
-msgstr ""
+msgstr "Asennus epäonnistui"
 
 #: ../grpmi/curl_download/curl_download.xs:270
 msgid "my_getpass() returns fail\n"
@@ -1519,9 +1535,8 @@ msgid "when this is a specific error\n"
 msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:291
-#, fuzzy
 msgid "SSL crypto engine not found\n"
-msgstr "Funktiota ei löytynyt\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:294
 msgid "can not set SSL crypto engine as default\n"
@@ -1558,27 +1573,24 @@ msgstr ""
 #: ../grpmi/curl_download/curl_download.xs:320
 #, c-format
 msgid "Unknown error code %d\n"
-msgstr "Tuntematon virhekoodi %d\n"
+msgstr ""
 
 #: data/rpmdrake.desktop.in.h:1
-#, fuzzy
 msgid "Install Software"
-msgstr "Asenna kaikki"
+msgstr "Asenna ohjelmia"
 
 #: data/rpmdrake-remove.desktop.in.h:1
 msgid "Remove Software"
-msgstr "Poista Ohjelmia"
+msgstr "Poista ohjelmia"
 
 #: data/rpmdrake-sources.desktop.in.h:1
 msgid "Software Sources Manager"
-msgstr "Ohjelmisto Lähteiden Hallinta"
+msgstr "Ohjelmistolähteiden hallinta"
 
 #~ msgid ""
 #~ "some packages failed to install\n"
 #~ "correctly"
-#~ msgstr ""
-#~ "Joitakin paketteja ei asentunut\n"
-#~ "oikein."
+#~ msgstr "Joidenkin pakettien asentaminen epäonnistui"
 
 #~ msgid "Please wait, removing packages to allow others to be upgraded..."
 #~ msgstr "Odota, poistetaan paketteja jotta muita voidaan päivittää..."
@@ -1588,247 +1600,3 @@ msgstr "Ohjelmisto Lähteiden Hallinta"
 
 #~ msgid "Program missing"
 #~ msgstr "Ohjelma puuttuu"
-
-#~ msgid ""
-#~ "There was an error while adding the update medium via urpmi.\n"
-#~ "\n"
-#~ "This may be due to a broken or temporary unavailable mirror, or when "
-#~ "your\n"
-#~ "Mandrake Linux version (%s) is not yet / no more supported by Mandrake "
-#~ "Linux\n"
-#~ "Official Updates.\n"
-#~ "\n"
-#~ "Do you want to try another mirror?"
-#~ msgstr ""
-#~ "Sattui virhe lisättäessä pävitymediaa 'urpmi':n kautta.\n"
-#~ "\n"
-#~ "Tämä voi johtua rikkoutuneesta tai tilapäisesti käytöstä poistettu\n"
-#~ "peilipalvelimesta, tai Mandrake Linux versiosi (%s) ei ole vielä/enää\n"
-#~ "tuettu Mandrake Linux:in virallisessa päivityksissä.\n"
-#~ "\n"
-#~ "Haluatko kokeilla toista peilipalvelinta?"
-
-#~ msgid "Error adding update medium"
-#~ msgstr "Virhe lisättäessä päivitysmediaa"
-
-#~ msgid "Please wait, contacting mirror to initialize updates packages."
-#~ msgstr "Odota, yhdistetään peilipalvelimelle pakettitietojen alustamiseksi."
-
-#, fuzzy
-#~ msgid ""
-#~ "There was an unrecoverable error while updating packages information."
-#~ msgstr ""
-#~ "Virhe pakettien asennuksessa:\n"
-#~ "\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid "Error updating medium"
-#~ msgstr "Virhe luettaessa tiedostoa\n"
-
-#~ msgid "Please wait, contacting mirror to update packages information."
-#~ msgstr ""
-#~ "Odota, yhdistetään peilipalvelimelle pakettitietojen päivittämiseksi."
-
-#~ msgid "Everything already installed (is this supposed to happen at all?)."
-#~ msgstr "Kaikki on jo asennettu. (pitäisikö tämä ollenkaan tapahtua?)"
-
-#~ msgid "Everything already installed."
-#~ msgstr "Kaikki on jo asennettu."
-
-#~ msgid "Local file `%s' already up to date"
-#~ msgstr "Paikallinen tiedosto `%s' on jo uusin versio"
-
-#~ msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#~ msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-
-#~ msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
-#~ msgstr "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
-
-#~ msgid "Installing/Upgrading Progress"
-#~ msgstr "Asennus/Päivitys käynnissä"
-
-#~ msgid "Fetching:"
-#~ msgstr "Haen:"
-
-#, fuzzy
-#~ msgid " is needed by %s-%s-%s"
-#~ msgstr " tarvitaan paketille "
-
-#, fuzzy
-#~ msgid "ftp weird PASV reply\n"
-#~ msgstr "Omituinen PASV-vastaus Ftp:ltä\n"
-
-#~ msgid "An error occured while fetching file"
-#~ msgstr "Tiedostoa haettaessa tapahtui virhe"
-
-#~ msgid "Skip"
-#~ msgstr "Ohita"
-
-#, fuzzy
-#~ msgid "Preparing for install"
-#~ msgstr "Valmistelen paketteja asennettaviksi ..."
-
-#~ msgid "Can't check the GPG signature"
-#~ msgstr "En voi tarkistaa GPG-allekirjoitusta"
-
-#~ msgid ""
-#~ "The package %s has a wrong signature or\n"
-#~ "GnuPG isn't correctly installed"
-#~ msgstr ""
-#~ "Paketilla %s on väärä allekirjoitus tai\n"
-#~ "GnuPG ei ole oikein asennettu"
-
-#~ msgid "Don't install"
-#~ msgstr "Älä asenna"
-
-#~ msgid "Signature problem"
-#~ msgstr "Ongelma allekirjoituksessa"
-
-#, fuzzy
-#~ msgid "Can't open package"
-#~ msgstr "Pakettia '%s' ei voida avata\n"
-
-#, fuzzy
-#~ msgid "Package is corrupted"
-#~ msgstr "Paketti '%s' on vioittunut\n"
-
-#, fuzzy
-#~ msgid "Package can't be installed"
-#~ msgstr "Pakettia '%s' ei voida asentaa\n"
-
-#, fuzzy
-#~ msgid "Error while checking dependencies :("
-#~ msgstr "Virhe tarkastettaessa riippuvuuksia 2"
-
-#~ msgid "Force"
-#~ msgstr "Pakota"
-
-#~ msgid "usage: grpmi <[-noupgrade] rpms>\n"
-#~ msgstr "käyttö: grpmi <[-noupgrade] rpmt>\n"
-
-#~ msgid "grpmi error: you must be superuser!\n"
-#~ msgstr "grpmi virhe: sinun pitää olla pääkäytäjä!\n"
-
-#~ msgid "Couldn't read RPM config files"
-#~ msgstr "RPM asetustiedostojen lukeminen ei onnistunut"
-
-#~ msgid "Couldn't open file\n"
-#~ msgstr "Tiedoston avaaminen ei onnistunut\n"
-
-#~ msgid "Could not read lead bytes\n"
-#~ msgstr "Alkumerkkien lukeminen ei onnistunut\n"
-
-#~ msgid "RPM version of package doesn't support signatures\n"
-#~ msgstr "Paketin RPM-versio ei tue allekirjoitusta\n"
-
-#~ msgid "Could not read signature block (`rpmReadSignature' failed)\n"
-#~ msgstr ""
-#~ "Allekirjoituslohkon lukeminen epäonnistui ('rpmReadSignature' "
-#~ "epäonnistui)\n"
-
-#~ msgid "No signatures\n"
-#~ msgstr "Ei allekirjoitusta\n"
-
-#~ msgid "`makeTempFile' failed!\n"
-#~ msgstr "'makeTempFile' epäonnistui!\n"
-
-#~ msgid "Error writing temp file\n"
-#~ msgstr "Virhe kirjoittaessa tilapäistiedostoa\n"
-
-#~ msgid "No GPG signature in package\n"
-#~ msgstr "paketissa ei ole GPG allekirjoitusta\n"
-
-#~ msgid "Couldn't open RPM DB for writing (not superuser?)"
-#~ msgstr "RPM-DB:n avaaminen kirjoitustilassa ei onnistunut (ei pääkäyttäjä?)"
-
-#~ msgid "Couldn't open RPM DB for writing"
-#~ msgstr "RPM-DM:n avaaminen kirjoitustilassa ei onnistunut "
-
-#~ msgid "Couldn't start transaction"
-#~ msgstr "Tapahtuman käynnistäminen ei onnistunut"
-
-#~ msgid "Error while checking dependencies"
-#~ msgstr "Virhe tarkastettaessa riippuvuuksia "
-
-#~ msgid "Problems occurred during installation:\n"
-#~ msgstr "Ongelmia asennuksen aikana:\n"
-
-#~ msgid ""
-#~ "Cleanup question: there was an error during installation, do you want to\n"
-#~ "remove the %d downloaded package(s)?\n"
-#~ "(they are located in %s)"
-#~ msgstr ""
-#~ "Tyhjennyskysymys: Sattui virhe asennuksen aikana, haluatko\n"
-#~ "poistaa %d haetut paketit?\n"
-#~ "(ne löytyvät hakemistosta: %s)"
-
-#~ msgid "Cleanup"
-#~ msgstr "Tyhjennys"
-
-#~ msgid ""
-#~ "Conflicts were detected:\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Install aborted."
-#~ msgstr ""
-#~ "Ristiriitaisuuksia löydettiin:\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Asennus keskeytetty"
-
-#~ msgid ""
-#~ "The following file is not valid:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Do you want to continue anyway (skipping this package)?"
-#~ msgstr ""
-#~ "Seuraava tiedosto on virheellinen:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "Haluatko jatkaa siitä huolimatta (ohitetaan tämä paketti)?"
-
-#~ msgid "Yes to all"
-#~ msgstr "Kyllä kaikille"
-
-#~ msgid ""
-#~ "The signature of the package `%s' is not correct:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "Do you want to install it anyway?"
-#~ msgstr ""
-#~ "Paketin: '%s' allekirjoitus on väärä\n"
-#~ "\n"
-#~ "%s\n"
-#~ "Haluatko asentaa paketin siitä huolimatta?"
-
-#~ msgid "Signature verification error"
-#~ msgstr "Allekirjoituksen varmistamis-virhe"
-
-#~ msgid "Retry download"
-#~ msgstr "Yritä lataa uudelleen"
-
-#~ msgid ""
-#~ "There was an error downloading package:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Error: %s\n"
-#~ "Do you want to continue (skipping this package)?"
-#~ msgstr ""
-#~ "Tapahtui virhe haettaessa paketti:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Virhe: %s\n"
-#~ "Haluatko jatkaa (ohitetaan tämä paketti)?"
-
-#~ msgid "The initialization of config files of RPM was not possible, sorry."
-#~ msgstr "RPM asetustiedostojen alustaminen ei onnistunut, valitan."
-
-#~ msgid "RPM initialization error"
-#~ msgstr "RPM alustamisvirhe"
-
-#~ msgid "The package %s is not signed"
-#~ msgstr "Paketti %s ei ole allekirjoitettu"
diff --git a/po/fr.po b/po/fr.po
index 79fd58a3..26f51e01 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grpmi-fr\n"
-"POT-Creation-Date: 2003-05-02 20:15+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+0200\n"
 "PO-Revision-Date: 2003-05-02 20:24+0200\n"
 "Last-Translator: Christophe Combelles <ccomb@free.fr>\n"
 "Language-Team: french <cooker-i18n@linux-mandrake.com>\n"
@@ -19,20 +19,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-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
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Portugal"
-msgstr "Portugal"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Êtes-vous d'accord pour continuer ?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -52,59 +48,106 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-msgstr "par groupe"
+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."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Name:"
-msgstr "Nom :"
+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 ""
+"Bienvenue dans l'outil de suppression de logiciels !\n"
+"\n"
+"Cet outil va vous aider à choisir quel(s) logiciel(s) vous\n"
+"souhaitez supprimer de votre ordinateur."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Italy"
-msgstr "Italie"
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"Une erreur est survenue pendant la suppression des paquetages :\n"
+"\n"
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "Comment choisir manuellement votre mirroir"
+msgid "Problem during removal"
+msgstr "Un problème est survenu pendant la désinstallation"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL :"
+msgid "Please wait, removing packages..."
+msgstr "Veuillez patienter, suppression des paquetages..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Certains paquetages doivent être enlevés"
+msgid "Please wait, reading packages database..."
+msgstr "Veuillez patienter, lecture de la base de donnée des paquetages..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Already existing update sources"
-msgstr "Des sources de mise-à-jour existent déjà"
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Une erreur est survenue pendant l'installation des paquetages :\n"
+"\n"
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "More information on package..."
-msgstr "Plus d'informations sur le paquetage..."
+msgid "Installation failed"
+msgstr "Echec de l'installation"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "Oui"
+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 "No package found for installation."
+msgstr "Aucun paquetage trouvé pour l'installation."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "Tous les paquetages demandés ont été installés correctement."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr "Tout a été installé correctement"
 
 #: ../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 ""
-"Pour satisfaire les dépendances, le(s) paquetage(s) suivant(s)\n"
-"doivent être déselectionnés :\n"
+"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
@@ -113,502 +156,515 @@ msgstr "tout a été installé correctement"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s Ko"
+msgid "Problem during installation"
+msgstr "Des problèmes sont survenus durant l'installation"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Installation du paquetage `%s' (%s/%s)..."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Preparing packages installation..."
+msgstr "Préparation de l'installation des paquetages..."
 
 #: ../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."
+"\n"
+"Error(s) reported:\n"
+"%s"
 msgstr ""
-"Bienvenue dans l'outil de suppression de logiciels !\n"
 "\n"
-"Cet outil va vous aider à choisir quel(s) logiciel(s) vous\n"
-"souhaitez supprimer de votre ordinateur."
+"\n"
+"Erreur(s) rencontrées :\n"
+"%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."
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
 msgstr ""
-"Afin de sauvegarder les changements, vous devez insérer le médium dans le "
-"lecteur."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Save and quit"
-msgstr "Sauver et quitter"
+"L'installation a échoué, certains fichiers sont introuvables.\n"
+"Vous pouvez mettre à jour vos sources."
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"The following packages have bad signatures:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"Une erreur est survenue pendant la suppression des paquetages :\n"
+"Les paquetages suivants ont une signature erronée :\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"Voulez-vous continuer l'installation ?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Size: "
-msgstr "Taille : "
+msgid "Verifying packages signatures..."
+msgstr "Vérification de la signature des paquetages..."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Security updates"
-msgstr "Mises à jour de sécurité"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "Téléchargement du paquetage `%s' (%s/%s)..."
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
+msgstr "Annuler"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "Ok"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Veuillez insérer le médium nommé \"%s\" dans le périphérique [%s]"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "Informations maximales"
+msgid "Change medium"
+msgstr "Changement de médium"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy..."
-msgstr "Mandataire..."
+msgid "Initializing..."
+msgstr "Initialisation..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Royaume-Uni"
+msgid "Package installation..."
+msgstr "Installation des paquetages..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure sources"
-msgstr "Configurer les sources"
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Impossible d'obtenir les paquetages sources, désolé. %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "parmi les noms"
+msgid "Unable to get source packages."
+msgstr "Impossible d'obtenir les paquetages sources."
 
-#: ../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 ""
-"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."
+msgid "Inspect..."
+msgstr "Examiner..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
-"\n"
-"\\Do you want to continue installation?"
-msgstr ""
-"Les paquetages suivants ont une signature erronée :\n"
-"\n"
-"%s\n"
-"\n"
-"Voulez-vous continuer l'installation ?"
+msgid "Installation finished"
+msgstr "L'installation est terminée"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Supprimer le .%s"
+msgid "Do nothing"
+msgstr "Ne rien faire"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Source"
-msgstr "Source"
+msgid "Use .%s as main file"
+msgstr "Utiliser le .%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "Finlande"
+msgid "Remove .%s"
+msgstr "Supprimer le .%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
-msgstr "Vérification de la signature des paquetages..."
+msgid "changes:"
+msgstr "changements :"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "France"
-msgstr "France"
+msgid "Inspecting %s"
+msgstr "Examen de %s"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "More info"
-msgstr "Plus d'infos"
+msgid "Please wait, finding available packages..."
+msgstr "Veuillez patienter, recherche des paquetages disponibles..."
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
+msgid "Please wait, adding medium..."
+msgstr "Veuillez patienter, ajout du médium..."
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"%s\n"
+"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"
-"Is it ok to continue?"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"%s\n"
+"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"
-"Êtes-vous d'accord pour continuer ?"
+"Puis, redémarrez MandrakeUpdate."
 
 #: ../rpmdrake:1
 #, c-format
-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..."
+msgid "How to choose manually your mirror"
+msgstr "Comment choisir manuellement votre mirroir"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Ajout d'une source :"
+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 ""
+"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"
+"\n"
+"Ensuite, redémarrez MandrakeUpdate."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages can't be installed"
-msgstr "Certains paquetages ne peuvent pas être installés"
+msgid "Already existing update sources"
+msgstr "Des sources de mise-à-jour existent déjà"
 
 #: ../rpmdrake: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 ""
+"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 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:1
 #, c-format
-msgid "All packages,"
-msgstr "Tous les paquetages,"
+msgid "A fatal error occurred: %s."
+msgstr "Une erreur fatale est survenue : %s."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "parmi les fichiers"
+msgid "Fatal error"
+msgstr "Erreur fatale"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Tous les paquetages demandés ont été installés correctement."
+msgid "Software Packages Installation"
+msgstr "Installation de paquetages logiciels"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "Nom du serveur mandataire"
+msgid "Mandrake Update"
+msgstr "Mandrake Update"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Update source(s)"
-msgstr "Mise à jour de source(s)"
+msgid "Software Packages Removal"
+msgstr "Suppression de Paquetages Logiciels"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Local files"
-msgstr "Fichiers locaux"
+msgid "Quit"
+msgstr "Quitter"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Examen de %s"
+msgid "Install"
+msgstr "Installer"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Israel"
-msgstr "Israël"
+msgid "Remove"
+msgstr "Supprimer"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Help"
 msgstr "Aide"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "Serveur HTTP"
+msgid "Search"
+msgstr "Chercher"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "Rechercher :"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"Welcome to the packages source editor!\n"
+"The following packages have to be removed for others to be upgraded:\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."
+"%s\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
-"Bienvenue dans l'éditeur de sources de paquetages !\n"
+"Les paquetages suivants doivent être supprimés afin que les autres\n"
+"puissent être mis à jour :\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."
+"%s\n"
+"\n"
+"Voulez-vous continuer ?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation failed"
-msgstr "Echec de l'installation"
+msgid "Some packages need to be removed"
+msgstr "Certains paquetages doivent être enlevés"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Utiliser le .%s"
+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
-msgid "Search results"
-msgstr "Résultats de la recherche"
+msgid "Too many packages are selected"
+msgstr "Trop de paquetages sont sélectionnés"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " failed!"
-msgstr " échec !"
+msgid "Maximum information"
+msgstr "Informations maximales"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Brazil"
-msgstr "Brésil"
+msgid "Normal information"
+msgstr "Informations normales"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../rpmdrake.pm: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 "Update source(s)"
+msgstr "Mise à jour de source(s)"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Rechercher :"
+msgid "Reload the packages list"
+msgstr "Rafraîchir la liste des paquetages"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Tous les paquetages, classement alphabétique"
+msgid "Reset the selection"
+msgstr "Remettre à zéro la sélection"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Veuillez patienter, recherche en cours..."
+msgid "in files"
+msgstr "parmi les fichiers"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Veuillez patienter, lecture de la base de donnée des paquetages..."
+msgid "in descriptions"
+msgstr "parmi les descriptions"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "unknown package "
-msgstr "paquetage inconnu "
+msgid "in names"
+msgstr "parmi les noms"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "Remettre à zéro la sélection"
+msgid "by update availability"
+msgstr "nouveaux ou mis à jour"
 
-#: ../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 "by source repository"
+msgstr "par source"
 
 #: ../rpmdrake: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 "by selection state"
+msgstr "sélectionnés ou non"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Costa Rica"
+msgid "by size"
+msgstr "par taille"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Une erreur est survenue pendant l'installation des paquetages :\n"
-"\n"
-"%s"
+msgid "by group"
+msgstr "par groupe"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Veuillez patienter, suppression du médium..."
+msgid "All packages,"
+msgstr "Tous les paquetages,"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "Mot de passe :"
+msgid "All packages, alphabetical"
+msgstr "Tous les paquetages, classement alphabétique"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "Examen du fichier distant de la source `%s'..."
+msgid "Mandrake choices"
+msgstr "Choix Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Taïwan"
+msgid "Normal updates"
+msgstr "Mises à jour normales"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "User:"
-msgstr "Nom d'utilisateur :"
+msgid "Bugfixes updates"
+msgstr "Corrections de bogues"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Veuillez patienter, mise à jour du médium..."
+msgid "Security updates"
+msgstr "Mises à jour de sécurité"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Veuillez patienter, énumération des paquetages..."
+msgid "Description: "
+msgstr "Description : "
 
 #: ../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 ""
-"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"
-"\n"
-"Ensuite, redémarrez MandrakeUpdate."
+msgid "Reason for update: "
+msgstr "Raison de la mise à jour : "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Information on packages"
-msgstr "Informations sur les paquetages"
+msgid "Summary: "
+msgstr "Intitulé : "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "Annuler"
+msgid "Importance: "
+msgstr "Importance : "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Tout a été installé correctement"
+msgid "%s KB"
+msgstr "%s Ko"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Veuillez patienter, mise à jour des média..."
+msgid "Size: "
+msgstr "Taille : "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr "Une erreur fatale est survenue : %s."
+msgid "Version: "
+msgstr "Version : "
 
 #: ../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 ""
-"Les paquetages suivants doivent être supprimés afin que les autres\n"
-"puissent être mis à jour :\n"
-"\n"
-"%s\n"
-"\n"
-"Voulez-vous continuer ?"
+msgid "Name: "
+msgstr "Nom : "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "parmi les descriptions"
+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 "Source: "
+msgstr "Source : "
 
-#: ../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 ""
-"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"
-"Êtes-vous d'accord pour continuer ?"
+msgid "(Not available)"
+msgstr "(Non disponible)"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Veuillez choisir"
+msgid "Changelog:\n"
+msgstr "Changelog :\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "Taille sélectionnée : %d Mo"
+msgid "Files:\n"
+msgstr "Fichiers :\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add a source"
-msgstr "Ajout d'une source :"
+msgid "Selected size: %d MB"
+msgstr "Taille sélectionnée : %d Mo"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "Initialisation..."
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Sélectionnés : %d Mo / Place libre sur disque : %d Mo"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "Sauvegarder"
+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"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
-msgstr "Erreur pendant le téléchargement"
+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:1
 #, c-format
-msgid "Package installation..."
-msgstr "Installation des paquetages..."
+msgid "%s conflicts with %s"
+msgstr "%s est en conflit avec %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Importance: "
-msgstr "Importance : "
+msgid "Some packages can't be installed"
+msgstr "Certains paquetages ne peuvent pas être installés"
 
 #: ../rpmdrake:1
 #, c-format
@@ -621,435 +677,467 @@ msgstr ""
 "doivent aussi être installés :\n"
 "\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "Ajouter..."
+msgid "Additional packages needed"
+msgstr "Des paquetages supplémentaires sont nécessaires"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Unable to create medium."
-msgstr "Impossible de créer le médium."
+msgid "Some packages can't be removed"
+msgstr "Des paquetages ne peuvent pas être supprimés"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Removing these packages would break your system, sorry:\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"
+"Le fait d'enlever ce paquetage rendrait instable votre système, désolé:\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 :"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Browse..."
-msgstr "Parcourir..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages can't be removed"
-msgstr "Des paquetages ne peuvent pas être supprimés"
+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"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
-msgstr "Info..."
+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 "You need to insert the medium to continue"
-msgstr "Vous devez insérer le médium pour continuer"
+msgid "More information on package..."
+msgstr "Plus d'informations sur le paquetage..."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "Supprimer"
+msgid "Information on packages"
+msgstr "Informations sur les paquetages"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "Preparing packages installation..."
-msgstr "Préparation de l'installation des paquetages..."
+msgid "More info"
+msgstr "Plus d'infos"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "No mirror"
-msgstr "Pas de miroir"
+msgid "Addable"
+msgstr "Nouveaux"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake: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 "Upgradable"
+msgstr "Mises à jour"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Installer"
+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 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
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "Japon"
+msgid "No update"
+msgstr "Pas de mise à jour"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Ne rien faire"
+msgid "(none)"
+msgstr "(aucun)"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "No update"
-msgstr "Pas de mise à jour"
+msgid "Please wait, listing packages..."
+msgstr "Veuillez patienter, énumération des paquetages..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Description: "
-msgstr "Description : "
+msgid "unknown package "
+msgstr "paquetage inconnu "
 
 #: ../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 "One of the following packages is needed:"
+msgstr "L'un des paquetages suivants est nécessaire :"
 
 #: ../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 ""
-"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 ?"
+msgid "Please choose"
+msgstr "Veuillez choisir"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "Nom : "
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "Examiner..."
+msgid "Not selected"
+msgstr "Non sélectionnés"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "No package found for installation."
-msgstr "Aucun paquetage trouvé pour l'installation."
+msgid "Selected"
+msgstr "Sélectionnés"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Australie"
+msgid "Search results"
+msgstr "Résultats de la recherche"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation finished"
-msgstr "L'installation est terminée"
+msgid "Stop"
+msgstr "Arrêter"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
-msgstr "nouveaux ou mis à jour"
+msgid "Please wait, searching..."
+msgstr "Veuillez patienter, recherche en cours..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
-msgstr "Pologne"
+msgid "Search results (none)"
+msgstr "Résultats de la recherche (aucun)"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Version: "
-msgstr "Version : "
+msgid "Other"
+msgstr "Autre"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
+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 ""
-"Vous pouvez aussi utiliser un nom d'utilisateur/mot de passe pour la "
-"connexion\n"
-"au serveur mandataire :"
+"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 "Editing source \\\"%s\\\":"
-msgstr "Édition de la source \"%s\" :"
+msgid "Save and quit"
+msgstr "Sauver et quitter"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Upgradable"
-msgstr "Mises à jour"
+msgid "Proxy..."
+msgstr "Mandataire..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid " done."
-msgstr " fini."
+msgid "Update..."
+msgstr "Mettre à jour..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Software Packages Installation"
-msgstr "Installation de paquetages logiciels"
+msgid "Add..."
+msgstr "Ajouter..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "Examen du fichier de la source `%s'..."
+msgid "Edit"
+msgstr "Éditer"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "Des paquetages supplémentaires sont nécessaires"
+msgid "Source"
+msgstr "Source"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Corrections de bogues"
+msgid "Enabled?"
+msgstr "Activée ?"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "Téléchargement de `%s', temps : %s, vitesse : %s"
+msgid "Configure sources"
+msgstr "Configurer les sources"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Germany"
-msgstr "Allemagne"
+msgid "Password:"
+msgstr "Mot de passe :"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Russia"
-msgstr "Russie"
+msgid "User:"
+msgstr "Nom d'utilisateur :"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Norway"
-msgstr "Norvège"
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+"Vous pouvez aussi utiliser un nom d'utilisateur/mot de passe pour la "
+"connexion\n"
+"au serveur mandataire :"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Problem during installation"
-msgstr "Des problèmes sont survenus durant l'installation"
+msgid "Proxy hostname:"
+msgstr "Nom du serveur mandataire"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search"
-msgstr "Chercher"
+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]>) :"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit a source"
-msgstr "Éditer une source"
+msgid "Configure proxies"
+msgstr "Configurer les serveurs mandataires (proxy)"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Czech Republic"
-msgstr "République Tchèque"
+msgid "Please wait, updating medium..."
+msgstr "Veuillez patienter, mise à jour du médium..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Stop"
-msgstr "Arrêter"
+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."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "Mettre à jour"
+msgid "You need to insert the medium to continue"
+msgstr "Vous devez insérer le médium pour continuer"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "Veuillez patienter, suppression des paquetages..."
+msgid "Save changes"
+msgstr "Sauvegarder"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal information"
-msgstr "Informations normales"
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Chemin relatif vers hdlist/synthesis :"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Téléchargement du paquetage `%s' (%s/%s)..."
+msgid "URL:"
+msgstr "URL :"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing source \"%s\":"
+msgstr "Édition de la source \"%s\" :"
+
+#: ../edit-urpm-sources.pl: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 "Edit a source"
+msgstr "Éditer une source"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Spain"
-msgstr "Espagne"
+msgid "Please wait, removing medium..."
+msgstr "Veuillez patienter, suppression du médium..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
-msgstr "Mises à jour normales"
+msgid "Type of source:"
+msgstr "Type de source :"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by selection state"
-msgstr "sélectionnés ou non"
+msgid "Adding a source:"
+msgstr "Ajout d'une source :"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 msgstr ""
-"Veuillez patienter, téléchargement de la liste des miroirs à partir du site "
-"web de MandrakeSoft."
+"Il existe déjà un médium du même nom,\n"
+"voulez-vous vraiment le remplacer ?"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Login:"
-msgstr "Login :"
+msgid "You need to fill up at least the two first entries."
+msgstr "Vous devez remplir au moins les deux premiers champs."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Austria"
-msgstr "Autriche"
+msgid "Name:"
+msgstr "Nom :"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Fatal error"
-msgstr "Erreur fatale"
+msgid "Login:"
+msgstr "Login :"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Veuillez choisir les sources que vous voulez mettre à jour :"
+msgid "Choose a mirror..."
+msgstr "Choisissez votre miroir..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update..."
-msgstr "Mettre à jour..."
+msgid "Browse..."
+msgstr "Parcourir..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Starting download of `%s'..."
-msgstr "Démarrage du téléchargement de `%s'..."
+msgid "Path or mount point:"
+msgstr "Chemin ou point de montage :"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
-msgstr "(aucun)"
+msgid "Removable device"
+msgstr "Périphérique amovible"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl: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 "HTTP server"
+msgstr "Serveur HTTP"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Installation du paquetage `%s' (%s/%s)..."
+msgid "FTP server"
+msgstr "Serveur FTP"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Version actuellement installée : "
+msgid "Path:"
+msgstr "Chemin : "
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Other"
-msgstr "Autre"
+msgid "Local files"
+msgstr "Fichiers locaux"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Raison de la mise à jour : "
+msgid "Add a source"
+msgstr "Ajout d'une source :"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Please choose the desired mirror."
-msgstr "Veuillez choisir le miroir."
+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"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "Éditer"
+msgid "Unable to create medium."
+msgstr "Impossible de créer le médium."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Veuillez patienter, recherche des paquetages disponibles..."
+msgid "Update"
+msgstr "Mettre à jour"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Chemin relatif vers hdlist/synthesis :"
+msgid "Select the source(s) you wish to update:"
+msgstr "Veuillez choisir les sources que vous voulez mettre à jour :"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Résultats de la recherche (aucun)"
+msgid "Please wait, updating media..."
+msgstr "Veuillez patienter, mise à jour des média..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Danmark"
-msgstr "Danemark"
+msgid " failed!"
+msgstr " échec !"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "Chine"
+msgid " done."
+msgstr " fini."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United States"
-msgstr "États-Unis"
+msgid "Download of `%s', speed:%s"
+msgstr "Téléchargement de `%s', vitesse : %s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "changes:"
-msgstr "changements :"
+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 "Some additional packages need to be removed"
-msgstr "Des paquetages supplémentaires doivent être supprimés"
+msgid "Starting download of `%s'..."
+msgstr "Démarrage du téléchargement de `%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Examining distant file of source `%s'..."
+msgstr "Examen du fichier distant de la source `%s'..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No"
-msgstr "Non"
+msgid "Examining file of source `%s'..."
+msgstr "Examen du fichier de la source `%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Summary: "
-msgstr "Intitulé : "
+msgid "Copying file for source `%s'..."
+msgstr "Copie du fichier pour la source `%s'..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "Canada"
+msgid "Please choose the desired mirror."
+msgstr "Veuillez choisir le miroir."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Greece"
-msgstr "Grèce"
+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 ""
+"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"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1067,268 +1155,181 @@ msgstr ""
 "indisponibles.\n"
 "Veuillez réessayer ultérieurement."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Source: "
-msgstr "Source : "
-
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "Copie du fichier pour la source `%s'..."
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Impossible d'obtenir les paquetages sources, désolé. %s"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Path:"
-msgstr "Chemin : "
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Problem during removal"
-msgstr "Un problème est survenu pendant la désinstallation"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "by source repository"
-msgstr "par source"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Selected"
-msgstr "Sélectionnés"
+msgid "Error during download"
+msgstr "Erreur pendant le téléchargement"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Netherlands"
-msgstr "Pays-Bas"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Addable"
-msgstr "Nouveaux"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "(Not available)"
-msgstr "(Non disponible)"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
+"Veuillez patienter, téléchargement de la liste des miroirs à partir du site "
+"web de MandrakeSoft."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
 "\n"
-"%s"
+"Is it ok to continue?"
 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"
+"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"
-"%s"
+"Êtes-vous d'accord pour continuer ?"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Not selected"
-msgstr "Non sélectionnés"
+msgid "United States"
+msgstr "États-Unis"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Suppression de Paquetages Logiciels"
+msgid "China"
+msgstr "Chine"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr "Royaume-Uni"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "Taïwan"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Sweden"
 msgstr "Suède"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
-msgstr ""
-"\n"
-"\n"
-"Erreur(s) rencontrées :\n"
-"%s"
+msgid "Russia"
+msgstr "Russie"
 
-#: ../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."
-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."
+msgid "Portugal"
+msgstr "Portugal"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "Téléchargement de `%s', vitesse : %s"
+msgid "Poland"
+msgstr "Pologne"
 
-#: ../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 "Norway"
+msgstr "Norvège"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "Quitter"
+msgid "Netherlands"
+msgstr "Pays-Bas"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 ""
-"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 ?"
+msgid "Korea"
+msgstr "Corée"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid "Japan"
+msgstr "Japon"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "Veuillez patienter, ajout du médium..."
+msgid "Italy"
+msgstr "Italie"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "Type de source :"
+msgid "Israel"
+msgstr "Israël"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Greece"
+msgstr "Grèce"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to get source packages."
-msgstr "Impossible d'obtenir les paquetages sources."
+msgid "France"
+msgstr "France"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Trop de paquetages sont sélectionnés"
+msgid "Finland"
+msgstr "Finlande"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "%s conflicts with %s"
-msgstr "%s est en conflit avec %s"
+msgid "Spain"
+msgstr "Espagne"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 ""
-"Bienvenue dans MandrakeUpdate !\n"
-"\n"
-"Cet outil va vous aider à choisir les mises à jour que vous\n"
-"souhaiter installer sur votre ordinateur."
+msgid "Danmark"
+msgstr "Danemark"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Choix Mandrake"
+msgid "Germany"
+msgstr "Allemagne"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Czech Republic"
+msgstr "République Tchèque"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Changelog :\n"
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Korea"
-msgstr "Corée"
+msgid "Canada"
+msgstr "Canada"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "Périphérique amovible"
+msgid "Brazil"
+msgstr "Brésil"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Belgique"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Change medium"
-msgstr "Changement de médium"
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Mandrake Update"
+msgid "Australia"
+msgstr "Australie"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by size"
-msgstr "par taille"
+msgid "Austria"
+msgstr "Autriche"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "Serveur FTP"
+msgid "Info..."
+msgstr "Info..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Files:\n"
-msgstr "Fichiers :\n"
+msgid "No"
+msgstr "Non"
 
 #: ../rpmdrake.pm:1
 #, c-format
-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"
+msgid "Yes"
+msgstr "Oui"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
diff --git a/po/ga.po b/po/ga.po
index e486cd70..d5e10425 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grpmi\n"
-"POT-Creation-Date: 2003-05-02 20:15+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+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,21 +13,14 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr ""
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Path or mount point:"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Portugal"
-msgstr "Poirt:"
-
 #: ../rpmdrake:1
 #, c-format
 msgid ""
@@ -40,138 +33,125 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
 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 "How to choose manually your mirror"
+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 "URL:"
-msgstr "URL:"
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages need to be removed"
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Already existing update sources"
+msgid "Problem during removal"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "More information on package..."
+#, fuzzy, c-format
+msgid "Please wait, removing packages..."
 msgstr ""
+"Fan tamall\n"
+"Ag scrios pacáistí"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Yes"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, reading packages database..."
 msgstr ""
+"Fan tamall\n"
+"Ag scrios pacáistí"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"There was a problem during the installation:\n"
 "\n"
+"%s"
 msgstr ""
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Installation failed"
+msgstr "Feist gach rud"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "everything was installed correctly"
+msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "%s KB"
-msgstr "%.1f KB"
+msgid "No package found for installation."
+msgstr "Bainisteoir Bog-Earraí"
 
 #: ../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
-#, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
+msgid "All requested packages were installed successfully."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
+msgid "Everything installed successfully"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"The installation is finished; %s.\n"
 "\n"
-"%s"
+"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 "Size: "
-msgstr "Meid"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Security updates"
-msgstr "Slándáil"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
+msgid "everything was installed correctly"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Earraidh..."
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
+msgid "Problem during installation"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure sources"
+msgid "Installing package `%s' (%s/%s)..."
 msgstr ""
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Bainisteoir Bog-Earraí"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "in names"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
 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."
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
 msgstr ""
 
 #: ../rpmdrake:1
@@ -181,139 +161,73 @@ msgid ""
 "\n"
 "%s\n"
 "\n"
-"\\Do you want to continue installation?"
+"Do you want to continue installation?"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Remove .%s"
-msgstr ""
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Source"
-msgstr "Bún"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Finland"
-msgstr "Faigh:"
-
-#: ../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 "More info"
-msgstr ""
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
+msgid "Downloading package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Reload the packages list"
-msgstr ""
+msgid "Cancel"
+msgstr "Cealaigh"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr ""
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Adding a source:"
-msgstr ""
-"Fan tamall\n"
-"Ag scrios pacáistí"
+msgid "Ok"
+msgstr "Ceart go Leor"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages can't be installed"
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
+msgid "Change medium"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "All packages,"
-msgstr "%d pacáistí"
+msgid "Initializing..."
+msgstr "Ag Feistiú:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "in files"
-msgstr "Áit"
+msgid "Package installation..."
+msgstr "Bainisteoir Bog-Earraí"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr ""
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Proxy hostname:"
+msgid "Unable to get source packages, sorry. %s"
 msgstr ""
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Update source(s)"
+msgid "Unable to get source packages."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Local files"
-msgstr "Comhaid Áitiúl"
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
+msgid "Inspect..."
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Israel"
-msgstr "Ag Feistiú:"
-
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Help"
-msgstr "/_Cúnamh"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "HTTP server"
-msgstr "Freastalaí HTTP:"
-
-#: ../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 "Installation finished"
+msgstr "Ag Feistiú"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Feist gach rud"
+msgid "Do nothing"
+msgstr "Ag Tosnaigh CUPS"
 
 #: ../rpmdrake:1
 #, c-format
@@ -321,167 +235,128 @@ 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 "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?"
+msgid "Remove .%s"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Find:"
-msgstr "Faigh:"
+#, fuzzy, c-format
+msgid "changes:"
+msgstr "Pacáistí"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
+msgid "Inspecting %s"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, searching..."
+msgid "Please wait, finding available packages..."
 msgstr ""
 "Fan tamall\n"
 "Ag scrios pacáistí"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Please wait, reading packages database..."
+msgid "Please wait, adding medium..."
 msgstr ""
 "Fan tamall\n"
-"Ag scrios pacáistí"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "Teip ag oscailt pacáiste"
+"Checking dependencies"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
+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 ""
 
-#: ../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 "How to choose manually your mirror"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"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 ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
+msgid "Already existing update sources"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"There was a problem during the installation:\n"
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
 "\n"
-"%s"
-msgstr ""
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Please wait, removing medium..."
-msgstr ""
-"Fan tamall\n"
-"Checking dependencies"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Password:"
-msgstr "Pasfhocal:"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Examining distant file of source `%s'..."
+"Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Taiwan"
-msgstr "Áit"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "User:"
+msgid "A fatal error occurred: %s."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, updating medium..."
-msgstr ""
-"Fan tamall\n"
-"Checking dependencies"
+msgid "Fatal error"
+msgstr "Earraidh scríobhta\n"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, listing packages..."
-msgstr ""
-"Fan tamall\n"
-"Ag scrios pacáistí"
+msgid "Software Packages Installation"
+msgstr "Bainisteoir Bog-Earraí"
 
 #: ../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 "Mandrake Update"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Information on packages"
-msgstr "Teip ag oscailt pacáiste"
+msgid "Software Packages Removal"
+msgstr "Bainisteoir Bog-Earraí"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Cancel"
-msgstr "Cealaigh"
+msgid "Quit"
+msgstr "Éirigh"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr ""
+msgid "Install"
+msgstr "Ag Feistiú:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Please wait, updating media..."
-msgstr ""
-"Fan tamall\n"
-"Checking dependencies"
+msgid "Remove"
+msgstr "Scríos Printéir"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Help"
+msgstr "/_Cúnamh"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Search"
+msgstr "Cuardaigh"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "Faigh:"
 
 #: ../rpmdrake:1
 #, c-format
@@ -494,246 +369,232 @@ msgid ""
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "in descriptions"
-msgstr "Cuntasaí"
-
-#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Configure proxies"
+msgid "Some packages need to be removed"
 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"
+"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"
-"Is it ok to continue?"
+"Do you really want to install all the selected packages?"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please choose"
-msgstr "Cinntigh, le do thoil"
+#, c-format
+msgid "Too many packages are selected"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
+msgid "Maximum information"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Add a source"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal information"
 msgstr ""
-"Fan tamall\n"
-"Ag scrios pacáistí"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Initializing..."
-msgstr "Ag Feistiú:"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update source(s)"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Save changes"
-msgstr "Pacáistí"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reload the packages list"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
+msgid "Reset the selection"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Bainisteoir Bog-Earraí"
+msgid "in files"
+msgstr "Áit"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "in descriptions"
+msgstr "Cuntasaí"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Importance: "
+msgid "in names"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
+msgid "by update availability"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
+msgid "by source repository"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Unable to create medium."
+msgid "by selection state"
 msgstr ""
 
 #: ../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:"
+msgid "by size"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
+msgid "by group"
 msgstr ""
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "All packages,"
+msgstr "%d pacáistí"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Some packages can't be removed"
+msgid "All packages, alphabetical"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
+msgid "Mandrake choices"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
+msgid "Normal updates"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Bugfixes updates"
 msgstr ""
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Remove"
-msgstr "Scríos Printéir"
+msgid "Security updates"
+msgstr "Slándáil"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Bainisteoir Bog-Earraí"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "No mirror"
-msgstr "Gan earraidh"
+msgid "Description: "
+msgstr "Cuntasaí"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
+msgid "Reason for update: "
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Install"
-msgstr "Ag Feistiú:"
+#, fuzzy, c-format
+msgid "Summary: "
+msgstr "Coimriú"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "An tSeapáin"
+msgid "Importance: "
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Do nothing"
-msgstr "Ag Tosnaigh CUPS"
+msgid "%s KB"
+msgstr "%.1f KB"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No update"
-msgstr "slí"
+msgid "Size: "
+msgstr "Meid"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Description: "
-msgstr "Cuntasaí"
+msgid "Version: "
+msgstr "Leagan:"
 
 #: ../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 "Name: "
+msgstr "Ainm: %s"
 
 #: ../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 "Currently installed version: "
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Name: "
-msgstr "Ainm: %s"
+msgid "Source: "
+msgstr "Bún"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
+msgid "(Not available)"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Bainisteoir Bog-Earraí"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Australia"
-msgstr "srathach"
+#, c-format
+msgid "Changelog:\n"
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Installation finished"
-msgstr "Ag Feistiú"
+msgid "Files:\n"
+msgstr "/_Comhad"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
+msgid "Selected size: %d MB"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
-msgstr "An Pholainn"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Version: "
-msgstr "Leagan:"
-
-#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Editing source \\\"%s\\\":"
+#: ../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 ""
-"Fan tamall\n"
-"Ag scrios pacáistí"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Upgradable"
+msgid "%s conflicts with %s"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " done."
+msgid "Some packages can't be installed"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Bainisteoir Bog-Earraí"
-
-#: ../rpmdrake.pm:1
 #, c-format
-msgid "Examining file of source `%s'..."
+msgid ""
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -743,483 +604,622 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Bugfixes updates"
+msgid "Some packages can't be removed"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Germany"
-msgstr "Gearmáinis"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Russia"
-msgstr "Ruislís"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Norway"
-msgstr "Ioruais"
+msgid "Information on packages"
+msgstr "Teip ag oscailt pacáiste"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "Problem during installation"
+msgid "More info"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Search"
-msgstr "Cuardaigh"
+#, fuzzy, c-format
+msgid "Addable"
+msgstr "Ag Feistiú"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Edit a source"
+msgid "Upgradable"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
-msgstr "An Phoblacht nc tSeic"
+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:1
 #, fuzzy, c-format
-msgid "Stop"
-msgstr "Teascán"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Update"
+msgid "No update"
 msgstr "slí"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "(none)"
+msgstr "(ar bith)"
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, removing packages..."
+msgid "Please wait, listing packages..."
 msgstr ""
 "Fan tamall\n"
 "Ag scrios pacáistí"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Normal information"
-msgstr ""
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "Teip ag oscailt pacáiste"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
+msgid "One of the following packages is needed:"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr ""
+#, fuzzy, c-format
+msgid "Please choose"
+msgstr "Cinntigh, le do thoil"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Spain"
-msgstr ""
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Normal updates"
-msgstr ""
+#, fuzzy, c-format
+msgid "Not selected"
+msgstr "Tóg gach rud"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by selection state"
+#, fuzzy, c-format
+msgid "Selected"
 msgstr ""
+"Tóg\n"
+"gach rud"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Search results"
+msgstr "Cuardaigh"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Login:"
-msgstr "Logann:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Stop"
+msgstr "Teascán"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Austria"
-msgstr "srathach"
+msgid "Please wait, searching..."
+msgstr ""
+"Fan tamall\n"
+"Ag scrios pacáistí"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Earraidh scríobhta\n"
+msgid "Search results (none)"
+msgstr "Cuardaigh"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
+msgid "Other"
+msgstr "Eile"
+
+#: ../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 ""
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Proxy..."
+msgstr "Earraidh..."
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Update..."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Starting download of `%s'..."
+msgid "Add..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
-msgstr "(ar bith)"
+msgid "Edit"
+msgstr "Eagar"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
+msgid "Source"
+msgstr "Bún"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
+msgid "Enabled?"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
+msgid "Configure sources"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Other"
-msgstr "Eile"
+msgid "Password:"
+msgstr "Pasfhocal:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reason for update: "
+msgid "User:"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please choose the desired mirror."
+msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit"
-msgstr "Eagar"
+msgid "Proxy hostname:"
+msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, finding available packages..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
 msgstr ""
-"Fan tamall\n"
-"Ag scrios pacáistí"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
+msgid "Configure proxies"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Search results (none)"
-msgstr "Cuardaigh"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Danmark"
+msgid "Please wait, updating medium..."
 msgstr ""
+"Fan tamall\n"
+"Checking dependencies"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "China"
-msgstr "An tSín"
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "United States"
-msgstr "Stáit Aontaithe Mheiriceá"
+msgid "You need to insert the medium to continue"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "changes:"
+msgid "Save changes"
 msgstr "Pacáistí"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Some additional packages need to be removed"
+msgid "Relative path to synthesis/hdlist:"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing source \"%s\":"
+msgstr ""
+"Fan tamall\n"
+"Ag scrios pacáistí"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
+msgid "Edit a source"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Summary: "
-msgstr "Coimriú"
+msgid "Please wait, removing medium..."
+msgstr ""
+"Fan tamall\n"
+"Checking dependencies"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Canada"
-msgstr "Ceanada"
+msgid "Type of source:"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Greece"
-msgstr "Greicís"
+msgid "Adding a source:"
+msgstr ""
+"Fan tamall\n"
+"Ag scrios pacáistí"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl: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."
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../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
 #, fuzzy, c-format
-msgid "Source: "
-msgstr "Bún"
+msgid "Name:"
+msgstr "Ainm"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr ""
+msgid "Login:"
+msgstr "Logann:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Unable to get source packages, sorry. %s"
+msgid "Choose a mirror..."
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Path:"
-msgstr "Poirt:"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "Problem during removal"
+msgid "Browse..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by source repository"
+msgid "Path or mount point:"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Selected"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Removable device"
 msgstr ""
-"Tóg\n"
-"gach rud"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Netherlands"
-msgstr "An Isiltír"
+msgid "HTTP server"
+msgstr "Freastalaí HTTP:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "Freastalaí FTP:"
+
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Addable"
-msgstr "Ag Feistiú"
+msgid "Path:"
+msgstr "Poirt:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(Not available)"
+msgid "Local files"
+msgstr "Comhaid Áitiúl"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a source"
 msgstr ""
+"Fan tamall\n"
+"Ag scrios pacáistí"
 
-#: ../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"
+"Unable to update medium; it will be automatically disabled.\n"
 "\n"
+"Errors:\n"
 "%s"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Unable to create medium."
+msgstr ""
+
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Not selected"
-msgstr "Tóg gach rud"
+msgid "Update"
+msgstr "slí"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Select the source(s) you wish to update:"
+msgstr ""
+
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Software Packages Removal"
-msgstr "Bainisteoir Bog-Earraí"
+msgid "Please wait, updating media..."
+msgstr ""
+"Fan tamall\n"
+"Checking dependencies"
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Sweden"
-msgstr "Amharc"
+msgid " failed!"
+msgstr "Áit"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+msgid " done."
 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', speed:%s"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
+msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
+msgid "Starting download of `%s'..."
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "Éirigh"
+msgid "Examining distant file of source `%s'..."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Examining file of source `%s'..."
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "Ceart go Leor"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Please wait, adding medium..."
+msgid "Copying file for source `%s'..."
 msgstr ""
-"Fan tamall\n"
-"Checking dependencies"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
+msgid "Please choose the desired mirror."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \\\"%s\\\" on device [%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 ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "No mirror"
+msgstr "Gan earraidh"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to get source packages."
+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:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Too many packages are selected"
+msgid "Error during download"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "%s conflicts with %s"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"Welcome to MandrakeUpdate!\n"
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
 "\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
+"Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
-msgstr ""
+msgid "United States"
+msgstr "Stáit Aontaithe Mheiriceá"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "China"
+msgstr "An tSín"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
+msgid "United Kingdom"
 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
+#, c-format
+msgid "Poland"
+msgstr "An Pholainn"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Norway"
+msgstr "Ioruais"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
+msgstr "An Isiltír"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
 msgid "Korea"
 msgstr "Fórsáil"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr ""
+msgid "Japan"
+msgstr "An tSeapáin"
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Belgium"
-msgstr "Belgáiris"
+msgid "Italy"
+msgstr "Ag Feistiú:"
 
-#: ../rpmdrake:1
+#: ../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"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Finland"
+msgstr "Faigh:"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Change medium"
+msgid "Spain"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake Update"
+msgid "Danmark"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Germany"
+msgstr "Gearmáinis"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by size"
+msgid "Czech Republic"
+msgstr "An Phoblacht nc tSeic"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Costa Rica"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "Freastalaí FTP:"
+msgid "Canada"
+msgstr "Ceanada"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
+msgstr "An Bhrasail"
+
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Files:\n"
-msgstr "/_Comhad"
+msgid "Belgium"
+msgstr "Belgáiris"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Australia"
+msgstr "srathach"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Austria"
+msgstr "srathach"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
+msgid "Info..."
+msgstr ""
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
+msgstr ""
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
 msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:86
diff --git a/po/gl.po b/po/gl.po
index 6c9a93f4..c79de8b1 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grpmi\n"
-"POT-Creation-Date: 2003-05-02 20:15+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+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,21 +13,14 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr ""
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Path or mount point:"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Portugal"
-msgstr "Porto:"
-
 #: ../rpmdrake:1
 #, c-format
 msgid ""
@@ -40,138 +33,121 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Name:"
-msgstr "Nome"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Italy"
-msgstr "Instalar"
-
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr ""
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "URL:"
+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
-#, c-format
-msgid "Some packages need to be removed"
-msgstr ""
+#, 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 "Already existing update sources"
-msgstr ""
+#, fuzzy, c-format
+msgid "Problem during removal"
+msgstr "Preparando para a instalación"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "More information on package..."
-msgstr ""
+#, fuzzy, c-format
+msgid "Please wait, removing packages..."
+msgstr "Agarde, por favor"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
+msgid "Please wait, reading packages database..."
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"There was a problem during the installation:\n"
 "\n"
-msgstr ""
+"%s"
+msgstr "Preparando para a instalación"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "everything was installed correctly"
-msgstr ""
+#, fuzzy, c-format
+msgid "Installation failed"
+msgstr "Instalar"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "%s KB"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "Preparando para a instalació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 ""
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "Preparando para a instalació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."
+msgid "All requested packages were installed successfully."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
+msgid "Everything installed successfully"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"The installation is finished; %s.\n"
 "\n"
-"%s"
-msgstr "Preparando para a instalación"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Size: "
-msgstr "Tamaño"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Security updates"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
+msgid "everything was installed correctly"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Erro..."
+msgid "Problem during installation"
+msgstr "Preparando para a instalación"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
+msgid "Installing package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Configure sources"
-msgstr "Engadir usuario"
+msgid "Preparing packages installation..."
+msgstr "Preparando para a instalación"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
 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."
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
 msgstr ""
 
 #: ../rpmdrake:1
@@ -181,357 +157,339 @@ msgid ""
 "\n"
 "%s\n"
 "\n"
-"\\Do you want to continue installation?"
+"Do you want to continue installation?"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Remove .%s"
-msgstr "Quitar"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Source"
-msgstr "Forzar"
-
-#: ../rpmdrake.pm:1
 #, c-format
-msgid "Finland"
+msgid "Verifying packages signatures..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
+msgid "Downloading package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "France"
-msgstr "Forzar"
-
-#. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "More info"
-msgstr ""
+msgid "Cancel"
+msgstr "Cancelar"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
+msgid "Ok"
+msgstr "Aceptar"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reload the packages list"
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
+msgid "Change medium"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Adding a source:"
-msgstr "Medio"
-
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "O paquete non se pode instalar"
+msgid "Initializing..."
+msgstr "Instalando:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
+msgid "Package installation..."
 msgstr "Preparando para a instalación"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "All packages,"
-msgstr "Desinstalando"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "in files"
-msgstr "Etiqueta"
+#, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
+msgid "Unable to get source packages."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
+msgid "Inspect..."
 msgstr ""
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Update source(s)"
-msgstr "Medio"
+msgid "Installation finished"
+msgstr "Instalar"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Local files"
-msgstr "Etiqueta"
+msgid "Do nothing"
+msgstr "Máquina:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
+msgid "Use .%s as main file"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Israel"
-msgstr "Instalar"
+msgid "Remove .%s"
+msgstr "Quitar"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "changes:"
+msgstr "Paquetes"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Help"
-msgstr "Axuda"
+msgid "Inspecting %s"
+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
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, adding medium..."
+msgstr "Agarde, por favor"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"Welcome to the packages source editor!\n"
+"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"
-"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 ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Instalar"
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
+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 ""
 
 #: ../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 "Brazil"
+msgid "Already existing update sources"
 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?"
+"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
 #, c-format
-msgid "Find:"
+msgid "A fatal error occurred: %s."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
+msgid "Fatal error"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, searching..."
-msgstr "Agarde, por favor"
+msgid "Software Packages Installation"
+msgstr "Preparando para a instalación"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mandrake Update"
+msgstr "Actualización de Linux-Mandrake"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, reading packages database..."
+msgid "Software Packages Removal"
 msgstr ""
 
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Saír"
+
 #: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "Instalar"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "unknown package "
-msgstr "Non se pode abri-lo paquete"
+msgid "Remove"
+msgstr "Impresora remota"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr ""
+msgid "Help"
+msgstr "Axuda"
 
-#: ../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 "Search"
+msgstr "Buscar"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"The following packages have to be removed for others to be upgraded:\n"
 "\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
+msgid "Some packages need to be removed"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"There was a problem during the installation:\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"
-"%s"
-msgstr "Preparando para a instalación"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Please wait, removing medium..."
+"Do you really want to install all the selected packages?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "Contrasinal:"
+msgid "Too many packages are selected"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
+msgid "Maximum information"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Taiwan"
-msgstr "Localización"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "User:"
-msgstr ""
+msgid "Normal information"
+msgstr "Actualización de Linux-Mandrake"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Please wait, updating medium..."
-msgstr "Agarde, por favor"
+msgid "Update source(s)"
+msgstr "Medio"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
+msgid "Reload the packages list"
 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 "Reset the selection"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Information on packages"
-msgstr "Non se pode abri-lo paquete"
+msgid "in files"
+msgstr "Etiqueta"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "in descriptions"
+msgstr "Descripcións"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "Cancelar"
+msgid "in names"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
+msgid "by update availability"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Please wait, updating media..."
-msgstr "Agarde, por favor"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
+msgid "by selection state"
 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 "by size"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "in descriptions"
-msgstr "Descripcións"
+#, c-format
+msgid "by group"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Configure proxies"
-msgstr "Engadir usuario"
+msgid "All packages,"
+msgstr "Desinstalando"
 
-#: ../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 "All packages, alphabetical"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please choose"
-msgstr "Agarde, por favor"
+msgid "Normal updates"
+msgstr "Actualización de Linux-Mandrake"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
+msgid "Bugfixes updates"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Add a source"
-msgstr "Medio"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Initializing..."
-msgstr "Instalando:"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Save changes"
-msgstr "Paquetes"
+msgid "Description: "
+msgstr "Descripcións"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
+msgid "Reason for update: "
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Preparando para a instalación"
+msgid "Summary: "
+msgstr "Resume"
 
 #: ../rpmdrake:1
 #, c-format
@@ -540,623 +498,674 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
+msgid "%s KB"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add..."
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Size: "
+msgstr "Tamaño"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Unable to create medium."
+msgid "Version: "
 msgstr ""
 
 #: ../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 ""
+#, fuzzy, c-format
+msgid "Name: "
+msgstr "Nome: %s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
+msgid "Currently installed version: "
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "O paquete non se pode instalar"
+msgid "Source: "
+msgstr "Forzar"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
+msgid "(Not available)"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
+msgid "Changelog:\n"
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Remove"
-msgstr "Impresora remota"
-
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Preparando para a instalación"
-
-#: ../rpmdrake.pm:1
 #, c-format
-msgid "No mirror"
+msgid "Files:\n"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
+msgid "Selected size: %d MB"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Instalar"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Do nothing"
-msgstr "Máquina:"
+#, 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 "No update"
-msgstr "Actualización de Linux-Mandrake"
+msgid "%s conflicts with %s"
+msgstr " ten conflictos con %s-%s-%s"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Description: "
-msgstr "Descripcións"
+msgid "Some packages can't be installed"
+msgstr "O paquete non se pode instalar"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
 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 "Additional packages needed"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Name: "
-msgstr "Nome: %s"
+msgid "Some packages can't be removed"
+msgstr "O paquete non se pode instalar"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Preparando para a instalación"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Australia"
-msgstr "serie"
+#, c-format
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation finished"
-msgstr "Instalar"
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
+msgid "More information on package..."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Poland"
-msgstr "Islandés"
+msgid "Information on packages"
+msgstr "Non se pode abri-lo paquete"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "Version: "
-msgstr ""
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You may specify a user/password for the proxy authentication:"
+msgid "More info"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Editing source \\\"%s\\\":"
-msgstr "Medio"
+msgid "Addable"
+msgstr "Instalar sistema"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Upgradable"
 msgstr "Actualización de Linux-Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " done."
+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:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Preparando para a instalación"
+msgid "No update"
+msgstr "Actualización de Linux-Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining file of source `%s'..."
+msgid "(none)"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Additional packages needed"
+msgid "Please wait, listing packages..."
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Bugfixes updates"
-msgstr ""
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "Non se pode abri-lo paquete"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
+msgid "One of the following packages is needed:"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Germany"
-msgstr "Alemán"
+msgid "Please choose"
+msgstr "Agarde, por favor"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Russia"
-msgstr "Ruso"
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Norway"
-msgstr "Noruegués"
+msgid "Not selected"
+msgstr " ten conflictos con %s-%s-%s"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Preparando para a instalación"
+msgid "Selected"
+msgstr ""
+"Seleccionar\n"
+"Todos"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Search"
-msgstr "Buscar"
-
-#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Edit a source"
-msgstr "Medio"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Czech Republic"
-msgstr ""
+msgid "Search results"
+msgstr "Buscar"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Stop"
 msgstr "Sector"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Update"
-msgstr "Actualización de Linux-Mandrake"
-
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, removing packages..."
+msgid "Please wait, searching..."
 msgstr "Agarde, por favor"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Normal information"
-msgstr "Actualización de Linux-Mandrake"
+msgid "Search results (none)"
+msgstr "Buscar"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
+msgid "Other"
+msgstr "Outros"
+
+#: ../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 ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
+msgid "Save and quit"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Spain"
-msgstr "Español"
+msgid "Proxy..."
+msgstr "Erro..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Normal updates"
+msgid "Update..."
 msgstr "Actualización de Linux-Mandrake"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by selection state"
+msgid "Add..."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgid "Edit"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Source"
+msgstr "Forzar"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Login:"
+msgid "Enabled?"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Austria"
-msgstr "serie"
+msgid "Configure sources"
+msgstr "Engadir usuario"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Fatal error"
-msgstr ""
+msgid "Password:"
+msgstr "Contrasinal:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
+msgid "User:"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Update..."
-msgstr "Actualización de Linux-Mandrake"
-
-#: ../rpmdrake.pm:1
 #, c-format
-msgid "Starting download of `%s'..."
+msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
+msgid "Proxy hostname:"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure proxies"
+msgstr "Engadir usuario"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, updating medium..."
+msgstr "Agarde, por favor"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
+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 "Currently installed version: "
+msgid "You need to insert the medium to continue"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Save changes"
+msgstr "Paquetes"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Other"
-msgstr "Outros"
+msgid "Relative path to synthesis/hdlist:"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reason for update: "
+msgid "URL:"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing source \"%s\":"
+msgstr "Medio"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Edit a source"
+msgstr "Medio"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please choose the desired mirror."
+msgid "Please wait, removing medium..."
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit"
+msgid "Type of source:"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Adding a source:"
+msgstr "Medio"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, finding available packages..."
+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 "Relative path to synthesis/hdlist:"
+msgid "You need to fill up at least the two first entries."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Search results (none)"
-msgstr "Buscar"
+msgid "Name:"
+msgstr "Nome"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Danmark"
+msgid "Login:"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "China"
+msgid "Choose a mirror..."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "United States"
+msgid "Browse..."
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "changes:"
-msgstr "Paquetes"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Some additional packages need to be removed"
+msgid "Removable device"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "HTTP server"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
+msgid "FTP server"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Summary: "
-msgstr "Resume"
+msgid "Path:"
+msgstr "Porto:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Canada"
-msgstr "Canadiano (Québec)"
+msgid "Local files"
+msgstr "Etiqueta"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Greece"
-msgstr "Grego"
+msgid "Add a source"
+msgstr "Medio"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"There was an error downloading the mirrors list:\n"
+"Unable to update medium; it will be automatically disabled.\n"
 "\n"
-"%s\n"
-"The network, or MandrakeSoft website, are maybe unavailable.\n"
-"Please try again later."
+"Errors:\n"
+"%s"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Source: "
-msgstr "Forzar"
-
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
+msgid "Unable to create medium."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update"
+msgstr "Actualización de Linux-Mandrake"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to get source packages, sorry. %s"
+msgid "Select the source(s) you wish to update:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Path:"
-msgstr "Porto:"
+msgid "Please wait, updating media..."
+msgstr "Agarde, por favor"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Problem during removal"
-msgstr "Preparando para a instalación"
+msgid " failed!"
+msgstr "Etiqueta"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by source repository"
+msgid " done."
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Selected"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Download of `%s', speed:%s"
 msgstr ""
-"Seleccionar\n"
-"Todos"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Netherlands"
+msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Addable"
-msgstr "Instalar sistema"
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
+msgid "Starting download of `%s'..."
 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 "Examining distant file of source `%s'..."
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr " ten conflictos con %s-%s-%s"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Examining file of source `%s'..."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
+msgid "Copying file for source `%s'..."
 msgstr ""
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Sweden"
-msgstr "Mirar"
+#, c-format
+msgid "Please choose the desired mirror."
+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
+#: ../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 "No mirror"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%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:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
+msgid "Error during download"
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "Saír"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
+"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 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "Aceptar"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Please wait, adding medium..."
-msgstr "Agarde, por favor"
+msgid "United States"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
+msgid "China"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \\\"%s\\\" on device [%s]"
+msgid "United Kingdom"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Taiwan"
+msgstr "Localización"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Sweden"
+msgstr "Mirar"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Russia"
+msgstr "Ruso"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Portugal"
+msgstr "Porto:"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Poland"
+msgstr "Islandés"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Norway"
+msgstr "Noruegués"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to get source packages."
+msgid "Netherlands"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Korea"
+msgstr "Forzar"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Too many packages are selected"
+msgid "Japan"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr " ten conflictos con %s-%s-%s"
+msgid "Italy"
+msgstr "Instalar"
 
-#: ../rpmdrake:1
+#: ../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
 #, 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 "Finland"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Spain"
+msgstr "Español"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
+msgid "Danmark"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Germany"
+msgstr "Alemán"
+
+#: ../rpmdrake.pm: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 "Czech Republic"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
+msgid "Costa Rica"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Korea"
-msgstr "Forzar"
+msgid "Canada"
+msgstr "Canadiano (Québec)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
+msgid "Brazil"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1164,38 +1173,29 @@ msgstr ""
 msgid "Belgium"
 msgstr "Belga"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Change medium"
-msgstr ""
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Mandrake Update"
-msgstr "Actualización de Linux-Mandrake"
+msgid "Australia"
+msgstr "serie"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "by size"
-msgstr ""
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Austria"
+msgstr "serie"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
+msgid "Info..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Files:\n"
+msgid "No"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
+msgid "Yes"
 msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:86
diff --git a/po/he.po b/po/he.po
index 745ad089..28837082 100644
--- a/po/he.po
+++ b/po/he.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grpmi-he\n"
-"POT-Creation-Date: 2003-05-02 20:15+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+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"
@@ -17,20 +17,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "מופעל?"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Path or mount point:"
-msgstr "נתיב �ו נקודת חיבור (mount) : "
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Portugal"
-msgstr "פורטוגל"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"ה�� להמשיך ?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -49,59 +45,102 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-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"
+"כלי זה יעזור לך לבחור �ת העדכוני� שהנך רוצה להתקין על המחשב שלך."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Name:"
-msgstr "ש�:"
+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.pm:1
-#, c-format
-msgid "Italy"
-msgstr "�יטליה"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"שגי�ה קרתה בעת התקנת החבילות:\n"
+"\n"
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "�יך לבחור �ת �תר המר�ה ב�ופן ידני"
+msgid "Problem during removal"
+msgstr "בעיה בזמן ההסרה"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "כתובת (URL):"
+msgid "Please wait, removing packages..."
+msgstr "נ� להמתין בעת הסרת החבילות..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "מספר חבילות צריכות להמחק"
+msgid "Please wait, reading packages database..."
+msgstr "נ� להמתין בעת קרי�ת מסד הנתוני� של החבילות..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Already existing update sources"
-msgstr "כבר קיי� מקור לעידקוני�"
+#, 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 "מכין חבילות להתקנה..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "מכין חבילות להתקנה..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "More information on package..."
-msgstr "עוד מידע על החבילות..."
+msgid "All requested packages were installed successfully."
+msgstr "כל החבילות המבוקשות הותקנו בהצלחה."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "כן"
+msgid "Everything installed successfully"
+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 ""
-"בחירת החבילה �ו החבילות הב�ות יבוטל כעת עקב תלויות\n"
-"\n"
+"ההתקנה הסתיימה; %s.\n"
 "\n"
+"כמה קבצי תצורה נוצרו בש�, `.rpmnew' �ו `.rpmsave'\n"
+"יש ב�פשרותך לעיין בה� בכדי להשלי� �ת עדכון המערכת שלך:"
 
 #: ../rpmdrake:1
 #, c-format
@@ -109,492 +148,510 @@ msgid "everything was installed correctly"
 msgstr "הכל הותקן בצורה תקינה."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during installation"
+msgstr "התגלו בעיות תוך כדי ההתקנה"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "מתקין �ת החבילה %s' (%s/%s)"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+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."
+"\n"
+"Error(s) reported:\n"
+"%s"
 msgstr ""
-"ברוך בו�ך לכלי העזר להסרת חבילות תוכנה!\n"
 "\n"
-"כלי זה יעזור לך לבחור �יזה חבילות �תה רוצה להסיר מהמחשב שלך."
+"\n"
+"דוח שגי�ות:\n"
+"%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 "בכדי לשמור �ת השינויי�, עליך להכניס �ת המדיה �ל הכונן."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Save and quit"
-msgstr "שמירה ויצי�ה"
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
+msgstr ""
+"ההתקנה נכשלה, כמה קבצי� חסרי�.\n"
+"יתכן שעלייך לעדכן �ת בסיס הנתוני� של מ�גרי התוכנה."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"The following packages have bad signatures:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"שגי�ה קרתה בעת התקנת החבילות:\n"
+"החבילות הב�ות יוסרו על מנת ל�פשר שדרוג של חבילות �חרות:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"ה�� להמשיך ?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Size: "
-msgstr "גודל : "
+msgid "Verifying packages signatures..."
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Security updates"
-msgstr "עדכוני �בטחה"
+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 "ביטול"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl: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]"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "מידע מירבי"
+msgid "Change medium"
+msgstr "החלפת מדיה"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, c-format
+msgid "Initializing..."
+msgstr "מ�תחל..."
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "שגי�ה..."
+msgid "Package installation..."
+msgstr "מכין חבילות להתקנה..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr "צר לי, רק משתמש על יכול להתקין חבילות."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "בריטניה"
+msgid "Unable to get source packages."
+msgstr "ייבו� חבילות מהמ�גר �ינו �פשרי"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure sources"
-msgstr "הגדרת מ�גרי�"
+msgid "Inspect..."
+msgstr "בחינה ...."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "בשמות"
+msgid "Installation finished"
+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 ""
-"�ין �פשרות למצו� �תר מת�י�.\n"
-"\n"
-"ישנן מספר סיבות �פשריות לבעיה מעין זו, שהנפוצה בהן הי� ש�רכיטקטורת\n"
-"המעבד הר�שי במחשב שלך ל� נתמכת על-ידי העדכוני� הרשמיי� של מנדרייק\n"
-"לינוקס."
+msgid "Do nothing"
+msgstr "ל� לעשות כלו�"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
-"\n"
-"\\Do you want to continue installation?"
-msgstr ""
-"החבילות הב�ות יוסרו על מנת ל�פשר שדרוג של חבילות �חרות:\n"
-"\n"
-"%s\n"
-"\n"
-"ה�� להמשיך ?"
+#, c-format
+msgid "Use .%s as main file"
+msgstr "שימוש ב .%s כקובץ ר�שי"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Remove .%s"
 msgstr "הסרת .%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Source"
-msgstr "מ�גר"
+msgid "changes:"
+msgstr "שינויי�:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "פינלנד"
+msgid "Inspecting %s"
+msgstr "בחינת %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
+msgid "Please wait, finding available packages..."
+msgstr "נ� להמתין בעת חיפוש חבילות זמינות..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "France"
-msgstr "צרפת"
+msgid "Please wait, adding medium..."
+msgstr "נ� להמתין בעת הוספת המ�גר..."
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "More info"
-msgstr "עוד מידע "
+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."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "�יך לבחור �ת �תר המר�ה ב�ופן ידני"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"%s\n"
+"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"
-"Is it ok to continue?"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"%s\n"
-"\n"
-"ה�� להמשיך ?"
+"יש לך לפחות מקור �חד לעידקוני� ,�בל\n"
+"כול המקורות כרגע מבוטלי� �תה צריך להריץ �ת מנהל \n"
+"מקורות עידקוני� ל�פשר לפחות מקור �חד (תבדוק �ת העמודה של �ישור )\n"
+"ו�ז התחל �ת מנהל העידקוני�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "טעינה מחדש של רשימת החבילות"
+msgid "Already existing update sources"
+msgstr "כבר קיי� מקור לעידקוני�"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
-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"
+"ה�� ניתן להמשיך?"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Adding a source:"
-msgstr "הוספת מ�גר: "
+msgid "A fatal error occurred: %s."
+msgstr "שגי�ה חמורה קרתה : %s."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "�ין �פשרות להתקין �ת החבילה '%s'\n"
+msgid "Fatal error"
+msgstr "שגי�ה בקובץ"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
+msgid "Software Packages Installation"
 msgstr "מכין חבילות להתקנה..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages,"
-msgstr "כל החבילות,"
+msgid "Mandrake Update"
+msgstr "עדכון מנדרייק"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "בקבצי�"
+msgid "Software Packages Removal"
+msgstr "הסרת חבילות תוכנה"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "כל החבילות המבוקשות הותקנו בהצלחה."
+msgid "Quit"
+msgstr "יצי�ה"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "ש� המחשב המ�רח של השרת המתווך:"
+msgid "Install"
+msgstr "התקנה"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update source(s)"
-msgstr "עדכון מ�גר/י�"
+msgid "Remove"
+msgstr "הסרה"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "קבצי� מקומיי�"
+msgid "Help"
+msgstr "עזרה"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "בחינת %s"
+msgid "Search"
+msgstr "חיפוש"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Israel"
-msgstr "ישר�ל"
+msgid "Find:"
+msgstr "חיפוש:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Help"
-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"
+"ה�� להמשיך ?"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "שרת HTTP"
+msgid "Some packages need to be removed"
+msgstr "מספר חבילות צריכות להמחק"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"Welcome to the packages source editor!\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"
-"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."
+"Do you really want to install all the selected packages?"
 msgstr ""
-"ברוך בו�ך ל\"עורך מקורות התוכנה\"\n"
+"�זהרה! נר�ה שכמות החבילות שנדרש להתקין עלול לגרו�\n"
+"לכך שהכונן הקשיח יתמל� לחלוטין; מצב מסוכן במיוחד \n"
+"בעת התקנת חבילות שיש להימנע ממנו.\n"
 "\n"
-"כלי זה יעזור לך להגדיר �ת מ�גרי התוכנה להתקנת חבילות שבהן ברצונך להשתמש\n"
-"במחשב זה. מ�גרי� �לו ישמשו להתקנת חבילות תוכנה חדשות �ו על-מנת לעדכן\n"
-"�ת המערכת."
+"ה�� �כן ברצונך להתקין �ת כל החבילות שבחרת ?"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "מימשק HTTP נכשל\n"
+#, c-format
+msgid "Too many packages are selected"
+msgstr "נבחרו יותר מידי חבילות"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "שימוש ב .%s כקובץ ר�שי"
+msgid "Maximum information"
+msgstr "מידע מירבי"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results"
-msgstr "תוצ�ות חיפוש"
+msgid "Normal information"
+msgstr "מידע רגיל"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, c-format
-msgid " failed!"
-msgstr " נכשל!"
+msgid "Update source(s)"
+msgstr "עדכון מ�גר/י�"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Brazil"
-msgstr "ברזיל"
+msgid "Reload the packages list"
+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 "Reset the selection"
+msgstr "�יפוס הבחירה"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "חיפוש:"
+msgid "in files"
+msgstr "בקבצי�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "כל החבילות, �לפבתי"
+msgid "in descriptions"
+msgstr "בתי�ורי�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "נ� להמתין בעת החיפוש..."
+msgid "in names"
+msgstr "בשמות"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "נ� להמתין בעת קרי�ת מסד הנתוני� של החבילות..."
+msgid "by update availability"
+msgstr "על פי נגישות עדכון"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "ל� יכול לפתוח �ת החבילה '%s'\n"
+#, c-format
+msgid "by source repository"
+msgstr "לפי מ�גר התוכנה"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "�יפוס הבחירה"
+msgid "by selection state"
+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 ""
-"�� נדרשת הגדרת שרת מתווך, יש להגדיר �ת ש� המחשב המ�רח וממשק (port) �ופציונלי "
-"(תחביר: <proxyhost[:port]>):"
+msgid "by size"
+msgstr "על פי גודל"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"החבילות הב�ות צריכות להימחק בגלל התלויות שלהן:\n"
-"\n"
+msgid "by group"
+msgstr "על פי קבוצה"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "קוסטה-ריקו"
+msgid "All packages,"
+msgstr "כל החבילות,"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"שגי�ה קרתה בעת התקנת החבילות:\n"
-"\n"
-"%s"
-
-#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "נ� להמתין בעת הסרת המ�גר..."
+msgid "All packages, alphabetical"
+msgstr "כל החבילות, �לפבתי"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "סיסמה:"
+msgid "Mandrake choices"
+msgstr "בחירות מנדרייק"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "בחינת קובץ מרוחק במ�גר `%s'..."
+msgid "Normal updates"
+msgstr "עדכוני� רגילי�"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "טיוו�ן"
+msgid "Bugfixes updates"
+msgstr "תיקוני ב�גי�"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "User:"
-msgstr "משתמש: "
+msgid "Security updates"
+msgstr "עדכוני �בטחה"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "נ� להמתין בעת עדכון המ�גר..."
+msgid "Description: "
+msgstr "תי�ור: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "נ� להמתין בעת הכנת רשימת חבילות..."
+msgid "Reason for update: "
+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 ""
-"יש לך לפחות מקור �חד לעידקוני� ,�בל\n"
-"כול המקורות כרגע מבוטלי� �תה צריך להריץ �ת מנהל \n"
-"מקורות עידקוני� ל�פשר לפחות מקור �חד (תבדוק �ת העמודה של �ישור )\n"
-"ו�ז התחל �ת מנהל העידקוני�"
+msgid "Summary: "
+msgstr "סיכו�:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Information on packages"
-msgstr "מידע על החבילות"
+msgid "Importance: "
+msgstr "חשיבות : "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "ביטול"
+msgid "%s KB"
+msgstr "%s KB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "הכל הותקן בהצלחה."
+msgid "Size: "
+msgstr "גודל : "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "נ� להמתין בעת עדכון המ�גר..."
+msgid "Version: "
+msgstr "גרסה: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr "שגי�ה חמורה קרתה : %s."
+msgid "Name: "
+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 "Currently installed version: "
+msgstr "הגירסה המותקנת כרגע: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "בתי�ורי�"
+msgid "Source: "
+msgstr "מ�גר: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "הגדרת שרתי� מתווכי�"
+msgid "(Not available)"
+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 "Changelog:\n"
+msgstr "רשימת שינויי�:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "נ� לבחור"
+msgid "Files:\n"
+msgstr "קבצי�:\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "גודל נבחר: %d MB"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add a source"
-msgstr "הוספת מ�גר"
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "מ�תחל..."
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "גודל נבחר : %d MB /מקו� פנוי : %d MB"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "שמירת שינויי�"
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
+msgstr ""
+"בחירת החבילה �ו החבילות הב�ות יבוטל כעת עקב תלויות\n"
+"\n"
+"\n"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
-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 "Package installation..."
-msgstr "מכין חבילות להתקנה..."
+msgid "%s conflicts with %s"
+msgstr "סתירה ע�"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Importance: "
-msgstr "חשיבות : "
+#, fuzzy, c-format
+msgid "Some packages can't be installed"
+msgstr "�ין �פשרות להתקין �ת החבילה '%s'\n"
 
 #: ../rpmdrake:1
 #, c-format
@@ -607,83 +664,76 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "הוספה..."
+msgid "Additional packages needed"
+msgstr "חבילות נוספות נדרשות"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Unable to create medium."
-msgstr "הגדרת המ�גר נכשלה."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "�ין �פשרות להתקין �ת החבילה '%s'\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Removing these packages would break your system, sorry:\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"
-"יש ב�פשרותך לעיין בה� בכדי להשלי� �ת עדכון המערכת שלך:"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Browse..."
-msgstr "דפדוף..."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "�ין �פשרות להתקין �ת החבילה '%s'\n"
-
-#: ../rpmdrake.pm:1
 #, c-format
-msgid "Info..."
-msgstr "מידע..."
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\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 "Some additional packages need to be removed"
+msgstr "יש להסיר מספר חבילות נוספות"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "הסרה"
+msgid "More information on package..."
+msgstr "עוד מידע על החבילות..."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "מכין חבילות להתקנה..."
-
-#: ../rpmdrake.pm:1
 #, c-format
-msgid "No mirror"
-msgstr "�ין שרת"
+msgid "Information on packages"
+msgstr "מידע על החבילות"
 
-#: ../edit-urpm-sources.pl:1
+#. -PO: Keep it short, this is gonna be on a button
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "עליך למל� לפחות �ת שתי הכניסות הר�שונות."
+msgid "More info"
+msgstr "עוד מידע "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "התקנה"
+msgid "Addable"
+msgstr "בעלות יכולות הוספה"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "יפן"
+msgid "Upgradable"
+msgstr "בעלות יכולת שדרוג"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-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:1
 #, c-format
@@ -692,342 +742,380 @@ msgstr "ל� לעדכן"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Description: "
-msgstr "תי�ור: "
+msgid "(none)"
+msgstr "(כלו�)"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"ההתקנה נכשלה, כמה קבצי� חסרי�.\n"
-"יתכן שעלייך לעדכן �ת בסיס הנתוני� של מ�גרי התוכנה."
+msgid "Please wait, listing packages..."
+msgstr "נ� להמתין בעת הכנת רשימת חבילות..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "ל� יכול לפתוח �ת החבילה '%s'\n"
 
 #: ../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"
-"ה�� �כן ברצונך להתקין �ת כל החבילות שבחרת ?"
+msgid "One of the following packages is needed:"
+msgstr "�חת החבילות הב�ות דרושה:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "ש�: "
+msgid "Please choose"
+msgstr "נ� לבחור"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "בחינה ...."
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "מכין חבילות להתקנה..."
+msgid "Not selected"
+msgstr "התגלו סתירות"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "�וסטרליה"
+msgid "Selected"
+msgstr "נבחרה"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation finished"
-msgstr "ההתקנה נגמרה"
+msgid "Search results"
+msgstr "תוצ�ות חיפוש"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
-msgstr "על פי נגישות עדכון"
+msgid "Stop"
+msgstr "עצירה"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
-msgstr "פולין"
+msgid "Please wait, searching..."
+msgstr "נ� להמתין בעת החיפוש..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Version: "
-msgstr "גרסה: "
+msgid "Search results (none)"
+msgstr "תוצ�ות חיפוש (כלו�)"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "�חר"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "ב�פשרותך לספק ש� מישתמש/סיסמה לצורך הזדהות בשרת המתווך:"
+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 "Editing source \\\"%s\\\":"
-msgstr "עריכת מ�גר \"%s\":"
+msgid "Proxy..."
+msgstr "שגי�ה..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Upgradable"
-msgstr "בעלות יכולת שדרוג"
+msgid "Update..."
+msgstr "עדכון..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid " done."
-msgstr " סיו�."
+msgid "Add..."
+msgstr "הוספה..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "מכין חבילות להתקנה..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "עריכה"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "בחינת קובץ במ�גר `%s'..."
+msgid "Source"
+msgstr "מ�גר"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "חבילות נוספות נדרשות"
+msgid "Enabled?"
+msgstr "מופעל?"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "תיקוני ב�גי�"
+msgid "Configure sources"
+msgstr "הגדרת מ�גרי�"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "הורדה של `%s', זמן נותר:%s, במהירות: %s"
+msgid "Password:"
+msgstr "סיסמה:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Germany"
-msgstr "גרמניה"
+msgid "User:"
+msgstr "משתמש: "
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Russia"
-msgstr "רוסיה"
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "ב�פשרותך לספק ש� מישתמש/סיסמה לצורך הזדהות בשרת המתווך:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Norway"
-msgstr "נורווגיה"
+msgid "Proxy hostname:"
+msgstr "ש� המחשב המ�רח של השרת המתווך:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-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 ""
+"�� נדרשת הגדרת שרת מתווך, יש להגדיר �ת ש� המחשב המ�רח וממשק (port) �ופציונלי "
+"(תחביר: <proxyhost[:port]>):"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search"
-msgstr "חיפוש"
+msgid "Configure proxies"
+msgstr "הגדרת שרתי� מתווכי�"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit a source"
-msgstr "עריכת מ�גר"
+msgid "Please wait, updating medium..."
+msgstr "נ� להמתין בעת עדכון המ�גר..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Czech Republic"
-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 "Stop"
-msgstr "עצירה"
+msgid "You need to insert the medium to continue"
+msgstr "עליך להכניס �ת המדיה בכדי להמשיך."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "עדכון"
+msgid "Save changes"
+msgstr "שמירת שינויי�"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "נ� להמתין בעת הסרת החבילות..."
+msgid "Relative path to synthesis/hdlist:"
+msgstr "הנתיב לקובץ synthesis/hdlist:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal information"
-msgstr "מידע רגיל"
+msgid "URL:"
+msgstr "כתובת (URL):"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing source \"%s\":"
+msgstr "עריכת מ�גר \"%s\":"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "מוריד �ת החבילה %s' (%s/%s)"
+msgid "Edit a source"
+msgstr "עריכת מ�גר"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "גודל נבחר : %d MB /מקו� פנוי : %d MB"
+msgid "Please wait, removing medium..."
+msgstr "נ� להמתין בעת הסרת המ�גר..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Spain"
-msgstr "ספרד"
+msgid "Type of source:"
+msgstr "סוג המ�גר:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
-msgstr "עדכוני� רגילי�"
+msgid "Adding a source:"
+msgstr "הוספת מ�גר: "
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by selection state"
-msgstr "על פי מצב בחירה"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"כבר יש מ�גר בש� זה, ה�� ברצונך \n"
+"להחליף �ותו ?"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr " נ� להמתין בעת הורדת כתובות �תרי מר�ה מ�תר MandrakeSoft"
+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
 msgid "Login:"
 msgstr "ש� מישתמש:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Austria"
-msgstr "�וסטריה"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Fatal error"
-msgstr "שגי�ה בקובץ"
+msgid "Choose a mirror..."
+msgstr "בחירת �תר מר�ה..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "נ� לבחור �ת המ�גרי� �ות� ברצונך לעדכן:"
+msgid "Browse..."
+msgstr "דפדוף..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update..."
-msgstr "עדכון..."
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "בודק חות� זיהוי של '%s'..."
+msgid "Path or mount point:"
+msgstr "נתיב �ו נקודת חיבור (mount) : "
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
-msgstr "(כלו�)"
+msgid "Removable device"
+msgstr "התקן ניתן להסרה"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
-"הסרת החבילות הב�ות, תהרוס לך �ת המערכת. מצטער: \n"
-"\n"
+msgid "HTTP server"
+msgstr "שרת HTTP"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "מתקין �ת החבילה %s' (%s/%s)"
+msgid "FTP server"
+msgstr "שרת FTP"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "הגירסה המותקנת כרגע: "
+msgid "Path:"
+msgstr "נתיב:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Other"
-msgstr "�חר"
+msgid "Local files"
+msgstr "קבצי� מקומיי�"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reason for update: "
-msgstr "סיבת העדכון: "
+msgid "Add a source"
+msgstr "הוספת מ�גר"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Please choose the desired mirror."
-msgstr "נ� לבחור �ת השרת �ליו ברצונך להתחבר."
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr ""
+"עדכון המ�גר נכשל, מ�גר זה ינוטרל ב�ופן �וטומטי.\n"
+"\n"
+"שגי�ות:\n"
+"%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "עריכה"
+msgid "Unable to create medium."
+msgstr "הגדרת המ�גר נכשלה."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, finding available packages..."
-msgstr "נ� להמתין בעת חיפוש חבילות זמינות..."
+msgid "Update"
+msgstr "עדכון"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "הנתיב לקובץ synthesis/hdlist:"
+msgid "Select the source(s) you wish to update:"
+msgstr "נ� לבחור �ת המ�גרי� �ות� ברצונך לעדכן:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results (none)"
-msgstr "תוצ�ות חיפוש (כלו�)"
+msgid "Please wait, updating media..."
+msgstr "נ� להמתין בעת עדכון המ�גר..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Danmark"
-msgstr "דנמרק"
+msgid " failed!"
+msgstr " נכשל!"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "סין"
+msgid " done."
+msgstr " סיו�."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United States"
-msgstr "�רה\"ב"
+msgid "Download of `%s', speed:%s"
+msgstr "הורדה של `%s' במהירות: %s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "changes:"
-msgstr "שינויי�:"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "הורדה של `%s', זמן נותר:%s, במהירות: %s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "בודק חות� זיהוי של '%s'..."
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "יש להסיר מספר חבילות נוספות"
+msgid "Examining distant file of source `%s'..."
+msgstr "בחינת קובץ מרוחק במ�גר `%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Examining file of source `%s'..."
+msgstr "בחינת קובץ במ�גר `%s'..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No"
-msgstr "ל�"
+msgid "Copying file for source `%s'..."
+msgstr "העתקת קובץ מהמ�גר `%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Summary: "
-msgstr "סיכו�:"
+msgid "Please choose the desired mirror."
+msgstr "נ� לבחור �ת השרת �ליו ברצונך להתחבר."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "קנדה"
+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.pm:1
 #, c-format
-msgid "Greece"
-msgstr "יוון"
+msgid "No mirror"
+msgstr "�ין שרת"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1044,266 +1132,178 @@ msgstr ""
 "יתכן והרשת, �ו ה�תר של MandrakeSoft �ינ� זמיני�.\n"
 "נ� לנסות שוב מ�וחר יותר."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Source: "
-msgstr "מ�גר: "
-
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "העתקת קובץ מהמ�גר `%s'..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "צר לי, רק משתמש על יכול להתקין חבילות."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Path:"
-msgstr "נתיב:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Problem during removal"
-msgstr "בעיה בזמן ההסרה"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "by source repository"
-msgstr "לפי מ�גר התוכנה"
+msgid "Error during download"
+msgstr "שגי�ה בזמן הורדה"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Selected"
-msgstr "נבחרה"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr " נ� להמתין בעת הורדת כתובות �תרי מר�ה מ�תר MandrakeSoft"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Netherlands"
-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 על מנת לייב� �ת רשימת �תרי המר�ה.\n"
+"נ� לבדוק שהמחשב שלך מחובר לרשת.\n"
+"\n"
+"ה�� ניתן להמשיך?"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "בעלות יכולות הוספה"
+msgid "United States"
+msgstr "�רה\"ב"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
-msgstr "(ל�-זמין)"
+msgid "China"
+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"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr "התגלו סתירות"
+msgid "United Kingdom"
+msgstr "בריטניה"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "הסרת חבילות תוכנה"
+msgid "Taiwan"
+msgstr "טיוו�ן"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Sweden"
 msgstr "שוודיה"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
-msgstr ""
-"\n"
-"\n"
-"דוח שגי�ות:\n"
-"%s"
+msgid "Russia"
+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."
-msgstr ""
-"רשימת העידכוני� ריקה. מצב זה יכול לקרות ב��\n"
-"�ין עדכוני� זמיני� עבור החבילות המותקנות במחשבך,\n"
-"�ו שכבר התקנת �ת כל העידכוני�."
+msgid "Portugal"
+msgstr "פורטוגל"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "הורדה של `%s' במהירות: %s"
+msgid "Poland"
+msgstr "פולין"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "�חת החבילות הב�ות דרושה:"
+msgid "Norway"
+msgstr "נורווגיה"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "יצי�ה"
+msgid "Netherlands"
+msgstr "הולנד"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 ""
-"יש צורך להתחבר לשרת על מנת לייב� �ת החבילות המעודכנות.\n"
-"נ� לבדוק שהמחשב שלך מחובר לרשת.\n"
-"\n"
-"ה�� ניתן להמשיך?"
+msgid "Korea"
+msgstr "קורי�ה"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "�ישור"
+msgid "Japan"
+msgstr "יפן"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "נ� להמתין בעת הוספת המ�גר..."
+msgid "Italy"
+msgstr "�יטליה"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "סוג המ�גר:"
+msgid "Israel"
+msgstr "ישר�ל"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please insert the medium named \\\"%s\\\" on device [%s]"
-msgstr "נ� להכניס �ת המדיה בש� \"%s\" להתקן [%s]"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "יוון"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to get source packages."
-msgstr "ייבו� חבילות מהמ�גר �ינו �פשרי"
+msgid "France"
+msgstr "צרפת"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "נבחרו יותר מידי חבילות"
+msgid "Finland"
+msgstr "פינלנד"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "סתירה ע�"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "ספרד"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Danmark"
+msgstr "דנמרק"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "בחירות מנדרייק"
+msgid "Germany"
+msgstr "גרמניה"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Czech Republic"
+msgstr "הרפובליקה הצ'כית"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "רשימת שינויי�:\n"
+msgid "Costa Rica"
+msgstr "קוסטה-ריקו"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Korea"
-msgstr "קורי�ה"
+msgid "Canada"
+msgstr "קנדה"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "התקן ניתן להסרה"
+msgid "Brazil"
+msgstr "ברזיל"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "בלגיה"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Change medium"
-msgstr "החלפת מדיה"
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "עדכון מנדרייק"
+msgid "Australia"
+msgstr "�וסטרליה"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by size"
-msgstr "על פי גודל"
+msgid "Austria"
+msgstr "�וסטריה"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "שרת FTP"
+msgid "Info..."
+msgstr "מידע..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Files:\n"
-msgstr "קבצי�:\n"
+msgid "No"
+msgstr "ל�"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr ""
-"עדכון המ�גר נכשל, מ�גר זה ינוטרל ב�ופן �וטומטי.\n"
-"\n"
-"שגי�ות:\n"
-"%s"
+msgid "Yes"
+msgstr "כן"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
diff --git a/po/hr.po b/po/hr.po
index f184caef..3c3ff5cd 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grpmi\n"
-"POT-Creation-Date: 2003-05-02 20:15+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+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,21 +14,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KTranslator v 0.5.0\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Enabled?"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
 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 ""
@@ -41,138 +34,125 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
 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 "How to choose manually your mirror"
+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
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "URL:"
-msgstr "URL: "
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr "Pripremam se za instalaciju"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Some packages need to be removed"
-msgstr ""
+#, fuzzy, c-format
+msgid "Problem during removal"
+msgstr "Dogodili su se problemi prilikom instalacije"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Already existing update sources"
+#, fuzzy, c-format
+msgid "Please wait, removing packages..."
 msgstr ""
+"Molimo prièekajte\n"
+"Sortiram pakete"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "More information on package..."
-msgstr ""
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Yes"
+#, fuzzy, c-format
+msgid "Please wait, reading packages database..."
 msgstr ""
+"Molimo prièekajte\n"
+"Sortiram pakete"
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"There was a problem during the installation:\n"
 "\n"
-msgstr ""
+"%s"
+msgstr "Pripremam se za instalaciju"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "everything was installed correctly"
-msgstr "Paket je veæ instaliran"
+msgid "Installation failed"
+msgstr "Instaliraj sve"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "%s KB"
-msgstr "%.1f KB"
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "Pripremam se za instalaciju"
 
 #: ../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 ""
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "Pripremam se za instalaciju"
 
-#: ../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 "All requested packages were installed successfully."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
+msgid "Everything installed successfully"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"The installation is finished; %s.\n"
 "\n"
-"%s"
-msgstr "Pripremam se za instalaciju"
+"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 "Size: "
-msgstr "Velièina"
+msgid "everything was installed correctly"
+msgstr "Paket je veæ instaliran"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Security updates"
-msgstr "Prika¾i sigurnosne nadogradnje"
+msgid "Problem during installation"
+msgstr "Dogodili su se problemi prilikom instalacije"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
+msgid "Installing package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Gre¹ka..."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "United Kingdom"
-msgstr "Ujedinjeno Kraljevstvo"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Configure sources"
-msgstr "Podesiti izvor?"
+msgid "Preparing packages installation..."
+msgstr "Pripremam se za instalaciju"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
 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."
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
 msgstr ""
 
 #: ../rpmdrake:1
@@ -182,367 +162,341 @@ msgid ""
 "\n"
 "%s\n"
 "\n"
-"\\Do you want to continue installation?"
+"Do you want to continue installation?"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Remove .%s"
-msgstr "Prenosivi medij"
-
-#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Source"
-msgstr "Izvor"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Finland"
-msgstr "Pronaði:"
+msgid "Verifying packages signatures..."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
+msgid "Downloading package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "France"
-msgstr "Prisili"
+#: ../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"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "More info"
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
+msgid "Change medium"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Reload the packages list"
-msgstr "Paket %s nije potpisan"
+msgid "Initializing..."
+msgstr "Instaliram:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Choose a mirror..."
-msgstr "Izaberite mirror:"
+msgid "Package installation..."
+msgstr "Pripremam se za instalaciju"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Adding a source:"
-msgstr ""
-"Molim prièekajte\n"
-"Dodajem izvor"
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Lo¹i, neèitljivi ili nisu pronaðeni paketi"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Nisam u stanju instalirati paket"
+msgid "Unable to get source packages."
+msgstr "Izaberite va¹e pakete"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Pripremam se za instalaciju"
+#, c-format
+msgid "Inspect..."
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "All packages,"
-msgstr "0 paketa, 0 byte-ova"
+msgid "Installation finished"
+msgstr "Instalirano"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "in files"
-msgstr "Lokalno"
+msgid "Do nothing"
+msgstr "ali ne odgovara"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
+msgid "Use .%s as main file"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Proxy hostname:"
-msgstr "Proxy korisnik:"
-
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Update source(s)"
-msgstr "A¾uriraj izvore"
+msgid "Remove .%s"
+msgstr "Prenosivi medij"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Local files"
-msgstr "Lokalno"
+msgid "changes:"
+msgstr "Paketi"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspecting %s"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Israel"
-msgstr "Instaliraj"
-
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Help"
-msgstr "/_Pomoæ"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "HTTP server"
+msgid "Please wait, finding available packages..."
 msgstr ""
+"Molimo prièekajte\n"
+"Sortiram pakete"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, adding medium..."
+msgstr "Provjeravam ovisnosti..."
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"Welcome to the packages source editor!\n"
+"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"
-"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 ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Instaliraj sve"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
+msgid "How to choose manually your mirror"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Search results"
-msgstr "Rezultati pretra¾ivanja"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid " failed!"
-msgstr "Lokalno"
-
-#: ../rpmdrake.pm:1
 #, c-format
-msgid "Brazil"
-msgstr "Brazil"
+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 ""
 
-#: ../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 "Already existing update sources"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Pronaði:"
+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
 #, c-format
-msgid "All packages, alphabetical"
+msgid "A fatal error occurred: %s."
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, searching..."
-msgstr "Molimo prièekajte dok rpm uklanja navedene pakete:"
+msgid "Fatal error"
+msgstr "Gre¹a pri pisanju\n"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, reading packages database..."
-msgstr ""
-"Molimo prièekajte\n"
-"Sortiram pakete"
+msgid "Software Packages Installation"
+msgstr "Pripremam se za instalaciju"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "unknown package "
-msgstr "nepoznato"
+msgid "Mandrake Update"
+msgstr "MandrakeUpdate postavke"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Software Packages Removal"
+msgstr " Upravitelj programima "
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reset the selection"
-msgstr ""
+msgid "Quit"
+msgstr "Zavr¹i"
 
-#: ../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 ""
+msgid "Install"
+msgstr "Instaliraj"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Remove"
+msgstr "Popis za uklanjanje"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
+msgid "Help"
+msgstr "/_Pomoæ"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Search"
+msgstr "potraga"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "Pronaði:"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
 "\n"
+"Is it ok to continue?"
 msgstr ""
-"U pravilu da zadovoljite sve ovisnosti,\n"
-"slijedeæi paketi biti æe uklonjeni:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Kosta Rika"
+msgid "Some packages need to be removed"
+msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"There was a problem during the installation:\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"
-"%s"
-msgstr "Pripremam se za instalaciju"
+"Do you really want to install all the selected packages?"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, removing medium..."
-msgstr "Provjeravam ovisnosti..."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Password:"
-msgstr "Lozinka:"
+msgid "Too many packages are selected"
+msgstr "Paketa veæ instalirano"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
+msgid "Maximum information"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Taiwan"
-msgstr "Tajland"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "User:"
-msgstr "Korisnik:"
+msgid "Normal information"
+msgstr "normalne dogradnje"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Please wait, updating medium..."
-msgstr "Provjeravam ovisnosti..."
+msgid "Update source(s)"
+msgstr "A¾uriraj izvore"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, listing packages..."
-msgstr ""
-"Molimo prièekajte\n"
-"Sortiram pakete"
+msgid "Reload the packages list"
+msgstr "Paket %s nije potpisan"
 
 #: ../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
 #, fuzzy, c-format
-msgid "Information on packages"
-msgstr "Izaberite va¹e pakete"
+msgid "in files"
+msgstr "Lokalno"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Cancel"
-msgstr "Odustani"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "in descriptions"
+msgstr "Opisi"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
+msgid "in names"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Please wait, updating media..."
-msgstr "Provjeravam ovisnosti..."
-
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
+msgid "by update availability"
 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 "by source repository"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "in descriptions"
-msgstr "Opisi"
+#, c-format
+msgid "by selection state"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Configure proxies"
-msgstr "Podesiti izvor?"
+msgid "by size"
+msgstr "Veliè. Dub."
 
-#: ../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 "by group"
 msgstr ""
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "All packages,"
+msgstr "0 paketa, 0 byte-ova"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
+msgid "All packages, alphabetical"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Selected size: %d MB"
-msgstr "%d izabranih paketa: %.1f MB"
+msgid "Mandrake choices"
+msgstr "MandrakeDogradnja"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Add a source"
-msgstr ""
-"Molim prièekajte\n"
-"Dodajem izvor"
+msgid "Normal updates"
+msgstr "Normalne nadogradnje"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Initializing..."
-msgstr "Instaliram:"
+msgid "Bugfixes updates"
+msgstr "Prika¾i ispravke gre¹aka"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Save changes"
-msgstr "Paketi"
+msgid "Security updates"
+msgstr "Prika¾i sigurnosne nadogradnje"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Description: "
+msgstr "Opisi"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
+msgid "Reason for update: "
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Pripremam se za instalaciju"
+msgid "Summary: "
+msgstr "Sumarno"
 
 #: ../rpmdrake:1
 #, c-format
@@ -550,673 +504,719 @@ msgid "Importance: "
 msgstr ""
 
 #: ../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 "%s KB"
+msgstr "%.1f KB"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add..."
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Size: "
+msgstr "Velièina"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unable to create medium."
-msgstr "Ne mogu napraviti report datoteku, prekidam.\n"
+msgid "Version: "
+msgstr "Verzija:"
 
 #: ../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 ""
+#, fuzzy, c-format
+msgid "Name: "
+msgstr "Ime: %s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
+msgid "Currently installed version: "
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "Nisam u stanju instalirati paket"
+msgid "Source: "
+msgstr "Izvor"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
+msgid "(Not available)"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
+msgid "Changelog:\n"
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Remove"
-msgstr "Popis za uklanjanje"
-
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Pripremam se za instalaciju"
+msgid "Files:\n"
+msgstr "/_Datoteka"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No mirror"
-msgstr "mirror:"
+msgid "Selected size: %d MB"
+msgstr "%d izabranih paketa: %.1f MB"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
+msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Instaliraj"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Japan"
-msgstr "Japan"
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
+msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Do nothing"
-msgstr "ali ne odgovara"
+#, 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 "No update"
-msgstr "Napravi Nadogradnje"
+msgid "%s conflicts with %s"
+msgstr " je u konfliktu s %s-%s-%s"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Description: "
-msgstr "Opisi"
+msgid "Some packages can't be installed"
+msgstr "Nisam u stanju instalirati paket"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
 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 "Additional packages needed"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Name: "
-msgstr "Ime: %s"
+msgid "Some packages can't be removed"
+msgstr "Nisam u stanju instalirati paket"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Pripremam se za instalaciju"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Australia"
-msgstr "Australija"
+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
 #, fuzzy, c-format
-msgid "Installation finished"
-msgstr "Instalirano"
+msgid "Some additional packages need to be removed"
+msgstr ""
+"Ovi dodatni paketi su potrebni da budu instalirani u pravilu da sve radi "
+"ispravno:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
+msgid "More information on package..."
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Poland"
-msgstr "Poljska"
-
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Version: "
-msgstr "Verzija:"
+msgid "Information on packages"
+msgstr "Izaberite va¹e pakete"
 
-#: ../edit-urpm-sources.pl:1
+#. -PO: Keep it short, this is gonna be on a button
+#: ../rpmdrake:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
+msgid "More info"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Editing source \\\"%s\\\":"
-msgstr "A¾uriraj izvore"
+#: ../rpmdrake:1
+#, c-format
+msgid "Addable"
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Upgradable"
 msgstr "Nadogradi"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " done."
+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:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Pripremam se za instalaciju"
+msgid "No update"
+msgstr "Napravi Nadogradnje"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr ""
+msgid "(none)"
+msgstr "(nema)"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Additional packages needed"
+#, fuzzy, c-format
+msgid "Please wait, listing packages..."
 msgstr ""
+"Molimo prièekajte\n"
+"Sortiram pakete"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Bugfixes updates"
-msgstr "Prika¾i ispravke gre¹aka"
+msgid "unknown package "
+msgstr "nepoznato"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
+msgid "One of the following packages is needed:"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "Njemaèka"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Russia"
-msgstr "Ruska"
+msgid "Please choose"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Norway"
-msgstr "Norve¹ka"
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Dogodili su se problemi prilikom instalacije"
+msgid "Not selected"
+msgstr " je u konfliktu s %s-%s-%s"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Search"
-msgstr "potraga"
+msgid "Selected"
+msgstr ""
+"Izaberi\n"
+"sve"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Edit a source"
-msgstr "A¾uriraj izvore"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Czech Republic"
-msgstr "Èe¹ka Republika"
+msgid "Search results"
+msgstr "Rezultati pretra¾ivanja"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Stop"
 msgstr "Zaustavljanje"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Update"
-msgstr "Nadogradi"
-
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, removing packages..."
-msgstr ""
-"Molimo prièekajte\n"
-"Sortiram pakete"
+msgid "Please wait, searching..."
+msgstr "Molimo prièekajte dok rpm uklanja navedene pakete:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Normal information"
-msgstr "normalne dogradnje"
+msgid "Search results (none)"
+msgstr "Rezultati pretra¾ivanja"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr ""
+msgid "Other"
+msgstr "Ostali"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
+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 ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Spain"
-msgstr "©panjolska"
+msgid "Save and quit"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Normal updates"
-msgstr "Normalne nadogradnje"
+msgid "Proxy..."
+msgstr "Gre¹ka..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Update..."
+msgstr "Nadogradi"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by selection state"
+msgid "Add..."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
+msgid "Edit"
+msgstr "A¾uriraj"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Login:"
-msgstr "Login:"
+msgid "Source"
+msgstr "Izvor"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Austria"
-msgstr "Austrija"
+msgid "Enabled?"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Gre¹a pri pisanju\n"
+msgid "Configure sources"
+msgstr "Podesiti izvor?"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr ""
-"Molim odaberite izvore\n"
-"koje ¾elite dograditi:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "Lozinka:"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Update..."
-msgstr "Nadogradi"
+msgid "User:"
+msgstr "Korisnik:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Starting download of `%s'..."
+msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "(none)"
-msgstr "(nema)"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Proxy hostname:"
+msgstr "Proxy korisnik:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure proxies"
+msgstr "Podesiti izvor?"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, updating medium..."
+msgstr "Provjeravam ovisnosti..."
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
+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 "Currently installed version: "
+msgid "You need to insert the medium to continue"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Other"
-msgstr "Ostali"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Save changes"
+msgstr "Paketi"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "relativna putanja do synthesis ili hdlist: "
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Please choose the desired mirror."
-msgstr ""
-"Molimo prièekajte\n"
-"Dohvaæam listu mirror-a"
+msgid "URL:"
+msgstr "URL: "
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Edit"
-msgstr "A¾uriraj"
+#, fuzzy, c-format
+msgid "Editing source \"%s\":"
+msgstr "A¾uriraj izvore"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Please wait, finding available packages..."
-msgstr ""
-"Molimo prièekajte\n"
-"Sortiram pakete"
+msgid "Edit a source"
+msgstr "A¾uriraj izvore"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "relativna putanja do synthesis ili hdlist: "
+msgid "Please wait, removing medium..."
+msgstr "Provjeravam ovisnosti..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of source:"
+msgstr "Tip izvora:"
+
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Search results (none)"
-msgstr "Rezultati pretra¾ivanja"
+msgid "Adding a source:"
+msgstr ""
+"Molim prièekajte\n"
+"Dodajem izvor"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Danmark"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "China"
-msgstr "Kina"
+msgid "You need to fill up at least the two first entries."
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Name:"
+msgstr "Ime"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "United States"
-msgstr "Sjedinjene Amerièke Dr¾ave"
+msgid "Login:"
+msgstr "Login:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "changes:"
-msgstr "Paketi"
+msgid "Choose a mirror..."
+msgstr "Izaberite mirror:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Browse..."
+msgstr ""
+
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Some additional packages need to be removed"
+msgid "Path or mount point:"
+msgstr "putanja ili mjesto za montiranje: "
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Removable device"
 msgstr ""
-"Ovi dodatni paketi su potrebni da budu instalirani u pravilu da sve radi "
-"ispravno:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "HTTP server"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
+msgid "FTP server"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Summary: "
-msgstr "Sumarno"
+msgid "Path:"
+msgstr "Port:"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Canada"
-msgstr "Kanada"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Local files"
+msgstr "Lokalno"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Greece"
-msgstr "Grèka"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a source"
+msgstr ""
+"Molim prièekajte\n"
+"Dodajem izvor"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"There was an error downloading the mirrors list:\n"
+"Unable to update medium; it will be automatically disabled.\n"
 "\n"
-"%s\n"
-"The network, or MandrakeSoft website, are maybe unavailable.\n"
-"Please try again later."
+"Errors:\n"
+"%s"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Source: "
-msgstr "Izvor"
+msgid "Unable to create medium."
+msgstr "Ne mogu napraviti report datoteku, prekidam.\n"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr ""
+msgid "Update"
+msgstr "Nadogradi"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Lo¹i, neèitljivi ili nisu pronaðeni paketi"
+msgid "Select the source(s) you wish to update:"
+msgstr ""
+"Molim odaberite izvore\n"
+"koje ¾elite dograditi:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Path:"
-msgstr "Port:"
+msgid "Please wait, updating media..."
+msgstr "Provjeravam ovisnosti..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Problem during removal"
-msgstr "Dogodili su se problemi prilikom instalacije"
+msgid " failed!"
+msgstr "Lokalno"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by source repository"
+msgid " done."
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Selected"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Download of `%s', speed:%s"
 msgstr ""
-"Izaberi\n"
-"sve"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Netherlands"
-msgstr "Nizozemska"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
+msgid "Starting download of `%s'..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
+msgid "Examining distant file of source `%s'..."
 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 "Examining file of source `%s'..."
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr " je u konfliktu s %s-%s-%s"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Copying file for source `%s'..."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Software Packages Removal"
-msgstr " Upravitelj programima "
+msgid "Please choose the desired mirror."
+msgstr ""
+"Molimo prièekajte\n"
+"Dohvaæam listu mirror-a"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Sweden"
-msgstr "©vedska"
-
-#: ../rpmdrake: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
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "No mirror"
+msgstr "mirror:"
+
+#: ../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."
+"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
 #, c-format
-msgid "Download of `%s', speed:%s"
+msgid "Error during download"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Quit"
-msgstr "Zavr¹i"
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
+"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 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "U Redu"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Please wait, adding medium..."
-msgstr "Provjeravam ovisnosti..."
+msgid "United States"
+msgstr "Sjedinjene Amerièke Dr¾ave"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "Tip izvora:"
+msgid "China"
+msgstr "Kina"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \\\"%s\\\" on device [%s]"
-msgstr ""
+msgid "United Kingdom"
+msgstr "Ujedinjeno Kraljevstvo"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Unable to get source packages."
-msgstr "Izaberite va¹e pakete"
+msgid "Taiwan"
+msgstr "Tajland"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "©vedska"
+
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Too many packages are selected"
-msgstr "Paketa veæ instalirano"
+msgid "Russia"
+msgstr "Ruska"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr " je u konfliktu s %s-%s-%s"
+msgid "Portugal"
+msgstr "Port:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 ""
+msgid "Poland"
+msgstr "Poljska"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
+msgstr "Norve¹ka"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
+msgstr "Nizozemska"
+
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Mandrake choices"
-msgstr "MandrakeDogradnja"
+msgid "Korea"
+msgstr "Prisili"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Japan"
+msgstr "Japan"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Italy"
+msgstr "Instaliraj"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Israel"
+msgstr "Instaliraj"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr ""
+msgid "Greece"
+msgstr "Grèka"
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Korea"
+msgid "France"
 msgstr "Prisili"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Finland"
+msgstr "Pronaði:"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
+msgid "Spain"
+msgstr "©panjolska"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
 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:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Change medium"
-msgstr ""
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Mandrake Update"
-msgstr "MandrakeUpdate postavke"
+msgid "Australia"
+msgstr "Australija"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "by size"
-msgstr "Veliè. Dub."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
+msgstr "Austrija"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
+msgid "Info..."
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Files:\n"
-msgstr "/_Datoteka"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
+msgid "Yes"
 msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:86
diff --git a/po/hu.po b/po/hu.po
index 637dbbef..97bab416 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grpmi 8.0\n"
-"POT-Creation-Date: 2003-05-02 20:15+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+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,20 +16,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-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
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Portugal"
-msgstr "Portugália"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Kívánja folytatni?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -48,58 +44,104 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-msgstr "csoport szerint"
+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."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Name:"
-msgstr "Név:"
+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."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Italy"
-msgstr "Telepítés"
+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"
 
 #: ../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"
+msgid "Problem during removal"
+msgstr "Probléma adódott az eltávolítás során"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "Please wait, removing packages..."
+msgstr "Csomagok eltávolítása folyamatban..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Bizonyos csomagokat el kell távolítani"
+msgid "Please wait, reading packages database..."
+msgstr "Csomag-adatbázis olvasása..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Already existing update sources"
+#, 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..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "More information on package..."
-msgstr "További információ a csomagról..."
+msgid "All requested packages were installed successfully."
+msgstr "Az összes kért csomag telepítve lett."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "Igen"
+msgid "Everything installed successfully"
+msgstr "Sikeresen telepítve lett minden"
 
 #: ../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 ""
-"A függõségeik miatt a következõ csomag(ok) kijelölését törölni kell:\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
 #, fuzzy, c-format
@@ -107,490 +149,506 @@ 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 "%s KB"
-msgstr "%s KByte"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "\"%s\" csomag telepítése (%s/%s)..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Csomagok elõkészítése a telepítéshez..."
 
 #: ../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."
+"\n"
+"Error(s) reported:\n"
+"%s"
 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."
+"\n"
+"Hibaüzenetek:\n"
+"%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."
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
 msgstr ""
-"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"
+"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
 #, fuzzy, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"The following packages have bad signatures:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"Hiba történt a csomagtelepítés közben:\n"
+"A következõ csomagokat el kell távolítani ahhoz, hogy más csomagokat\n"
+"frissíteni lehessen:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"Kívánja folytatni?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Size: "
-msgstr "Méret: "
+msgid "Verifying packages signatures..."
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Security updates"
-msgstr "Biztonsági frissítések"
+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"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "OK"
+
+#: ../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"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "Maximális mennyiségû információ"
+msgid "Change medium"
+msgstr "Adatforrás váltása"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, c-format
+msgid "Initializing..."
+msgstr "Inicializálás..."
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Hiba..."
+msgid "Package installation..."
+msgstr "Csomagok elõkészítése a telepítéshez..."
 
-#: ../rpmdrake.pm:1
+#: ../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 "United Kingdom"
-msgstr "Egyesült Királyság"
+msgid "Unable to get source packages."
+msgstr "A forráscsomagok letöltése sikertelen."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure sources"
-msgstr "Források beállítása"
+msgid "Inspect..."
+msgstr "Vizsgálat..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "a nevekben"
+msgid "Installation finished"
+msgstr "A telepítés befejezõdött"
 
-#: ../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 ""
-"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 "Do nothing"
+msgstr "Ne tegyen semmit"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
-"\n"
-"\\Do you want to continue installation?"
-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?"
+#, c-format
+msgid "Use .%s as main file"
+msgstr ".%s használata fõfájlként"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Remove .%s"
 msgstr ".%s eltávolítása"
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Source"
-msgstr "Akkor is"
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "Finnország"
+msgid "changes:"
+msgstr "módosítások:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "France"
-msgstr "Akkor is"
+msgid "Inspecting %s"
+msgstr "%s vizsgálata"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "More info"
-msgstr "További információ"
+#, c-format
+msgid "Please wait, finding available packages..."
+msgstr "A rendelkezésre álló csomagok lekérdezése..."
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
+msgid "Please wait, adding medium..."
+msgstr "Az adatforrás felvétele folyamatban..."
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"%s\n"
+"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"
-"Is it ok to continue?"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"%s\n"
+"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"
-"Kívánja folytatni?"
+"Ez után indítsa el újra a MandrakeUpdate programot."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "A csomaglista újraolvasása"
+msgid "How to choose manually your mirror"
+msgstr "Hogyan lehet tükörkiszolgálót választani saját kezûleg"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr "Válasszon ki egy tükröt..."
+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 ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Forrás felvétele:"
+msgid "Already existing update sources"
+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?"
+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:1
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "A(z) \"%s\" csomag nem telepíthetõ\n"
+msgid "Fatal error"
+msgstr "Fájlhiba"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
+msgid "Software Packages Installation"
 msgstr "Csomagok elõkészítése a telepítéshez..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages,"
-msgstr "Az összes csomag,"
+msgid "Mandrake Update"
+msgstr "Mandrake-frissítés"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "a fájlokban"
+msgid "Software Packages Removal"
+msgstr "Szoftvercsomag-eltávolítás"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Az összes kért csomag telepítve lett."
+msgid "Quit"
+msgstr "Kilépés"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "A proxy gépneve:"
+msgid "Install"
+msgstr "Telepítés"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update source(s)"
-msgstr "Forrás(ok) frissítése"
+msgid "Remove"
+msgstr "Eltávolítás"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "Helyi fájlok"
+msgid "Help"
+msgstr "Segítség"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "%s vizsgálata"
+msgid "Search"
+msgstr "Keresés"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Israel"
-msgstr "Telepítés"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "Keresés:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Help"
-msgstr "Segítség"
+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?"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "HTTP-kiszolgáló"
+msgid "Some packages need to be removed"
+msgstr "Bizonyos csomagokat el kell távolítani"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"Welcome to the packages source editor!\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"
-"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."
+"Do you really want to install all the selected packages?"
 msgstr ""
-"Üdvözli a csomagforrás-szerkesztõ.\n"
+"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"
-"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."
+"Biztos abban, hogy telepíteni kívánja az összes kijelölt csomagot?"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Teljes telepítés"
+#, c-format
+msgid "Too many packages are selected"
+msgstr "Túl sok csomag van kijelölve"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr ".%s használata fõfájlként"
+msgid "Maximum information"
+msgstr "Maximális mennyiségû információ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results"
-msgstr "Keresési eredmény"
+msgid "Normal information"
+msgstr "Normál mennyiségû információ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, c-format
-msgid " failed!"
-msgstr " nem sikerült"
+msgid "Update source(s)"
+msgstr "Forrás(ok) frissítése"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Brazil"
-msgstr "Brazília"
+msgid "Reload the packages list"
+msgstr "A csomaglista újraolvasása"
 
-#: ../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 "Már van ilyen néven adatforrás. Szeretné azt felülírni?"
+msgid "Reset the selection"
+msgstr "A kijelölés visszaállítása"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Keresés:"
+msgid "in files"
+msgstr "a fájlokban"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Az összes csomag, ábécérendben"
+msgid "in descriptions"
+msgstr "a leírásokban"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Keresés..."
+msgid "in names"
+msgstr "a nevekben"
 
+# it's a sort method
+# "new or update"
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Csomag-adatbázis olvasása..."
+msgid "by update availability"
+msgstr "telepítettség alapján"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "A(z) \"%s\" csomag nem nyitható meg\n"
+#, c-format
+msgid "by source repository"
+msgstr "forrás alapján"
 
+# it's a sort method
+# "selected or not"
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "A kijelölés visszaállítása"
+msgid "by selection state"
+msgstr "kijelölési állapot szerint"
 
-#: ../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 ""
-"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]>):"
+msgid "by size"
+msgstr "méret szerint"
 
 #: ../rpmdrake: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 "by group"
+msgstr "csoport szerint"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Costa Rica"
+msgid "All packages,"
+msgstr "Az összes csomag,"
 
 #: ../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"
-
-#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Az adatforrás eltávolítása folyamatban..."
+msgid "All packages, alphabetical"
+msgstr "Az összes csomag, ábécérendben"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "Jelszó:"
+msgid "Mandrake choices"
+msgstr "Mandrake-válogatás"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "Távoli fájl vizsgálata: \"%s\"..."
+msgid "Normal updates"
+msgstr "Normál frissítések"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Tajvan"
+msgid "Bugfixes updates"
+msgstr "Hibajavító frissítések"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "User:"
-msgstr "Felhasználó:"
+msgid "Security updates"
+msgstr "Biztonsági frissítések"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Az adatforrás frissítése folyamatban..."
+msgid "Description: "
+msgstr "Leírás: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "A csomagok listázása folyamatban..."
+msgid "Reason for update: "
+msgstr "A frissítés oka: "
 
 #: ../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 "Summary: "
+msgstr "Összefoglaló: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Information on packages"
-msgstr "Információ a csomagokról"
+msgid "Importance: "
+msgstr "Fontosság: "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "Mégsem"
+msgid "%s KB"
+msgstr "%s KByte"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Sikeresen telepítve lett minden"
+msgid "Size: "
+msgstr "Méret: "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Az adatforrások frissítése folyamatban..."
+msgid "Version: "
+msgstr "Verzió: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Name: "
+msgstr "Név: "
 
 #: ../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 "Currently installed version: "
+msgstr "A jelenleg telepített verzió: "
 
 #: ../rpmdrake:1
-#, c-format
-msgid "in descriptions"
-msgstr "a leírásokban"
+#, fuzzy, c-format
+msgid "Source: "
+msgstr "Akkor is"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Proxyk beállítása"
+msgid "(Not available)"
+msgstr "(Nem elérhetõ)"
 
-#: ../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 "Changelog:\n"
+msgstr "Változások jegyzéke:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Válasszon"
+msgid "Files:\n"
+msgstr "Fájlok:\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Kijelölve: %d MB"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add a source"
-msgstr "Forrás felvétele"
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "Inicializálás..."
+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
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "Módosítások mentése"
+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"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Error during download"
-msgstr "Hiba a letöltés közben"
+#: ../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:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Csomagok elõkészítése a telepítéshez..."
+msgid "%s conflicts with %s"
+msgstr "ütközik ezzel:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Importance: "
-msgstr "Fontosság: "
+#, fuzzy, c-format
+msgid "Some packages can't be installed"
+msgstr "A(z) \"%s\" csomag nem telepíthetõ\n"
 
 #: ../rpmdrake:1
 #, c-format
@@ -602,83 +660,80 @@ msgstr ""
 "A függõségek miatt a következõ csomago(ka)t is telepíteni kell:\n"
 "\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "Felvétel..."
+msgid "Additional packages needed"
+msgstr "Szükség van további csomagokra"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Unable to create medium."
-msgstr "Az adatforrás létrehozása nem sikerült."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "A(z) \"%s\" csomag nem telepíthetõ\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Removing these packages would break your system, sorry:\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"
+"Ezen csomagok eltávolítása rendszerproblémákhoz vezetne:\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."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
-msgstr "Böngészés..."
+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
-#, 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 "Info..."
-msgstr "Információ..."
+msgid "Some additional packages need to be removed"
+msgstr "Néhány további csomagot is el kell távolítani"
 
-#: ../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 "More information on package..."
+msgstr "További információ a csomagról..."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "Eltávolítás"
+msgid "Information on packages"
+msgstr "Információ a csomagokról"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Csomagok elõkészítése a telepítéshez..."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "No mirror"
-msgstr "Tükörkiszolgáló nem található"
-
-#: ../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."
+msgid "More info"
+msgstr "További információ"
 
+# "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 "Install"
-msgstr "Telepítés"
+msgid "Addable"
+msgstr "Telepíthetõ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "Japán"
+msgid "Upgradable"
+msgstr "Frissíthetõ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Ne tegyen semmit"
+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:1
 #, c-format
@@ -687,347 +742,376 @@ msgstr "Frissítés nem található"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Description: "
-msgstr "Leírás: "
+msgid "(none)"
+msgstr "(egyik sem)"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources 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."
+msgid "Please wait, listing packages..."
+msgstr "A csomagok listázása folyamatban..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "A(z) \"%s\" csomag nem nyitható meg\n"
 
 #: ../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?"
+msgid "One of the following packages is needed:"
+msgstr "Szükség van a következõ csomagok valamelyikére:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "Név: "
+msgid "Please choose"
+msgstr "Válasszon"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "Vizsgálat..."
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Csomagok elõkészítése a telepítéshez..."
+msgid "Not selected"
+msgstr "Ütközések találhatók"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Ausztrália"
+msgid "Selected"
+msgstr "Kijelölve"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation finished"
-msgstr "A telepítés befejezõdött"
+msgid "Search results"
+msgstr "Keresési eredmény"
 
-# it's a sort method
-# "new or update"
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
-msgstr "telepítettség alapján"
+msgid "Stop"
+msgstr "Leállítás"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
-msgstr "Lengyelország"
+msgid "Please wait, searching..."
+msgstr "Keresés..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Version: "
-msgstr "Verzió: "
+msgid "Search results (none)"
+msgstr "Keresési eredmény (nincs)"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Egyéb"
 
 #: ../edit-urpm-sources.pl: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 ""
+"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."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Mentés és kilépés"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Editing source \\\"%s\\\":"
-msgstr "\"%s\" forrás szerkesztése:"
+msgid "Proxy..."
+msgstr "Hiba..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Upgradable"
-msgstr "Frissíthetõ"
+msgid "Update..."
+msgstr "Frissítés..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid " done."
-msgstr " kész"
+msgid "Add..."
+msgstr "Felvétel..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "Módosítás"
+
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Csomagok elõkészítése a telepítéshez..."
+msgid "Source"
+msgstr "Akkor is"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "Fájl vizsgálata: \"%s\"..."
+msgid "Enabled?"
+msgstr "Engedélyezve?"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "Szükség van további csomagokra"
+msgid "Configure sources"
+msgstr "Források beállítása"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Hibajavító frissítések"
+msgid "Password:"
+msgstr "Jelszó:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl: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 "User:"
+msgstr "Felhasználó:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Germany"
-msgstr "Németország"
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "A proxyhoz szükséges felhasználónév és jelszó:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Russia"
-msgstr "Oroszország"
+msgid "Proxy hostname:"
+msgstr "A proxy gépneve:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Norway"
-msgstr "Norvégia"
+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
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Problémák adódtak a telepítés során"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "Proxyk beállítása"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search"
-msgstr "Keresés"
+msgid "Please wait, updating medium..."
+msgstr "Az adatforrás frissítése folyamatban..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit a source"
-msgstr "Forrás szerkesztése"
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr ""
+"A módosítások mentéséhez be kell helyeznie az adathordozót a meghajtóba."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Cseh Köztársaság"
+msgid "You need to insert the medium to continue"
+msgstr "A folytatáshoz be kell helyeznie az adathordozót"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Stop"
-msgstr "Leállítás"
+msgid "Save changes"
+msgstr "Módosítások mentése"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "Frissítés"
+msgid "Relative path to synthesis/hdlist:"
+msgstr ""
+"A kiterjesztett függõséglista illetve fejléclista relatív elérési útja:"
 
-#: ../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
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing source \"%s\":"
+msgstr "\"%s\" forrás szerkesztése:"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal information"
-msgstr "Normál mennyiségû információ"
+msgid "Edit a source"
+msgstr "Forrás szerkesztése"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "\"%s\" csomag letöltése (%s/%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 "Selected: %d MB / Free disk space: %d MB"
-msgstr "Kijelölve: %d MB / Üres hely a lemezen: %d MB"
+msgid "Type of source:"
+msgstr "Az adatforrás típusa:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Spain"
-msgstr "Spanyolország"
+msgid "Adding a source:"
+msgstr "Forrás felvétele:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
-msgstr "Normál frissítések"
+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?"
 
-# it's a sort method
-# "selected or not"
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by selection state"
-msgstr "kijelölési állapot szerint"
+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.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 "Name:"
+msgstr "Név:"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "Felhasználónév:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Austria"
-msgstr "Ausztria"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Fájlhiba"
+msgid "Choose a mirror..."
+msgstr "Válasszon ki egy tükröt..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl: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 "Browse..."
+msgstr "Böngészés..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update..."
-msgstr "Frissítés..."
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "\"%s\" aláírásának ellenõrzése..."
+msgid "Path or mount point:"
+msgstr "Útvonal vagy csatolási pont:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
-msgstr "(egyik sem)"
+msgid "Removable device"
+msgstr "Cserélhetõ eszköz"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
-"Ezen csomagok eltávolítása rendszerproblémákhoz vezetne:\n"
-"\n"
+msgid "HTTP server"
+msgstr "HTTP-kiszolgáló"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "\"%s\" csomag telepítése (%s/%s)..."
+msgid "FTP server"
+msgstr "FTP-kiszolgáló"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "A jelenleg telepített verzió: "
+msgid "Path:"
+msgstr "Útvonal:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Other"
-msgstr "Egyéb"
+msgid "Local files"
+msgstr "Helyi fájlok"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reason for update: "
-msgstr "A frissítés oka: "
+msgid "Add a source"
+msgstr "Forrás felvétele"
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Please choose the desired mirror."
-msgstr "Válassza ki a kívánt tükörkiszolgálót."
+#, 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."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "Módosítás"
+msgid "Unable to create medium."
+msgstr "Az adatforrás létrehozása nem sikerült."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, finding available packages..."
-msgstr "A rendelkezésre álló csomagok lekérdezése..."
+msgid "Update"
+msgstr "Frissítés"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr ""
-"A kiterjesztett függõséglista illetve fejléclista relatív elérési útja:"
+msgid "Select the source(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 "Search results (none)"
-msgstr "Keresési eredmény (nincs)"
+msgid "Please wait, updating media..."
+msgstr "Az adatforrások frissítése folyamatban..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Danmark"
-msgstr "Dánia"
+msgid " failed!"
+msgstr " nem sikerült"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "Kína"
+msgid " done."
+msgstr " kész"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United States"
-msgstr "Amerikai Egyesült Államok"
+msgid "Download of `%s', speed:%s"
+msgstr "\"%s\" letöltése; sebesség: %s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "changes:"
-msgstr "módosítások:"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "\"%s\" letöltése; hátralevõ idõ: %s; sebesség: %s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "\"%s\" aláírásának ellenõrzése..."
+
+#: ../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 "Examining distant file of source `%s'..."
+msgstr "Távoli fájl vizsgálata: \"%s\"..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Examining file of source `%s'..."
+msgstr "Fájl vizsgálata: \"%s\"..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No"
-msgstr "Nem"
+msgid "Copying file for source `%s'..."
+msgstr "Fájl másolása: \"%s\"..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Summary: "
-msgstr "Összefoglaló: "
+msgid "Please choose the desired mirror."
+msgstr "Válassza ki a kívánt tükörkiszolgálót."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "Kanada"
+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.pm:1
 #, c-format
-msgid "Greece"
-msgstr "Görögország"
+msgid "No mirror"
+msgstr "Tükörkiszolgáló nem található"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1044,262 +1128,178 @@ msgstr ""
 "Elképzelhetõ, hogy a hálózat vagy a MandrakeSoft-weboldal nem\n"
 "elérhetõ. Próbálja meg késõbb."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Source: "
-msgstr "Akkor is"
-
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "Fájl másolása: \"%s\"..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Csomagtelepítéshez rendszergazdai jogosultság szükséges."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Path:"
-msgstr "Útvonal:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Problem during removal"
-msgstr "Probléma adódott az eltávolítás során"
+msgid "Error during download"
+msgstr "Hiba a letöltés közben"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by source repository"
-msgstr "forrás alapján"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "A tükörkiszolgálók listájának letöltése a MandrakeSoft weboldaláról..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Selected"
-msgstr "Kijelölve"
+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.pm:1
 #, c-format
-msgid "Netherlands"
-msgstr "Hollandia"
+msgid "United States"
+msgstr "Amerikai Egyesült Államok"
 
-# "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
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "Telepíthetõ"
+msgid "China"
+msgstr "Kína"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
-msgstr "(Nem elérhetõ)"
-
-#: ../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:1
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr "Ütközések találhatók"
+msgid "United Kingdom"
+msgstr "Egyesült Királyság"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Szoftvercsomag-eltávolítás"
+msgid "Taiwan"
+msgstr "Tajvan"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Sweden"
 msgstr "Svédország"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
-msgstr ""
-"\n"
-"\n"
-"Hibaüzenetek:\n"
-"%s"
+msgid "Russia"
+msgstr "Oroszország"
 
-#: ../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."
-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 "Portugal"
+msgstr "Portugália"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "\"%s\" letöltése; sebesség: %s"
+msgid "Poland"
+msgstr "Lengyelország"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Szükség van a következõ csomagok valamelyikére:"
+msgid "Norway"
+msgstr "Norvégia"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "Kilépés"
+msgid "Netherlands"
+msgstr "Hollandia"
 
-#: ../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 ""
-"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
+#, fuzzy, c-format
+msgid "Korea"
+msgstr "Akkor is"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "OK"
+msgid "Japan"
+msgstr "Japán"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Please wait, adding medium..."
-msgstr "Az adatforrás felvétele folyamatban..."
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Italy"
+msgstr "Telepítés"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Israel"
+msgstr "Telepítés"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "Az adatforrás típusa:"
+msgid "Greece"
+msgstr "Görögország"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "France"
+msgstr "Akkor is"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to get source packages."
-msgstr "A forráscsomagok letöltése sikertelen."
+msgid "Finland"
+msgstr "Finnország"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Túl sok csomag van kijelölve"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "ütközik ezzel:"
+msgid "Spain"
+msgstr "Spanyolország"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Danmark"
+msgstr "Dánia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Mandrake-válogatás"
+msgid "Germany"
+msgstr "Németország"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 ""
-"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."
+msgid "Czech Republic"
+msgstr "Cseh Köztársaság"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Változások jegyzéke:\n"
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Korea"
-msgstr "Akkor is"
+#, c-format
+msgid "Canada"
+msgstr "Kanada"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "Cserélhetõ eszköz"
+msgid "Brazil"
+msgstr "Brazília"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Belgium"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Change medium"
-msgstr "Adatforrás váltása"
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Mandrake-frissítés"
+msgid "Australia"
+msgstr "Ausztrália"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by size"
-msgstr "méret szerint"
+msgid "Austria"
+msgstr "Ausztria"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "FTP-kiszolgáló"
+msgid "Info..."
+msgstr "Információ..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Files:\n"
-msgstr "Fájlok:\n"
+msgid "No"
+msgstr "Nem"
 
 #: ../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."
+#, c-format
+msgid "Yes"
+msgstr "Igen"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
diff --git a/po/id.po b/po/id.po
index 12e107cc..e9a63548 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grpmi\n"
-"POT-Creation-Date: 2003-05-02 20:15+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+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,20 +16,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.6\n"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "Diaktifkan?"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../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:"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Lanjutkan?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -48,68 +44,16 @@ 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 "Already existing update sources"
-msgstr ""
-
-#: ../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 ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"Welcome to MandrakeUpdate!\n"
 "\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
 msgstr ""
-"Karena aspek ketergantungan, paket berikut harus tak dipilih:\n"
+"Selamat Datang di MandrakeUpdate!\n"
 "\n"
-
-#: ../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"
+"Perkakas ini membantu Anda memilih update yang ingin Anda instal di\n"
+"komputer Anda."
 
 #: ../rpmdrake:1
 #, c-format
@@ -124,21 +68,40 @@ msgstr ""
 "Perkakas ini membantu Anda memilih piranti lunak yang ingin Anda hapus\n"
 "dari komputer Anda."
 
-#: ../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 "Untuk menyimpan perubahan, masukkan media ke dalam drive."
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"Error saat instalasi paket:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
-msgstr "Simpan dan keluar"
+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"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"There was a problem during the installation:\n"
 "\n"
 "%s"
 msgstr ""
@@ -148,368 +111,300 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Size: "
-msgstr "Ukuran"
+msgid "Installation failed"
+msgstr "Install semua"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Security updates"
-msgstr "Tampilkan update sekuriti"
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "Paket sedang disiapkan untuk instalasi..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Maximum information"
-msgstr "Info maximum"
-
-#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Error..."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "United Kingdom"
-msgstr "Inggris"
+msgid "No package found for installation."
+msgstr "Paket sedang disiapkan untuk instalasi..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure sources"
-msgstr "Konfigurasikan source"
+msgid "All requested packages were installed successfully."
+msgstr "Semua paket yg diminta telah sukses diinstal."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "dalam nama"
+msgid "Everything installed successfully"
+msgstr "Semua sukses diinstal"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"I can't find any suitable mirror.\n"
+"The installation is finished; %s.\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."
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
 msgstr ""
-"Tak ditemukan mirror yang cocok.\n"
+"Instalasi usai; %s.\n"
 "\n"
-"Sebabnya mungkin banyak; yang paling sering yaitu jika arsitektur\n"
-"prosesor Anda tak ditunjang oleh Update Resmi Linux Mandrake."
+"Beberapa file konfigurasi telah dibuat dg extensi `.rpmnew' atau `."
+"rpmsave',\n"
+"Anda mungkin perlu memeriksanya sekarang untuk bertindak selanjutnya:"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "semua sudah diinstal dengan benar"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
-"\n"
-"\\Do you want to continue installation?"
-msgstr ""
-"Paket berikut harus dihapus agar yg lain dapat diupgrade:\n"
-"\n"
-"%s\n"
-"\n"
-"Jalan terus?"
+msgid "Problem during installation"
+msgstr "Ada masalah saat instalasi"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Hapus .%s"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Instalasi paket `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Source"
-msgstr "Sumber"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Paket sedang disiapkan untuk instalasi..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "Finlandia"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
+msgstr ""
+"\n"
+"\n"
+"Error yg dilaporkan:\n"
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
+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."
 
-#: ../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 ""
+"The following packages have bad signatures:\n"
+"\n"
 "%s\n"
 "\n"
-"Is it ok to continue?"
+"Do you want to continue installation?"
 msgstr ""
+"Paket berikut harus dihapus agar yg lain dapat diupgrade:\n"
+"\n"
 "%s\n"
 "\n"
-"Lanjutkan?"
+"Jalan terus?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Muat ulang daftar paket"
+msgid "Verifying packages signatures..."
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr "Pilih mirror..."
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "Download packet `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Penambahan source:"
+msgid "Cancel"
+msgstr "Batal"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Paket `%s' tak dapat diinstal\n"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "Ok"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Paket sedang disiapkan untuk instalasi..."
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Masukkan media \"%s\" di device [%s]"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages,"
-msgstr "Semua paket,"
+msgid "Change medium"
+msgstr "Ubah media"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "dalam file"
+msgid "Initializing..."
+msgstr "Inisialisasi..."
 
 #: ../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 "Proxy hostname:"
-msgstr "Username proxy:"
-
-#: ../rpmdrake:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Update source(s)"
-msgstr "Update source"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Local files"
-msgstr "File lokal"
+msgid "Package installation..."
+msgstr "Paket sedang disiapkan untuk instalasi..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Inspecting %s"
-msgstr "Pemeriksaan %s"
-
-#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Israel"
-msgstr "Install"
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Maaf, untuk menginstal paket, Anda harus jadi root."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Help"
-msgstr "/_Help"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "HTTP server"
-msgstr "Server HTTP"
+msgid "Unable to get source packages."
+msgstr "Pilih paket Anda"
 
-#: ../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 ""
-"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"
+msgid "Inspect..."
+msgstr "Periksa..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Install semua"
+msgid "Installation finished"
+msgstr "Terinstall"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Gunakan .%s sebagai file utama"
+msgid "Do nothing"
+msgstr "Menganggur"
 
 #: ../rpmdrake:1
 #, c-format
-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?"
+msgid "Use .%s as main file"
+msgstr "Gunakan .%s sebagai file utama"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Cari:"
+msgid "Remove .%s"
+msgstr "Hapus .%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Semua paket, menurut abjad"
+msgid "changes:"
+msgstr "perubahan:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Tunggu, sedang dicari..."
+msgid "Inspecting %s"
+msgstr "Pemeriksaan %s"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, reading packages database..."
+msgid "Please wait, finding available packages..."
 msgstr ""
 "Silahkan Tunggu\n"
 "Saya sedang mengurutkan paket"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "tidak tahu"
-
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reset the selection"
-msgstr "Reset pilihan"
+msgid "Please wait, adding medium..."
+msgstr "Media sedang ditambahkan..."
 
-#: ../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 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 ""
-"Jika perlu proxy, masukkan nama host dan port (syntax: <proxyhost[:port]>):"
+"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
+msgid "How to choose manually your mirror"
+msgstr "Cara memilih mirror"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"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"
-msgstr "Untuk memenuhi dependensi, paket-paket berikut perlu dihapus:\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Kosta Rika"
+msgid "Already existing update sources"
+msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"There was a problem during the installation:\n"
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
 "\n"
-"%s"
+"Is it ok to continue?"
 msgstr ""
-"Error saat instalasi paket:\n"
+"Mirror harus dihubungi untuk mendapatkan paket update terbaru.\n"
+"Pastikan bahwa jaringan Anda sedang berjalan.\n"
 "\n"
-"%s"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Please wait, removing medium..."
-msgstr "Media sedang dihapus..."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Password:"
-msgstr "Password:"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "Periksa file jauh source `%s'..."
+"Jalan terus?"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Taiwan"
+msgid "A fatal error occurred: %s."
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "User:"
-msgstr "Username:"
+msgid "Fatal error"
+msgstr "Error file"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Please wait, updating medium..."
-msgstr "Media sedang di-update..."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Software Packages Installation"
+msgstr "Paket sedang disiapkan untuk instalasi..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, listing packages..."
-msgstr ""
-"Silahkan Tunggu\n"
-"Saya sedang mengurutkan paket"
+msgid "Mandrake Update"
+msgstr "Setting MandrakeUpdate"
 
 #: ../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 "Software Packages Removal"
+msgstr "Penghapusan Paket Software"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Keluar"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Information on packages"
-msgstr "Pilih paket Anda"
+#, c-format
+msgid "Install"
+msgstr "Install"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Cancel"
-msgstr "Batal"
+msgid "Remove"
+msgstr "Hapus"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Everything installed successfully"
-msgstr "Semua sukses diinstal"
+#, fuzzy, c-format
+msgid "Help"
+msgstr "/_Help"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Media sedang di-update..."
+msgid "Search"
+msgstr "Cari"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Find:"
+msgstr "Cari:"
 
 #: ../rpmdrake:1
 #, c-format
@@ -527,190 +422,161 @@ msgstr ""
 "Jalan terus?"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "in descriptions"
-msgstr "Keterangan"
-
-#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Konfigurasikan proxy"
+msgid "Some packages need to be removed"
+msgstr "Beberapa paket perlu dihapus"
 
-#: ../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"
+"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"
-"Is it ok to continue?"
+"Do you really want to install all the selected packages?"
 msgstr ""
-"Website MandrakeSoft harus dihubungi untuk mendapatkan daftar mirror.\n"
-"Pastikan bahwa jaringan Anda berjalan baik.\n"
+"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"
-"Jalan terus?"
+"Benarkah Anda ingin menginstal semua paket terpilih?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Pilihlah"
+msgid "Too many packages are selected"
+msgstr "Terlalu banyak paket dipilih"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Selected size: %d MB"
-msgstr "paket terpilih ada %d sebesar: %.1f MB"
+#, c-format
+msgid "Maximum information"
+msgstr "Info maximum"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add a source"
-msgstr "Tambah source"
+msgid "Normal information"
+msgstr "Info normal"
+
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update source(s)"
+msgstr "Update source"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "Inisialisasi..."
+msgid "Reload the packages list"
+msgstr "Muat ulang daftar paket"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "Simpan perubahan"
+msgid "Reset the selection"
+msgstr "Reset pilihan"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
-msgstr "Error saat download"
+msgid "in files"
+msgstr "dalam file"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Paket sedang disiapkan untuk instalasi..."
+msgid "in descriptions"
+msgstr "Keterangan"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Importance: "
-msgstr "Derajat Kepentingan: "
+msgid "in names"
+msgstr "dalam nama"
 
 #: ../rpmdrake: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 "by update availability"
+msgstr "menurut kesediaan update"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "Tambahkan..."
+msgid "by source repository"
+msgstr "menurut repositori sumber"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Unable to create medium."
-msgstr "Gagal membuat media."
+msgid "by selection state"
+msgstr "menurut status pilihan"
 
 #: ../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 ""
-"Instalasi usai; %s.\n"
-"\n"
-"Beberapa file konfigurasi telah dibuat dg extensi `.rpmnew' atau `."
-"rpmsave',\n"
-"Anda mungkin perlu memeriksanya sekarang untuk bertindak selanjutnya:"
+msgid "by size"
+msgstr "menurut ukuran"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
-msgstr "Selancar..."
+msgid "by group"
+msgstr "menurut grup"
 
 #: ../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 "Info..."
-msgstr "Info..."
+msgid "All packages,"
+msgstr "Semua paket,"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "Untuk melanjutkan, masukkan media"
+msgid "All packages, alphabetical"
+msgstr "Semua paket, menurut abjad"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "Hapus"
+msgid "Mandrake choices"
+msgstr "Pilihan Mandrake"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Paket sedang disiapkan untuk instalasi..."
+msgid "Normal updates"
+msgstr "Lakukan update"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No mirror"
-msgstr "Mirror:"
+msgid "Bugfixes updates"
+msgstr "Tampilkan update bugfix"
 
-#: ../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 ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Security updates"
+msgstr "Tampilkan update sekuriti"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Install"
-msgstr "Install"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Japan"
-msgstr "Jepang"
+#, fuzzy, c-format
+msgid "Description: "
+msgstr "Keterangan"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Menganggur"
+msgid "Reason for update: "
+msgstr "Alasan update: "
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No update"
-msgstr "Lakukan update"
+msgid "Summary: "
+msgstr "Ringkasan"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "Derajat Kepentingan: "
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Description: "
-msgstr "Keterangan"
+msgid "%s KB"
+msgstr "%.1f KB"
 
 #: ../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."
+#, fuzzy, c-format
+msgid "Size: "
+msgstr "Ukuran"
 
 #: ../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 ""
-"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?"
+#, fuzzy, c-format
+msgid "Version: "
+msgstr "Versi:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -719,68 +585,80 @@ msgstr "Nama: %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "Periksa..."
+msgid "Currently installed version: "
+msgstr "Versi terinstal: "
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Paket sedang disiapkan untuk instalasi..."
+msgid "Source: "
+msgstr "Sumber"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Australia"
+msgid "(Not available)"
+msgstr "(Tak tersedia)"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
+msgstr "Changelog:\n"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Installation finished"
-msgstr "Terinstall"
+msgid "Files:\n"
+msgstr "/_File"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by update availability"
-msgstr "menurut kesediaan update"
+#, fuzzy, c-format
+msgid "Selected size: %d MB"
+msgstr "paket terpilih ada %d sebesar: %.1f MB"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
-msgstr "Polandia"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Terpilih: %d MB / Tersedia: %d MB"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Version: "
-msgstr "Versi:"
-
-#: ../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:"
+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"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Editing source \\\"%s\\\":"
-msgstr "Edit source \"%s\":"
+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"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Upgradable"
-msgstr "Update"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid " done."
-msgstr " selesai."
+msgid "%s conflicts with %s"
+msgstr "konflik dengan"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Paket sedang disiapkan untuk instalasi..."
+msgid "Some packages can't be installed"
+msgstr "Paket `%s' tak dapat diinstal\n"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "Periksa file source `%s'..."
+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
 #, c-format
@@ -789,512 +667,634 @@ msgstr "Dibutuhkan paket tambahan"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Bugfixes updates"
-msgstr "Tampilkan update bugfix"
+msgid "Some packages can't be removed"
+msgstr "Paket `%s' tak dapat diinstal\n"
 
-#: ../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 ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
+"Maaf, menghapus paket ini berarti merusak sistem Anda:\n"
+"\n"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "Jerman"
+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.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Russia"
-msgstr "Rusia"
+msgid "Some additional packages need to be removed"
+msgstr "Beberapa paket tambahan perlu dihapus"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Norway"
-msgstr "Norwegia"
+msgid "More information on package..."
+msgstr "Info tambahan paket..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Ada masalah saat instalasi"
+msgid "Information on packages"
+msgstr "Pilih paket Anda"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
-#, c-format
-msgid "Search"
-msgstr "Cari"
+#, fuzzy, c-format
+msgid "More info"
+msgstr "Info lain"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Edit a source"
-msgstr "Edit source"
+msgid "Addable"
+msgstr "Dapat ditambahkan"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Czech Republic"
-msgstr "Republik Ceko"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Upgradable"
+msgstr "Update"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Stop"
-msgstr "Stop"
+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
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "No update"
+msgstr "Lakukan update"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Update"
-msgstr "Update"
+msgid "(none)"
+msgstr "(tiada)"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, removing packages..."
+msgid "Please wait, listing packages..."
 msgstr ""
 "Silahkan Tunggu\n"
 "Saya sedang mengurutkan paket"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Normal information"
-msgstr "Info normal"
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "tidak tahu"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Download packet `%s' (%s/%s)..."
+msgid "One of the following packages is needed:"
+msgstr "Satu di antara paket berikut diperlukan:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Terpilih: %d MB / Tersedia: %d MB"
+msgid "Please choose"
+msgstr "Pilihlah"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Spain"
-msgstr "Spanyol"
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Normal updates"
-msgstr "Lakukan update"
+msgid "Not selected"
+msgstr "Konflik terdeteksi"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Selected"
+msgstr ""
+"Pilih\n"
+"semua"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by selection state"
-msgstr "menurut status pilihan"
+msgid "Search results"
+msgstr "Hasil pencarian"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr "Tunggu, alamat mirror sedang diambil dari website MandrakeSoft."
+msgid "Stop"
+msgstr "Stop"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Login:"
-msgstr "Login:"
+msgid "Please wait, searching..."
+msgstr "Tunggu, sedang dicari..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "Austria"
+msgid "Search results (none)"
+msgstr "Hasil pencarian (tak ada)"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Error file"
+#, c-format
+msgid "Other"
+msgstr "Lainnya"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Pilih source yg ingin di-update:"
+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 ""
+"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
+#, c-format
+msgid "Save and quit"
+msgstr "Simpan dan keluar"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Update..."
-msgstr "Update"
+msgid "Proxy..."
+msgstr "Error..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "Verifikasi tandatangan `%s'..."
+msgid "Update..."
+msgstr "Update"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
-msgstr "(tiada)"
+msgid "Add..."
+msgstr "Tambahkan..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl: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 "Edit"
+msgstr "Edit"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Instalasi paket `%s' (%s/%s)..."
+msgid "Source"
+msgstr "Sumber"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Versi terinstal: "
+msgid "Enabled?"
+msgstr "Diaktifkan?"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Other"
-msgstr "Lainnya"
+msgid "Configure sources"
+msgstr "Konfigurasikan source"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Alasan update: "
+msgid "Password:"
+msgstr "Password:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Please choose the desired mirror."
-msgstr ""
-"Silahkan tunggu\n"
-"Saya sedang mengambil daftar mirror"
+msgid "User:"
+msgstr "Username:"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit"
-msgstr "Edit"
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Anda dapat menentukan pengguna/katakunci untuk otentikasi proxy:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Please wait, finding available packages..."
+msgid "Proxy hostname:"
+msgstr "Username proxy:"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
 msgstr ""
-"Silahkan Tunggu\n"
-"Saya sedang mengurutkan paket"
+"Jika perlu proxy, masukkan nama host dan port (syntax: <proxyhost[:port]>):"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "Konfigurasikan proxy"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr "Media sedang di-update..."
+
+#: ../edit-urpm-sources.pl: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."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
+msgstr "Untuk melanjutkan, masukkan media"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save changes"
+msgstr "Simpan perubahan"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Path relatif terhadap sintesa atau hdlist:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Hasil pencarian (tak ada)"
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Danmark"
-msgstr "Denmark"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing source \"%s\":"
+msgstr "Edit source \"%s\":"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "China"
-msgstr "Cina"
+msgid "Edit a source"
+msgstr "Edit source"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "United States"
-msgstr "Amerika Serikat"
+msgid "Please wait, removing medium..."
+msgstr "Media sedang dihapus..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "changes:"
-msgstr "perubahan:"
+msgid "Type of source:"
+msgstr "Jenis source:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Beberapa paket tambahan perlu dihapus"
+msgid "Adding a source:"
+msgstr "Penambahan source:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+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.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "Tidak"
+msgid "You need to fill up at least the two first entries."
+msgstr "Setidaknya dua entri pertama harus diisi."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Summary: "
-msgstr "Ringkasan"
+msgid "Name:"
+msgstr "Nama"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Canada"
-msgstr "Kanada"
+msgid "Login:"
+msgstr "Login:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Greece"
-msgstr "Yunani"
+msgid "Choose a mirror..."
+msgstr "Pilih mirror..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl: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 ""
-"Error saat pengambilan daftar mirror:\n"
-"\n"
-"%s\n"
-"Jaringan, atau website MandrakeSoft mungkin tak dapat dipakai.\n"
-"Cobalah lagi nanti."
+msgid "Browse..."
+msgstr "Selancar..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Source: "
-msgstr "Sumber"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Path atau titik mount:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "Salin file utk source `%s'..."
+msgid "Removable device"
+msgstr "Perangkat portabel"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Maaf, untuk menginstal paket, Anda harus jadi root."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "HTTP server"
+msgstr "Server HTTP"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "Server FTP"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Path:"
 msgstr "Port:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Problem during removal"
-msgstr "Masalah saat penghapusan"
+msgid "Local files"
+msgstr "File lokal"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by source repository"
-msgstr "menurut repositori sumber"
+msgid "Add a source"
+msgstr "Tambah source"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Selected"
-msgstr ""
-"Pilih\n"
-"semua"
+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 "Netherlands"
-msgstr "Belanda"
+msgid "Unable to create medium."
+msgstr "Gagal membuat media."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "Dapat ditambahkan"
+msgid "Update"
+msgstr "Update"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
-msgstr "(Tak tersedia)"
+msgid "Select the source(s) you wish to update:"
+msgstr "Pilih source yg ingin di-update:"
 
-#: ../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"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, updating media..."
+msgstr "Media sedang di-update..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid " failed!"
+msgstr " gagal!"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid " done."
+msgstr " selesai."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Download of `%s', speed:%s"
+msgstr "Download `%s', kecepatan:%s"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "Download `%s', waktu yg dibutuhkan:%s, kecepatan:%s"
+
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Not selected"
-msgstr "Konflik terdeteksi"
+msgid "Starting download of `%s'..."
+msgstr "Verifikasi tandatangan `%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Penghapusan Paket Software"
+msgid "Examining distant file of source `%s'..."
+msgstr "Periksa file jauh source `%s'..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Sweden"
-msgstr "Swedia"
+msgid "Examining file of source `%s'..."
+msgstr "Periksa file source `%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Copying file for source `%s'..."
+msgstr "Salin file utk source `%s'..."
+
+#: ../rpmdrake.pm: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"
 "\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
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "No mirror"
+msgstr "Mirror:"
+
+#: ../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."
+"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 ""
-"Daftar update kosong. Artinya tidak ada update untuk paket yang\n"
-"terinstal di komputer Anda, atau Anda sudah menginstalnya."
+"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 "Download of `%s', speed:%s"
-msgstr "Download `%s', kecepatan:%s"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "One of the following packages is needed:"
-msgstr "Satu di antara paket berikut diperlukan:"
+msgid "Error during download"
+msgstr "Error saat download"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "Keluar"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "Tunggu, alamat mirror sedang diambil dari website MandrakeSoft."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
+"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 ""
-"Mirror harus dihubungi untuk mendapatkan paket update terbaru.\n"
-"Pastikan bahwa jaringan Anda sedang berjalan.\n"
+"Website MandrakeSoft harus dihubungi untuk mendapatkan daftar mirror.\n"
+"Pastikan bahwa jaringan Anda berjalan baik.\n"
 "\n"
 "Jalan terus?"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid "United States"
+msgstr "Amerika Serikat"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "Media sedang ditambahkan..."
+msgid "China"
+msgstr "Cina"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "Jenis source:"
+msgid "United Kingdom"
+msgstr "Inggris"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please insert the medium named \\\"%s\\\" on device [%s]"
-msgstr "Masukkan media \"%s\" di device [%s]"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "Taiwan"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unable to get source packages."
-msgstr "Pilih paket Anda"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "Swedia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Terlalu banyak paket dipilih"
+msgid "Russia"
+msgstr "Rusia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "konflik dengan"
+msgid "Portugal"
+msgstr "Port:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 ""
-"Selamat Datang di MandrakeUpdate!\n"
-"\n"
-"Perkakas ini membantu Anda memilih update yang ingin Anda instal di\n"
-"komputer Anda."
+msgid "Poland"
+msgstr "Polandia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Pilihan Mandrake"
+msgid "Norway"
+msgstr "Norwegia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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."
+msgid "Netherlands"
+msgstr "Belanda"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Korea"
+msgstr "Force"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Changelog:\n"
+msgid "Japan"
+msgstr "Jepang"
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Korea"
+msgid "Italy"
+msgstr "Install"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Israel"
+msgstr "Install"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Yunani"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "France"
 msgstr "Force"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "Perangkat portabel"
+msgid "Finland"
+msgstr "Finlandia"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "Spanyol"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
+msgstr "Denmark"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr "Jerman"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
+msgstr "Republik Ceko"
+
+#: ../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 "Belgia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Change medium"
-msgstr "Ubah media"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Mandrake Update"
-msgstr "Setting MandrakeUpdate"
+msgid "Australia"
+msgstr "Australia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by size"
-msgstr "menurut ukuran"
+msgid "Austria"
+msgstr "Austria"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "Server FTP"
+msgid "Info..."
+msgstr "Info..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Files:\n"
-msgstr "/_File"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
+msgstr "Tidak"
 
 #: ../rpmdrake.pm: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."
+#, c-format
+msgid "Yes"
+msgstr "Ya"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
diff --git a/po/is.po b/po/is.po
index 7cd6149a..7c113133 100644
--- a/po/is.po
+++ b/po/is.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grpmi\n"
-"POT-Creation-Date: 2003-05-02 20:15+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+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,21 +13,14 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr ""
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Path or mount point:"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Portugal"
-msgstr "Port:"
-
 #: ../rpmdrake:1
 #, c-format
 msgid ""
@@ -40,138 +33,121 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
 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 "How to choose manually your mirror"
-msgstr ""
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "URL:"
+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
-#, c-format
-msgid "Some packages need to be removed"
-msgstr ""
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr "Undirbý innsetningu"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Already existing update sources"
-msgstr ""
+#, fuzzy, c-format
+msgid "Problem during removal"
+msgstr "Undirbý innsetningu"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "More information on package..."
-msgstr ""
+#, fuzzy, c-format
+msgid "Please wait, removing packages..."
+msgstr "Augnablik..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
+msgid "Please wait, reading packages database..."
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"There was a problem during the installation:\n"
 "\n"
-msgstr ""
+"%s"
+msgstr "Undirbý innsetningu"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "everything was installed correctly"
-msgstr ""
+#, fuzzy, c-format
+msgid "Installation failed"
+msgstr "Set inn:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "%s KB"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "Undirbý innsetningu"
 
 #: ../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 ""
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "Undirbý innsetningu"
 
-#: ../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 "All requested packages were installed successfully."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
+msgid "Everything installed successfully"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"The installation is finished; %s.\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 "Security updates"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
+msgid "everything was installed correctly"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Villa..."
+msgid "Problem during installation"
+msgstr "Undirbý innsetningu"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
+msgid "Installing package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Configure sources"
-msgstr "Bæta við notanda"
+msgid "Preparing packages installation..."
+msgstr "Undirbý innsetningu"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
 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."
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
 msgstr ""
 
 #: ../rpmdrake:1
@@ -181,357 +157,339 @@ msgid ""
 "\n"
 "%s\n"
 "\n"
-"\\Do you want to continue installation?"
+"Do you want to continue installation?"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Remove .%s"
-msgstr "Fjarlægja"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Source"
-msgstr "Neyða"
-
-#: ../rpmdrake.pm:1
 #, c-format
-msgid "Finland"
+msgid "Verifying packages signatures..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
+msgid "Downloading package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "France"
-msgstr "Neyða"
-
-#. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "More info"
-msgstr ""
+msgid "Cancel"
+msgstr "Hætta við"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
+msgid "Ok"
+msgstr "Í lagi"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reload the packages list"
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
+msgid "Change medium"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Adding a source:"
-msgstr "Miðlungs"
-
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Get ekki sett inn þennan pakka"
+msgid "Initializing..."
+msgstr "Set inn:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
+msgid "Package installation..."
 msgstr "Undirbý innsetningu"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "All packages,"
-msgstr "Fjarlægja"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "in files"
-msgstr "Nafn"
+#, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
+msgid "Unable to get source packages."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
+msgid "Inspect..."
 msgstr ""
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Update source(s)"
-msgstr "Miðlungs"
+msgid "Installation finished"
+msgstr "Set inn"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Local files"
-msgstr "Nafn"
+msgid "Do nothing"
+msgstr "Staðbundinn prentari"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
+msgid "Use .%s as main file"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Israel"
-msgstr "Set inn"
+msgid "Remove .%s"
+msgstr "Fjarlægja"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "changes:"
+msgstr "Pakka"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Help"
-msgstr "Hjálp"
+msgid "Inspecting %s"
+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
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, adding medium..."
+msgstr "Augnablik..."
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"Welcome to the packages source editor!\n"
+"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"
-"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 ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Set inn:"
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
+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 ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Search results"
-msgstr "Leita"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid " failed!"
-msgstr "Nafn"
-
-#: ../rpmdrake.pm:1
 #, c-format
-msgid "Brazil"
+msgid "Already existing update sources"
 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?"
+"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
 #, c-format
-msgid "Find:"
+msgid "A fatal error occurred: %s."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
+msgid "Fatal error"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, searching..."
-msgstr "Augnablik..."
+msgid "Software Packages Installation"
+msgstr "Undirbý innsetningu"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mandrake Update"
+msgstr "Linux-Mandrake uppfærsla"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, reading packages database..."
+msgid "Software Packages Removal"
 msgstr ""
 
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Hætta"
+
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "unknown package "
-msgstr "Get ekki opnað pakka"
+msgid "Install"
+msgstr "Set inn:"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Remove"
+msgstr "Viðföng fyrir fjartengda lpd prentara"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr ""
+msgid "Help"
+msgstr "Hjálp"
 
-#: ../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 "Search"
+msgstr "Leita"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"The following packages have to be removed for others to be upgraded:\n"
 "\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
+msgid "Some packages need to be removed"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"There was a problem during the installation:\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"
-"%s"
-msgstr "Undirbý innsetningu"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Please wait, removing medium..."
+"Do you really want to install all the selected packages?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "Lykilorð:"
+msgid "Too many packages are selected"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
+msgid "Maximum information"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Taiwan"
-msgstr "Upplýsingar"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "User:"
-msgstr ""
+msgid "Normal information"
+msgstr "Linux-Mandrake uppfærsla"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Please wait, updating medium..."
-msgstr "Augnablik..."
+msgid "Update source(s)"
+msgstr "Miðlungs"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
+msgid "Reload the packages list"
 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 "Reset the selection"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Information on packages"
-msgstr "Get ekki opnað pakka"
+msgid "in files"
+msgstr "Nafn"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "in descriptions"
+msgstr "Lýsingar"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "Hætta við"
+msgid "in names"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
+msgid "by update availability"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Please wait, updating media..."
-msgstr "Augnablik..."
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
+msgid "by selection state"
 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 "by size"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "in descriptions"
-msgstr "Lýsingar"
+#, c-format
+msgid "by group"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Configure proxies"
-msgstr "Bæta við notanda"
+msgid "All packages,"
+msgstr "Fjarlægja"
 
-#: ../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 "All packages, alphabetical"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please choose"
-msgstr "Augnablik..."
+msgid "Normal updates"
+msgstr "Linux-Mandrake uppfærsla"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
+msgid "Bugfixes updates"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Add a source"
-msgstr "Miðlungs"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Initializing..."
-msgstr "Set inn:"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Save changes"
-msgstr "Pakka"
+msgid "Description: "
+msgstr "Lýsingar"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
+msgid "Reason for update: "
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Undirbý innsetningu"
+msgid "Summary: "
+msgstr "Yfirlit"
 
 #: ../rpmdrake:1
 #, c-format
@@ -540,623 +498,674 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
+msgid "%s KB"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add..."
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Size: "
+msgstr "Stærð"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Unable to create medium."
+msgid "Version: "
 msgstr ""
 
 #: ../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 ""
+#, fuzzy, c-format
+msgid "Name: "
+msgstr "Nafn: %s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
+msgid "Currently installed version: "
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "Get ekki sett inn þennan pakka"
+msgid "Source: "
+msgstr "Neyða"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
+msgid "(Not available)"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
+msgid "Changelog:\n"
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Remove"
-msgstr "Viðföng fyrir fjartengda lpd prentara"
-
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Undirbý innsetningu"
-
-#: ../rpmdrake.pm:1
 #, c-format
-msgid "No mirror"
+msgid "Files:\n"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
+msgid "Selected size: %d MB"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Install"
-msgstr "Set inn:"
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Do nothing"
-msgstr "Staðbundinn prentari"
+#, 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 "No update"
-msgstr "Linux-Mandrake uppfærsla"
+msgid "%s conflicts with %s"
+msgstr " brýtur í bága við %s-%s-%s"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Description: "
-msgstr "Lýsingar"
+msgid "Some packages can't be installed"
+msgstr "Get ekki sett inn þennan pakka"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
 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 "Additional packages needed"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Name: "
-msgstr "Nafn: %s"
+msgid "Some packages can't be removed"
+msgstr "Get ekki sett inn þennan pakka"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Undirbý innsetningu"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Australia"
-msgstr "raðtengd"
+#, c-format
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation finished"
-msgstr "Set inn"
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
+msgid "More information on package..."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Poland"
-msgstr "�slenskt"
+msgid "Information on packages"
+msgstr "Get ekki opnað pakka"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "Version: "
-msgstr ""
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You may specify a user/password for the proxy authentication:"
+msgid "More info"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Editing source \\\"%s\\\":"
-msgstr "Miðlungs"
+msgid "Addable"
+msgstr "Setja kerfið inn"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Upgradable"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " done."
+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:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Undirbý innsetningu"
+msgid "No update"
+msgstr "Linux-Mandrake uppfærsla"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining file of source `%s'..."
+msgid "(none)"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Additional packages needed"
+msgid "Please wait, listing packages..."
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Bugfixes updates"
-msgstr ""
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "Get ekki opnað pakka"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
+msgid "One of the following packages is needed:"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Germany"
-msgstr "Þýskt"
+msgid "Please choose"
+msgstr "Augnablik..."
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Russia"
-msgstr "Rússneskt"
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Norway"
-msgstr "Norkst"
+msgid "Not selected"
+msgstr " brýtur í bága við %s-%s-%s"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Undirbý innsetningu"
+msgid "Selected"
+msgstr ""
+"Velja\n"
+"alla"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Search"
-msgstr "Leita"
-
-#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Edit a source"
-msgstr "Miðlungs"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Czech Republic"
-msgstr ""
+msgid "Search results"
+msgstr "Leita"
 
 #: ../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, removing packages..."
+msgid "Please wait, searching..."
 msgstr "Augnablik..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Normal information"
-msgstr "Linux-Mandrake uppfærsla"
+msgid "Search results (none)"
+msgstr "Leita"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
+msgid "Other"
+msgstr "Annað"
+
+#: ../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 ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
+msgid "Save and quit"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Spain"
-msgstr "Spænskt"
+msgid "Proxy..."
+msgstr "Villa..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Normal updates"
+msgid "Update..."
 msgstr "Linux-Mandrake uppfærsla"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by selection state"
+msgid "Add..."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgid "Edit"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Source"
+msgstr "Neyða"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Login:"
+msgid "Enabled?"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Austria"
-msgstr "raðtengd"
+msgid "Configure sources"
+msgstr "Bæta við notanda"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Fatal error"
-msgstr ""
+msgid "Password:"
+msgstr "Lykilorð:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
+msgid "User:"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Update..."
-msgstr "Linux-Mandrake uppfærsla"
-
-#: ../rpmdrake.pm:1
 #, c-format
-msgid "Starting download of `%s'..."
+msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
+msgid "Proxy hostname:"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../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
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
+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 "Currently installed version: "
+msgid "You need to insert the medium to continue"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Save changes"
+msgstr "Pakka"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Other"
-msgstr "Annað"
+msgid "Relative path to synthesis/hdlist:"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reason for update: "
+msgid "URL:"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../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
 #, c-format
-msgid "Please choose the desired mirror."
+msgid "Please wait, removing medium..."
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit"
+msgid "Type of source:"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Adding a source:"
+msgstr "Miðlungs"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, finding available packages..."
+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 "Relative path to synthesis/hdlist:"
+msgid "You need to fill up at least the two first entries."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Search results (none)"
-msgstr "Leita"
+msgid "Name:"
+msgstr "Nafn"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Danmark"
+msgid "Login:"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "China"
+msgid "Choose a mirror..."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "United States"
+msgid "Browse..."
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "changes:"
-msgstr "Pakka"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Some additional packages need to be removed"
+msgid "Removable device"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "HTTP server"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
+msgid "FTP server"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Summary: "
-msgstr "Yfirlit"
+msgid "Path:"
+msgstr "Port:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Canada"
-msgstr "Kanadískt (Quebec)"
+msgid "Local files"
+msgstr "Nafn"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Greece"
-msgstr "Grískt"
+msgid "Add a source"
+msgstr "Miðlungs"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"There was an error downloading the mirrors list:\n"
+"Unable to update medium; it will be automatically disabled.\n"
 "\n"
-"%s\n"
-"The network, or MandrakeSoft website, are maybe unavailable.\n"
-"Please try again later."
+"Errors:\n"
+"%s"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Source: "
-msgstr "Neyða"
-
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
+msgid "Unable to create medium."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update"
+msgstr "Linux-Mandrake uppfærsla"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to get source packages, sorry. %s"
+msgid "Select the source(s) you wish to update:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Path:"
-msgstr "Port:"
+msgid "Please wait, updating media..."
+msgstr "Augnablik..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Problem during removal"
-msgstr "Undirbý innsetningu"
+msgid " failed!"
+msgstr "Nafn"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by source repository"
+msgid " done."
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Selected"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Download of `%s', speed:%s"
 msgstr ""
-"Velja\n"
-"alla"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Netherlands"
+msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Addable"
-msgstr "Setja kerfið inn"
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
+msgid "Starting download of `%s'..."
 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 "Examining distant file of source `%s'..."
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr " brýtur í bága við %s-%s-%s"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Examining file of source `%s'..."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
+msgid "Copying file for source `%s'..."
 msgstr ""
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Sweden"
-msgstr "Skoða"
+#, c-format
+msgid "Please choose the desired mirror."
+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
+#: ../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 "No mirror"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%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:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
+msgid "Error during download"
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "Hætta"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
+"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 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "Í lagi"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Please wait, adding medium..."
-msgstr "Augnablik..."
+msgid "United States"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
+msgid "China"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \\\"%s\\\" on device [%s]"
+msgid "United Kingdom"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../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
+#, fuzzy, c-format
+msgid "Portugal"
+msgstr "Port:"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Poland"
+msgstr "�slenskt"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Norway"
+msgstr "Norkst"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to get source packages."
+msgid "Netherlands"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Korea"
+msgstr "Neyða"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Too many packages are selected"
+msgid "Japan"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr " brýtur í bága við %s-%s-%s"
+msgid "Italy"
+msgstr "Set inn"
 
-#: ../rpmdrake:1
+#: ../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
 #, 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 "Finland"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Spain"
+msgstr "Spænskt"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
+msgid "Danmark"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Germany"
+msgstr "Þýskt"
+
+#: ../rpmdrake.pm: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 "Czech Republic"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
+msgid "Costa Rica"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Korea"
-msgstr "Neyða"
+msgid "Canada"
+msgstr "Kanadískt (Quebec)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
+msgid "Brazil"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1164,38 +1173,29 @@ msgstr ""
 msgid "Belgium"
 msgstr "Belgískt"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Change medium"
-msgstr ""
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Mandrake Update"
-msgstr "Linux-Mandrake uppfærsla"
+msgid "Australia"
+msgstr "raðtengd"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "by size"
-msgstr ""
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Austria"
+msgstr "raðtengd"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
+msgid "Info..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Files:\n"
+msgid "No"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
+msgid "Yes"
 msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:86
diff --git a/po/it.po b/po/it.po
index dd5b8a6e..dd79e0d7 100644
--- a/po/it.po
+++ b/po/it.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grpmi-it\n"
-"POT-Creation-Date: 2003-05-02 20:15+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+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,20 +19,16 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "Abilitato?"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../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:"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Andiamo avanti?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -52,69 +48,17 @@ 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 "Already existing update sources"
-msgstr ""
-
-#: ../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 ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"Welcome to MandrakeUpdate!\n"
 "\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
 msgstr ""
-"Per soddisfare le dipendenze, i seguenti pacchetti devono essere\n"
-"deselezionati ora:\n"
+"Benvenuto in MandrakeUpdate!\n"
 "\n"
-
-#: ../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"
+"Questo programma ti aiuterà a scegliere gli aggiornamenti che vuoi "
+"installare sul tuo\n"
+"computer."
 
 #: ../rpmdrake:1
 #, c-format
@@ -129,21 +73,40 @@ msgstr ""
 "Questa utilità ti aiuterà a scegliere che software vuoi rimuovere dal\n"
 "tuo computer."
 
-#: ../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 "Per salvare le modifiche devi inserire il supporto nel drive"
+"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"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
-msgstr "Salva ed esci"
+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"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"There was a problem during the installation:\n"
 "\n"
 "%s"
 msgstr ""
@@ -153,378 +116,300 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Size: "
-msgstr "Dimensioni"
+msgid "Installation failed"
+msgstr "Installa tutto"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Security updates"
-msgstr "Mostra aggiornamenti sulla sicurezza"
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "Sto preparando i pacchetti per l'installazione..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Maximum information"
-msgstr "Tutte le informazioni"
-
-#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Errore..."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "United Kingdom"
-msgstr "Regno Unito"
+msgid "No package found for installation."
+msgstr "Sto preparando i pacchetti per l'installazione..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure sources"
-msgstr "Configura sorgenti"
+msgid "All requested packages were installed successfully."
+msgstr "Tutti i pacchetti richiesti sono stati installati con successo."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "nei nomi"
+msgid "Everything installed successfully"
+msgstr "Tutto è stato installato con successo."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"I can't find any suitable mirror.\n"
+"The installation is finished; %s.\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."
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
 msgstr ""
-"Non riesco a trovare un mirror adatto.\n"
+"L'installazione è terminata, %s.\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."
+"Sono stati creati alcuni file di configurazione `.rpmnew' o `.rpmsave',\n"
+"adesso puoi ispezionarli in modo da decidere cosa fare:"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "tutto è stato installato correttamente"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
-"\n"
-"\\Do you want to continue installation?"
-msgstr ""
-"I seguenti pacchetti devono essere rimossi per altri da aggiornare:\n"
-"\n"
-"%s\n"
-"\n"
-"Proseguiamo?"
+msgid "Problem during installation"
+msgstr "Si sono verificati dei problemi durante l'installazione"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Rimuovi .%s"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Sto installando il pacchetto `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Source"
-msgstr "Proviene da"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Sto preparando i pacchetti per l'installazione..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "Finlandia"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
+msgstr ""
+"\n"
+"\n"
+"Errore/i riportati:\n"
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
+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."
 
-#: ../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 ""
+"The following packages have bad signatures:\n"
+"\n"
 "%s\n"
 "\n"
-"Is it ok to continue?"
+"Do you want to continue installation?"
 msgstr ""
+"I seguenti pacchetti devono essere rimossi per altri da aggiornare:\n"
+"\n"
 "%s\n"
 "\n"
-"Andiamo avanti?"
+"Proseguiamo?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Ricarica la lista dei pacchetti"
+msgid "Verifying packages signatures..."
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr "Scegli un mirror..."
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "Sto scaricando il pacchetto `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Aggiunta sorgente:"
+msgid "Cancel"
+msgstr "Annulla"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Il pacchetto `%s' non può essere installato\n"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "Ok"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Sto preparando i pacchetti per l'installazione..."
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr ""
+"Per favore inserisci il supporto etichettato \"%s\" nel dispositivo [%s]"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages,"
-msgstr "Tutti i pacchetti,"
+msgid "Change medium"
+msgstr "Cambia supporto"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "nei file"
+msgid "Initializing..."
+msgstr "Inizializzazione..."
 
 #: ../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 "Proxy hostname:"
-msgstr "Username per il Proxy:"
-
-#: ../rpmdrake:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Update source(s)"
-msgstr "Aggiorna sorgente(i)"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Local files"
-msgstr "File locali"
+msgid "Package installation..."
+msgstr "Sto preparando i pacchetti per l'installazione..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Inspecting %s"
-msgstr "Ispezione di %s"
-
-#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Israel"
-msgstr "Installa"
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Devi essere root per installare dei pacchetti."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Help"
-msgstr "/_Guida"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "HTTP server"
-msgstr "Server HTTP"
+msgid "Unable to get source packages."
+msgstr "Scegli i tuoi pacchetti"
 
-#: ../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 ""
-"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."
+msgid "Inspect..."
+msgstr "Ispezionare..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Installa tutto"
+msgid "Installation finished"
+msgstr "Installato"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Usa .%s come file principale"
+msgid "Do nothing"
+msgstr "Non fare niente"
 
 #: ../rpmdrake:1
 #, c-format
-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?"
+msgid "Use .%s as main file"
+msgstr "Usa .%s come file principale"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Trova:"
+msgid "Remove .%s"
+msgstr "Rimuovi .%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Tutti i pacchetti, alfabeticamente"
+msgid "changes:"
+msgstr "modifiche:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Per favore attendere, ricerca in corso..."
+msgid "Inspecting %s"
+msgstr "Ispezione di %s"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, reading packages database..."
+msgid "Please wait, finding available packages..."
 msgstr ""
 "Attendi...\n"
 "Ordino i pacchetti"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "sconosciuto"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Reset the selection"
-msgstr "Annulla la selezione"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"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]>):"
+msgid "Please wait, adding medium..."
+msgstr "Attendere l'aggiunta del supporto..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"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 ""
-"Per soddisfare le dipendenze, anche i seguenti pacchetti devono essere\n"
-"rimossi:\n"
+"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.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Costa Rica"
+msgid "How to choose manually your mirror"
+msgstr "Come scegliere manualmente il mirror"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"There was a problem during the installation:\n"
+"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"
-"%s"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"Si è verificato un errore durante l'installazione dei pacchetti:\n"
-"\n"
-"%s"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Please wait, removing medium..."
-msgstr "Attendere la rimozione supporto..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "Password:"
+msgid "Already existing update sources"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "Esamino il file remoto della sorgente '%s'..."
+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 ""
+"Devo contattare il mirror per recuperare gli ultimi aggiornamenti.\n"
+"Controlla che la rete sia in funzione.\n"
+"\n"
+"Proseguiamo?"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Taiwan"
+msgid "A fatal error occurred: %s."
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "User:"
-msgstr "Nome utente:"
+msgid "Fatal error"
+msgstr "Errore nel file"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Please wait, updating medium..."
-msgstr "Attendere l'aggiornamento del supporto..."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Software Packages Installation"
+msgstr "Sto preparando i pacchetti per l'installazione..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, listing packages..."
-msgstr ""
-"Attendi...\n"
-"Ordino i pacchetti"
+msgid "Mandrake Update"
+msgstr "MandrakeUpdate: Preferenze"
 
 #: ../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 "Software Packages Removal"
+msgstr "Rimozione Pacchetti Software"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Esci"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Information on packages"
-msgstr "Scegli i tuoi pacchetti"
+#, c-format
+msgid "Install"
+msgstr "Installa"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Cancel"
-msgstr "Annulla"
+msgid "Remove"
+msgstr "Rimuovi"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Everything installed successfully"
-msgstr "Tutto è stato installato con successo."
+#, fuzzy, c-format
+msgid "Help"
+msgstr "/_Guida"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Attendere l'aggiornamento del supporto..."
+msgid "Search"
+msgstr "Cerca"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Find:"
+msgstr "Trova:"
 
 #: ../rpmdrake:1
 #, c-format
@@ -542,192 +427,161 @@ msgstr ""
 "Proseguiamo?"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "in descriptions"
-msgstr "Descrizioni"
-
-#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Configurazione dei proxy"
+msgid "Some packages need to be removed"
+msgstr "Alcuni pacchetti devono essere rimossi"
 
-#: ../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"
+"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"
-"Is it ok to continue?"
+"Do you really want to install all the selected packages?"
 msgstr ""
-"Devo contattare il sito di MandrakeSoft per recuperare la lista dei mirror.\n"
-"Controlla che la tua rete sia in funzione.\n"
+"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"
-"Proseguiamo?"
+"Vuoi davvero installare tutti i pacchetti selezionati?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Per favore scegli"
+msgid "Too many packages are selected"
+msgstr "Troppi pacchetti selezionati"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Selected size: %d MB"
-msgstr "%d pacchetti selezionati: %.1f Mb"
+#, c-format
+msgid "Maximum information"
+msgstr "Tutte le informazioni"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add a source"
-msgstr "Aggiunta sorgente:"
+msgid "Normal information"
+msgstr "Informazioni normali"
+
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update source(s)"
+msgstr "Aggiorna sorgente(i)"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "Inizializzazione..."
+msgid "Reload the packages list"
+msgstr "Ricarica la lista dei pacchetti"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "Salva le modifiche"
+msgid "Reset the selection"
+msgstr "Annulla la selezione"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
-msgstr "Errore durante lo scaricamento"
+msgid "in files"
+msgstr "nei file"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Sto preparando i pacchetti per l'installazione..."
+msgid "in descriptions"
+msgstr "Descrizioni"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Importance: "
-msgstr "Importanza: "
+msgid "in names"
+msgstr "nei nomi"
 
 #: ../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"
+msgid "by update availability"
+msgstr "per disponibilità aggiornamenti"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "Aggiungi..."
+msgid "by source repository"
+msgstr "per repositorio di sorgente"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Unable to create medium."
-msgstr "Impossibile creare il supporto."
+msgid "by selection state"
+msgstr "per selezione"
 
 #: ../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 ""
-"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:"
+msgid "by size"
+msgstr "per dimensione"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
-msgstr "Sfoglia..."
+msgid "by group"
+msgstr "per gruppo"
 
 #: ../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 "Info..."
-msgstr "Informazioni..."
+msgid "All packages,"
+msgstr "Tutti i pacchetti,"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "Devi inserire il supporto per continuare"
+msgid "All packages, alphabetical"
+msgstr "Tutti i pacchetti, alfabeticamente"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "Rimuovi"
+msgid "Mandrake choices"
+msgstr "Scelte di Mandrake"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Sto preparando i pacchetti per l'installazione..."
+msgid "Normal updates"
+msgstr "Aggiornamenti normali"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No mirror"
-msgstr "mirror:"
+msgid "Bugfixes updates"
+msgstr "Mostra gli aggiornamenti bugfix"
 
-#: ../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 ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Security updates"
+msgstr "Mostra aggiornamenti sulla sicurezza"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Install"
-msgstr "Installa"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Japan"
-msgstr "Giappone"
+#, fuzzy, c-format
+msgid "Description: "
+msgstr "Descrizioni"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Non fare niente"
+msgid "Reason for update: "
+msgstr "Causa dell'aggiornamento:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No update"
-msgstr "Fai gli aggiornamenti"
+msgid "Summary: "
+msgstr "Sommario"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "Importanza: "
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Description: "
-msgstr "Descrizioni"
+msgid "%s KB"
+msgstr "%.1f Kb"
 
 #: ../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."
+#, fuzzy, c-format
+msgid "Size: "
+msgstr "Dimensioni"
 
 #: ../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 ""
-"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?"
+#, fuzzy, c-format
+msgid "Version: "
+msgstr "Versione:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -736,70 +590,84 @@ msgstr "Nome: %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "Ispezionare..."
+msgid "Currently installed version: "
+msgstr "Versione attualmente installata:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Sto preparando i pacchetti per l'installazione..."
+msgid "Source: "
+msgstr "Proviene da"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Australia"
+msgid "(Not available)"
+msgstr "(Non disponibile)"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
+msgstr "Changelog:\n"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Installation finished"
-msgstr "Installato"
+msgid "Files:\n"
+msgstr "/_File"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by update availability"
-msgstr "per disponibilità aggiornamenti"
+#, fuzzy, c-format
+msgid "Selected size: %d MB"
+msgstr "%d pacchetti selezionati: %.1f Mb"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
-msgstr "Polonia"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Selezionati: %d MB / Spazio libero su disco: %d MB"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Version: "
-msgstr "Versione:"
-
-#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
 msgstr ""
-"Devi specificare nome utente/password per l'autenticazione da parte del "
-"proxy:"
+"Per soddisfare le dipendenze, i seguenti pacchetti devono essere\n"
+"deselezionati ora:\n"
+"\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Editing source \\\"%s\\\":"
-msgstr "Modifica sorgente \"%s\":"
+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:1
 #, fuzzy, c-format
-msgid "Upgradable"
-msgstr "Aggiorna"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid " done."
-msgstr " fatto."
+msgid "%s conflicts with %s"
+msgstr "è in conflitto con"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Sto preparando i pacchetti per l'installazione..."
+msgid "Some packages can't be installed"
+msgstr "Il pacchetto `%s' non può essere installato\n"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "Esamino il file della sorgente '%s'..."
+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
 #, c-format
@@ -808,517 +676,649 @@ msgstr "Sono necessari altri pacchetti"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Bugfixes updates"
-msgstr "Mostra gli aggiornamenti bugfix"
+msgid "Some packages can't be removed"
+msgstr "Il pacchetto `%s' non può essere installato\n"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "Scaricamento di '%s', tempo rimasto: %s, velocità: %s"
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
+"Spiacente, la rimozione di questi pacchetti danneggerebbe il tuo sitema:\n"
+"\n"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "Germania"
+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.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Russia"
-msgstr "Russia"
+msgid "Some additional packages need to be removed"
+msgstr "Ci sono altri pacchetti da rimuovere"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Norway"
-msgstr "Norvegia"
+msgid "More information on package..."
+msgstr "Ulteriori informazioni sul pacchetto..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Si sono verificati dei problemi durante l'installazione"
+msgid "Information on packages"
+msgstr "Scegli i tuoi pacchetti"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
-#, c-format
-msgid "Search"
-msgstr "Cerca"
+#, fuzzy, c-format
+msgid "More info"
+msgstr "Maggiori informazioni"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Edit a source"
-msgstr "Modifica una sorgente"
+msgid "Addable"
+msgstr "Aggiungibile"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Czech Republic"
-msgstr "Repubblica Ceca"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Upgradable"
+msgstr "Aggiorna"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Stop"
-msgstr "Stop"
+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 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
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "No update"
+msgstr "Fai gli aggiornamenti"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Update"
-msgstr "Aggiorna"
+msgid "(none)"
+msgstr "(nessuno)"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, removing packages..."
+msgid "Please wait, listing packages..."
 msgstr ""
 "Attendi...\n"
 "Ordino i pacchetti"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Normal information"
-msgstr "Informazioni normali"
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "sconosciuto"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Sto scaricando il pacchetto `%s' (%s/%s)..."
+msgid "One of the following packages is needed:"
+msgstr "Uno dei seguenti pacchetti è necessario:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Selezionati: %d MB / Spazio libero su disco: %d MB"
+msgid "Please choose"
+msgstr "Per favore scegli"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Spain"
-msgstr "Spagna"
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Normal updates"
-msgstr "Aggiornamenti normali"
+msgid "Not selected"
+msgstr "Individuati dei conflitti"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Selected"
+msgstr ""
+"Seleziona\n"
+"tutto"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by selection state"
-msgstr "per selezione"
+msgid "Search results"
+msgstr "Risultati della Ricerca"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake: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 "Stop"
+msgstr "Stop"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Login:"
-msgstr "Login:"
+msgid "Please wait, searching..."
+msgstr "Per favore attendere, ricerca in corso..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "Austria"
+msgid "Search results (none)"
+msgstr "Risultati della Ricerca (nessuno)"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Errore nel file"
+#, c-format
+msgid "Other"
+msgstr "Altro"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Seleziona la sorgente che vuoi aggiornare:"
+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 ""
+"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."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Salva ed esci"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Update..."
-msgstr "Aggiorna"
+msgid "Proxy..."
+msgstr "Errore..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "Sto verificando la firma di `%s'..."
+msgid "Update..."
+msgstr "Aggiorna"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
-msgstr "(nessuno)"
+msgid "Add..."
+msgstr "Aggiungi..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl: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 "Edit"
+msgstr "Modifica"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Sto installando il pacchetto `%s' (%s/%s)..."
+msgid "Source"
+msgstr "Proviene da"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Versione attualmente installata:"
+msgid "Enabled?"
+msgstr "Abilitato?"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Other"
-msgstr "Altro"
+msgid "Configure sources"
+msgstr "Configura sorgenti"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Causa dell'aggiornamento:"
+msgid "Password:"
+msgstr "Password:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Please choose the desired mirror."
-msgstr ""
-"Attendi...\n"
-"Sto recuperando la lista dei mirrors..."
+msgid "User:"
+msgstr "Nome utente:"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit"
-msgstr "Modifica"
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+"Devi specificare nome utente/password per l'autenticazione da parte del "
+"proxy:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Please wait, finding available packages..."
-msgstr ""
-"Attendi...\n"
-"Ordino i pacchetti"
+msgid "Proxy hostname:"
+msgstr "Username per il Proxy:"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Percorso relativo a synthesis/hdlist"
+msgid ""
+"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
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Risultati della Ricerca (nessuno)"
+msgid "Configure proxies"
+msgstr "Configurazione dei proxy"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Danmark"
-msgstr "Danimarca"
+msgid "Please wait, updating medium..."
+msgstr "Attendere l'aggiornamento del supporto..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "China"
-msgstr "Cina"
+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"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "United States"
-msgstr "Stati Uniti"
+msgid "You need to insert the medium to continue"
+msgstr "Devi inserire il supporto per continuare"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "changes:"
-msgstr "modifiche:"
+msgid "Save changes"
+msgstr "Salva le modifiche"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Ci sono altri pacchetti da rimuovere"
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Percorso relativo a synthesis/hdlist"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing source \"%s\":"
+msgstr "Modifica sorgente \"%s\":"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "No"
+msgid "Edit a source"
+msgstr "Modifica una sorgente"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Summary: "
-msgstr "Sommario"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr "Attendere la rimozione supporto..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Canada"
-msgstr "Canada"
+msgid "Type of source:"
+msgstr "Tipo di sorgente:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Greece"
-msgstr "Grecia"
+msgid "Adding a source:"
+msgstr "Aggiunta sorgente:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl: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."
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 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."
+"C'è già un supporto con quel nome, vuoi\n"
+"veramente sostrituirlo?"
 
-#: ../rpmdrake:1
+#: ../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."
+
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Source: "
-msgstr "Proviene da"
+msgid "Name:"
+msgstr "Nome"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "Copio il file per la sorgente '%s'..."
+msgid "Login:"
+msgstr "Login:"
 
-#: ../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
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Scegli un mirror..."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Browse..."
+msgstr "Sfoglia..."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Percorso o punto di mount:"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Removable device"
+msgstr "Dispositivo rimovibile"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "HTTP server"
+msgstr "Server HTTP"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "Server FTP"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Path:"
 msgstr "Porta:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Problem during removal"
-msgstr "Si sono verificati dei problemi durante la rimozione"
+msgid "Local files"
+msgstr "File locali"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by source repository"
-msgstr "per repositorio di sorgente"
+msgid "Add a source"
+msgstr "Aggiunta sorgente:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Selected"
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
 msgstr ""
-"Seleziona\n"
-"tutto"
+"Impossibile aggiornare il supporto, sarà automaticamente disabilitato."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Netherlands"
-msgstr "Paesi Bassi"
+msgid "Unable to create medium."
+msgstr "Impossibile creare il supporto."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "Aggiungibile"
+msgid "Update"
+msgstr "Aggiorna"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
-msgstr "(Non disponibile)"
+msgid "Select the source(s) you wish to update:"
+msgstr "Seleziona la sorgente che vuoi aggiornare:"
 
-#: ../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
+#, c-format
+msgid "Please wait, updating media..."
+msgstr "Attendere l'aggiornamento del supporto..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid " failed!"
+msgstr " fallita!"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid " done."
+msgstr " fatto."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Download of `%s', speed:%s"
+msgstr "Scaricamento di '%s', velocità: %s"
+
+#: ../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.pm:1
 #, fuzzy, c-format
-msgid "Not selected"
-msgstr "Individuati dei conflitti"
+msgid "Starting download of `%s'..."
+msgstr "Sto verificando la firma di `%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Rimozione Pacchetti Software"
+msgid "Examining distant file of source `%s'..."
+msgstr "Esamino il file remoto della sorgente '%s'..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Sweden"
-msgstr "Svezia"
+msgid "Examining file of source `%s'..."
+msgstr "Esamino il file della sorgente '%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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."
+msgstr ""
+"Attendi...\n"
+"Sto recuperando la lista dei mirrors..."
+
+#: ../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
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "No mirror"
+msgstr "mirror:"
+
+#: ../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."
+"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 ""
-"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."
+"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."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "Scaricamento di '%s', velocità: %s"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "One of the following packages is needed:"
-msgstr "Uno dei seguenti pacchetti è necessario:"
+msgid "Error during download"
+msgstr "Errore durante lo scaricamento"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "Esci"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
+"Attendere il download  degli indirizzi dei mirror dal sito di MandrakeSoft."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
+"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 ""
-"Devo contattare il mirror per recuperare gli ultimi aggiornamenti.\n"
-"Controlla che la rete sia in funzione.\n"
+"Devo contattare il sito di MandrakeSoft per recuperare la lista dei mirror.\n"
+"Controlla che la tua rete sia in funzione.\n"
 "\n"
 "Proseguiamo?"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid "United States"
+msgstr "Stati Uniti"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "Attendere l'aggiunta del supporto..."
+msgid "China"
+msgstr "Cina"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "Tipo di sorgente:"
+msgid "United Kingdom"
+msgstr "Regno Unito"
 
-#: ../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]"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "Taiwan"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unable to get source packages."
-msgstr "Scegli i tuoi pacchetti"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "Svezia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Troppi pacchetti selezionati"
+msgid "Russia"
+msgstr "Russia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "è in conflitto con"
+msgid "Portugal"
+msgstr "Porta:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 ""
-"Benvenuto in MandrakeUpdate!\n"
-"\n"
-"Questo programma ti aiuterà a scegliere gli aggiornamenti che vuoi "
-"installare sul tuo\n"
-"computer."
+msgid "Poland"
+msgstr "Polonia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Scelte di Mandrake"
+msgid "Norway"
+msgstr "Norvegia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 ""
-"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."
+msgid "Netherlands"
+msgstr "Paesi Bassi"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Korea"
+msgstr "Forza"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Changelog:\n"
+msgid "Japan"
+msgstr "Giappone"
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Korea"
+msgid "Italy"
+msgstr "Installa"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Israel"
+msgstr "Installa"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Grecia"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "France"
 msgstr "Forza"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "Dispositivo rimovibile"
+msgid "Finland"
+msgstr "Finlandia"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "Spagna"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
+msgstr "Danimarca"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr "Germania"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
+msgstr "Repubblica Ceca"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Costa Rica"
+msgstr "Costa Rica"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Canada"
+msgstr "Canada"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
+msgstr "Brasile"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Belgio"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Change medium"
-msgstr "Cambia supporto"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Mandrake Update"
-msgstr "MandrakeUpdate: Preferenze"
+msgid "Australia"
+msgstr "Australia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by size"
-msgstr "per dimensione"
+msgid "Austria"
+msgstr "Austria"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "Server FTP"
+msgid "Info..."
+msgstr "Informazioni..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Files:\n"
-msgstr "/_File"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
+msgstr "No"
 
 #: ../rpmdrake.pm:1
-#, 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."
+#, c-format
+msgid "Yes"
+msgstr "Sì"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
diff --git a/po/ja.po b/po/ja.po
index 94ca7ea6..c3328a72 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grpmi\n"
-"POT-Creation-Date: 2003-05-02 20:15+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+0200\n"
 "PO-Revision-Date: 2000-09-13 21:10+0200\n"
 "Last-Translator: YAMAGATA Hiroo <hiyori13@alum.mit.edu>\n"
 "Language-Team: JAPANESE <ja@li.org>\n"
@@ -13,20 +13,16 @@ msgstr ""
 "Content-Type: text/plain; charset=euc-jp\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "Í­¸ú¤Ç¤¹¤«¡©"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Path or mount point:"
-msgstr "¥Ñ¥¹¤Þ¤¿¤Ï¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È¡§"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Portugal"
-msgstr "¥Ý¡¼¥È:"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"³¤±¤Æ¤¤¤¤¤Ç¤¹¤«¡©"
 
 #: ../rpmdrake:1
 #, c-format
@@ -44,69 +40,15 @@ 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 "Already existing update sources"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "More information on package..."
-msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î¾ÜºÙ¾ðÊó..."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Yes"
-msgstr "¤Ï¤¤"
-
-#: ../rpmdrake:1
-#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"Welcome to MandrakeUpdate!\n"
 "\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
 msgstr ""
-"°Í¸´Ø·¸¤ò¤¼¤ó¤ÖËþ­¤µ¤»¤ë¤¿¤á¤Ë¤Ï¡¢\n"
-"°Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤òº£¤ÏÈóÁªÂò¤Ë¤·¤Æ¤¯¤À¤µ¤¤:\n"
+"MandrakeUpdate¤Ø¤¤¤é¤Ã¤·¤ã¤¤¤Þ¤»!\n"
 "\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
@@ -120,21 +62,40 @@ msgstr ""
 "\n"
 "¤³¤Î¥Ä¡¼¥ë¤Ï¡¢ºï½ü¤·¤¿¤¤¥½¥Õ¥È¥¦¥§¥¢¤òÁª¤Ö»Ù±ç¤ò¤·¤Þ¤¹¡£"
 
-#: ../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 "Êѹ¹¤òÊݸ¤¹¤ë¤Ë¤Ï¥á¥Ç¥£¥¢¤ò¥É¥é¥¤¥Ö¤ËÁÞÆþ¤·¤Æ¤¯¤À¤µ¤¤"
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"¥Ñ¥Ã¥±¡¼¥¸¥¤¥ó¥¹¥È¡¼¥ëÃæ¤Ë¥¨¥é¡¼:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
-msgstr "Êݸ¤·¤Æ½ªÎ»"
+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"
+"¥Ñ¥Ã¥±¡¼¥¸¤òʤ٤Ƥ¤¤Þ¤¹"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"There was a problem during the installation:\n"
 "\n"
 "%s"
 msgstr ""
@@ -144,374 +105,299 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Size: "
-msgstr "¥µ¥¤¥º"
+msgid "Installation failed"
+msgstr "¤¹¤Ù¤Æ¥¤¥ó¥¹¥È¡¼¥ë"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Security updates"
-msgstr "¥»¥­¥å¥ê¥Æ¥£¾å¤Î¹¹¿·¤òɽ¼¨"
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "¥¤¥ó¥¹¥È¡¼¥ëÍѤ˥ѥ屡¼¥¸½àÈ÷Ãæ"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Maximum information"
-msgstr "¾ðÊóÎ̤òºÇÂç¤Ë"
-
-#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "¥¨¥é¡¼..."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "United Kingdom"
-msgstr "¥¤¥®¥ê¥¹"
+msgid "No package found for installation."
+msgstr "¥¤¥ó¥¹¥È¡¼¥ëÍѤ˥ѥ屡¼¥¸½àÈ÷Ãæ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure sources"
-msgstr "¥½¡¼¥¹¤ÎÀßÄê"
+msgid "All requested packages were installed successfully."
+msgstr "Í׵ᤵ¤ì¤¿¥Ñ¥Ã¥±¡¼¥¸¤Ï¤¹¤Ù¤Æ¥¤¥ó¥¹¥È¡¼¥ëÀ®¸ù¤Ç¤¹¡£"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "̾¾Î¤ÎÃæ"
+msgid "Everything installed successfully"
+msgstr "¤¹¤Ù¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤ËÀ®¸ù¤·¤Þ¤·¤¿"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"I can't find any suitable mirror.\n"
+"The installation is finished; %s.\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."
+"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"
-"Íýͳ¤Ï¤¤¤í¤¤¤í¹Í¤¨¤é¤ì¤Þ¤¹¤¬¡¢¤¤¤Á¤Ð¤ó¤¢¤ê¤¬¤Á¤Ê¤Î¤Ï¡¢¤¢¤Ê¤¿¤Î\n"
-"¥×¥í¥»¥Ã¥µ¤Î¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤¬Mandrake Linux ¸ø¼°¥¢¥Ã¥×¥Ç¡¼¥È¤Ç\n"
-"¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ç¤¹¡£"
+"`.rpmnew' ¤ä `.rpmsave'¤È¤¤¤¦ÀßÄê¥Õ¥¡¥¤¥ë¤¬À¸À®¤µ¤ì¤Þ¤·¤¿¡£\n"
+"¤³¤ì¤ò¸¡Æ¤¤·¤ÆÄɲäÎÀßÄê¤ò¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹:"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "¤¹¤Ù¤ÆÀµ¤·¤¯¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤·¤¿"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
-"\n"
-"\\Do you want to continue installation?"
-msgstr ""
-"°Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤òºï½ü¤·¤Ê¤¤¤È¾¤¬¹¹¿·¤Ç¤­¤Þ¤»¤ó:\n"
-"\n"
-"%s\n"
-"\n"
-"³¤±¤Æ¤¤¤¤¤Ç¤¹¤«?"
+msgid "Problem during installation"
+msgstr "¥¤¥ó¥¹¥È¡¼¥ëÃæ¤ËÌäÂ꤬µ¯¤³¤ê¤Þ¤·¤¿"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Remove .%s"
-msgstr ".%s ¤ò¼è¤ê½ü¤¯"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "¥Ñ¥Ã¥±¡¼¥¸ `%s' (%s/%s)¥¤¥ó¥¹¥È¡¼¥ëÃæ"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Source"
-msgstr "¥½¡¼¥¹"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "¥¤¥ó¥¹¥È¡¼¥ëÍѤ˥ѥ屡¼¥¸½àÈ÷Ãæ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "¥Õ¥£¥ó¥é¥ó¥É"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
+msgstr ""
+"\n"
+"\n"
+"Êó¹ð¤µ¤ì¤¿¥¨¥é¡¼:\n"
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
 msgstr ""
+"¥¤¥ó¥¹¥È¡¼¥ë¼ºÇÔ¡¢°ìÉô¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó¡£\n"
+"¥½¡¼¥¹¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¹¹¿·¤·¤Æ¤ß¤Æ¤Ï¤¤¤«¤¬¤Ç¤·¤ç¤¦¡£"
 
-#: ../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 ""
+"The following packages have bad signatures:\n"
+"\n"
 "%s\n"
 "\n"
-"Is it ok to continue?"
+"Do you want to continue installation?"
 msgstr ""
+"°Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤òºï½ü¤·¤Ê¤¤¤È¾¤¬¹¹¿·¤Ç¤­¤Þ¤»¤ó:\n"
+"\n"
 "%s\n"
 "\n"
-"³¤±¤Æ¤¤¤¤¤Ç¤¹¤«¡©"
+"³¤±¤Æ¤¤¤¤¤Ç¤¹¤«?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "¥Ñ¥Ã¥±¡¼¥¸°ìÍ÷¤òÆɤßľ¤¹"
+msgid "Verifying packages signatures..."
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr "¥ß¥é¡¼¤òÁª¤ó¤Ç¤¯¤À¤µ¤¤¡§"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "°Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¥À¥¦¥ó¥í¡¼¥ÉÃæ `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Adding a source:"
-msgstr "¥½¡¼¥¹¤ÎÄɲÃ"
+msgid "Cancel"
+msgstr "¥­¥ã¥ó¥»¥ë"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "¥Ñ¥Ã¥±¡¼¥¸¤¬¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤»¤ó"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "Ok"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "¥¤¥ó¥¹¥È¡¼¥ëÍѤ˥ѥ屡¼¥¸½àÈ÷Ãæ"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "%s¤È¤¤¤¦¥á¥Ç¥£¥¢¤ò¥Ç¥Ð¥¤¥¹[%s]¤ËÁÞÆþ¤·¤Æ¤¯¤À¤µ¤¤"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages,"
-msgstr "Á´¥Ñ¥Ã¥±¡¼¥¸"
+msgid "Change medium"
+msgstr "¥á¥Ç¥£¥¢Êѹ¹"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "¥Õ¥¡¥¤¥ë¤ÎÃæ"
+msgid "Initializing..."
+msgstr "½é´ü²½Ã桧"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Í׵ᤵ¤ì¤¿¥Ñ¥Ã¥±¡¼¥¸¤Ï¤¹¤Ù¤Æ¥¤¥ó¥¹¥È¡¼¥ëÀ®¸ù¤Ç¤¹¡£"
-
-#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Proxy hostname:"
-msgstr "¥×¥í¥­¥·¤Î¥æ¡¼¥¶Ì¾¡§"
-
-#: ../rpmdrake:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Update source(s)"
-msgstr "¥½¡¼¥¹¹¹¿·"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Local files"
-msgstr "¥í¡¼¥«¥ë¥Õ¥¡¥¤¥ë"
+msgid "Package installation..."
+msgstr "¥¤¥ó¥¹¥È¡¼¥ëÍѤ˥ѥ屡¼¥¸½àÈ÷Ãæ"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Inspecting %s"
-msgstr "%s ¸¡ººÃæ"
-
-#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Israel"
-msgstr "¥¤¥ó¥¹¥È¡¼¥ë"
+msgid "Unable to get source packages, sorry. %s"
+msgstr "¥Ñ¥Ã¥±¡¼¥¸¥¤¥ó¥¹¥È¡¼¥ë¤Ë¤Ïroot¸¢¸Â¤¬É¬ÍפǤ¹"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Help"
-msgstr "/¥Ø¥ë¥×(_H)"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "HTTP server"
-msgstr "HTTP ¥µ¡¼¥Ð"
+msgid "Unable to get source packages."
+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"
-"¿·¤·¤¤¥½¥Õ¥È¥Ñ¥Ã¥±¡¼¥¸¤¬¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤¿¤ê¡¢¹¹¿·¤Ê¤É¤¬¤Ç¤­¤Þ¤¹¡£"
+msgid "Inspect..."
+msgstr "¸¡ºº..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Installation failed"
-msgstr "¤¹¤Ù¤Æ¥¤¥ó¥¹¥È¡¼¥ë"
+msgid "Installation finished"
+msgstr "¥¤¥ó¥¹¥È¡¼¥ëºÑ¤ß"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr ".%s ¤ò¥á¥¤¥ó¥Õ¥¡¥¤¥ë¤È¤·¤Æ»È¤¦"
+msgid "Do nothing"
+msgstr "¤Ê¤Ë¤â¤·¤Ê¤¤"
 
 #: ../rpmdrake:1
 #, c-format
-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"
-"ÃÖ¤­´¹¤¨¤Þ¤¹¤«¡©"
+msgid "Use .%s as main file"
+msgstr ".%s ¤ò¥á¥¤¥ó¥Õ¥¡¥¤¥ë¤È¤·¤Æ»È¤¦"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "°Ê²¼¤òõ¤¹¡§"
+msgid "Remove .%s"
+msgstr ".%s ¤ò¼è¤ê½ü¤¯"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Á´¥Ñ¥Ã¥±¡¼¥¸¡¢ABC½ç"
+msgid "changes:"
+msgstr "Êѹ¹:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "¥Õ¥¡¥¤¥ë¸¡º÷Ãæ¡¢¾¯¡¹¤ªÂÔ¤Á¤ò"
+msgid "Inspecting %s"
+msgstr "%s ¸¡ººÃæ"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, reading packages database..."
+msgid "Please wait, finding available packages..."
 msgstr ""
 "¾¯¡¹¤ªÂÔ¤Á¤ò\n"
 "¥Ñ¥Ã¥±¡¼¥¸¤òʤ٤Ƥ¤¤Þ¤¹"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "¥Ñ¥Ã¥±¡¼¥¸¤¬³«¤±¤Þ¤»¤ó"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Reset the selection"
-msgstr "ÁªÂò¤ò¥ê¥»¥Ã¥È"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
-msgstr ""
-"¥×¥í¥¯¥·¤¬É¬Íפʤ顢¥Û¥¹¥È̾¤È¥ª¥×¥·¥ç¥ó¤Ç¥Ý¡¼¥ÈÈÖ¹æ¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤(½ñ¼°: "
-"<¥×¥í¥¯¥·¥Û¥¹¥È[:¥Ý¡¼¥È]>):"
+msgid "Please wait, adding medium..."
+msgstr "¾¯¡¹¤ªÂÔ¤Á¤ò¡¢¥á¥Ç¥£¥¢ÄɲÃÃæ"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"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"
+"¥½¡¼¥¹¤òÄɲä·¤Þ¤¹¡£\n"
 "\n"
+"¤½¤ì¤«¤éMandrakeUpdate¤òºÆµ¯Æ°¤·¤Þ¤¹¡£"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "¥³¥¹¥¿¥ê¥«"
+msgid "How to choose manually your mirror"
+msgstr "¥ß¥é¡¼¤ò¥Þ¥Ë¥å¥¢¥ë¤ÇÁª¤Ö¤Ë¤Ï"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"There was a problem during the installation:\n"
+"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"
-"%s"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"¥Ñ¥Ã¥±¡¼¥¸¥¤¥ó¥¹¥È¡¼¥ëÃæ¤Ë¥¨¥é¡¼:\n"
-"\n"
-"%s"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Please wait, removing medium..."
-msgstr "¾¯¡¹¤ªÂÔ¤Á¤ò¡¢¥á¥Ç¥£¥¢¼è¤ê½Ð¤·Ãæ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "¥Ñ¥¹¥ï¡¼¥É:"
+msgid "Already existing update sources"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "¥½¡¼¥¹ %s ¤Î±ó¤¯¤Î¥Õ¥¡¥¤¥ë¤òÄ´¤Ù¤Æ¤¤¤Þ¤¹..."
+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
 #, c-format
-msgid "Taiwan"
-msgstr "ÂæÏÑ"
+msgid "A fatal error occurred: %s."
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "User:"
-msgstr "¥æ¡¼¥¶Ì¾¡§"
+msgid "Fatal error"
+msgstr "¥Õ¥¡¥¤¥ë¥¨¥é¡¼"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Please wait, updating medium..."
-msgstr "¾¯¡¹¤ªÂÔ¤Á¤ò¡¢¥á¥Ç¥£¥¢¹¹¿·Ãæ"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Software Packages Installation"
+msgstr "¥¤¥ó¥¹¥È¡¼¥ëÍѤ˥ѥ屡¼¥¸½àÈ÷Ãæ"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, listing packages..."
-msgstr ""
-"¾¯¡¹¤ªÂÔ¤Á¤ò\n"
-"¥Ñ¥Ã¥±¡¼¥¸¤òʤ٤Ƥ¤¤Þ¤¹"
+msgid "Mandrake Update"
+msgstr "MandrakeUpdate ÀßÄê"
 
 #: ../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 "Software Packages Removal"
+msgstr "¥½¥Õ¥È¥¦¥§¥¢¥Ñ¥Ã¥±¡¼¥¸ºï½ü"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "½ªÎ»"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Information on packages"
-msgstr "¥Ñ¥Ã¥±¡¼¥¸¤¬³«¤±¤Þ¤»¤ó"
+#, c-format
+msgid "Install"
+msgstr "¥¤¥ó¥¹¥È¡¼¥ë"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Cancel"
-msgstr "¥­¥ã¥ó¥»¥ë"
+msgid "Remove"
+msgstr "¼è¤ê½ü¤¯"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Everything installed successfully"
-msgstr "¤¹¤Ù¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤ËÀ®¸ù¤·¤Þ¤·¤¿"
+#, fuzzy, c-format
+msgid "Help"
+msgstr "/¥Ø¥ë¥×(_H)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "¾¯¡¹¤ªÂÔ¤Á¤ò¡¢¥á¥Ç¥£¥¢¹¹¿·Ãæ"
+msgid "Search"
+msgstr "¸¡º÷"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Find:"
+msgstr "°Ê²¼¤òõ¤¹¡§"
 
 #: ../rpmdrake:1
 #, c-format
@@ -529,191 +415,160 @@ msgstr ""
 "³¤±¤Æ¤¤¤¤¤Ç¤¹¤«?"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "in descriptions"
-msgstr "ÀâÌÀ"
-
-#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Configure proxies"
-msgstr "¥×¥í¥¯¥·¤ÎÀßÄê"
+msgid "Some packages need to be removed"
+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"
+"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"
-"Is it ok to continue?"
+"Do you really want to install all the selected packages?"
 msgstr ""
-"MandrakeSoft ¥¦¥§¥Ö¥µ¥¤¥È¤ËÀܳ¤·¤Æ¥ß¥é¡¼¥µ¥¤¥È¤Î°ìÍ÷¤ò¼èÆÀ\n"
-"¤·¤Þ¤¹¡£¥Í¥Ã¥È¥ï¡¼¥¯¤¬Í­¸ú¤«³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
+"·Ù¹ð¡§Äɲ䷤褦¤È¤·¤Æ¤¤¤ë¥Ñ¥Ã¥±¡¼¥¸¤¬Â¿¤¹¤®¤Æ¡¢¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à\n"
+"¤Î¥Ç¥£¥¹¥¯ÍÆÎ̤¬¥¤¥ó¥¹¥È¡¼¥ëÃæ¤ËÉÔ­¤¹¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£¤³¤ì¤Ï\n"
+"¤È¤Æ¤â´í¸±¤Ê¤³¤È¤Ê¤Î¤Ç¡¢¿µ½Å¤Ë¹Í¤¨¤Æ¤¯¤À¤µ¤¤¡£\n"
 "\n"
-"³¤±¤Þ¤¹¤«?"
+"ËÜÅö¤Ë¤³¤ÎÁª¤ó¤À¥Ñ¥Ã¥±¡¼¥¸¤òÁ´Éô¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¤«¡©"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Áª¤ó¤Ç¤¯¤À¤µ¤¤"
+msgid "Too many packages are selected"
+msgstr "Áª¤ó¤À¥Ñ¥Ã¥±¡¼¥¸¤¬Â¿¤¹¤®¤Þ¤¹"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Selected size: %d MB"
-msgstr "ÁªÂò¤·¤¿¥Ñ¥Ã¥±¡¼¥¸¿ô¤Ï%d: %.1f MB"
+#, c-format
+msgid "Maximum information"
+msgstr "¾ðÊóÎ̤òºÇÂç¤Ë"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add a source"
-msgstr "¥½¡¼¥¹¤ÎÄɲÃ"
+msgid "Normal information"
+msgstr "Ä̾ï¤Î¾ðÊó"
+
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update source(s)"
+msgstr "¥½¡¼¥¹¹¹¿·"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "½é´ü²½Ã桧"
+msgid "Reload the packages list"
+msgstr "¥Ñ¥Ã¥±¡¼¥¸°ìÍ÷¤òÆɤßľ¤¹"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "Êѹ¹¤òÊݸ"
+msgid "Reset the selection"
+msgstr "ÁªÂò¤ò¥ê¥»¥Ã¥È"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
-msgstr "¥À¥¦¥ó¥í¡¼¥ÉÃæ¤Ë¥¨¥é¡¼"
+msgid "in files"
+msgstr "¥Õ¥¡¥¤¥ë¤ÎÃæ"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "¥¤¥ó¥¹¥È¡¼¥ëÍѤ˥ѥ屡¼¥¸½àÈ÷Ãæ"
+msgid "in descriptions"
+msgstr "ÀâÌÀ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Importance: "
-msgstr "½ÅÍ×À­: "
+msgid "in names"
+msgstr "̾¾Î¤ÎÃæ"
 
 #: ../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 "by update availability"
+msgstr "¹¹¿·¤Î̵ͭ½ç"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "ÄɲÃ..."
+msgid "by source repository"
+msgstr "¥½¡¼¥¹repository½ç"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Unable to create medium."
-msgstr "¥á¥Ç¥£¥¢¤¬ºî¤ì¤Þ¤»¤ó¡£"
+msgid "by selection state"
+msgstr "ÁªÂò¾õÂÖ½ç"
 
 #: ../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 ""
-"¥¤¥ó¥¹¥È¡¼¥ë¤Ï´°Î»¤·¤Þ¤·¤¿; %s.\n"
-"\n"
-"`.rpmnew' ¤ä `.rpmsave'¤È¤¤¤¦ÀßÄê¥Õ¥¡¥¤¥ë¤¬À¸À®¤µ¤ì¤Þ¤·¤¿¡£\n"
-"¤³¤ì¤ò¸¡Æ¤¤·¤ÆÄɲäÎÀßÄê¤ò¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹:"
+msgid "by size"
+msgstr "¥µ¥¤¥º½ç"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
-msgstr "°Ê²¼¤ò¥Ö¥é¥¦¥º..."
+msgid "by group"
+msgstr "¥°¥ë¡¼¥×ÊÌ"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "¥Ñ¥Ã¥±¡¼¥¸¤¬¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤»¤ó"
-
-#: ../rpmdrake.pm:1
 #, c-format
-msgid "Info..."
-msgstr "¾ðÊó..."
+msgid "All packages,"
+msgstr "Á´¥Ñ¥Ã¥±¡¼¥¸"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "³¤±¤ë¤Ë¤Ï¥á¥Ç¥£¥¢¤òÁÞÆþ¤·¤Æ¤¯¤À¤µ¤¤"
+msgid "All packages, alphabetical"
+msgstr "Á´¥Ñ¥Ã¥±¡¼¥¸¡¢ABC½ç"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "¼è¤ê½ü¤¯"
+msgid "Mandrake choices"
+msgstr "Mandrake¤ÎÁªÂò"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "¥¤¥ó¥¹¥È¡¼¥ëÍѤ˥ѥ屡¼¥¸½àÈ÷Ãæ"
+msgid "Normal updates"
+msgstr "Ä̾ï¤Î¹¹¿·"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No mirror"
-msgstr "¥ß¥é¡¼¥µ¥¤¥È:"
+msgid "Bugfixes updates"
+msgstr "¥Ð¥°¥Õ¥£¥¯¥¹¤Î¹¹¿·¤òɽ¼¨"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "¾¯¤Ê¤¯¤È¤âºÇ½é¤ÎÆó¹àÌܤÏɬ¿Ü¤Ç¤¹¡£"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Security updates"
+msgstr "¥»¥­¥å¥ê¥Æ¥£¾å¤Î¹¹¿·¤òɽ¼¨"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Install"
-msgstr "¥¤¥ó¥¹¥È¡¼¥ë"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Japan"
-msgstr "ÆüËÜ"
+#, fuzzy, c-format
+msgid "Description: "
+msgstr "ÀâÌÀ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "¤Ê¤Ë¤â¤·¤Ê¤¤"
+msgid "Reason for update: "
+msgstr "¹¹¿·¤ÎÍýͳ: "
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No update"
-msgstr "¹¹¿·¤¹¤ë"
+msgid "Summary: "
+msgstr "¤Þ¤È¤á"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "½ÅÍ×À­: "
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Description: "
-msgstr "ÀâÌÀ"
+msgid "%s KB"
+msgstr "%.1f KB"
 
 #: ../rpmdrake:1
-#, c-format
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"¥¤¥ó¥¹¥È¡¼¥ë¼ºÇÔ¡¢°ìÉô¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó¡£\n"
-"¥½¡¼¥¹¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¹¹¿·¤·¤Æ¤ß¤Æ¤Ï¤¤¤«¤¬¤Ç¤·¤ç¤¦¡£"
+#, fuzzy, c-format
+msgid "Size: "
+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?"
-msgstr ""
-"·Ù¹ð¡§Äɲ䷤褦¤È¤·¤Æ¤¤¤ë¥Ñ¥Ã¥±¡¼¥¸¤¬Â¿¤¹¤®¤Æ¡¢¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à\n"
-"¤Î¥Ç¥£¥¹¥¯ÍÆÎ̤¬¥¤¥ó¥¹¥È¡¼¥ëÃæ¤ËÉÔ­¤¹¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£¤³¤ì¤Ï\n"
-"¤È¤Æ¤â´í¸±¤Ê¤³¤È¤Ê¤Î¤Ç¡¢¿µ½Å¤Ë¹Í¤¨¤Æ¤¯¤À¤µ¤¤¡£\n"
-"\n"
-"ËÜÅö¤Ë¤³¤ÎÁª¤ó¤À¥Ñ¥Ã¥±¡¼¥¸¤òÁ´Éô¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¤«¡©"
+#, fuzzy, c-format
+msgid "Version: "
+msgstr "¥Ð¡¼¥¸¥ç¥ó:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -722,68 +577,84 @@ msgstr "̾Á°: %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "¸¡ºº..."
+msgid "Currently installed version: "
+msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥Ð¡¼¥¸¥ç¥ó: "
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "¥¤¥ó¥¹¥È¡¼¥ëÍѤ˥ѥ屡¼¥¸½àÈ÷Ãæ"
+msgid "Source: "
+msgstr "¥½¡¼¥¹"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "¥ª¡¼¥¹¥È¥é¥ê¥¢"
+msgid "(Not available)"
+msgstr "¡Ê°ì¤Ä¤â¤¢¤ê¤Þ¤»¤ó¡Ë"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
+msgstr "Êѹ¹¥í¥°: \n"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Installation finished"
-msgstr "¥¤¥ó¥¹¥È¡¼¥ëºÑ¤ß"
+msgid "Files:\n"
+msgstr "/¥Õ¥¡¥¤¥ë(_F)"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by update availability"
-msgstr "¹¹¿·¤Î̵ͭ½ç"
+#, fuzzy, c-format
+msgid "Selected size: %d MB"
+msgstr "ÁªÂò¤·¤¿¥Ñ¥Ã¥±¡¼¥¸¿ô¤Ï%d: %.1f MB"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
-msgstr "¥Ý¡¼¥é¥ó¥É"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "ÁªÂò¡§%d MB / ¥Ç¥£¥¹¥¯¶õ¤­ÍÆÎÌ: %d MB"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Version: "
-msgstr "¥Ð¡¼¥¸¥ç¥ó:"
-
-#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "¥×¥í¥¯¥·Ç§¾ÚÍѤ˥桼¥¶Ì¾/¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄê¤Ç¤­¤Þ¤¹"
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
+msgstr ""
+"°Í¸´Ø·¸¤ò¤¼¤ó¤ÖËþ­¤µ¤»¤ë¤¿¤á¤Ë¤Ï¡¢\n"
+"°Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤òº£¤ÏÈóÁªÂò¤Ë¤·¤Æ¤¯¤À¤µ¤¤:\n"
+"\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Editing source \\\"%s\\\":"
-msgstr "¥½¡¼¥¹ %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:1
 #, fuzzy, c-format
-msgid "Upgradable"
-msgstr "¹¹¿·"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid " done."
-msgstr " ´°Î»¡£"
+msgid "%s conflicts with %s"
+msgstr "¤Ï°Ê²¼¤È¤Ö¤Ä¤«¤ê¤Þ¤¹"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "¥¤¥ó¥¹¥È¡¼¥ëÍѤ˥ѥ屡¼¥¸½àÈ÷Ãæ"
+msgid "Some packages can't be installed"
+msgstr "¥Ñ¥Ã¥±¡¼¥¸¤¬¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤»¤ó"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "¥½¡¼¥¹ %s ¤Î¥Õ¥¡¥¤¥ë¤òÄ´¤Ù¤Æ¤¤¤Þ¤¹..."
+msgid ""
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
+msgstr ""
+"°Í¸´Ø·¸¤ò¤¼¤ó¤ÖËþ­¤µ¤»¤ë¤¿¤á¤Ë¤Ï¡¢\n"
+"°Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤ÎÄɲä¬É¬ÍפǤ¹:\n"
+"\n"
 
 #: ../rpmdrake:1
 #, c-format
@@ -792,511 +663,640 @@ msgstr "Äɲåѥ屡¼¥¸¤¬É¬ÍפǤ¹"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Bugfixes updates"
-msgstr "¥Ð¥°¥Õ¥£¥¯¥¹¤Î¹¹¿·¤òɽ¼¨"
+msgid "Some packages can't be removed"
+msgstr "¥Ñ¥Ã¥±¡¼¥¸¤¬¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤»¤ó"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "%s'¤Î¥À¥¦¥ó¥í¡¼¥É, »Ä¤ê»þ´Ö:%s, ®ÅÙ:%s"
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
+"¤¹¤ß¤Þ¤»¤ó¡¢¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤òºï½ü¤¹¤ë¤È¥·¥¹¥Æ¥à¤¬²õ¤ì¤Þ¤¹:\n"
+"\n"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "¥É¥¤¥Ä"
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
+"°Í¸´Ø·¸¤ò¤¼¤ó¤ÖËþ­¤µ¤»¤ë¤¿¤á¤Ë¡¢\n"
+"°Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤òºï½ü¤·¤Þ¤¹:\n"
+"\n"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Russia"
-msgstr "¥í¥·¥¢"
+msgid "Some additional packages need to be removed"
+msgstr "¾¤Ëºï½ü¤¹¤Ù¤­¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤¹"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Norway"
-msgstr "¥Î¥ë¥¦¥§¡¼"
+msgid "More information on package..."
+msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î¾ÜºÙ¾ðÊó..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "¥¤¥ó¥¹¥È¡¼¥ëÃæ¤ËÌäÂ꤬µ¯¤³¤ê¤Þ¤·¤¿"
+msgid "Information on packages"
+msgstr "¥Ñ¥Ã¥±¡¼¥¸¤¬³«¤±¤Þ¤»¤ó"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
-#, c-format
-msgid "Search"
-msgstr "¸¡º÷"
+#, fuzzy, c-format
+msgid "More info"
+msgstr "¤â¤Ã¤È¾ðÊó¤ò"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Edit a source"
-msgstr "¥½¡¼¥¹¤ÎÊÔ½¸"
+msgid "Addable"
+msgstr "ÄɲòÄǽ¤Ê¤â¤Î"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Czech Republic"
-msgstr "¥Á¥§¥³"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Upgradable"
+msgstr "¹¹¿·"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Stop"
-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
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "No update"
+msgstr "¹¹¿·¤¹¤ë"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Update"
-msgstr "¹¹¿·"
+msgid "(none)"
+msgstr "(¤Ê¤·)"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, removing packages..."
+msgid "Please wait, listing packages..."
 msgstr ""
 "¾¯¡¹¤ªÂÔ¤Á¤ò\n"
 "¥Ñ¥Ã¥±¡¼¥¸¤òʤ٤Ƥ¤¤Þ¤¹"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Normal information"
-msgstr "Ä̾ï¤Î¾ðÊó"
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "¥Ñ¥Ã¥±¡¼¥¸¤¬³«¤±¤Þ¤»¤ó"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "°Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¥À¥¦¥ó¥í¡¼¥ÉÃæ `%s' (%s/%s)..."
+msgid "One of the following packages is needed:"
+msgstr "°Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¤É¤ì¤«¤¬É¬ÍפǤ¹:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "ÁªÂò¡§%d MB / ¥Ç¥£¥¹¥¯¶õ¤­ÍÆÎÌ: %d MB"
+msgid "Please choose"
+msgstr "Áª¤ó¤Ç¤¯¤À¤µ¤¤"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Spain"
-msgstr "¥¹¥Ú¥¤¥ó"
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Normal updates"
-msgstr "Ä̾ï¤Î¹¹¿·"
+msgid "Not selected"
+msgstr "¾×Æͤ¬¸«¤Ä¤«¤ê¤Þ¤·¤¿"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Selected"
+msgstr ""
+"¤¹¤Ù¤Æ\n"
+"Áª¤Ö"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by selection state"
-msgstr "ÁªÂò¾õÂÖ½ç"
+msgid "Search results"
+msgstr "¸¡º÷·ë²Ì"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr "¾¯¡¹¤ªÂÔ¤Á¤ò¡¢Mandrake¥¦¥§¥Ö¥µ¥¤¥È¤«¤é¥ß¥é¡¼¥µ¥¤¥È¤ò¼èÆÀÃæ¡£"
+msgid "Stop"
+msgstr "Ää»ß"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Login:"
-msgstr "Login: "
+msgid "Please wait, searching..."
+msgstr "¥Õ¥¡¥¤¥ë¸¡º÷Ãæ¡¢¾¯¡¹¤ªÂÔ¤Á¤ò"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "¥ª¡¼¥¹¥È¥ê¥¢"
+msgid "Search results (none)"
+msgstr "¸¡º÷·ë²Ì¡Ê¤Ê¤·¡Ë"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Fatal error"
-msgstr "¥Õ¥¡¥¤¥ë¥¨¥é¡¼"
+#, c-format
+msgid "Other"
+msgstr "¤½¤Î¾"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "¹¹¿·¤·¤¿¤¤¥½¡¼¥¹¤òÁª¤ó¤Ç¤¯¤À¤µ¤¤:"
+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"
+"¿·¤·¤¤¥½¥Õ¥È¥Ñ¥Ã¥±¡¼¥¸¤¬¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤¿¤ê¡¢¹¹¿·¤Ê¤É¤¬¤Ç¤­¤Þ¤¹¡£"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Êݸ¤·¤Æ½ªÎ»"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Update..."
-msgstr "¹¹¿·"
+msgid "Proxy..."
+msgstr "¥¨¥é¡¼..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "%s ¤Î½ð̾³ÎǧÃæ..."
+msgid "Update..."
+msgstr "¹¹¿·"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
-msgstr "(¤Ê¤·)"
+msgid "Add..."
+msgstr "ÄɲÃ..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
-"¤¹¤ß¤Þ¤»¤ó¡¢¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤òºï½ü¤¹¤ë¤È¥·¥¹¥Æ¥à¤¬²õ¤ì¤Þ¤¹:\n"
-"\n"
+msgid "Edit"
+msgstr "ÊÔ½¸"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "¥Ñ¥Ã¥±¡¼¥¸ `%s' (%s/%s)¥¤¥ó¥¹¥È¡¼¥ëÃæ"
+msgid "Source"
+msgstr "¥½¡¼¥¹"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥Ð¡¼¥¸¥ç¥ó: "
+msgid "Enabled?"
+msgstr "Í­¸ú¤Ç¤¹¤«¡©"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Other"
-msgstr "¤½¤Î¾"
+msgid "Configure sources"
+msgstr "¥½¡¼¥¹¤ÎÀßÄê"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reason for update: "
-msgstr "¹¹¿·¤ÎÍýͳ: "
+msgid "Password:"
+msgstr "¥Ñ¥¹¥ï¡¼¥É:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Please choose the desired mirror."
-msgstr ""
-"¾¯¡¹¤ªÂÔ¤Á¤ò\n"
-"¥ß¥é¡¼°ìÍ÷¤ò¼èÆÀ¤·¤Æ¤¤¤Þ¤¹"
+msgid "User:"
+msgstr "¥æ¡¼¥¶Ì¾¡§"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit"
-msgstr "ÊÔ½¸"
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "¥×¥í¥¯¥·Ç§¾ÚÍѤ˥桼¥¶Ì¾/¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄê¤Ç¤­¤Þ¤¹"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Please wait, finding available packages..."
-msgstr ""
-"¾¯¡¹¤ªÂÔ¤Á¤ò\n"
-"¥Ñ¥Ã¥±¡¼¥¸¤òʤ٤Ƥ¤¤Þ¤¹"
+msgid "Proxy hostname:"
+msgstr "¥×¥í¥­¥·¤Î¥æ¡¼¥¶Ì¾¡§"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Åý¹ç¤Þ¤¿¤Ïhdlist ¤Ø¤ÎÁêÂХѥ¹:"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"¥×¥í¥¯¥·¤¬É¬Íפʤ顢¥Û¥¹¥È̾¤È¥ª¥×¥·¥ç¥ó¤Ç¥Ý¡¼¥ÈÈÖ¹æ¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤(½ñ¼°: "
+"<¥×¥í¥¯¥·¥Û¥¹¥È[:¥Ý¡¼¥È]>):"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search results (none)"
-msgstr "¸¡º÷·ë²Ì¡Ê¤Ê¤·¡Ë"
+msgid "Configure proxies"
+msgstr "¥×¥í¥¯¥·¤ÎÀßÄê"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Danmark"
-msgstr "¥Ç¥ó¥Þ¡¼¥¯"
+msgid "Please wait, updating medium..."
+msgstr "¾¯¡¹¤ªÂÔ¤Á¤ò¡¢¥á¥Ç¥£¥¢¹¹¿·Ãæ"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "China"
-msgstr "Ãæ¹ñ"
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "Êѹ¹¤òÊݸ¤¹¤ë¤Ë¤Ï¥á¥Ç¥£¥¢¤ò¥É¥é¥¤¥Ö¤ËÁÞÆþ¤·¤Æ¤¯¤À¤µ¤¤"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "United States"
-msgstr "¥¢¥á¥ê¥«"
+msgid "You need to insert the medium to continue"
+msgstr "³¤±¤ë¤Ë¤Ï¥á¥Ç¥£¥¢¤òÁÞÆþ¤·¤Æ¤¯¤À¤µ¤¤"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "changes:"
-msgstr "Êѹ¹:"
+msgid "Save changes"
+msgstr "Êѹ¹¤òÊݸ"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "¾¤Ëºï½ü¤¹¤Ù¤­¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤¹"
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Åý¹ç¤Þ¤¿¤Ïhdlist ¤Ø¤ÎÁêÂХѥ¹:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "URL:"
+msgstr "URL: "
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing source \"%s\":"
+msgstr "¥½¡¼¥¹ %s ¤ÎÊÔ½¸Ãæ:"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "¤¤¤¤¤¨"
+msgid "Edit a source"
+msgstr "¥½¡¼¥¹¤ÎÊÔ½¸"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Summary: "
-msgstr "¤Þ¤È¤á"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr "¾¯¡¹¤ªÂÔ¤Á¤ò¡¢¥á¥Ç¥£¥¢¼è¤ê½Ð¤·Ãæ"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Canada"
-msgstr "¥«¥Ê¥À"
+msgid "Type of source:"
+msgstr "¥½¡¼¥¹¤Î¼ïÎà:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Greece"
-msgstr "¥®¥ê¥·¥ã"
+msgid "Adding a source:"
+msgstr "¥½¡¼¥¹¤ÎÄɲÃ"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl: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."
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 msgstr ""
-"¥ß¥é¡¼°ìÍ÷¥À¥¦¥ó¥í¡¼¥ÉÃæ¤Ë¥¨¥é¡¼¤¬ÃÖ¤­¤Þ¤·¤¿:\n"
-"\n"
-"%s\n"
-"¥Í¥Ã¥È¥ï¡¼¥¯¤«Mandrakesoft¥¦¥§¥Ö¥µ¥¤¥È¤¬»È¤¨¤Ê¤¤¤è¤¦¤Ç¤¹¡£\n"
-"¤¢¤È¤Ç¤ä¤ê¤Ê¤ª¤·¤Æ¤¯¤À¤µ¤¤¡£"
+"Ʊ¤¸Ì¾Á°¤Î¥á¥Ç¥£¥¢¤¬¤¹¤Ç¤Ë¤¢¤ê¤Þ¤¹¡£ËÜÅö¤Ë\n"
+"ÃÖ¤­´¹¤¨¤Þ¤¹¤«¡©"
 
-#: ../rpmdrake:1
+#: ../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
 #, fuzzy, c-format
-msgid "Source: "
-msgstr "¥½¡¼¥¹"
+msgid "Name:"
+msgstr "̾Á°"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "¥½¡¼¥¹ `%s' ÍѤΥե¡¥¤¥ë¤ò¥³¥Ô¡¼Ãæ..."
+msgid "Login:"
+msgstr "Login: "
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "¥Ñ¥Ã¥±¡¼¥¸¥¤¥ó¥¹¥È¡¼¥ë¤Ë¤Ïroot¸¢¸Â¤¬É¬ÍפǤ¹"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "¥ß¥é¡¼¤òÁª¤ó¤Ç¤¯¤À¤µ¤¤¡§"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Browse..."
+msgstr "°Ê²¼¤ò¥Ö¥é¥¦¥º..."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "¥Ñ¥¹¤Þ¤¿¤Ï¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È¡§"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Removable device"
+msgstr "¥ê¥à¡¼¥Ð¥Ö¥ë¥Ç¥Ð¥¤¥¹"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "HTTP server"
+msgstr "HTTP ¥µ¡¼¥Ð"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "FTP¥µ¡¼¥Ð"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Path:"
 msgstr "¥Ý¡¼¥È:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Problem during removal"
-msgstr "ºï½üÃæ¤ËÌäÂ꤬µ¯¤³¤ê¤Þ¤·¤¿"
+msgid "Local files"
+msgstr "¥í¡¼¥«¥ë¥Õ¥¡¥¤¥ë"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by source repository"
-msgstr "¥½¡¼¥¹repository½ç"
+msgid "Add a source"
+msgstr "¥½¡¼¥¹¤ÎÄɲÃ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Selected"
-msgstr ""
-"¤¹¤Ù¤Æ\n"
-"Áª¤Ö"
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr "¥á¥Ç¥£¥¢¤ò¹¹¿·¤Ç¤­¤Þ¤»¤ó¡£»ÈÍÑÉÔǽ¤Ë¤·¤Þ¤¹¡£"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Netherlands"
-msgstr "¥ª¥é¥ó¥À"
+msgid "Unable to create medium."
+msgstr "¥á¥Ç¥£¥¢¤¬ºî¤ì¤Þ¤»¤ó¡£"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "ÄɲòÄǽ¤Ê¤â¤Î"
+msgid "Update"
+msgstr "¹¹¿·"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
-msgstr "¡Ê°ì¤Ä¤â¤¢¤ê¤Þ¤»¤ó¡Ë"
+msgid "Select the source(s) you wish to update:"
+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 "Please wait, updating media..."
+msgstr "¾¯¡¹¤ªÂÔ¤Á¤ò¡¢¥á¥Ç¥£¥¢¹¹¿·Ãæ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, 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 "`%s'¤Î¥À¥¦¥ó¥í¡¼¥É, ®ÅÙ:%s"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "%s'¤Î¥À¥¦¥ó¥í¡¼¥É, »Ä¤ê»þ´Ö:%s, ®ÅÙ:%s"
+
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Not selected"
-msgstr "¾×Æͤ¬¸«¤Ä¤«¤ê¤Þ¤·¤¿"
+msgid "Starting download of `%s'..."
+msgstr "%s ¤Î½ð̾³ÎǧÃæ..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "¥½¥Õ¥È¥¦¥§¥¢¥Ñ¥Ã¥±¡¼¥¸ºï½ü"
+msgid "Examining distant file of source `%s'..."
+msgstr "¥½¡¼¥¹ %s ¤Î±ó¤¯¤Î¥Õ¥¡¥¤¥ë¤òÄ´¤Ù¤Æ¤¤¤Þ¤¹..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Sweden"
-msgstr "¥¹¥¦¥§¡¼¥Ç¥ó"
+msgid "Examining file of source `%s'..."
+msgstr "¥½¡¼¥¹ %s ¤Î¥Õ¥¡¥¤¥ë¤òÄ´¤Ù¤Æ¤¤¤Þ¤¹..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Copying file for source `%s'..."
+msgstr "¥½¡¼¥¹ `%s' ÍѤΥե¡¥¤¥ë¤ò¥³¥Ô¡¼Ãæ..."
+
+#: ../rpmdrake.pm: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"
 "\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"
+"¥×¥í¥»¥Ã¥µ¤Î¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤¬Mandrake Linux ¸ø¼°¥¢¥Ã¥×¥Ç¡¼¥È¤Ç\n"
+"¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ç¤¹¡£"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "No mirror"
+msgstr "¥ß¥é¡¼¥µ¥¤¥È:"
+
+#: ../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."
+"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"
+"\n"
+"%s\n"
+"¥Í¥Ã¥È¥ï¡¼¥¯¤«Mandrakesoft¥¦¥§¥Ö¥µ¥¤¥È¤¬»È¤¨¤Ê¤¤¤è¤¦¤Ç¤¹¡£\n"
+"¤¢¤È¤Ç¤ä¤ê¤Ê¤ª¤·¤Æ¤¯¤À¤µ¤¤¡£"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "`%s'¤Î¥À¥¦¥ó¥í¡¼¥É, ®ÅÙ:%s"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "One of the following packages is needed:"
-msgstr "°Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¤É¤ì¤«¤¬É¬ÍפǤ¹:"
+msgid "Error during download"
+msgstr "¥À¥¦¥ó¥í¡¼¥ÉÃæ¤Ë¥¨¥é¡¼"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "½ªÎ»"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "¾¯¡¹¤ªÂÔ¤Á¤ò¡¢Mandrake¥¦¥§¥Ö¥µ¥¤¥È¤«¤é¥ß¥é¡¼¥µ¥¤¥È¤ò¼èÆÀÃæ¡£"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
+"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"
+"MandrakeSoft ¥¦¥§¥Ö¥µ¥¤¥È¤ËÀܳ¤·¤Æ¥ß¥é¡¼¥µ¥¤¥È¤Î°ìÍ÷¤ò¼èÆÀ\n"
+"¤·¤Þ¤¹¡£¥Í¥Ã¥È¥ï¡¼¥¯¤¬Í­¸ú¤«³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 "\n"
 "³¤±¤Þ¤¹¤«?"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid "United States"
+msgstr "¥¢¥á¥ê¥«"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "¾¯¡¹¤ªÂÔ¤Á¤ò¡¢¥á¥Ç¥£¥¢ÄɲÃÃæ"
+msgid "China"
+msgstr "Ãæ¹ñ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "¥½¡¼¥¹¤Î¼ïÎà:"
+msgid "United Kingdom"
+msgstr "¥¤¥®¥ê¥¹"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please insert the medium named \\\"%s\\\" on device [%s]"
-msgstr "%s¤È¤¤¤¦¥á¥Ç¥£¥¢¤ò¥Ç¥Ð¥¤¥¹[%s]¤ËÁÞÆþ¤·¤Æ¤¯¤À¤µ¤¤"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "ÂæÏÑ"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unable to get source packages."
-msgstr "¥Ñ¥Ã¥±¡¼¥¸¤òÁª¤ó¤Ç¤¯¤À¤µ¤¤"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "¥¹¥¦¥§¡¼¥Ç¥ó"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Áª¤ó¤À¥Ñ¥Ã¥±¡¼¥¸¤¬Â¿¤¹¤®¤Þ¤¹"
+msgid "Russia"
+msgstr "¥í¥·¥¢"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "¤Ï°Ê²¼¤È¤Ö¤Ä¤«¤ê¤Þ¤¹"
+msgid "Portugal"
+msgstr "¥Ý¡¼¥È:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Poland"
+msgstr "¥Ý¡¼¥é¥ó¥É"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Mandrake¤ÎÁªÂò"
+msgid "Norway"
+msgstr "¥Î¥ë¥¦¥§¡¼"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Netherlands"
+msgstr "¥ª¥é¥ó¥À"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Korea"
+msgstr "¶¯À©"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Êѹ¹¥í¥°: \n"
+msgid "Japan"
+msgstr "ÆüËÜ"
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Korea"
+msgid "Italy"
+msgstr "¥¤¥ó¥¹¥È¡¼¥ë"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Israel"
+msgstr "¥¤¥ó¥¹¥È¡¼¥ë"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "¥®¥ê¥·¥ã"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "France"
 msgstr "¶¯À©"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "¥ê¥à¡¼¥Ð¥Ö¥ë¥Ç¥Ð¥¤¥¹"
+msgid "Finland"
+msgstr "¥Õ¥£¥ó¥é¥ó¥É"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "¥¹¥Ú¥¤¥ó"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
+msgstr "¥Ç¥ó¥Þ¡¼¥¯"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr "¥É¥¤¥Ä"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
+msgstr "¥Á¥§¥³"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Costa Rica"
+msgstr "¥³¥¹¥¿¥ê¥«"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Canada"
+msgstr "¥«¥Ê¥À"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
+msgstr "¥Ö¥é¥¸¥ë"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "¥Ù¥ë¥®¡¼"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Change medium"
-msgstr "¥á¥Ç¥£¥¢Êѹ¹"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Mandrake Update"
-msgstr "MandrakeUpdate ÀßÄê"
+msgid "Australia"
+msgstr "¥ª¡¼¥¹¥È¥é¥ê¥¢"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by size"
-msgstr "¥µ¥¤¥º½ç"
+msgid "Austria"
+msgstr "¥ª¡¼¥¹¥È¥ê¥¢"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "FTP¥µ¡¼¥Ð"
+msgid "Info..."
+msgstr "¾ðÊó..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Files:\n"
-msgstr "/¥Õ¥¡¥¤¥ë(_F)"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
+msgstr "¤¤¤¤¤¨"
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr "¥á¥Ç¥£¥¢¤ò¹¹¿·¤Ç¤­¤Þ¤»¤ó¡£»ÈÍÑÉÔǽ¤Ë¤·¤Þ¤¹¡£"
+#, c-format
+msgid "Yes"
+msgstr "¤Ï¤¤"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
diff --git a/po/ko.po b/po/ko.po
index a0f8b2a1..68f676ef 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grpmi\n"
-"POT-Creation-Date: 2003-05-02 20:15+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+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,20 +19,16 @@ msgstr ""
 "Content-Type: text/plain; charset=euc-kr\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "»ç¿ë°¡?"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Path or mount point:"
-msgstr "°æ·Î ¶Ç´Â ¸¶¿îÆ® À§Ä¡:"
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Portugal"
-msgstr "Æ÷¸£Åõ°¥"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"°è¼ÓÇÒ±î¿ä?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -52,59 +48,104 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-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"
+"µµ¿Í ÁÝ´Ï´Ù."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Name:"
-msgstr "À̸§:"
+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.pm:1
-#, c-format
-msgid "Italy"
-msgstr "ÀÌŸ®"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"ÆÑÅ°Áö ¼³Ä¡ Áß ¿À·ù°¡ ÀÖ¾ú½À´Ï´Ù:\n"
+"\n"
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "¼öµ¿À¸·Î ¹Ì·¯¸¦ ¼±ÅÃÇÏ´Â ¹æ¹ý"
+msgid "Problem during removal"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "Please wait, removing packages..."
+msgstr "±â´Ù·Á ÁÖ¼¼¿ä. ÆÑÅ°Áö Á¦°Å Áß..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "ÀϺΠÆÑÅ°Áö´Â Á¦°ÅµÇ¾î¾ß ÇÕ´Ï´Ù."
+msgid "Please wait, reading packages database..."
+msgstr "±â´Ù·Á ÁÖ¼¼¿ä. ÆÑÅ°Áö µ¥ÀÌÅͺ£À̽º Àд Áß..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Already existing update sources"
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
 msgstr ""
+"ÆÑÅ°Áö ¼³Ä¡ Áß ¿À·ù°¡ ÀÖ¾ú½À´Ï´Ù:\n"
+"\n"
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "More information on package..."
-msgstr "Ãß°¡ ÆÑÅ°Áö Á¤º¸..."
+msgid "Installation failed"
+msgstr "¼³Ä¡ ½ÇÆÐ"
 
-#: ../rpmdrake.pm:1
+#: ../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 "¼³Ä¡ÇÒ ÆÑÅ°Áö Áغñ Áß..."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "¿¹"
+msgid "All requested packages were installed successfully."
+msgstr "¿äûµÈ ¸ðµç ÆÑÅ°ÁöÀÇ ¼³Ä¡¸¦ ¸¶ÃƽÀ´Ï´Ù."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+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 ""
-"ÀÇÁ¸¼º ¹®Á¦·Î ÀÎÇÏ¿©, ´ÙÀ½ ÆÑÅ°ÁöµéÀº\n"
-"Áö±Ý ¼±Åà ÇØÁ¦µÇ¾î¾ß ÇÕ´Ï´Ù:\n"
+"¼³Ä¡¸¦ ¿Ï·áÇÏ¿´½À´Ï´Ù; %s.\n"
 "\n"
+"ÀϺΠ¼³Á¤ ÆÄÀϵéÀº '.rpmnew' ¶Ç´Â '.rpmsave'·Î »ý¼ºµÇ¾ú½À´Ï´Ù.\n"
+"Á¶Ä¡¸¦ ÃëÇϱâ À§ÇØ ÀϺθ¦ Á¶»çÇØ º¼ ¼ö ÀÖ½À´Ï´Ù:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -112,490 +153,499 @@ msgid "everything was installed correctly"
 msgstr "¸ðµç ¼³Ä¡¸¦ ¸¶ÃƽÀ´Ï´Ù."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during installation"
+msgstr "¼³Ä¡Áß¿¡ ¹®Á¦°¡ ¹ß»ýÇß½À´Ï´Ù."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "ÆÑÅ°Áö ¼³Ä¡ Áß: [%s] (%s/%s)..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+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 ""
-"¼ÒÇÁÆ®¿þ¾î Á¦°Å µµ±¸ÀÔ´Ï´Ù!\n"
 "\n"
-"ÀÌ µµ±¸´Â ÄÄÇ»ÅÍ¿¡¼­ Á¦°ÅÇÒ ¼ÒÇÁÆ®¿þ¾î¸¦ ¼±ÅÃÇÒ ¼ö ÀÖµµ·Ï\n"
-"µµ¿Í ÁÝ´Ï´Ù."
+"Error(s) reported:\n"
+"%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."
-msgstr "º¯°æ»çÇ×À» ÀúÀåÇÏ·Á¸é, ¸Åü¸¦ µå¶óÀ̺꿡 »ðÀÔÇØ¾ß ÇÕ´Ï´Ù."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Save and quit"
-msgstr "ÀúÀå ÈÄ Á¾·á"
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
+msgstr ""
+"¼³Ä¡ ½ÇÆÐ. ÀϺΠÆÄÀÏÀÌ ¾ø½À´Ï´Ù.\n"
+"¼Ò½º µ¥ÀÌÅͺ£À̽º¸¦ ¾÷µ¥ÀÌÆ®ÇØ º¸¼¼¿ä."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"The following packages have bad signatures:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"ÆÑÅ°Áö ¼³Ä¡ Áß ¿À·ù°¡ ÀÖ¾ú½À´Ï´Ù:\n"
+"´Ù¸¥ ÆÑÅ°Áö¸¦ ¾÷±×·¹À̵åÇϱâ À§ÇØ, ´ÙÀ½ ÆÑÅ°ÁöµéÀº Á¦°ÅµÇ¾î¾ß ÇÕ´Ï´Ù:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"°è¼ÓÇÒ±î¿ä?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Size: "
-msgstr "Å©±â: "
+msgid "Verifying packages signatures..."
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Security updates"
-msgstr "º¸¾È ¾÷µ¥ÀÌÆ®"
+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 "Ãë¼Ò"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl: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]ÀåÄ¡¿¡ ³Ö¾î ÁÖ¼¼¿ä."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "ÃÖ´ë Á¤º¸"
+msgid "Change medium"
+msgstr "¸Åü ±³È¯"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, c-format
+msgid "Initializing..."
+msgstr "ÃʱâÈ­..."
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "¿À·ù..."
+msgid "Package installation..."
+msgstr "¼³Ä¡ÇÒ ÆÑÅ°Áö Áغñ Áß..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr "ÆÑÅ°Áö ¼³Ä¡´Â root »ç¿ëÀÚ¸¸ ÇÒ ¼ö ÀÖ½À´Ï´Ù."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "¿µ±¹"
+msgid "Unable to get source packages."
+msgstr "¼Ò½º ÆÑÅ°Áö¸¦ °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure sources"
-msgstr "¼Ò½º ¼³Á¤"
+msgid "Inspect..."
+msgstr "Á¶»ç..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "À̸§º°"
+msgid "Installation finished"
+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 ""
-"Àû´çÇÑ ¹Ì·¯¸¦ ãÀ» ¼ö ¾ø½À´Ï´Ù.\n"
-"\n"
-"ÀÌ ¹®Á¦ÀÇ ¿øÀÎÀº ¿©·¯°¡ÁöÀÏ ¼ö ÀÖ½À´Ï´Ù; °¡Àå ÈçÇÑ ¿øÀÎÀº\n"
-"ÀÌ ÄÄÇ»ÅÍÀÇ ÇÁ·Î¼¼¼­¸¦ ¸Çµå·¹ÀÌÅ© ¸®´ª½º °ø½Ä ¾÷µ¥ÀÌÆ®°¡\n"
-"Áö¿øÇÏÁö ¾Ê´Â °æ¿ìÀÔ´Ï´Ù."
+msgid "Do nothing"
+msgstr "±×³É µÒ"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
-"\n"
-"\\Do you want to continue installation?"
-msgstr ""
-"´Ù¸¥ ÆÑÅ°Áö¸¦ ¾÷±×·¹À̵åÇϱâ À§ÇØ, ´ÙÀ½ ÆÑÅ°ÁöµéÀº Á¦°ÅµÇ¾î¾ß ÇÕ´Ï´Ù:\n"
-"\n"
-"%s\n"
-"\n"
-"°è¼ÓÇÒ±î¿ä?"
+#, c-format
+msgid "Use .%s as main file"
+msgstr ".%sÀ»(¸¦) ÁÖ ÆÄÀÏ·Î »ç¿ë"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Remove .%s"
 msgstr ".%s Á¦°Å"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "changes:"
+msgstr "º¯°æ»çÇ× ÀúÀå"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Source"
-msgstr "¼Ò½º"
+msgid "Inspecting %s"
+msgstr "%s Á¶»çÁß"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "Çɶõµå"
+msgid "Please wait, finding available packages..."
+msgstr "±â´Ù·Á ÁÖ¼¼¿ä. À¯È¿ÇÑ ÆÑÅ°Áö °Ë»ö Áß..."
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, adding medium..."
+msgstr "±â´Ù·Á ÁÖ¼¼¿ä. ¸Åü Ãß°¡ Áß..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
+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"
+"±×·± ÈÄ, ¸Çµå·¹ÀÌÅ© ¾÷µ¥ÀÌÆ®¸¦ ´Ù½Ã ½ÇÇàÇϼ¼¿ä."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "France"
-msgstr "ÇÁ¶û½º"
+msgid "How to choose manually your mirror"
+msgstr "¼öµ¿À¸·Î ¹Ì·¯¸¦ ¼±ÅÃÇÏ´Â ¹æ¹ý"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "More info"
+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 ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, c-format
+msgid "Already existing update sources"
+msgstr ""
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"%s\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 ""
-"%s\n"
+"ÃֽŠ¾÷µ¥ÀÌÆ® ÆÑÅ°ÁöµéÀ» °¡Á®¿À±â À§ÇØ ¹Ì·¯¿¡ Á¢¼ÓÇØ¾ß ÇÕ´Ï´Ù.\n"
+"ÇöÀç ³×Æ®¿÷ÀÌ °¡´ÉÇÑÁö È®ÀÎÇϼ¼¿ä.\n"
 "\n"
 "°è¼ÓÇÒ±î¿ä?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "ÆÑÅ°Áö ¸ñ·Ï ´Ù½Ã Àбâ"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Choose a mirror..."
-msgstr "¹Ì·¯ ¼±ÅÃ..."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Adding a source:"
-msgstr "¼Ò½º Ãß°¡:"
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "[%s] ÆÑÅ°Áö¸¦ ¼³Ä¡ÇÒ ¼ö ¾ø½À´Ï´Ù.\n"
+msgid "Fatal error"
+msgstr "ÆÄÀÏ ¿À·ù"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
+msgid "Software Packages Installation"
 msgstr "¼³Ä¡ÇÒ ÆÑÅ°Áö Áغñ Áß..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages,"
-msgstr "¸ðµç ÆÑÅ°Áö"
+msgid "Mandrake Update"
+msgstr "¸Çµå·¹ÀÌÅ© ¾÷µ¥ÀÌÆ®"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "ÆÄÀϺ°"
+msgid "Software Packages Removal"
+msgstr "¼ÒÇÁÆ®¿þ¾î ÆÑÅ°Áö Á¦°Å"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "¿äûµÈ ¸ðµç ÆÑÅ°ÁöÀÇ ¼³Ä¡¸¦ ¸¶ÃƽÀ´Ï´Ù."
+msgid "Quit"
+msgstr "Á¾·á"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "ÇÁ¶ô½Ã È£½ºÆ®¸í:"
+msgid "Install"
+msgstr "¼³Ä¡"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update source(s)"
-msgstr "¼Ò½º ¾÷µ¥ÀÌÆ®"
+msgid "Remove"
+msgstr "Á¦°Å"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "Áö¿ª ÆÄÀÏ"
+msgid "Help"
+msgstr "µµ¿ò¸»"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "%s Á¶»çÁß"
+msgid "Search"
+msgstr "°Ë»ö"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Israel"
-msgstr "À̽º¶ó¿¤"
+msgid "Find:"
+msgstr "ã±â"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Help"
-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"
+"°è¼ÓÇÒ±î¿ä?"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "HTTP ¼­¹ö"
+msgid "Some packages need to be removed"
+msgstr "ÀϺΠÆÑÅ°Áö´Â Á¦°ÅµÇ¾î¾ß ÇÕ´Ï´Ù."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"Welcome to the packages source editor!\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"
-"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."
+"Do you really want to install all the selected packages?"
 msgstr ""
-"ÆÑÅ°Áö ¼Ò½º ÆíÁý±â¿¡ Àß ¿À¼Ì½À´Ï´Ù!\n"
+"°æ°í:\n"
+"¼³Ä¡ ¿Ï·áÈÄ ¶Ç´Â ¼³Ä¡°úÁ¤Áß¿¡ µð½ºÅ© °ø°£ ºÎÁ·À» ÀÏÀ¸Å³ ¼ö\n"
+"ÀÖÀ» Á¤µµ·Î ³Ê¹« ¸¹Àº ÆÑÅ°Áö¸¦ Ãß°¡ÇÏ·Á ÇÏ°í ÀÖ½À´Ï´Ù.\n"
+"À̴ ƯÈ÷ À§ÇèÇÒ ¼ö ÀÖÀ¸¹Ç·Î, \n"
+"ÁÖÀǸ¦ ¿äÇÕ´Ï´Ù.\n"
 "\n"
-"ÀÌ µµ±¸´Â ÀÌ ÄÄÇ»ÅÍ »ó¿¡¼­ »ç¿ëÇÒ ÆÑÅ°Áö ¼Ò½º ¼³Á¤À» µµ¿Í ÁÝ´Ï´Ù.\n"
-"¼³Á¤µÈ ¼Ò½º´Â »õ ¼ÒÇÁÆ®¿þ¾î ÆÑÅ°Áö¸¦ ¼³Ä¡Çϰųª ¾÷µ¥ÀÌÆ®ÇÒ ¶§\n"
-"»ç¿ëµË´Ï´Ù."
+"Á¤¸»·Î ¼±ÅÃµÈ ¸ðµç ÆÑÅ°Áö¸¦ ¼³Ä¡ÇϽðڽÀ´Ï±î?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation failed"
-msgstr "¼³Ä¡ ½ÇÆÐ"
+msgid "Too many packages are selected"
+msgstr "³Ê¹« ¸¹Àº ÆÑÅ°Áö¸¦ ¼±ÅÃÇÏ¿´½À´Ï´Ù."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr ".%sÀ»(¸¦) ÁÖ ÆÄÀÏ·Î »ç¿ë"
+msgid "Maximum information"
+msgstr "ÃÖ´ë Á¤º¸"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results"
-msgstr "°Ë»ö °á°ú"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid " failed!"
-msgstr "ÆÄÀϺ°"
+msgid "Normal information"
+msgstr "ÀÏ¹Ý Á¤º¸"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Brazil"
-msgstr "ºê¶óÁú"
+msgid "Update source(s)"
+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 "Reload the packages list"
+msgstr "ÆÑÅ°Áö ¸ñ·Ï ´Ù½Ã Àбâ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "ã±â"
+msgid "Reset the selection"
+msgstr "¼±Åà Àç¼³Á¤"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "¸ðµç ÆÑÅ°Áö, °¡³ª´Ù¼ø"
+msgid "in files"
+msgstr "ÆÄÀϺ°"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "±â´Ù·Á ÁÖ¼¼¿ä. °Ë»ö Áß..."
+msgid "in descriptions"
+msgstr "¼³¸íº°"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "±â´Ù·Á ÁÖ¼¼¿ä. ÆÑÅ°Áö µ¥ÀÌÅͺ£À̽º Àд Áß..."
+msgid "in names"
+msgstr "À̸§º°"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "[%s] ÆÑÅ°Áö¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù.\n"
+#, c-format
+msgid "by update availability"
+msgstr "¾÷µ¥ÀÌÆ® °¡´É¼ºº°"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "¼±Åà Àç¼³Á¤"
+msgid "by source repository"
+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 ""
-"ÇÁ¶ô½Ã°¡ ÇÊ¿äÇÏ´Ù¸é, ÇÁ¶ô½Ã È£½ºÆ®¸í°ú Æ÷Æ®(¿É¼Ç)¸¦ ÀÔ·ÂÇϼ¼¿ä.(¹®¹ý: <È£½ºÆ®"
-"¸í[:Æ÷Æ®]>):"
+msgid "by selection state"
+msgstr "¼±Åà »óź°"
 
 #: ../rpmdrake: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 "by size"
+msgstr "Å©±âº°"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "ÄÚ½ºÅ¸¸®Ä«"
+msgid "by group"
+msgstr "±×·ìº°"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"ÆÑÅ°Áö ¼³Ä¡ Áß ¿À·ù°¡ ÀÖ¾ú½À´Ï´Ù:\n"
-"\n"
-"%s"
-
-#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "±â´Ù·Á ÁÖ¼¼¿ä. ¸Åü Á¦°Å Áß..."
+msgid "All packages,"
+msgstr "¸ðµç ÆÑÅ°Áö"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "¾ÏÈ£:"
+msgid "All packages, alphabetical"
+msgstr "¸ðµç ÆÑÅ°Áö, °¡³ª´Ù¼ø"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr ""
+msgid "Mandrake choices"
+msgstr "¸Çµå·¹ÀÌÅ© ¼±ÅÃ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "´ë¸¸"
+msgid "Normal updates"
+msgstr "ÀÏ¹Ý ¾÷µ¥ÀÌÆ®"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "User:"
-msgstr "»ç¿ëÀÚ:"
+msgid "Bugfixes updates"
+msgstr "¹ö±×¼öÁ¤ ¾÷µ¥ÀÌÆ®"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "±â´Ù·Á ÁÖ¼¼¿ä. ¸Åü ¾÷µ¥ÀÌÆ® Áß..."
+msgid "Security updates"
+msgstr "º¸¾È ¾÷µ¥ÀÌÆ®"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "±â´Ù·Á ÁÖ¼¼¿ä. ÆÑÅ°Áö ¸ñ·Ï Á¤·Ä Áß..."
+msgid "Description: "
+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 ""
+msgid "Reason for update: "
+msgstr "¾÷µ¥ÀÌÆ® ÀÌÀ¯:"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Information on packages"
-msgstr "Ãß°¡ ÆÑÅ°Áö Á¤º¸..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Cancel"
-msgstr "Ãë¼Ò"
+msgid "Summary: "
+msgstr "¿ä¾à ¼³¸í: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "¸ðµç ¼³Ä¡¸¦ ¸¶ÃƽÀ´Ï´Ù."
+msgid "Importance: "
+msgstr "Áß¿äµµ: "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "±â´Ù·Á ÁÖ¼¼¿ä. ¸Åü ¾÷µ¥ÀÌÆ® Áß..."
+msgid "%s KB"
+msgstr "%s KB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Size: "
+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 "Version: "
+msgstr "¹öÀü: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "¼³¸íº°"
+msgid "Name: "
+msgstr "À̸§: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "ÇÁ¶ô½Ã ¼³Á¤"
+msgid "Currently installed version: "
+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 "Source: "
+msgstr "¼Ò½º: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "¼±ÅÃÇϼ¼¿ä"
+msgid "(Not available)"
+msgstr "(À¯È¿ÇÏÁö ¾ÊÀ½)"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "¼±ÅÃµÈ Å©±â: %d MB"
+msgid "Changelog:\n"
+msgstr "º¯°æ»çÇ×:\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Add a source"
-msgstr "¼Ò½º Ãß°¡:"
+msgid "Files:\n"
+msgstr "%sÆÄÀϵé:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "ÃʱâÈ­..."
+msgid "Selected size: %d MB"
+msgstr "¼±ÅÃµÈ Å©±â: %d MB"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "º¯°æ»çÇ× ÀúÀå"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "¼±ÅÃµÈ ¿ë·®: %d MB / ¿©À¯ °ø°£: %d MB"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
-msgstr "³»·Á¹Þ±â Áß ¿À·ù"
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
+msgstr ""
+"ÀÇÁ¸¼º ¹®Á¦·Î ÀÎÇÏ¿©, ´ÙÀ½ ÆÑÅ°ÁöµéÀº\n"
+"Áö±Ý ¼±Åà ÇØÁ¦µÇ¾î¾ß ÇÕ´Ï´Ù:\n"
+"\n"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "¼³Ä¡ÇÒ ÆÑÅ°Áö Áغñ Áß..."
+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 "Importance: "
-msgstr "Áß¿äµµ: "
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
+msgstr "(Àº)´Â ´ÙÀ½°ú Ãæµ¹ÇÕ´Ï´Ù:"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be installed"
+msgstr "[%s] ÆÑÅ°Áö¸¦ ¼³Ä¡ÇÒ ¼ö ¾ø½À´Ï´Ù.\n"
 
 #: ../rpmdrake:1
 #, c-format
@@ -608,83 +658,75 @@ msgstr ""
 "¼³Ä¡µÇ¾î¾ß ÇÕ´Ï´Ù.\n"
 "\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "Ãß°¡..."
+msgid "Additional packages needed"
+msgstr "Ãß°¡ ÆÑÅ°Áö°¡ ÇÊ¿äÇÕ´Ï´Ù."
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Unable to create medium."
-msgstr "¸Åü¸¦ »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "[%s] ÆÑÅ°Áö¸¦ ¼³Ä¡ÇÒ ¼ö ¾ø½À´Ï´Ù.\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Removing these packages would break your system, sorry:\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"
-"Á¶Ä¡¸¦ ÃëÇϱâ À§ÇØ ÀϺθ¦ Á¶»çÇØ º¼ ¼ö ÀÖ½À´Ï´Ù:"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Browse..."
-msgstr "ã¾Æº¸±â..."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "[%s] ÆÑÅ°Áö¸¦ ¼³Ä¡ÇÒ ¼ö ¾ø½À´Ï´Ù.\n"
-
-#: ../rpmdrake.pm:1
 #, c-format
-msgid "Info..."
-msgstr "Á¤º¸..."
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
+"ÀÇÁ¸¼º ¹®Á¦·Î ÀÎÇÏ¿©,\n"
+"´ÙÀ½ ÆÑÅ°Áöµéµµ Á¦°Å µÇ¾î¾ß ÇÕ´Ï´Ù:\n"
+"\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "°Ô¼ÓÇÏ·Á¸é ¸Åü¸¦ »ðÀÔÇØ¾ß ÇÕ´Ï´Ù."
+msgid "Some additional packages need to be removed"
+msgstr "ÀϺΠÆÑÅ°Áö°¡ ´õ Á¦°Å µÇ¾î¾ß ÇÕ´Ï´Ù."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "Á¦°Å"
+msgid "More information on package..."
+msgstr "Ãß°¡ ÆÑÅ°Áö Á¤º¸..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "¼³Ä¡ÇÒ ÆÑÅ°Áö Áغñ Áß..."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "No mirror"
-msgstr "¹Ì·¯ ¾øÀ½"
+msgid "Information on packages"
+msgstr "Ãß°¡ ÆÑÅ°Áö Á¤º¸..."
 
-#: ../edit-urpm-sources.pl:1
+#. -PO: Keep it short, this is gonna be on a button
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "ÃÖ¼ÒÇÑ Ã³À½ µÎ Ç׸ñ¿¡´Â ±âÀÔÇØ¾ß ÇÕ´Ï´Ù."
+msgid "More info"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "¼³Ä¡"
+msgid "Addable"
+msgstr "Ãß°¡ °¡´É"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "ÀϺ»"
+msgid "Upgradable"
+msgstr "¾÷±×·¹ÀÌµå °¡´É"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-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:1
 #, c-format
@@ -693,343 +735,376 @@ msgstr "¾÷µ¥ÀÌÆ® ¾øÀ½"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Description: "
-msgstr "¼³¸í:"
+msgid "(none)"
+msgstr "(¾øÀ½)"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"¼³Ä¡ ½ÇÆÐ. ÀϺΠÆÄÀÏÀÌ ¾ø½À´Ï´Ù.\n"
-"¼Ò½º µ¥ÀÌÅͺ£À̽º¸¦ ¾÷µ¥ÀÌÆ®ÇØ º¸¼¼¿ä."
+msgid "Please wait, listing packages..."
+msgstr "±â´Ù·Á ÁÖ¼¼¿ä. ÆÑÅ°Áö ¸ñ·Ï Á¤·Ä Áß..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "[%s] ÆÑÅ°Áö¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù.\n"
 
 #: ../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 "One of the following packages is needed:"
+msgstr "´ÙÀ½ ÆÑÅ°Áöµé Áß Çϳª°¡ ÇÊ¿äÇÕ´Ï´Ù:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "À̸§: "
+msgid "Please choose"
+msgstr "¼±ÅÃÇϼ¼¿ä"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "Á¶»ç..."
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "¼³Ä¡ÇÒ ÆÑÅ°Áö Áغñ Áß..."
+msgid "Not selected"
+msgstr "Ãæµ¹ÀÌ °¨ÁöµÇ¾ú½À´Ï´Ù."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "¿À½ºÆ®·¹Àϸ®¾Æ"
+msgid "Selected"
+msgstr "¼±ÅõÊ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation finished"
-msgstr "¼³Ä¡ ¿Ï·á"
+msgid "Search results"
+msgstr "°Ë»ö °á°ú"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
-msgstr "¾÷µ¥ÀÌÆ® °¡´É¼ºº°"
+msgid "Stop"
+msgstr "ÁßÁö"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
-msgstr "Æú¶õµå"
+msgid "Please wait, searching..."
+msgstr "±â´Ù·Á ÁÖ¼¼¿ä. °Ë»ö Áß..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Version: "
-msgstr "¹öÀü: "
+msgid "Search results (none)"
+msgstr "°Ë»ö °á°ú(¾øÀ½)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "ÇÁ¶ô½Ã ÀÎÁõÀÌ ÀÖ´Ù¸é »ç¿ëÀÚ¸í°ú ¾ÏÈ£¸¦ ÀÔ·ÂÇÒ ¼ö ÀÖ½À´Ï´Ù:"
+msgid "Other"
+msgstr "±âŸ"
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Editing source \\\"%s\\\":"
-msgstr "¼Ò½º [%s] ÆíÁý:"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "Upgradable"
-msgstr "¾÷±×·¹ÀÌµå °¡´É"
+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"
+"»ç¿ëµË´Ï´Ù."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid " done."
-msgstr ""
+msgid "Save and quit"
+msgstr "ÀúÀå ÈÄ Á¾·á"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "¼³Ä¡ÇÒ ÆÑÅ°Áö Áغñ Áß..."
+msgid "Proxy..."
+msgstr "¿À·ù..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr ""
+msgid "Update..."
+msgstr "¾÷µ¥ÀÌÆ®..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "Ãß°¡ ÆÑÅ°Áö°¡ ÇÊ¿äÇÕ´Ï´Ù."
+msgid "Add..."
+msgstr "Ãß°¡..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "¹ö±×¼öÁ¤ ¾÷µ¥ÀÌÆ®"
+msgid "Edit"
+msgstr "ÆíÁý"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr ""
+msgid "Source"
+msgstr "¼Ò½º"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Germany"
-msgstr "µ¶ÀÏ"
+msgid "Enabled?"
+msgstr "»ç¿ë°¡?"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Russia"
-msgstr "·¯½Ã¾Æ"
+msgid "Configure sources"
+msgstr "¼Ò½º ¼³Á¤"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Norway"
-msgstr "³ë¸£¿þÀÌ"
+msgid "Password:"
+msgstr "¾ÏÈ£:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "¼³Ä¡Áß¿¡ ¹®Á¦°¡ ¹ß»ýÇß½À´Ï´Ù."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
+msgstr "»ç¿ëÀÚ:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search"
-msgstr "°Ë»ö"
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "ÇÁ¶ô½Ã ÀÎÁõÀÌ ÀÖ´Ù¸é »ç¿ëÀÚ¸í°ú ¾ÏÈ£¸¦ ÀÔ·ÂÇÒ ¼ö ÀÖ½À´Ï´Ù:"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit a source"
-msgstr "¼Ò½º ÆíÁý"
+msgid "Proxy hostname:"
+msgstr "ÇÁ¶ô½Ã È£½ºÆ®¸í:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Czech Republic"
-msgstr "üÄÚ °øÈ­±¹"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"ÇÁ¶ô½Ã°¡ ÇÊ¿äÇÏ´Ù¸é, ÇÁ¶ô½Ã È£½ºÆ®¸í°ú Æ÷Æ®(¿É¼Ç)¸¦ ÀÔ·ÂÇϼ¼¿ä.(¹®¹ý: <È£½ºÆ®"
+"¸í[:Æ÷Æ®]>):"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Stop"
-msgstr "ÁßÁö"
+msgid "Configure proxies"
+msgstr "ÇÁ¶ô½Ã ¼³Á¤"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "¾÷µ¥ÀÌÆ® ¹öÀü"
+msgid "Please wait, updating medium..."
+msgstr "±â´Ù·Á ÁÖ¼¼¿ä. ¸Åü ¾÷µ¥ÀÌÆ® Áß..."
 
-#: ../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 "Normal information"
-msgstr "ÀÏ¹Ý Á¤º¸"
+msgid "You need to insert the medium to continue"
+msgstr "°Ô¼ÓÇÏ·Á¸é ¸Åü¸¦ »ðÀÔÇØ¾ß ÇÕ´Ï´Ù."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "ÆÑÅ°Áö ³»·Á¹Þ´Â Áß: [%s] (%s/%s)..."
+msgid "Save changes"
+msgstr "º¯°æ»çÇ× ÀúÀå"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "¼±ÅÃµÈ ¿ë·®: %d MB / ¿©À¯ °ø°£: %d MB"
+msgid "Relative path to synthesis/hdlist:"
+msgstr "ÇÕ¼º/¸ñ·Ï ÆÄÀÏ·ÎÀÇ »ó´ë °æ·Î:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Spain"
-msgstr "½ºÆäÀÎ"
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing source \"%s\":"
+msgstr "¼Ò½º [%s] ÆíÁý:"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
-msgstr "ÀÏ¹Ý ¾÷µ¥ÀÌÆ®"
+msgid "Edit a source"
+msgstr "¼Ò½º ÆíÁý"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by selection state"
-msgstr "¼±Åà »óź°"
+msgid "Please wait, removing medium..."
+msgstr "±â´Ù·Á ÁÖ¼¼¿ä. ¸Åü Á¦°Å Áß..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
-"±â´Ù·Á ÁÖ¼¼¿ä. ¸Çµå·¹ÀÌÅ©¼ÒÇÁÆ® À¥»çÀÌÆ®¿¡¼­ ¹Ì·¯ ¸ñ·ÏÀ» ³»·Á¹Þ°í ÀÖ½À´Ï´Ù."
+msgid "Type of source:"
+msgstr "¼Ò½º À¯Çü:"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Login:"
-msgstr "¾ÆÀ̵ð:"
+msgid "Adding a source:"
+msgstr "¼Ò½º Ãß°¡:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Austria"
-msgstr "¿À½ºÆ®¸®¾Æ"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"ÀÌ¹Ì µ¿ÀÏÇÑ À̸§ÀÇ ¸Åü°¡ ÀÖ½À´Ï´Ù.\n"
+"»õ·Î ¹Ù²Ù½Ã°Ú½À´Ï±î?"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Fatal error"
-msgstr "ÆÄÀÏ ¿À·ù"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to fill up at least the two first entries."
+msgstr "ÃÖ¼ÒÇÑ Ã³À½ µÎ Ç׸ñ¿¡´Â ±âÀÔÇØ¾ß ÇÕ´Ï´Ù."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "¾÷µ¥ÀÌÆ®ÇÏ·Á´Â ¼Ò½ºÀ» ¼±ÅÃÇØ ÁÖ¼¼¿ä:"
+msgid "Name:"
+msgstr "À̸§:"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update..."
-msgstr "¾÷µ¥ÀÌÆ®..."
+msgid "Login:"
+msgstr "¾ÆÀ̵ð:"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "[%s]ÀÇ ¼­¸í °ËÁõ Áß ..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "¹Ì·¯ ¼±ÅÃ..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
-msgstr "(¾øÀ½)"
+msgid "Browse..."
+msgstr "ã¾Æº¸±â..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
+msgid "Path or mount point:"
+msgstr "°æ·Î ¶Ç´Â ¸¶¿îÆ® À§Ä¡:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "ÆÑÅ°Áö ¼³Ä¡ Áß: [%s] (%s/%s)..."
+msgid "Removable device"
+msgstr "Å»Âø½Ä ÀåÄ¡"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "¼³Ä¡µÈ ¹öÀü:"
+msgid "HTTP server"
+msgstr "HTTP ¼­¹ö"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Other"
-msgstr "±âŸ"
+msgid "FTP server"
+msgstr "FTP ¼­¹ö"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reason for update: "
-msgstr "¾÷µ¥ÀÌÆ® ÀÌÀ¯:"
+msgid "Path:"
+msgstr "°æ·Î:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please choose the desired mirror."
-msgstr "Èñ¸ÁÇÏ´Â ¹Ì·¯¸¦ ¼±ÅÃÇϼ¼¿ä."
+msgid "Local files"
+msgstr "Áö¿ª ÆÄÀÏ"
 
 #: ../edit-urpm-sources.pl:1
+#, fuzzy, 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 "¸Åü¸¦ ¾÷µ¥ÀÌÆ®ÇÒ ¼ö ¾ø½À´Ï´Ù; ÀÚµ¿À¸·Î »ç¿ëºÒ°¡µÉ °ÍÀÔ´Ï´Ù."
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "ÆíÁý"
+msgid "Unable to create medium."
+msgstr "¸Åü¸¦ »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, finding available packages..."
-msgstr "±â´Ù·Á ÁÖ¼¼¿ä. À¯È¿ÇÑ ÆÑÅ°Áö °Ë»ö Áß..."
+msgid "Update"
+msgstr "¾÷µ¥ÀÌÆ® ¹öÀü"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "ÇÕ¼º/¸ñ·Ï ÆÄÀÏ·ÎÀÇ »ó´ë °æ·Î:"
+msgid "Select the source(s) you wish to update:"
+msgstr "¾÷µ¥ÀÌÆ®ÇÏ·Á´Â ¼Ò½ºÀ» ¼±ÅÃÇØ ÁÖ¼¼¿ä:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results (none)"
-msgstr "°Ë»ö °á°ú(¾øÀ½)"
+msgid "Please wait, updating media..."
+msgstr "±â´Ù·Á ÁÖ¼¼¿ä. ¸Åü ¾÷µ¥ÀÌÆ® Áß..."
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid " failed!"
+msgstr "ÆÄÀϺ°"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Danmark"
-msgstr "µ§¸¶Å©"
+msgid " done."
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "Áß±¹"
+msgid "Download of `%s', speed:%s"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United States"
-msgstr "¹Ì±¹"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "changes:"
-msgstr "º¯°æ»çÇ× ÀúÀå"
+msgid "Starting download of `%s'..."
+msgstr "[%s]ÀÇ ¼­¸í °ËÁõ Áß ..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "ÀϺΠÆÑÅ°Áö°¡ ´õ Á¦°Å µÇ¾î¾ß ÇÕ´Ï´Ù."
+msgid "Examining distant file of source `%s'..."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Examining file of source `%s'..."
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No"
-msgstr "¾Æ´Ï¿À"
+msgid "Copying file for source `%s'..."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Summary: "
-msgstr "¿ä¾à ¼³¸í: "
+msgid "Please choose the desired mirror."
+msgstr "Èñ¸ÁÇÏ´Â ¹Ì·¯¸¦ ¼±ÅÃÇϼ¼¿ä."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "ij³ª´Ù"
+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.pm:1
 #, c-format
-msgid "Greece"
-msgstr "±×¸®½º"
+msgid "No mirror"
+msgstr "¹Ì·¯ ¾øÀ½"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1046,254 +1121,179 @@ msgstr ""
 "³×Æ®¿÷ ¶Ç´Â ¸Çµå·¹ÀÌÅ©¼ÒÇÁÆ® À¥»çÀÌÆ®°¡ ÇöÀç À¯È¿ÇÏÁö ¾ÊÀº µí ÇÕ´Ï´Ù.\n"
 "³ªÁß¿¡ ´Ù½Ã ½ÃµµÇØ º¸¼¼¿ä."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Source: "
-msgstr "¼Ò½º: "
+msgid "Error during download"
+msgstr "³»·Á¹Þ±â Áß ¿À·ù"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
+"±â´Ù·Á ÁÖ¼¼¿ä. ¸Çµå·¹ÀÌÅ©¼ÒÇÁÆ® À¥»çÀÌÆ®¿¡¼­ ¹Ì·¯ ¸ñ·ÏÀ» ³»·Á¹Þ°í ÀÖ½À´Ï´Ù."
 
-#: ../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 "°æ·Î:"
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Problem during removal"
+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 "by source repository"
-msgstr "¼Ò½º µî·Ïº°"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Selected"
-msgstr "¼±ÅõÊ"
+"¹Ì·¯ ¸ñ·ÏÀ» °¡Á®¿À±â À§Çؼ­ ¸Çµå·¹ÀÌÅ©¼ÒÇÁÆ® À¥»çÀÌÆ®¿¡ Á¢¼ÓÇØ¾ß ÇÕ´Ï´Ù.\n"
+"ÇöÀç ³×Æ®¿÷ÀÌ °¡´ÉÇÑÁö È®ÀÎÇϼ¼¿ä.\n"
+"\n"
+"°è¼ÓÇÒ±î¿ä?"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Netherlands"
-msgstr "³×´ú¶õµå"
+msgid "United States"
+msgstr "¹Ì±¹"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "Ãß°¡ °¡´É"
+msgid "China"
+msgstr "Áß±¹"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
-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:1
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr "Ãæµ¹ÀÌ °¨ÁöµÇ¾ú½À´Ï´Ù."
+msgid "United Kingdom"
+msgstr "¿µ±¹"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "¼ÒÇÁÆ®¿þ¾î ÆÑÅ°Áö Á¦°Å"
+msgid "Taiwan"
+msgstr "´ë¸¸"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Sweden"
 msgstr "½º¿þµ§"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
-msgstr ""
+msgid "Russia"
+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."
-msgstr ""
-"¾÷µ¥ÀÌÆ® ¸ñ·ÏÀÌ ºñ¾ú½À´Ï´Ù. ½Ã½ºÅÛ »ó¿¡ ¼³Ä¡µÈ\n"
-"ÆÑÅ°Áö¿¡ ´ëÇÑ ¾÷µ¥ÀÌÆ®°¡ ¾ø°Å³ª,\n"
-"ÀÌ¹Ì ´Ù ¼³Ä¡µÈ °æ¿ìÀÔ´Ï´Ù."
+msgid "Portugal"
+msgstr "Æ÷¸£Åõ°¥"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr ""
+msgid "Poland"
+msgstr "Æú¶õµå"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "´ÙÀ½ ÆÑÅ°Áöµé Áß Çϳª°¡ ÇÊ¿äÇÕ´Ï´Ù:"
+msgid "Norway"
+msgstr "³ë¸£¿þÀÌ"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "Á¾·á"
+msgid "Netherlands"
+msgstr "³×´ú¶õµå"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 ""
-"ÃֽŠ¾÷µ¥ÀÌÆ® ÆÑÅ°ÁöµéÀ» °¡Á®¿À±â À§ÇØ ¹Ì·¯¿¡ Á¢¼ÓÇØ¾ß ÇÕ´Ï´Ù.\n"
-"ÇöÀç ³×Æ®¿÷ÀÌ °¡´ÉÇÑÁö È®ÀÎÇϼ¼¿ä.\n"
-"\n"
-"°è¼ÓÇÒ±î¿ä?"
+msgid "Korea"
+msgstr "´ëÇѹα¹"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "È®ÀÎ"
+msgid "Japan"
+msgstr "ÀϺ»"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "±â´Ù·Á ÁÖ¼¼¿ä. ¸Åü Ãß°¡ Áß..."
+msgid "Italy"
+msgstr "ÀÌŸ®"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "¼Ò½º À¯Çü:"
+msgid "Israel"
+msgstr "À̽º¶ó¿¤"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please insert the medium named \\\"%s\\\" on device [%s]"
-msgstr "[%s] ¸Åü¸¦ [%s]ÀåÄ¡¿¡ ³Ö¾î ÁÖ¼¼¿ä."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "±×¸®½º"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to get source packages."
-msgstr "¼Ò½º ÆÑÅ°Áö¸¦ °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù."
+msgid "France"
+msgstr "ÇÁ¶û½º"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "³Ê¹« ¸¹Àº ÆÑÅ°Áö¸¦ ¼±ÅÃÇÏ¿´½À´Ï´Ù."
+msgid "Finland"
+msgstr "Çɶõµå"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "(Àº)´Â ´ÙÀ½°ú Ãæµ¹ÇÕ´Ï´Ù:"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "½ºÆäÀÎ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Danmark"
+msgstr "µ§¸¶Å©"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "¸Çµå·¹ÀÌÅ© ¼±ÅÃ"
+msgid "Germany"
+msgstr "µ¶ÀÏ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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"
-"±×·± ÈÄ, ¸Çµå·¹ÀÌÅ© ¾÷µ¥ÀÌÆ®¸¦ ´Ù½Ã ½ÇÇàÇϼ¼¿ä."
+msgid "Czech Republic"
+msgstr "üÄÚ °øÈ­±¹"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "º¯°æ»çÇ×:\n"
+msgid "Costa Rica"
+msgstr "ÄÚ½ºÅ¸¸®Ä«"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Korea"
-msgstr "´ëÇѹα¹"
+msgid "Canada"
+msgstr "ij³ª´Ù"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "Å»Âø½Ä ÀåÄ¡"
+msgid "Brazil"
+msgstr "ºê¶óÁú"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "º§±â¿¡"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Change medium"
-msgstr "¸Åü ±³È¯"
+msgid "Australia"
+msgstr "¿À½ºÆ®·¹Àϸ®¾Æ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "¸Çµå·¹ÀÌÅ© ¾÷µ¥ÀÌÆ®"
+msgid "Austria"
+msgstr "¿À½ºÆ®¸®¾Æ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by size"
-msgstr "Å©±âº°"
+msgid "Info..."
+msgstr "Á¤º¸..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "FTP ¼­¹ö"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Files:\n"
-msgstr "%sÆÄÀϵé:\n"
+msgid "No"
+msgstr "¾Æ´Ï¿À"
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr "¸Åü¸¦ ¾÷µ¥ÀÌÆ®ÇÒ ¼ö ¾ø½À´Ï´Ù; ÀÚµ¿À¸·Î »ç¿ëºÒ°¡µÉ °ÍÀÔ´Ï´Ù."
+#, c-format
+msgid "Yes"
+msgstr "¿¹"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
diff --git a/po/lt.po b/po/lt.po
index 17b2691f..53dcb853 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grpmi\n"
-"POT-Creation-Date: 2003-05-02 20:15+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+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,19 +16,12 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-13\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr ""
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Path or mount point:"
-msgstr "prijungimo vieta:"
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Portugal"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -43,143 +36,127 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
 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 "How to choose manually your mirror"
-msgstr ""
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "URL:"
+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
-#, c-format
-msgid "Some packages need to be removed"
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
 msgstr ""
+"Ávyko klaida(os) diegiant paketa(us):\n"
+"\n"
+"%s"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Already existing update sources"
-msgstr ""
+#, fuzzy, c-format
+msgid "Problem during removal"
+msgstr "Ádiegimo metu ávyko klaida"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "More information on package..."
-msgstr ""
+#, fuzzy, c-format
+msgid "Please wait, removing packages..."
+msgstr "Praðom palaukti.Paðalinami paketai"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Yes"
-msgstr "Taip"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, reading packages database..."
+msgstr "Praðom palaukti.Paðalinami paketai"
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"There was a problem during the installation:\n"
 "\n"
+"%s"
 msgstr ""
+"Ávyko klaida(os) diegiant paketa(us):\n"
+"\n"
+"%s"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "everything was installed correctly"
-msgstr ""
+#, fuzzy, c-format
+msgid "Installation failed"
+msgstr "Ádiegiama "
 
 #: ../rpmdrake:1
-#, c-format
-msgid "%s KB"
-msgstr "%s KB"
+#, fuzzy, c-format
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "Ruoðiamasi paketo diegimui"
 
 #: ../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 ""
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "Ruoðiamasi paketo diegimui"
 
-#: ../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 "All requested packages were installed successfully."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
+msgid "Everything installed successfully"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"The installation is finished; %s.\n"
 "\n"
-"%s"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
 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 "Security updates"
-msgstr "Saugumo atnaujinimai"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Maximum information"
+msgid "everything was installed correctly"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Klaida..."
+msgid "Problem during installation"
+msgstr "Ádiegimo metu ávyko klaida"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr ""
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Ádiegiamas paketas `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Configure sources"
-msgstr ""
-"Atnaujinti\n"
-"laikmenà"
+msgid "Preparing packages installation..."
+msgstr "Ruoðiamasi paketo diegimui"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
 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."
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
 msgstr ""
 
 #: ../rpmdrake:1
@@ -189,7 +166,7 @@ msgid ""
 "\n"
 "%s\n"
 "\n"
-"\\Do you want to continue installation?"
+"Do you want to continue installation?"
 msgstr ""
 "Sekanti byla yra netinkama:\n"
 "\n"
@@ -198,366 +175,337 @@ msgstr ""
 "Ar vistiek norite tæsti (praleidþiant ðá paketà)?"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Remove .%s"
-msgstr "Iðimama"
-
-#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Source"
-msgstr "Ðaltinis"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Finland"
-msgstr "Surasti:"
+msgid "Verifying packages signatures..."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "Siunèiami paketai `%s' (%s/%s)..."
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "France"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
 msgstr "Nutraukti"
 
-#. -PO: Keep it short, this is gonna be on a button
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "Gerai"
+
 #: ../rpmdrake:1
 #, c-format
-msgid "More info"
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
+msgid "Change medium"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Reload the packages list"
-msgstr "Paketas %s nëra pasiraðytas"
+#, c-format
+msgid "Initializing..."
+msgstr "Ruoðiama ádiegimui..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Choose a mirror..."
-msgstr "Pasirinkite veidrodá:"
+msgid "Package installation..."
+msgstr "Ruoðiamasi paketo diegimui"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Adding a source:"
-msgstr "Redaguoti Laikmena"
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Atsipraðome, bet jums reikia perkrauti sistema kad ádiegti."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Paketas `%s' negali bûti ádiegtas\n"
+#, c-format
+msgid "Unable to get source packages."
+msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Ruoðiamasi paketo diegimui"
+#, c-format
+msgid "Inspect..."
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "All packages,"
-msgstr "0 paketø, 0 baitø"
+msgid "Installation finished"
+msgstr "Ádiegiama "
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "in files"
-msgstr "%d bylos"
+msgid "Do nothing"
+msgstr "Kompiuteris: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
+msgid "Use .%s as main file"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Proxy hostname:"
-msgstr "Tarpinës stoties (proxy) vartotojo vardas:"
-
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Update source(s)"
-msgstr "Atnaujinti laikmenà"
+msgid "Remove .%s"
+msgstr "Iðimama"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Local files"
-msgstr "%d bylos"
+msgid "changes:"
+msgstr "Paketai"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspecting %s"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Israel"
-msgstr "Ádiegti"
+msgid "Please wait, finding available packages..."
+msgstr "Praðom palaukti.Paðalinami paketai"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, adding medium..."
+msgstr ""
+"Praðom palaukti\n"
+"Iðmetama laikmena"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Help"
-msgstr "Pagalba"
+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 ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
+msgid "How to choose manually your mirror"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"Welcome to the packages source editor!\n"
+"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"
-"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 ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Ádiegiama "
+#, c-format
+msgid "Already existing update sources"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
+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
+#, c-format
+msgid "A fatal error occurred: %s."
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Search results"
-msgstr "Paieðkos rezultatai"
+msgid "Fatal error"
+msgstr "Raðymo klaida"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid " failed!"
-msgstr "%d bylos"
+msgid "Software Packages Installation"
+msgstr "Ruoðiamasi paketo diegimui"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Brazil"
+msgid "Mandrake Update"
 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?"
+msgid "Software Packages Removal"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Find:"
-msgstr "Surasti:"
+msgid "Quit"
+msgstr "Iðeiti"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr ""
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, searching..."
-msgstr "Praðom palaukti.Paðalinami paketai"
+msgid "Install"
+msgstr "Ádiegti"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Praðom palaukti.Paðalinami paketai"
+msgid "Remove"
+msgstr "Nutolæs spausdintuvas"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "Negaliu atidaryti paketo  `%s'\n"
+#, c-format
+msgid "Help"
+msgstr "Pagalba"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr ""
+msgid "Search"
+msgstr "Ieðkoti"
 
-#: ../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 ""
+msgid "Find:"
+msgstr "Surasti:"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
 "\n"
+"Is it ok to continue?"
 msgstr ""
-"Kad bûtø patenkintos visos priklausomybës,\n"
-"ðie paketai bus paðalinti:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
+msgid "Some packages need to be removed"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Ávyko klaida(os) diegiant paketa(us):\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"
-"%s"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Please wait, removing medium..."
+"Do you really want to install all the selected packages?"
 msgstr ""
-"Praðom palaukti\n"
-"Iðmetama laikmena"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "Slaptaþodis:"
+msgid "Too many packages are selected"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
+msgid "Maximum information"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Taiwan"
-msgstr "Vieta"
+msgid "Normal information"
+msgstr "Saugumo atnaujinimai"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "User:"
-msgstr "Vartotojo vardas (username):"
+msgid "Update source(s)"
+msgstr "Atnaujinti laikmenà"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, updating medium..."
+msgid "Reload the packages list"
+msgstr "Paketas %s nëra pasiraðytas"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
 msgstr ""
-"Praðom palaukti\n"
-"Iðmetama laikmena"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, listing packages..."
-msgstr "Praðom palaukti.Paðalinami paketai"
+msgid "in files"
+msgstr "%d bylos"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "in descriptions"
+msgstr "Apraðymai"
 
 #: ../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 "in names"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Information on packages"
-msgstr "Negaliu atidaryti paketo"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Cancel"
-msgstr "Nutraukti"
+msgid "by update availability"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
+msgid "by source repository"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Please wait, updating media..."
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
 msgstr ""
-"Praðom palaukti\n"
-"Iðmetama laikmena"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
+msgid "by size"
 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 "by group"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "in descriptions"
-msgstr "Apraðymai"
+msgid "All packages,"
+msgstr "0 paketø, 0 baitø"
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Configure proxies"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
 msgstr ""
-"Atnaujinti\n"
-"laikmenà"
 
-#: ../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 "Mandrake choices"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please choose"
-msgstr "Praðom patvirtinti"
+msgid "Normal updates"
+msgstr "Saugumo atnaujinimai"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Selected size: %d MB"
-msgstr "%d paþymëti paketai: %.1f MB"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Add a source"
-msgstr "Redaguoti Laikmena"
+msgid "Bugfixes updates"
+msgstr "Saugumo atnaujinimai"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Initializing..."
-msgstr "Ruoðiama ádiegimui..."
+msgid "Security updates"
+msgstr "Saugumo atnaujinimai"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Save changes"
-msgstr "Paketai"
+msgid "Description: "
+msgstr "Apraðymai"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
-msgstr "Klaida siunèiant"
+msgid "Reason for update: "
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Ruoðiamasi paketo diegimui"
+msgid "Summary: "
+msgstr "Turinys"
 
 #: ../rpmdrake:1
 #, c-format
@@ -566,616 +514,617 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
-msgstr ""
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add..."
-msgstr ""
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unable to create medium."
-msgstr "Nepavyko sukurti raporto bylos, nutraukiu.\n"
+msgid "Size: "
+msgstr "Dydis"
 
 #: ../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 ""
+msgid "Version: "
+msgstr "Versija: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
-msgstr ""
+msgid "Name: "
+msgstr "Pavadinimas: "
 
 #: ../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 "Info..."
+msgid "Currently installed version: "
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr ""
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Remove"
-msgstr "Nutolæs spausdintuvas"
+msgid "Source: "
+msgstr "Ðaltinis: "
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Ruoðiamasi paketo diegimui"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "No mirror"
-msgstr "Lemtinga klaida"
-
-#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
+msgid "(Not available)"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Ádiegti"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Japan"
+msgid "Changelog:\n"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Do nothing"
-msgstr "Kompiuteris: "
+msgid "Files:\n"
+msgstr "/_Byla"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No update"
-msgstr "Saugumo atnaujinimai"
+msgid "Selected size: %d MB"
+msgstr "%d paþymëti paketai: %.1f MB"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Description: "
-msgstr "Apraðymai"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "%d paþymëti paketai: %.1f MB"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
 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"
+"Sorry, the following package(s) can't be selected:\n"
 "\n"
-"Do you really want to install all the selected packages?"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
 msgstr ""
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
+msgstr " konfliktuoja su "
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be installed"
+msgstr "Paketas `%s' negali bûti ádiegtas\n"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "Pavadinimas: "
+msgid ""
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
+msgid "Additional packages needed"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Ruoðiamasi paketo diegimui"
+msgid "Some packages can't be removed"
+msgstr "Paketas `%s' negali bûti ádiegtas\n"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Australia"
-msgstr "nuoseklioji"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Installation finished"
-msgstr "Ádiegiama "
+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:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by update availability"
+#, fuzzy, c-format
+msgid "Some additional packages need to be removed"
 msgstr ""
+"Ðis papildomas paketas turi bûti ádiegtas kad viskas dirbtø gerai gerai:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
+msgid "More information on package..."
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Version: "
-msgstr "Versija: "
+#, fuzzy, c-format
+msgid "Information on packages"
+msgstr "Negaliu atidaryti paketo"
 
-#: ../edit-urpm-sources.pl:1
+#. -PO: Keep it short, this is gonna be on a button
+#: ../rpmdrake:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
+msgid "More info"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Editing source \\\"%s\\\":"
-msgstr "Redaguoti Laikmena"
+msgid "Addable"
+msgstr "Galimi"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Upgradable"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " done."
+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:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Ruoðiamasi paketo diegimui"
+msgid "No update"
+msgstr "Saugumo atnaujinimai"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining file of source `%s'..."
+msgid "(none)"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Additional packages needed"
-msgstr ""
+#, fuzzy, c-format
+msgid "Please wait, listing packages..."
+msgstr "Praðom palaukti.Paðalinami paketai"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Bugfixes updates"
-msgstr "Saugumo atnaujinimai"
+msgid "unknown package "
+msgstr "Negaliu atidaryti paketo  `%s'\n"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
+msgid "One of the following packages is needed:"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Germany"
-msgstr "Vokieèiø"
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Russia"
-msgstr "Rusø"
+msgid "Please choose"
+msgstr "Praðom patvirtinti"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Norway"
-msgstr "Norvegø"
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Ádiegimo metu ávyko klaida"
+msgid "Not selected"
+msgstr "Rasti konfliktai"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Search"
-msgstr "Ieðkoti"
-
-#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Edit a source"
-msgstr "Redaguoti Laikmena"
+msgid "Selected"
+msgstr "Pasirinkti visus"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Czech Republic"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Search results"
+msgstr "Paieðkos rezultatai"
 
 #: ../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, removing packages..."
+msgid "Please wait, searching..."
 msgstr "Praðom palaukti.Paðalinami paketai"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Normal information"
-msgstr "Saugumo atnaujinimai"
+msgid "Search results (none)"
+msgstr "Paieðkos rezultatai"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Siunèiami paketai `%s' (%s/%s)..."
+msgid "Other"
+msgstr "Kitas"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-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 ""
+"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 ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Spain"
+msgid "Save and quit"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Normal updates"
-msgstr "Saugumo atnaujinimai"
+msgid "Proxy..."
+msgstr "Klaida..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by selection state"
+msgid "Update..."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgid "Add..."
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Login:"
-msgstr "Login:"
+msgid "Edit"
+msgstr "Redaguoti"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Source"
+msgstr "Ðaltinis"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Austria"
-msgstr "nuoseklioji"
+msgid "Configure sources"
+msgstr ""
+"Atnaujinti\n"
+"laikmenà"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "Slaptaþodis:"
+
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Raðymo klaida"
+msgid "User:"
+msgstr "Vartotojo vardas (username):"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
+msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Proxy hostname:"
+msgstr "Tarpinës stoties (proxy) vartotojo vardas:"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update..."
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "Tikrinu '%s' paraðà..."
+msgid "Configure proxies"
+msgstr ""
+"Atnaujinti\n"
+"laikmenà"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "(none)"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, updating medium..."
 msgstr ""
+"Praðom palaukti\n"
+"Iðmetama laikmena"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
+"In order to save the changes, you need to insert the medium in the drive."
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Ádiegiamas paketas `%s' (%s/%s)..."
-
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
+msgid "You need to insert the medium to continue"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Other"
-msgstr "Kitas"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Save changes"
+msgstr "Paketai"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "reliatyvus kelias iki hdlist: "
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reason for update: "
+msgid "URL:"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Please choose the desired mirror."
-msgstr ""
-"Praðom palaukti\n"
-"Gabenamas veidrodþiø sàraðas"
+msgid "Editing source \"%s\":"
+msgstr "Redaguoti Laikmena"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Edit"
-msgstr "Redaguoti"
+#, fuzzy, c-format
+msgid "Edit a source"
+msgstr "Redaguoti Laikmena"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Praðom palaukti.Paðalinami paketai"
+msgid "Please wait, removing medium..."
+msgstr ""
+"Praðom palaukti\n"
+"Iðmetama laikmena"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "reliatyvus kelias iki hdlist: "
+msgid "Type of source:"
+msgstr "Laikmenos tipas:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Search results (none)"
-msgstr "Paieðkos rezultatai"
+msgid "Adding a source:"
+msgstr "Redaguoti Laikmena"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Danmark"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "China"
+msgid "You need to fill up at least the two first entries."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "United States"
-msgstr "Jungtinës amerikos valstijos"
+msgid "Name:"
+msgstr "Pavadinimas:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "changes:"
-msgstr "Paketai"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
+msgstr "Login:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl: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 "Choose a mirror..."
+msgstr "Pasirinkite veidrodá:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Browse..."
+msgstr ""
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "No"
-msgstr "Ne"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Path or mount point:"
+msgstr "prijungimo vieta:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Summary: "
-msgstr "Turinys"
+msgid "Removable device"
+msgstr "Iðmesti laikmenà"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Canada"
+msgid "HTTP server"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Greece"
-msgstr "Graikø"
+msgid "Path:"
+msgstr "kelias:"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Local files"
+msgstr "%d bylos"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a source"
+msgstr "Redaguoti Laikmena"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"There was an error downloading the mirrors list:\n"
+"Unable to update medium; it will be automatically disabled.\n"
 "\n"
-"%s\n"
-"The network, or MandrakeSoft website, are maybe unavailable.\n"
-"Please try again later."
+"Errors:\n"
+"%s"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Unable to create medium."
+msgstr "Nepavyko sukurti raporto bylos, nutraukiu.\n"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Source: "
-msgstr "Ðaltinis: "
+msgid "Update"
+msgstr "Atnaujinti"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
+msgid "Select the source(s) you wish to update:"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Atsipraðome, bet jums reikia perkrauti sistema kad ádiegti."
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Path:"
-msgstr "kelias:"
+msgid "Please wait, updating media..."
+msgstr ""
+"Praðom palaukti\n"
+"Iðmetama laikmena"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Problem during removal"
-msgstr "Ádiegimo metu ávyko klaida"
+msgid " failed!"
+msgstr "%d bylos"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by source repository"
+msgid " done."
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Selected"
-msgstr "Pasirinkti visus"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Download of `%s', speed:%s"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Netherlands"
+msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Addable"
-msgstr "Galimi"
+msgid "Starting download of `%s'..."
+msgstr "Tikrinu '%s' paraðà..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
+msgid "Examining distant file of source `%s'..."
 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 "Examining file of source `%s'..."
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr "Rasti konfliktai"
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
+msgid "Copying file for source `%s'..."
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Sweden"
-msgstr "Pasiþiûrëti"
+msgid "Please choose the desired mirror."
+msgstr ""
+"Praðom palaukti\n"
+"Gabenamas veidrodþiø sàraðas"
 
-#: ../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
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "No mirror"
+msgstr "Lemtinga klaida"
+
+#: ../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."
+"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
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr ""
+msgid "Error during download"
+msgstr "Klaida siunèiant"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Quit"
-msgstr "Iðeiti"
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
+"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 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "Gerai"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Please wait, adding medium..."
-msgstr ""
-"Praðom palaukti\n"
-"Iðmetama laikmena"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Type of source:"
-msgstr "Laikmenos tipas:"
+msgid "United States"
+msgstr "Jungtinës amerikos valstijos"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \\\"%s\\\" on device [%s]"
+msgid "China"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to get source packages."
+msgid "United Kingdom"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Too many packages are selected"
-msgstr ""
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Taiwan"
+msgstr "Vieta"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr " konfliktuoja su "
+msgid "Sweden"
+msgstr "Pasiþiûrëti"
 
-#: ../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.pm:1
+#, fuzzy, c-format
+msgid "Russia"
+msgstr "Rusø"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
+msgid "Portugal"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Poland"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Norway"
+msgstr "Norvegø"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
+msgid "Netherlands"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1183,50 +1132,101 @@ msgstr ""
 msgid "Korea"
 msgstr "Dar"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Japan"
+msgstr ""
+
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Removable device"
-msgstr "Iðmesti laikmenà"
+msgid "Italy"
+msgstr "Ádiegti"
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Belgium"
-msgstr "Belgø"
+msgid "Israel"
+msgstr "Ádiegti"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Greece"
+msgstr "Graikø"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "France"
+msgstr "Nutraukti"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Finland"
+msgstr "Surasti:"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Change medium"
+msgid "Spain"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake Update"
+msgid "Danmark"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by size"
+msgid "Germany"
+msgstr "Vokieèiø"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
+msgid "Costa Rica"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Canada"
+msgstr ""
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
+msgstr ""
+
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Files:\n"
-msgstr "/_Byla"
+msgid "Belgium"
+msgstr "Belgø"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Australia"
+msgstr "nuoseklioji"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Austria"
+msgstr "nuoseklioji"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
+msgid "Info..."
 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"
diff --git a/po/lv.po b/po/lv.po
index dec5d274..b65785ea 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grpmi\n"
-"POT-Creation-Date: 2003-05-02 20:15+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+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,20 +15,16 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-13\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-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
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Portugal"
-msgstr "Portugâle"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Vai ir labi turpinât?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -47,59 +43,98 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-msgstr "pçc grupas"
+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."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Name:"
-msgstr "Vârds:"
+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 ""
+"Laipni lûdzam programmatûras noòemðanas rîkâ!\n"
+"\n"
+"Ðis rîks palîdzçs Jums izvçlçties, kuru programmatûru vçlaties\n"
+"noòemt no datora."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Italy"
-msgstr "Instalçt"
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr "Tiek sagatavota instalçðana"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "How to choose manually your mirror"
-msgstr "Kâ ar rokâm izvçlçties spoguïserveri"
+#, fuzzy, c-format
+msgid "Problem during removal"
+msgstr "Problçma instalçðanas laikâ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "Please wait, removing packages..."
+msgstr "Lûdzu gaidiet, noòemu pakotnes..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Daþas pakotnes nepiecieðams noòemt"
+msgid "Please wait, reading packages database..."
+msgstr "Lûdzu gaidiet, nolasu pakotòu datubâzi..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Already existing update sources"
-msgstr ""
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr "Tiek sagatavota instalçðana"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Installation failed"
+msgstr "Instalçt visu"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "Tiek sagatavota instalçðana"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "Tiek sagatavota instalçðana"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "More information on package..."
-msgstr "Vairâk informâcijas par pakotni..."
+msgid "All requested packages were installed successfully."
+msgstr "Visas pieprasîtâs pakotnes tika veiksmîgi instalçtas."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr ""
+msgid "Everything installed successfully"
+msgstr "Viss tika instalçts veiksmîgi"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, 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 ""
-"Sakarâ ar atkarîbâm, sekojoðâm pakotnçm jânoòem atzîmçjums:\n"
-"\n"
+"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
 #, c-format
@@ -107,485 +142,499 @@ 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"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr ""
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Tiek sagatavota instalçðana"
 
 #: ../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 ""
-"Laipni lûdzam programmatûras noòemðanas rîkâ!\n"
 "\n"
-"Ðis rîks palîdzçs Jums izvçlçties, kuru programmatûru vçlaties\n"
-"noòemt no datora."
+"Error(s) reported:\n"
+"%s"
+msgstr ""
 
-#: ../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 "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"
+"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."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"The following packages have bad signatures:\n"
 "\n"
-"%s"
-msgstr "Tiek sagatavota instalçðana"
+"%s\n"
+"\n"
+"Do you want to continue installation?"
+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 "Size: "
-msgstr "Apjoms: "
+msgid "Verifying packages signatures..."
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Security updates"
-msgstr "Droðîbas atjauninâjumi"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Maximum information"
-msgstr "Maksimâla informâcija"
+msgid "Cancel"
+msgstr "Atcelt"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "Labi"
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Kïûda..."
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Lûdzu, ievietojiet datu nesçju \"%s\" ierîcç [%s]"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Apvienotâ Karaliste"
+msgid "Change medium"
+msgstr "Nomainiet datu nesçju"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Configure sources"
-msgstr "Konfigurçt izejas kodus"
+msgid "Initializing..."
+msgstr "Instalçju:"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Package installation..."
+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."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages."
+msgstr "Nebija iespçjams saòemt izejas pakotnes."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "vârdos"
+msgid "Inspect..."
+msgstr "Pârbaude..."
 
-#: ../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 ""
-"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 "Installation finished"
+msgstr "Instalçðana pabeigta"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
-"\n"
-"\\Do you want to continue installation?"
-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?"
+#, c-format
+msgid "Do nothing"
+msgstr "Nedarît neko"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
+msgstr "Lietojiet .%s kâ galveno failu"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Remove .%s"
 msgstr "Noòemt .%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Source"
-msgstr "Piespiest"
+msgid "changes:"
+msgstr "Saglabât izmaiòas"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "Somija"
+msgid "Inspecting %s"
+msgstr "Pârbaudu %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
+msgid "Please wait, finding available packages..."
+msgstr "Lûdzu gaidiet, meklçju pieejamâs pakotnes..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, adding medium..."
+msgstr "Lûdzu gaidiet, pievienoju datu nesçju..."
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "France"
-msgstr "Piespiest"
+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."
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "More info"
+msgid "How to choose manually your mirror"
+msgstr "Kâ ar rokâm izvçlçties spoguïserveri"
+
+#: ../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 ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, c-format
+msgid "Already existing update sources"
+msgstr ""
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"%s\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 ""
-"%s\n"
+"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:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Pârlâdçjiet pakotòu sarakstu"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Choose a mirror..."
-msgstr "Izvçlieties spoguïserveri..."
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Adding a source:"
-msgstr "Pievienoju avotu:"
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Pakotni neizdodas instalçt"
+msgid "Fatal error"
+msgstr "Ierakstîðanas kïûda\n"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
+msgid "Software Packages Installation"
 msgstr "Tiek sagatavota instalçðana"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages,"
-msgstr "Visas pakotnes,"
+msgid "Mandrake Update"
+msgstr "Mandrake atjauninâðana"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "failos"
+msgid "Software Packages Removal"
+msgstr "Programmatûras pakotòu noòemðana"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Visas pieprasîtâs pakotnes tika veiksmîgi instalçtas."
+msgid "Quit"
+msgstr "Iziet"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "Proxy hosta vârds:"
+msgid "Install"
+msgstr "Instalçt"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Update source(s)"
-msgstr "Atjaunot avotus"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "Noòemt"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "Lokâlie faili"
+msgid "Help"
+msgstr "Palîdzîba"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Pârbaudu %s"
+msgid "Search"
+msgstr "Meklçt"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Israel"
-msgstr "Instalçt"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "Meklçt:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Help"
-msgstr "Palîdzîba"
+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?"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "HTTP serveris"
+msgid "Some packages need to be removed"
+msgstr "Daþas pakotnes nepiecieðams noòemt"
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Welcome to the packages source editor!\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"
-"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."
+"Do you really want to install all the selected packages?"
 msgstr ""
-"Laipni lûdzam pakotòu avota redaktorâ!\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"
-"Ð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."
+"Vai tieðâm vçlaties instalçt visas izvçlçtâs pakotnes?"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Instalçt visu"
+#, c-format
+msgid "Too many packages are selected"
+msgstr "Izvçlçtas pa daudz pakotnes"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Lietojiet .%s kâ galveno failu"
+msgid "Maximum information"
+msgstr "Maksimâla informâcija"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results"
-msgstr "Meklçðanas rezultâti"
+msgid "Normal information"
+msgstr "Parasta informâcija"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid " failed!"
-msgstr "failos"
+msgid "Update source(s)"
+msgstr "Atjaunot avotus"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Brazil"
-msgstr "Brazîlija"
+msgid "Reload the packages list"
+msgstr "Pârlâdçjiet pakotòu sarakstu"
 
-#: ../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 ""
-"Jau ir datu nesçjs ar ðâdu vârdu,\n"
-"vai tieðâm vçlaties to aizvietot?"
+msgid "Reset the selection"
+msgstr "Izvçlçties no jauna"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Meklçt:"
+msgid "in files"
+msgstr "failos"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Visas pakotnes, pçc alfabçta"
+msgid "in descriptions"
+msgstr "aprakstos"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Lûdzu gaidiet, meklçju..."
+msgid "in names"
+msgstr "vârdos"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Lûdzu gaidiet, nolasu pakotòu datubâzi..."
+msgid "by update availability"
+msgstr "pçc atjauninâjuma pieejamîbas"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "unknown package "
-msgstr "Neizdodas atvçrt pakotni"
+msgid "by source repository"
+msgstr "pçc avota repozitârija"
 
 #: ../rpmdrake:1
 #, c-format
-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]>):"
+msgid "by selection state"
+msgstr "pçc izvçlçðanâs statusa"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"Lai apmierinâtu visas atkarîbas,\n"
-"ir nepiecieðams noòemt arî sekojoða(s) pakotne(s):\n"
-"\n"
+msgid "by size"
+msgstr "pçc apjoma"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Kostarika"
+msgid "by group"
+msgstr "pçc grupas"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr "Tiek sagatavota instalçðana"
-
-#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Lûdzu gaidiet, atvienoju datu nesçju..."
+msgid "All packages,"
+msgstr "Visas pakotnes,"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "Parole:"
+msgid "All packages, alphabetical"
+msgstr "Visas pakotnes, pçc alfabçta"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr ""
+msgid "Mandrake choices"
+msgstr "Mandrake izvçles"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Taivâna"
+msgid "Normal updates"
+msgstr "Parasti jauninâjumi"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "User:"
-msgstr "Lietotâjs:"
+msgid "Bugfixes updates"
+msgstr "Kïûdu labojumu jauninâjumi"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Lûdzu gaidiet, atjauninu datu nesçju..."
+msgid "Security updates"
+msgstr "Droðîbas atjauninâjumi"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Lûdzu gaidiet, veidoju pakotòu sarakstu..."
+msgid "Description: "
+msgstr "Apraksts: "
 
 #: ../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 "Reason for update: "
+msgstr "Atjauninâðanas iemesls: "
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Information on packages"
-msgstr "Vairâk informâcijas par pakotni..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Cancel"
-msgstr "Atcelt"
+msgid "Summary: "
+msgstr "Kopsavilkums: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Viss tika instalçts veiksmîgi"
+msgid "Importance: "
+msgstr "Svarîgums: "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Lûdzu gaidiet, atjuaninu datu nesçju"
+msgid "%s KB"
+msgstr "%s KB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Size: "
+msgstr "Apjoms: "
 
 #: ../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 ""
-"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?"
+msgid "Version: "
+msgstr "Versija: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "aprakstos"
+msgid "Name: "
+msgstr "Vârds: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Konfigurçt proxy serverus"
+msgid "Currently installed version: "
+msgstr "Patreiz instalçtâ versija: "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Source: "
+msgstr "Piespiest"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "(Not available)"
+msgstr "(Nav pieejams)"
+
+#: ../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 ""
-"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?"
+msgid "Changelog:\n"
+msgstr "Izmaiòu þurnâls:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Lûdzu izvçlieties"
+msgid "Files:\n"
+msgstr "Faili:\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Izvçles apjoms: %d MB"
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Add a source"
-msgstr "Pievienoju avotu:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Izvçlçts: %d MB / brîvâ diska vieta: %d MB"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Initializing..."
-msgstr "Instalçju:"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Save changes"
-msgstr "Saglabât izmaiòas"
+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"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Error during download"
+#: ../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"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Tiek sagatavota instalçðana"
+msgid "%s conflicts with %s"
+msgstr " konfliktç ar %s-%s-%s"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Importance: "
-msgstr "Svarîgums: "
+#, fuzzy, c-format
+msgid "Some packages can't be installed"
+msgstr "Pakotni neizdodas instalçt"
 
 #: ../rpmdrake:1
 #, c-format
@@ -598,429 +647,455 @@ msgstr ""
 "ir nepiecieðams instalçt arî sekojoða(s) pakotne(s):\n"
 "\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "Pievienot..."
+msgid "Additional packages needed"
+msgstr "Papildus nepiecieðamâs pakotnes"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Unable to create medium."
-msgstr "Nevaru izveidot datu nesçju."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "Pakotni neizdodas instalçt"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Removing these packages would break your system, sorry:\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:"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Browse..."
-msgstr "Pârlûkot..."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "Pakotni neizdodas instalçt"
-
-#: ../rpmdrake.pm:1
 #, c-format
-msgid "Info..."
-msgstr "Info..."
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
+"Lai apmierinâtu visas atkarîbas,\n"
+"ir nepiecieðams noòemt arî sekojoða(s) pakotne(s):\n"
+"\n"
 
-#: ../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 "Some additional packages need to be removed"
+msgstr "Nepiecieðams noòemt daþas papildus pakotnes"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "Noòemt"
+msgid "More information on package..."
+msgstr "Vairâk informâcijas par pakotni..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Tiek sagatavota instalçðana"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "No mirror"
-msgstr "Nav spoguïservera"
-
-#: ../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."
+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 "Install"
-msgstr "Instalçt"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Japan"
-msgstr "Japâna"
+msgid "More info"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Nedarît neko"
+msgid "Addable"
+msgstr "Pievienojams"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "No update"
-msgstr "Nav jauninâjuma"
+msgid "Upgradable"
+msgstr "Atjauninâms"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Description: "
-msgstr "Apraksts: "
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"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 ""
-"Instalçðana neizdevâs, trûkst daþi faili.\n"
-"Jûs varbût vçlaties atjauninât avotu datubâzi."
+"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: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 ""
-"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?"
+msgid "No update"
+msgstr "Nav jauninâjuma"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "Vârds: "
+msgid "(none)"
+msgstr "(neviens)"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "Pârbaude..."
+msgid "Please wait, listing packages..."
+msgstr "Lûdzu gaidiet, veidoju pakotòu sarakstu..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Tiek sagatavota instalçðana"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Australia"
-msgstr "Austrâlija"
+msgid "unknown package "
+msgstr "Neizdodas atvçrt pakotni"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation finished"
-msgstr "Instalçðana pabeigta"
+msgid "One of the following packages is needed:"
+msgstr "Ir nepiecieðama viena no sekojoðâm pakotnçm:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
-msgstr "pçc atjauninâjuma pieejamîbas"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Poland"
-msgstr "Polija"
+msgid "Please choose"
+msgstr "Lûdzu izvçlieties"
 
 #: ../rpmdrake:1
 #, 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 "Varat norâdît lietotâja vârdu/paroli priekði proxy autentifikâcijas:"
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Editing source \\\"%s\\\":"
-msgstr "Laboju avotu \"%s\":"
+msgid "Not selected"
+msgstr " konfliktç ar %s-%s-%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Upgradable"
-msgstr "Atjauninâms"
+msgid "Selected"
+msgstr "Izvçlçts"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " done."
-msgstr ""
+msgid "Search results"
+msgstr "Meklçðanas rezultâti"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Tiek sagatavota instalçðana"
+msgid "Stop"
+msgstr "Stop"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr ""
+msgid "Please wait, searching..."
+msgstr "Lûdzu gaidiet, meklçju..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "Papildus nepiecieðamâs pakotnes"
+msgid "Search results (none)"
+msgstr "Meklçðanas rezultâti (neviens)"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Kïûdu labojumu jauninâjumi"
+msgid "Other"
+msgstr "Cits"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
+#: ../edit-urpm-sources.pl: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."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Germany"
-msgstr "Vâcija"
+msgid "Save and quit"
+msgstr "Saglabât un iziet"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Russia"
-msgstr "Krievija"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Proxy..."
+msgstr "Kïûda..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Norway"
-msgstr "Norvçìija"
+msgid "Update..."
+msgstr "Atjauninât..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Instalçðanas laikâ radâs problçmas"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "Pievienot..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search"
-msgstr "Meklçt"
+msgid "Edit"
+msgstr "Rediìçt"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Edit a source"
-msgstr "Labot avotu"
+msgid "Source"
+msgstr "Piespiest"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Èehija"
+msgid "Enabled?"
+msgstr "Atïauts?"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Stop"
-msgstr "Stop"
+msgid "Configure sources"
+msgstr "Konfigurçt izejas kodus"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "Atjauninât"
+msgid "Password:"
+msgstr "Parole:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "Lûdzu gaidiet, noòemu pakotnes..."
+msgid "User:"
+msgstr "Lietotâjs:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal information"
-msgstr "Parasta informâcija"
+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
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
+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]>):"
 msgstr ""
+"Ja nepiecieðams proxy, ievadiet hosta vârdu un opcionâli portu (sintakse: "
+"<proxy hosts[:ports]>):"
 
-#: ../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 "Configure proxies"
+msgstr "Konfigurçt proxy serverus"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Spain"
-msgstr "Spânija"
+msgid "Please wait, updating medium..."
+msgstr "Lûdzu gaidiet, atjauninu datu nesçju..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
-msgstr "Parasti jauninâjumi"
+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â."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by selection state"
-msgstr "pçc izvçlçðanâs statusa"
+msgid "You need to insert the medium to continue"
+msgstr "Jums jâielik datu nesçjs, lai turpinâtu"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl: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 "Save changes"
+msgstr "Saglabât izmaiòas"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Login:"
-msgstr "Lietotâjs:"
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Relatîvais èeïð uz synthesis/hdlist: "
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Austria"
-msgstr "Austrija"
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Ierakstîðanas kïûda\n"
+msgid "Editing source \"%s\":"
+msgstr "Laboju avotu \"%s\":"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl: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 "Edit a source"
+msgstr "Labot avotu"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update..."
-msgstr "Atjauninât..."
+msgid "Please wait, removing medium..."
+msgstr "Lûdzu gaidiet, atvienoju datu nesçju..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Type of source:"
+msgstr "Avota tips:"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Adding a source:"
+msgstr "Pievienoju avotu:"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Starting download of `%s'..."
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 msgstr ""
+"Jau ir datu nesçjs ar ðâdu vârdu,\n"
+"vai tieðâm vçlaties to aizvietot?"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
-msgstr "(neviens)"
+msgid "You need to fill up at least the two first entries."
+msgstr "Jums jâaizpilda vismaz pirmie divi ievadlauki."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
+msgid "Name:"
+msgstr "Vârds:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr ""
+msgid "Login:"
+msgstr "Lietotâjs:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Patreiz instalçtâ versija: "
+msgid "Choose a mirror..."
+msgstr "Izvçlieties spoguïserveri..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Other"
-msgstr "Cits"
+msgid "Browse..."
+msgstr "Pârlûkot..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Atjauninâðanas iemesls: "
+msgid "Path or mount point:"
+msgstr "Ceïð uz montçðanas punktu:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please choose the desired mirror."
-msgstr "Lûdzu izvçlieties spoguïserveri"
+msgid "Removable device"
+msgstr "Atvienojama ierîce"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit"
-msgstr "Rediìçt"
+msgid "HTTP server"
+msgstr "HTTP serveris"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Lûdzu gaidiet, meklçju pieejamâs pakotnes..."
+msgid "FTP server"
+msgstr "FTP serveris"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Relatîvais èeïð uz synthesis/hdlist: "
+msgid "Path:"
+msgstr "Ceïð:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Meklçðanas rezultâti (neviens)"
+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."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Danmark"
-msgstr "Dânija"
+msgid "Unable to create medium."
+msgstr "Nevaru izveidot datu nesçju."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "Íîna"
+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:"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United States"
-msgstr "ASV"
+msgid "Please wait, updating media..."
+msgstr "Lûdzu gaidiet, atjuaninu datu nesçju"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "changes:"
-msgstr "Saglabât izmaiòas"
+msgid " failed!"
+msgstr "failos"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Nepiecieðams noòemt daþas papildus pakotnes"
+msgid " done."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Download of `%s', speed:%s"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No"
+msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Summary: "
-msgstr "Kopsavilkums: "
+msgid "Starting download of `%s'..."
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "Kanâda"
+msgid "Examining distant file of source `%s'..."
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Greece"
-msgstr "Grieíija"
+msgid "Examining file of source `%s'..."
+msgstr ""
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Copying file for source `%s'..."
+msgstr ""
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please choose the desired mirror."
+msgstr "Lûdzu izvçlieties spoguïserveri"
+
+#: ../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."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
+msgstr "Nav spoguïservera"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1037,255 +1112,180 @@ msgstr ""
 "Tîkls, vai arî MandrakeSoft web vieta, iespçjams, nav pieejami.\n"
 "Lûdzu, mçìiniet vçlreiz vçlâk."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Source: "
-msgstr "Piespiest"
-
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
+msgid "Error during download"
 msgstr ""
 
-#: ../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 "Path:"
-msgstr "Ceïð:"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during removal"
-msgstr "Problçma instalçðanas laikâ"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "by source repository"
-msgstr "pçc avota repozitârija"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Selected"
-msgstr "Izvçlçts"
-
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Netherlands"
-msgstr "Holande"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
+"Lûdzu gaidiet, lujuplâdçju spoguïserveru sarakstu no MandrakeSoft web vietas."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "Pievienojams"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "(Not available)"
-msgstr "(Nav pieejams)"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
 "\n"
-"%s"
+"Is it ok to continue?"
 msgstr ""
-"Atvainojiet, sekojoðas pakotnes nevar tikt izvçlçtas\"\n"
+"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
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr " konfliktç ar %s-%s-%s"
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Programmatûras pakotòu noòemðana"
+msgid "United States"
+msgstr "ASV"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Sweden"
-msgstr "Zviedrija"
+msgid "China"
+msgstr "Íîna"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
-msgstr ""
+msgid "United Kingdom"
+msgstr "Apvienotâ Karaliste"
 
-#: ../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."
-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 "Taiwan"
+msgstr "Taivâna"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr ""
+msgid "Sweden"
+msgstr "Zviedrija"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Ir nepiecieðama viena no sekojoðâm pakotnçm:"
+msgid "Russia"
+msgstr "Krievija"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "Iziet"
+msgid "Portugal"
+msgstr "Portugâle"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 ""
-"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?"
+msgid "Poland"
+msgstr "Polija"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "Labi"
+msgid "Norway"
+msgstr "Norvçìija"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "Lûdzu gaidiet, pievienoju datu nesçju..."
+msgid "Netherlands"
+msgstr "Holande"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Type of source:"
-msgstr "Avota tips:"
+msgid "Korea"
+msgstr "Piespiest"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Japan"
+msgstr "Japâna"
+
+#: ../rpmdrake.pm: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]"
+msgid "Italy"
+msgstr "Instalçt"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Unable to get source packages."
-msgstr "Nebija iespçjams saòemt izejas pakotnes."
+msgid "Israel"
+msgstr "Instalçt"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Izvçlçtas pa daudz pakotnes"
+msgid "Greece"
+msgstr "Grieíija"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr " konfliktç ar %s-%s-%s"
+msgid "France"
+msgstr "Piespiest"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 ""
-"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."
+msgid "Finland"
+msgstr "Somija"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Mandrake izvçles"
+msgid "Spain"
+msgstr "Spânija"
 
-#: ../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."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
+msgstr "Dânija"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Izmaiòu þurnâls:\n"
+msgid "Germany"
+msgstr "Vâcija"
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Korea"
-msgstr "Piespiest"
+#, c-format
+msgid "Czech Republic"
+msgstr "Èehija"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "Atvienojama ierîce"
+msgid "Costa Rica"
+msgstr "Kostarika"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Belgium"
-msgstr "Beïìija"
+msgid "Canada"
+msgstr "Kanâda"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Change medium"
-msgstr "Nomainiet datu nesçju"
+msgid "Brazil"
+msgstr "Brazîlija"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Mandrake atjauninâðana"
+msgid "Belgium"
+msgstr "Beïìija"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by size"
-msgstr "pçc apjoma"
+msgid "Australia"
+msgstr "Austrâlija"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "FTP serveris"
+msgid "Austria"
+msgstr "Austrija"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Files:\n"
-msgstr "Faili:\n"
+msgid "Info..."
+msgstr "Info..."
 
 #: ../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."
+#, c-format
+msgid "No"
+msgstr ""
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
diff --git a/po/ms.po b/po/ms.po
index f2cd6f0b..8c24ae09 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grpmi 8.2\n"
-"POT-Creation-Date: 2003-05-02 20:15+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+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,21 +14,14 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Enabled?"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
 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 ""
@@ -41,141 +34,127 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Name:"
-msgstr "Nama"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Italy"
-msgstr "Terinstal"
-
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
+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
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "URL:"
-msgstr "URL: "
+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 "Some packages need to be removed"
-msgstr ""
+#, fuzzy, c-format
+msgid "Problem during removal"
+msgstr "Ada masalah semasa instalasi"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Already existing update sources"
-msgstr ""
+#, fuzzy, c-format
+msgid "Please wait, removing packages..."
+msgstr "Tunggu, pakej berikut sedang dihapus:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "More information on package..."
+msgid "Please wait, reading packages database..."
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Yes"
-msgstr "Ya"
-
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"There was a problem during the installation:\n"
 "\n"
+"%s"
 msgstr ""
+"Terdapat ralat semasa instalasi pakej:\n"
+"\n"
+"%s"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "everything was installed correctly"
-msgstr "Pakej sudah diinstal sebelumnya"
+msgid "Installation failed"
+msgstr "dapat diinstal"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "%s KB"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "Menyediakan pakej untuk instal..."
 
 #: ../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 ""
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "Menyediakan pakej untuk instal..."
 
-#: ../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 "All requested packages were installed successfully."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
+msgid "Everything installed successfully"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"The installation is finished; %s.\n"
 "\n"
-"%s"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
 msgstr ""
-"Terdapat ralat semasa instalasi pakej:\n"
-"\n"
-"%s"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Size: "
-msgstr ""
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Security updates"
-msgstr "Kemaskini sekuriti"
+#, fuzzy, c-format
+msgid "everything was installed correctly"
+msgstr "Pakej sudah diinstal sebelumnya"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Maximum information"
-msgstr ""
-
-#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Ralat..."
+msgid "Problem during installation"
+msgstr "Ada masalah semasa instalasi"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr ""
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Install pakej `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Configure sources"
-msgstr "Konfigurasikan sumber?"
+msgid "Preparing packages installation..."
+msgstr "Menyediakan pakej untuk instal..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
 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."
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
 msgstr ""
 
 #: ../rpmdrake:1
@@ -185,7 +164,7 @@ msgid ""
 "\n"
 "%s\n"
 "\n"
-"\\Do you want to continue installation?"
+"Do you want to continue installation?"
 msgstr ""
 "Fail yang berikut adalah tidak sah:\n"
 "\n"
@@ -194,398 +173,439 @@ msgstr ""
 "Adakah anda ingin teruskan (langkui pakej ini)?"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Remove .%s"
-msgstr "Boleh dihapus"
-
-#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Source"
-msgstr "Sumber"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Finland"
-msgstr "Cari:"
+msgid "Verifying packages signatures..."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "Muatturun pakej `%s' (%s/%s)..."
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "France"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
 msgstr "Batal"
 
-#. -PO: Keep it short, this is gonna be on a button
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "Ok"
+
 #: ../rpmdrake:1
 #, c-format
-msgid "More info"
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
+msgid "Change medium"
 msgstr ""
 
 #: ../rpmdrake:1
-#, 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:"
+#, c-format
+msgid "Initializing..."
+msgstr "Persediaan..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Adding a source:"
-msgstr ""
-"Tunggu\n"
-"Penambahan sumber"
+msgid "Package installation..."
+msgstr "Menyediakan pakej untuk instal..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Pakej `%s' tidak boleh diinstal\n"
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Maaf, anda perlu jadi root untuk instal pakej-pakej."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Menyediakan pakej untuk instal..."
+msgid "Unable to get source packages."
+msgstr "Pakej rosak, tidak boleh dibaca/dicari"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "All packages,"
-msgstr "0 pakej, 0 bait"
+#, c-format
+msgid "Inspect..."
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "in files"
-msgstr "Setempat"
+msgid "Installation finished"
+msgstr "dapat diinstal"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
+msgid "Do nothing"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
+msgid "Use .%s as main file"
 msgstr ""
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Update source(s)"
-msgstr "Ubah Sumber"
+msgid "Remove .%s"
+msgstr "Boleh dihapus"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Local files"
-msgstr "Setempat"
+msgid "changes:"
+msgstr "Pakej"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspecting %s"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Israel"
-msgstr "Terinstal"
+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 "Help"
-msgstr "Pertolongan"
+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 ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
+msgid "How to choose manually your mirror"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"Welcome to the packages source editor!\n"
+"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"
-"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 ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "dapat diinstal"
+#, c-format
+msgid "Already existing update sources"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
+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
+#, c-format
+msgid "A fatal error occurred: %s."
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Search results"
-msgstr "Hasil Pencarian"
+msgid "Fatal error"
+msgstr "Ralat fail"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid " failed!"
-msgstr "Setempat"
+msgid "Software Packages Installation"
+msgstr "Menyediakan pakej untuk instal..."
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Brazil"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mandrake Update"
 msgstr ""
+"Mandrake\n"
+"Update"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Software Packages Removal"
+msgstr " Pengurus Perisian "
+
+#: ../rpmdrake:1 ../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 "Quit"
+msgstr "Keluar"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Cari:"
+msgid "Install"
+msgstr "Install"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Remove"
+msgstr "Boleh dihapus"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr ""
+msgid "Help"
+msgstr "Pertolongan"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, searching..."
-msgstr "Tunggu, pakej berikut sedang dihapus:"
+msgid "Search"
+msgstr "Carian"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr ""
+msgid "Find:"
+msgstr "Cari:"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "Tidak boleh membuka pakej `%s'\n"
+#, 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 ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
+msgid "Some packages need to be removed"
 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]>):"
+"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 ""
-"Untuk memenuhi kebergantungan,\n"
-"Pakej-pakej berikut akan dihapus:"
+msgid "Too many packages are selected"
+msgstr "Pakej ini sudah diinstal sebelumnya"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
+msgid "Maximum information"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Terdapat ralat semasa instalasi pakej:\n"
-"\n"
-"%s"
+msgid "Normal information"
+msgstr "kemaskini normal"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Please wait, removing medium..."
-msgstr "Penmeriksaan kebergantungan..."
+msgid "Update source(s)"
+msgstr "Ubah Sumber"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Password:"
-msgstr "katalaluan:"
+msgid "Reload the packages list"
+msgstr "Pakej %s belum ditandatangani"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
+msgid "Reset the selection"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "in files"
+msgstr "Setempat"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
+msgid "in descriptions"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "User:"
+msgid "in names"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Please wait, updating medium..."
-msgstr "Penmeriksaan kebergantungan..."
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
+msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, listing packages..."
-msgstr "Tunggu, pakej berikut sedang dihapus:"
+#, c-format
+msgid "by source repository"
+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 "by selection state"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Information on packages"
-msgstr "Tidak boleh buka pakej"
+msgid "by size"
+msgstr "Kedalaman"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "Batal"
+msgid "by group"
+msgstr ""
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "All packages,"
+msgstr "0 pakej, 0 bait"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
+msgid "All packages, alphabetical"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, updating media..."
-msgstr "Penmeriksaan kebergantungan..."
+msgid "Mandrake choices"
+msgstr "MandrakeUpdate"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Normal updates"
+msgstr "kemaskini normal"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Bugfixes updates"
+msgstr "Kemaskini sekuriti"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "A fatal error occurred: %s."
+msgid "Security updates"
+msgstr "Kemaskini sekuriti"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Description: "
 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 "Reason for update: "
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
+msgid "Summary: "
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Configure proxies"
-msgstr "Konfigurasikan sumber?"
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+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 "%s KB"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
+msgid "Size: "
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
+msgid "Version: "
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Add a source"
+msgid "Name: "
+msgstr "Nama"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
 msgstr ""
-"Tunggu\n"
-"Penambahan sumber"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "Persediaan..."
+msgid "Source: "
+msgstr "Sumber: "
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Save changes"
-msgstr "Pakej"
+#: ../rpmdrake:1
+#, c-format
+msgid "(Not available)"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
-msgstr "Ralat semasa muatturun"
+msgid "Changelog:\n"
+msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Menyediakan pakej untuk instal..."
+#, c-format
+msgid "Files:\n"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Importance: "
+msgid "Selected size: %d MB"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
+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 "Unable to create medium."
-msgstr "Gagal membuat laporan fail. keluar\n"
+msgid "%s conflicts with %s"
+msgstr "konflik dengan"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be installed"
+msgstr "Pakej `%s' tidak boleh diinstal\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\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
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
+msgid "Additional packages needed"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -593,49 +613,60 @@ msgstr ""
 msgid "Some packages can't be removed"
 msgstr "Pakej `%s' tidak boleh diinstal\n"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to insert the medium to continue"
+#: ../rpmdrake:1
+#, 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 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Remove"
-msgstr "Boleh dihapus"
+msgid "Some additional packages need to be removed"
+msgstr "Pakej-pakej ini perlu diinstal dulu agar semuanya dapat berjalan baik."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Menyediakan pakej untuk instal..."
+#, c-format
+msgid "More information on package..."
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No mirror"
-msgstr "Tiada ralat"
+msgid "Information on packages"
+msgstr "Tidak boleh buka pakej"
 
-#: ../edit-urpm-sources.pl:1
+#. -PO: Keep it short, this is gonna be on a button
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
+msgid "More info"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Install"
+msgid "Addable"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
+msgid "Upgradable"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
+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:1
@@ -645,337 +676,370 @@ msgstr "kemaskini normal"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Description: "
-msgstr ""
+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 ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+msgid "One of the following packages is needed:"
 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 "Please choose"
 msgstr ""
 
 #: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Name: "
-msgstr "Nama"
+msgid "Not selected"
+msgstr "Konflik dikesan"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
+msgid "Selected"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Menyediakan pakej untuk instal..."
+msgid "Search results"
+msgstr "Hasil Pencarian"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
+msgid "Stop"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Installation finished"
-msgstr "dapat diinstal"
+msgid "Please wait, searching..."
+msgstr "Tunggu, pakej berikut sedang dihapus:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by update availability"
-msgstr ""
+#, fuzzy, c-format
+msgid "Search results (none)"
+msgstr "Hasil Pencarian"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
+msgid "Other"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Version: "
+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 ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
+msgid "Save and quit"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Editing source \\\"%s\\\":"
-msgstr "Ubah Sumber"
+msgid "Proxy..."
+msgstr "Ralat..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Upgradable"
+msgid "Update..."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid " done."
+msgid "Add..."
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Menyediakan pakej untuk instal..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "Ubah"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr ""
+msgid "Source"
+msgstr "Sumber"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
+msgid "Enabled?"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Bugfixes updates"
-msgstr "Kemaskini sekuriti"
+msgid "Configure sources"
+msgstr "Konfigurasikan sumber?"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Password:"
+msgstr "katalaluan:"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
+msgid "User:"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Germany"
+msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Russia"
+msgid "Proxy hostname:"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Norway"
+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 "Ada masalah semasa instalasi"
-
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Search"
-msgstr "Carian"
+msgid "Configure proxies"
+msgstr "Konfigurasikan sumber?"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Edit a source"
-msgstr "Ubah Sumber"
+msgid "Please wait, updating medium..."
+msgstr "Penmeriksaan kebergantungan..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Czech Republic"
+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 "Stop"
+msgid "You need to insert the medium to continue"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Update"
-msgstr "Kemaskini saja"
+msgid "Save changes"
+msgstr "Pakej"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Please wait, removing packages..."
-msgstr "Tunggu, pakej berikut sedang dihapus:"
+msgid "Relative path to synthesis/hdlist:"
+msgstr "path relatif  ke sintesis atau hdlist: "
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Normal information"
-msgstr "kemaskini normal"
+msgid "URL:"
+msgstr "URL: "
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Muatturun pakej `%s' (%s/%s)..."
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing source \"%s\":"
+msgstr "Ubah Sumber"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Edit a source"
+msgstr "Ubah Sumber"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, removing medium..."
+msgstr "Penmeriksaan kebergantungan..."
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Spain"
-msgstr ""
+msgid "Type of source:"
+msgstr "Jenis sumber:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Normal updates"
-msgstr "kemaskini normal"
+msgid "Adding a source:"
+msgstr ""
+"Tunggu\n"
+"Penambahan sumber"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by selection state"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgid "You need to fill up at least the two first entries."
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Login:"
-msgstr "login:"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Austria"
-msgstr ""
+msgid "Name:"
+msgstr "Nama"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Ralat fail"
+msgid "Login:"
+msgstr "login:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Pilih sumber yg ingin dikemaskini"
+msgid "Choose a mirror..."
+msgstr "Sila pilih mirror:"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update..."
+msgid "Browse..."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "Mengenalpasti tandatangan `%s'..."
-
-#: ../rpmdrake:1
-#, c-format
-msgid "(none)"
-msgstr "(tiada)"
+msgid "Path or mount point:"
+msgstr "path atau titik mount:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
+msgid "Removable device"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Install pakej `%s' (%s/%s)..."
+msgid "HTTP server"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
+msgid "FTP server"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Other"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Path:"
+msgstr "path: "
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Local files"
+msgstr "Setempat"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a source"
 msgstr ""
+"Tunggu\n"
+"Penambahan sumber"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Reason for update: "
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Please choose the desired mirror."
-msgstr ""
-"Tunggu\n"
-"Senarai mirror sedang diambil"
+msgid "Unable to create medium."
+msgstr "Gagal membuat laporan fail. keluar\n"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Edit"
-msgstr "Ubah"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update"
+msgstr "Kemaskini saja"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Please wait, finding available packages..."
-msgstr "muat ulang senarai pakej yg tersedia"
+msgid "Select the source(s) you wish to update:"
+msgstr "Pilih sumber yg ingin dikemaskini"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "path relatif  ke sintesis atau hdlist: "
+msgid "Please wait, updating media..."
+msgstr "Penmeriksaan kebergantungan..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Search results (none)"
-msgstr "Hasil Pencarian"
+msgid " failed!"
+msgstr "Setempat"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Danmark"
+msgid " done."
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
+msgid "Download of `%s', speed:%s"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United States"
+msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "changes:"
-msgstr "Pakej"
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Starting download of `%s'..."
+msgstr "Mengenalpasti tandatangan `%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Examining distant file of source `%s'..."
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No"
-msgstr "Tidak"
+msgid "Examining file of source `%s'..."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Summary: "
+msgid "Copying file for source `%s'..."
 msgstr ""
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Canada"
+#, fuzzy, c-format
+msgid "Please choose the desired mirror."
 msgstr ""
+"Tunggu\n"
+"Senarai mirror sedang diambil"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Greece"
+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 "Tiada ralat"
+
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
 "There was an error downloading the mirrors list:\n"
@@ -985,196 +1049,143 @@ msgid ""
 "Please try again later."
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Source: "
-msgstr "Sumber: "
-
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr ""
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Maaf, anda perlu jadi root untuk instal pakej-pakej."
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Path:"
-msgstr "path: "
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during removal"
-msgstr "Ada masalah semasa instalasi"
+msgid "Error during download"
+msgstr "Ralat semasa muatturun"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by source repository"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Selected"
+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.pm:1
 #, c-format
-msgid "Netherlands"
+msgid "United States"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
+msgid "China"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
+msgid "United Kingdom"
 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 "Taiwan"
 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:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+msgid "Russia"
 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 ""
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Portugal"
+msgstr "Port:"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
+msgid "Poland"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
+msgid "Norway"
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "Keluar"
+msgid "Netherlands"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Korea"
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid "Japan"
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Please wait, adding medium..."
-msgstr "Penmeriksaan kebergantungan..."
+msgid "Italy"
+msgstr "Terinstal"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Type of source:"
-msgstr "Jenis sumber:"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Israel"
+msgstr "Terinstal"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \\\"%s\\\" on device [%s]"
+msgid "Greece"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Unable to get source packages."
-msgstr "Pakej rosak, tidak boleh dibaca/dicari"
+msgid "France"
+msgstr "Batal"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Too many packages are selected"
-msgstr "Pakej ini sudah diinstal sebelumnya"
+msgid "Finland"
+msgstr "Cari:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "konflik dengan"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Danmark"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Mandrake choices"
-msgstr "MandrakeUpdate"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Czech Republic"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
+msgid "Costa Rica"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Korea"
+msgid "Canada"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
+msgid "Brazil"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1182,41 +1193,30 @@ msgstr ""
 msgid "Belgium"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Change medium"
+msgid "Australia"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Mandrake Update"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
 msgstr ""
-"Mandrake\n"
-"Update"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "by size"
-msgstr "Kedalaman"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
+msgid "Info..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Files:\n"
-msgstr ""
+msgid "No"
+msgstr "Tidak"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr ""
+msgid "Yes"
+msgstr "Ya"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
diff --git a/po/mt.po b/po/mt.po
index 298bd639..956fe246 100644
--- a/po/mt.po
+++ b/po/mt.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grpmi 8.2\n"
-"POT-Creation-Date: 2003-05-02 20:15+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+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,20 +14,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-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
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Portugal"
-msgstr "Portugall"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Trid li nkomplu?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -46,59 +42,104 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-msgstr "skond il-grupp"
+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."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Name:"
-msgstr "Isem:"
+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 ""
+"Merħba għall-għodda ta' tneħħija ta' softwer.\n"
+"\n"
+"Din l-għodda tgħinek tagħżel liema softwer trid tneħħi mill-kompjuter\n"
+"tiegħek."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Italy"
-msgstr "Installa"
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"Inqalgħu problemi waqt l-installazzjoni tal-pakketti:\n"
+"\n"
+"%s"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "How to choose manually your mirror"
-msgstr "Kif tagħżel mera manwalment"
+#, fuzzy, c-format
+msgid "Problem during removal"
+msgstr "Problema waqt l-installazzjoni"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "Please wait, removing packages..."
+msgstr "Stenna ftit, qed jitneħħew il-pakketti..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Xi pakketti jridu jitneħħew"
+msgid "Please wait, reading packages database..."
+msgstr "Stenna ftit, qed jinqara d-database tal-pakketti..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Already existing update sources"
+#, 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"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Installation failed"
+msgstr "Installa kollox"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "Qed jiġu ppreparati l-pakketti għall-installazzjoni..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "Qed jiġu ppreparati l-pakketti għall-installazzjoni..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "More information on package..."
-msgstr "Iżjed tagħrif dwar il-pakkett..."
+msgid "All requested packages were installed successfully."
+msgstr "Il-pakketti kollha mitluba Ä¡ew installati."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "Iva"
+msgid "Everything installed successfully"
+msgstr "Kollox Ä¡ie nstallat."
 
 #: ../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 ""
-"Minħabba d-dipendenzi tagħhom, dawn il-pakketti jridu jitneħħew \n"
-"mill-għażla issa:\n"
+"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
 #, c-format
@@ -106,491 +147,498 @@ 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 "%s KB"
-msgstr "%s KB"
+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..."
 
 #: ../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 ""
-"Merħba għall-għodda ta' tneħħija ta' softwer.\n"
 "\n"
-"Din l-għodda tgħinek tagħżel liema softwer trid tneħħi mill-kompjuter\n"
-"tiegħek."
+"Error(s) reported:\n"
+"%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."
-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ġ"
+"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."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"The following packages have bad signatures:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"Inqalgħu problemi waqt l-installazzjoni tal-pakketti:\n"
+"Dawn il-pakketti jridu jitneħħew sabiex oħrajn jistgħu jiġu aġġornati:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"Trid tkompli?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Size: "
-msgstr "Daqs: "
+msgid "Verifying packages signatures..."
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Security updates"
-msgstr "Aġġornamenti ta' sigurtà"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "Qed jitniżżel pakkett \"%s\" (%s/%s)..."
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
+msgstr "Ikkanċella"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "Ok"
+
+#: ../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 "Maximum information"
-msgstr "Informazzjoni massima"
+msgid "Change medium"
+msgstr "Ibdel sors"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, c-format
+msgid "Initializing..."
+msgstr "Qed ninizjalizza..."
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Problema..."
+msgid "Package installation..."
+msgstr "Qed jiġu ppreparati l-pakketti għall-installazzjoni..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Trid tkun \"root\" biex tinstalla dawn il-pakketti."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Renju Unit"
+msgid "Unable to get source packages."
+msgstr "Ma nistax nikseb pakketti sors."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure sources"
-msgstr "Ikkonfigura sorsi"
+msgid "Inspect..."
+msgstr "Spezzjona..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "fl-ismijiet"
+msgid "Installation finished"
+msgstr "Installazzjoni lesta"
 
-#: ../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 ""
-"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."
+msgid "Do nothing"
+msgstr "Tagħmel xejn"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
-"\n"
-"\\Do you want to continue installation?"
-msgstr ""
-"Dawn il-pakketti jridu jitneħħew sabiex oħrajn jistgħu jiġu aġġornati:\n"
-"\n"
-"%s\n"
-"\n"
-"Trid tkompli?"
+#, c-format
+msgid "Use .%s as main file"
+msgstr "Uża .%s bħala fajl prinċipali"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Remove .%s"
 msgstr "Neħħi .%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Source"
-msgstr "Ġiegħel"
+msgid "changes:"
+msgstr "Ikteb bidliet"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "Finlandja"
+msgid "Inspecting %s"
+msgstr "Qed jiġi nspezzjonat %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
+msgid "Please wait, finding available packages..."
+msgstr "Stenna ftit, qed insib pakketti disponibbli..."
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "France"
-msgstr "Ġiegħel"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, adding medium..."
+msgstr "Stenna ftit, qed jiġi miżjud medju..."
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "More info"
+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 ""
+"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 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Kif tagħżel mera manwalment"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"%s\n"
+"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"
-"Is it ok to continue?"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"%s\n"
-"\n"
-"Trid li nkomplu?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Erġa' aqra l-lista ta' pakketti"
+msgid "Already existing update sources"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr "Agħżel mera..."
+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 ""
+"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"
+"Trid tkompli?"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Qed jiġi miżjud sors:"
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Pakkett \"%s\" ma jistax jiġi nstallat\n"
+msgid "Fatal error"
+msgstr "Problema fil-fajl"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
+msgid "Software Packages Installation"
 msgstr "Qed jiġu ppreparati l-pakketti għall-installazzjoni..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages,"
-msgstr "Pakketti kollha"
+msgid "Mandrake Update"
+msgstr "AÄ¡Ä¡ornament Mandrake"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "fil-fajls"
+msgid "Software Packages Removal"
+msgstr "Tneħħija ta' pakketti ta' softwer"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Il-pakketti kollha mitluba Ä¡ew installati."
+msgid "Quit"
+msgstr "Oħroġ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "Kompjuter tal-proxy:"
+msgid "Install"
+msgstr "Installa"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update source(s)"
-msgstr "AÄ¡Ä¡orna sorsi"
+msgid "Remove"
+msgstr "Neħħi"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "Fajls lokali"
+msgid "Help"
+msgstr "Għajnuna"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Qed jiġi nspezzjonat %s"
+msgid "Search"
+msgstr "Fittex"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Israel"
-msgstr "Installa"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "Sib:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Help"
-msgstr "Għajnuna"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Dawn il-pakketti jridu jitneħħew sabiex oħrajn jistgħu jiġu aġġornati:\n"
+"\n"
+"%s\n"
+"\n"
+"Trid tkompli?"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "Server HTTP"
+msgid "Some packages need to be removed"
+msgstr "Xi pakketti jridu jitneħħew"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"Welcome to the packages source editor!\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"
-"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."
+"Do you really want to install all the selected packages?"
 msgstr ""
-"Merħba għall-editur ta' sorsi ta' pakketti!\n"
+"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"
-"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."
+"Żgur li trid tinstalla l-pakketti kollha magħżula?"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Installa kollox"
+#, c-format
+msgid "Too many packages are selected"
+msgstr "Hemm wisq pakketti magħżula"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Uża .%s bħala fajl prinċipali"
+msgid "Maximum information"
+msgstr "Informazzjoni massima"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results"
-msgstr "Riżultat tat-tfittxija"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid " failed!"
-msgstr "fil-fajls"
+msgid "Normal information"
+msgstr "Informazzjoni normali"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Brazil"
-msgstr "Brażil"
+msgid "Update source(s)"
+msgstr "AÄ¡Ä¡orna sorsi"
 
-#: ../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 "Reload the packages list"
+msgstr "Erġa' aqra l-lista ta' pakketti"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Sib:"
+msgid "Reset the selection"
+msgstr "Irrisettja l-għażla"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Pakketti kollha, alfabetiċi"
+msgid "in files"
+msgstr "fil-fajls"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Stenna ftit, qed infittex..."
+msgid "in descriptions"
+msgstr "fid-deskrizzjonijiet"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Stenna ftit, qed jinqara d-database tal-pakketti..."
+msgid "in names"
+msgstr "fl-ismijiet"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "Ma setax jinfetaħ il-pakkett \"%s\"\n"
+#, c-format
+msgid "by update availability"
+msgstr "skond id-disponibbiltà ta' aġġornament"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "Irrisettja l-għażla"
+msgid "by source repository"
+msgstr "skond is-sors"
 
-#: ../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 "by selection state"
+msgstr "skond l-istat tal-għażla"
 
 #: ../rpmdrake: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 "by size"
+msgstr "skond id-daqs"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Costa Rica"
+msgid "by group"
+msgstr "skond il-grupp"
 
 #: ../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"
-
-#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Stenna ftit, qed jitneħħa l-medju..."
+msgid "All packages,"
+msgstr "Pakketti kollha"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "Password:"
+msgid "All packages, alphabetical"
+msgstr "Pakketti kollha, alfabetiċi"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr ""
+msgid "Mandrake choices"
+msgstr "Għażliet ta' Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Tajwan"
+msgid "Normal updates"
+msgstr "AÄ¡Ä¡ornamenti normali"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "User:"
-msgstr "User:"
+msgid "Bugfixes updates"
+msgstr "Tiswijiet ta' bugs"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Stenna ftit, qed jiġi aġġornat il-medju..."
+msgid "Security updates"
+msgstr "Aġġornamenti ta' sigurtà"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Stenna ftit, qed jiġu llistjati l-pakketti..."
+msgid "Description: "
+msgstr "Deskrizzjoni: "
 
 #: ../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 "Reason for update: "
+msgstr "Raġuni għall-aġġornament: "
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Information on packages"
-msgstr "Iżjed tagħrif dwar il-pakkett..."
+#, c-format
+msgid "Summary: "
+msgstr "Sommarju: "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "Ikkanċella"
+msgid "Importance: "
+msgstr "Importanza: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Kollox Ä¡ie nstallat."
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Stenna ftit, qed jiġu aġġornati l-medji..."
+msgid "Size: "
+msgstr "Daqs: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Version: "
+msgstr "Verżjoni: "
 
 #: ../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 ""
-"Dawn il-pakketti jridu jitneħħew sabiex oħrajn jistgħu jiġu aġġornati:\n"
-"\n"
-"%s\n"
-"\n"
-"Trid tkompli?"
+msgid "Name: "
+msgstr "Isem: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "fid-deskrizzjonijiet"
+msgid "Currently installed version: "
+msgstr "Verżjoni nstallata bħalissa: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Source: "
+msgstr "Ġiegħel"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Ikkonfigura proxies"
+msgid "(Not available)"
+msgstr "(Mhux disponibbli)"
 
-#: ../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 ""
-"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"
-"Nista' nkompli?"
+msgid "Changelog:\n"
+msgstr "Log tal-bidliet:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Jekk jogħġbok agħżel wieħed"
+msgid "Files:\n"
+msgstr "Fajls:\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Daqs magħżula: %d MB"
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Add a source"
-msgstr "Qed jiġi miżjud sors:"
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "Qed ninizjalizza..."
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Magħżula: %d MB / Spazju disponibbli: %d MB"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "Ikteb bidliet"
+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"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Error during download"
-msgstr "Problema waqt it-tniżżil"
+#: ../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"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Qed jiġu ppreparati l-pakketti għall-installazzjoni..."
+msgid "%s conflicts with %s"
+msgstr "għandu konflitt ma'"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Importance: "
-msgstr "Importanza: "
+#, fuzzy, c-format
+msgid "Some packages can't be installed"
+msgstr "Pakkett \"%s\" ma jistax jiġi nstallat\n"
 
 #: ../rpmdrake:1
 #, c-format
@@ -603,83 +651,76 @@ msgstr ""
 "jiġu nstallati:\n"
 "\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "Żid..."
+msgid "Additional packages needed"
+msgstr "Pakketti oħra meħtieġa"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Unable to create medium."
-msgstr "Ma nistax noħloq medju."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "Pakkett \"%s\" ma jistax jiġi nstallat\n"
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Removing these packages would break your system, sorry:\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"
+"Jiddispjaċini, jekk tneħħi dawn il-pakketti s-sistema ma tibqax taħdem:\n"
 "\n"
-"Xi fajls ta' konfigurazzjoni inħolqu bħala \".rpmnew\" jew \".rpmsave\",\n"
-"issa tista' tinspezzjonahom sabiex tieħu azzjoni:"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Browse..."
-msgstr "Fittex..."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "Pakkett \"%s\" ma jistax jiġi nstallat\n"
-
-#: ../rpmdrake.pm:1
 #, c-format
-msgid "Info..."
-msgstr "Info..."
+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"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "Trid iddaħħal id-diska biex tkompli"
+msgid "Some additional packages need to be removed"
+msgstr "Xi pakketti oħra jridu jitneħħew"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "Neħħi"
+msgid "More information on package..."
+msgstr "Iżjed tagħrif dwar il-pakkett..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Qed jiġu ppreparati l-pakketti għall-installazzjoni..."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "No mirror"
-msgstr "Ebda mera"
+msgid "Information on packages"
+msgstr "Iżjed tagħrif dwar il-pakkett..."
 
-#: ../edit-urpm-sources.pl:1
+#. -PO: Keep it short, this is gonna be on a button
+#: ../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 "More info"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Installa"
+msgid "Addable"
+msgstr "Jistgħu jiġu miżjuda"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "Ä appun"
+msgid "Upgradable"
+msgstr "Jistgħu jiġu aġġornati"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Tagħmel xejn"
+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 ""
+"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
@@ -688,344 +729,378 @@ msgstr "Ebda aġġornament"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Description: "
-msgstr "Deskrizzjoni: "
+msgid "(none)"
+msgstr "(ebda)"
 
 #: ../rpmdrake: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 "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"
 
 #: ../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 ""
-"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?"
+msgid "One of the following packages is needed:"
+msgstr "Wieħed minn dawn il-pakketti huwa meħtieġ:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "Isem: "
+msgid "Please choose"
+msgstr "Jekk jogħġbok agħżel wieħed"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "Spezzjona..."
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Qed jiġu ppreparati l-pakketti għall-installazzjoni..."
+msgid "Not selected"
+msgstr "Instabu konflitti"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Awstralja"
+msgid "Selected"
+msgstr "Magħżul"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation finished"
-msgstr "Installazzjoni lesta"
+msgid "Search results"
+msgstr "Riżultat tat-tfittxija"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
-msgstr "skond id-disponibbiltà ta' aġġornament"
+msgid "Stop"
+msgstr "Ieqaf"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
-msgstr "Polonja"
+msgid "Please wait, searching..."
+msgstr "Stenna ftit, qed infittex..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Version: "
-msgstr "Verżjoni: "
+msgid "Search results (none)"
+msgstr "Riżultat tat-tfittxija (ebda)"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Oħrajn"
 
 #: ../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:"
+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 ""
+"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."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Ikteb u oħroġ"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Editing source \\\"%s\\\":"
-msgstr "Editja s-sors \"%s\":"
+msgid "Proxy..."
+msgstr "Problema..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Upgradable"
-msgstr "Jistgħu jiġu aġġornati"
+msgid "Update..."
+msgstr "AÄ¡Ä¡orna..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid " done."
-msgstr ""
+msgid "Add..."
+msgstr "Żid..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "Editja"
+
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Qed jiġu ppreparati l-pakketti għall-installazzjoni..."
+msgid "Source"
+msgstr "Ġiegħel"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr ""
+msgid "Enabled?"
+msgstr "Mixgħul?"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "Pakketti oħra meħtieġa"
+msgid "Configure sources"
+msgstr "Ikkonfigura sorsi"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Tiswijiet ta' bugs"
+msgid "Password:"
+msgstr "Password:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr ""
+msgid "User:"
+msgstr "User:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Germany"
-msgstr "Ä ermanja"
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Trid tispeċifika user/password għall-awtenitikazzjoni tal-proxy:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Russia"
-msgstr "Russja"
+msgid "Proxy hostname:"
+msgstr "Kompjuter tal-proxy:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Norway"
-msgstr "Norveġja"
+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
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Inqalgħu problemi waqt l-installazzjoni"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "Ikkonfigura proxies"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search"
-msgstr "Fittex"
+msgid "Please wait, updating medium..."
+msgstr "Stenna ftit, qed jiġi aġġornat il-medju..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit a source"
-msgstr "Editja sors"
+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"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Repubblika ÄŠeka"
+msgid "You need to insert the medium to continue"
+msgstr "Trid iddaħħal id-diska biex tkompli"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Stop"
-msgstr "Ieqaf"
+msgid "Save changes"
+msgstr "Ikteb bidliet"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "AÄ¡Ä¡orna"
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Direttorju relattiv għas-sintesi jew hdlist:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "Stenna ftit, qed jitneħħew il-pakketti..."
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing source \"%s\":"
+msgstr "Editja s-sors \"%s\":"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal information"
-msgstr "Informazzjoni normali"
+msgid "Edit a source"
+msgstr "Editja sors"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Qed jitniżżel pakkett \"%s\" (%s/%s)..."
+msgid "Please wait, removing medium..."
+msgstr "Stenna ftit, qed jitneħħa l-medju..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Magħżula: %d MB / Spazju disponibbli: %d MB"
+msgid "Type of source:"
+msgstr "Tip ta' sors:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Spain"
-msgstr "Spanja"
+msgid "Adding a source:"
+msgstr "Qed jiġi miżjud sors:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
-msgstr "AÄ¡Ä¡ornamenti normali"
+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?"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by selection state"
-msgstr "skond l-istat tal-għażla"
+msgid "You need to fill up at least the two first entries."
+msgstr "Trid timla tal-inqas l-ewwel żewġ elementi."
 
-#: ../rpmdrake.pm: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 "Name:"
+msgstr "Isem:"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Austria"
-msgstr "Awstrija"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Problema fil-fajl"
+msgid "Choose a mirror..."
+msgstr "Agħżel mera..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Agħżel is-sorsi li trid taġġorna:"
+msgid "Browse..."
+msgstr "Fittex..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update..."
-msgstr "AÄ¡Ä¡orna..."
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "Qed nivverifika l-firma ta' \"%s\"..."
+msgid "Path or mount point:"
+msgstr "Direttorju jew punt ta' mmuntar:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
-msgstr "(ebda)"
-
-#: ../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"
+msgid "Removable device"
+msgstr "Apparat jinħareġ"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Qed jiġi nstallat pakkett \"%s\" (%s/%s)..."
+msgid "HTTP server"
+msgstr "Server HTTP"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Verżjoni nstallata bħalissa: "
+msgid "FTP server"
+msgstr "Server FTP"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Other"
-msgstr "Oħrajn"
+msgid "Path:"
+msgstr "Direttorju: "
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Raġuni għall-aġġornament: "
+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
-#, c-format
-msgid "Please choose the desired mirror."
-msgstr "Jekk jogħġbok agħżel mera li tixtieq."
+#, 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."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "Editja"
+msgid "Unable to create medium."
+msgstr "Ma nistax noħloq medju."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Stenna ftit, qed insib pakketti disponibbli..."
+msgid "Update"
+msgstr "AÄ¡Ä¡orna"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Direttorju relattiv għas-sintesi jew hdlist:"
+msgid "Select the source(s) you wish to update:"
+msgstr "Agħżel is-sorsi li trid taġġorna:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Riżultat tat-tfittxija (ebda)"
+msgid "Please wait, updating media..."
+msgstr "Stenna ftit, qed jiġu aġġornati l-medji..."
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid " failed!"
+msgstr "fil-fajls"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Danmark"
-msgstr "Danimarka"
+msgid " done."
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "ÄŠina"
+msgid "Download of `%s', speed:%s"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United States"
-msgstr "Stati Uniti"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "changes:"
-msgstr "Ikteb bidliet"
+msgid "Starting download of `%s'..."
+msgstr "Qed nivverifika l-firma ta' \"%s\"..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Xi pakketti oħra jridu jitneħħew"
+msgid "Examining distant file of source `%s'..."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Examining file of source `%s'..."
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No"
-msgstr "Le"
+msgid "Copying file for source `%s'..."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Summary: "
-msgstr "Sommarju: "
+msgid "Please choose the desired mirror."
+msgstr "Jekk jogħġbok agħżel mera li tixtieq."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "Kanada"
+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 ""
+"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."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Greece"
-msgstr "Greċja"
+msgid "No mirror"
+msgstr "Ebda mera"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1042,254 +1117,179 @@ msgstr ""
 "In-network, jew il-website ta' MandrakeSoft, tista' ma tkunx \n"
 "disponibbli. Erġa' pprova iżjed tard."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Source: "
-msgstr "Ġiegħel"
-
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr ""
-
-#: ../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: "
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during removal"
-msgstr "Problema waqt l-installazzjoni"
+msgid "Error during download"
+msgstr "Problema waqt it-tniżżil"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by source repository"
-msgstr "skond is-sors"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
+"Stenna ftit, qed jitniżżlu indirizzi ta' mirja mill-website ta' MandrakeSoft."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Selected"
-msgstr "Magħżul"
+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 ""
+"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"
+"Nista' nkompli?"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Netherlands"
-msgstr "Netherlands"
+msgid "United States"
+msgstr "Stati Uniti"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "Jistgħu jiġu miżjuda"
+msgid "China"
+msgstr "ÄŠina"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
-msgstr "(Mhux disponibbli)"
-
-#: ../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"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr "Instabu konflitti"
+msgid "United Kingdom"
+msgstr "Renju Unit"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Tneħħija ta' pakketti ta' softwer"
+msgid "Taiwan"
+msgstr "Tajwan"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Sweden"
 msgstr "Svezja"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
-msgstr ""
+msgid "Russia"
+msgstr "Russja"
 
-#: ../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."
-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."
+msgid "Portugal"
+msgstr "Portugall"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr ""
+msgid "Poland"
+msgstr "Polonja"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Wieħed minn dawn il-pakketti huwa meħtieġ:"
+msgid "Norway"
+msgstr "Norveġja"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "Oħroġ"
+msgid "Netherlands"
+msgstr "Netherlands"
 
-#: ../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 ""
-"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"
-"Trid tkompli?"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Korea"
+msgstr "Ġiegħel"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid "Japan"
+msgstr "Ä appun"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Please wait, adding medium..."
-msgstr "Stenna ftit, qed jiġi miżjud medju..."
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Italy"
+msgstr "Installa"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Israel"
+msgstr "Installa"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "Tip ta' sors:"
+msgid "Greece"
+msgstr "Greċja"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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]"
+msgid "France"
+msgstr "Ġiegħel"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to get source packages."
-msgstr "Ma nistax nikseb pakketti sors."
+msgid "Finland"
+msgstr "Finlandja"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Hemm wisq pakketti magħżula"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "għandu konflitt ma'"
+msgid "Spain"
+msgstr "Spanja"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 ""
-"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."
+msgid "Danmark"
+msgstr "Danimarka"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Għażliet ta' Mandrake"
+msgid "Germany"
+msgstr "Ä ermanja"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 ""
-"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"
+msgid "Czech Republic"
+msgstr "Repubblika ÄŠeka"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Log tal-bidliet:\n"
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Korea"
-msgstr "Ġiegħel"
+#, c-format
+msgid "Canada"
+msgstr "Kanada"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "Apparat jinħareġ"
+msgid "Brazil"
+msgstr "Brażil"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Belġju"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Change medium"
-msgstr "Ibdel sors"
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "AÄ¡Ä¡ornament Mandrake"
+msgid "Australia"
+msgstr "Awstralja"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by size"
-msgstr "skond id-daqs"
+msgid "Austria"
+msgstr "Awstrija"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "Server FTP"
+msgid "Info..."
+msgstr "Info..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Files:\n"
-msgstr "Fajls:\n"
+msgid "No"
+msgstr "Le"
 
 #: ../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."
+#, c-format
+msgid "Yes"
+msgstr "Iva"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
diff --git a/po/nl.po b/po/nl.po
index 282ee2c5..0fcac6d8 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grpmi\n"
-"POT-Creation-Date: 2003-05-02 20:15+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+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,20 +17,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "Ingeschakeld?"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Path or mount point:"
-msgstr "Pad of koppelpunt::"
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Portugal"
-msgstr "Portugal"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Is het goed om door te gaan?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -49,60 +45,104 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-msgstr "op groep"
+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."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Name:"
-msgstr "Naam:"
+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."
 
-#  Use plural for "installed" if your language
-#  * distinguish plural and singular here
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Italy"
-msgstr "Italië"
+#: ../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"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "Hoe u handmatig uw mirror kunt kiezen"
+msgid "Problem during removal"
+msgstr "Probleem bij het verwijderen"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL: "
+msgid "Please wait, removing packages..."
+msgstr "Even geduld, bezig met het verwijderen van pakketten..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Enkele pakketten dienen verwijderd te worden"
+msgid "Please wait, reading packages database..."
+msgstr "Even geduld, bezig met lezen van pakkettendatabase..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Already existing update sources"
+#, 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
 #, c-format
-msgid "More information on package..."
-msgstr "Meer informatie over pakket..."
+msgid "Installation failed"
+msgstr "Installatie mislukt"
 
-#: ../rpmdrake.pm:1
+#: ../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"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "Ja"
+msgid "All requested packages were installed successfully."
+msgstr "Alle gevraagde pakketten zijn succesvol geïnstalleerd."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr "Alles is succesvol geïnstalleerd"
 
 #: ../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 ""
-"Vanwege hun afhankelijkheden dienen de volgende pakket(ten)\n"
-"nu gedeselecteerd te worden:\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
 #, c-format
@@ -110,112 +150,127 @@ 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 "%s KB"
-msgstr "%s KB"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Installeren pakket `%s' (%s/%s)..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Klaarmaken pakketten voor installatie"
 
 #: ../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."
+"\n"
+"Error(s) reported:\n"
+"%s"
 msgstr ""
-"Welkom bij het software-verwijderprogramma!\n"
 "\n"
-"Dit hulpprogramma helpt u bij het kiezen welke software u van uw\n"
-"computer wilt verwijderen."
+"\n"
+"Gerapporteerde fout(en):\n"
+"%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."
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
 msgstr ""
-"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"
+"Installatie mislukt, sommige bestanden missen.\n"
+"U wilt misschien uw bronnen-database verversen."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"The following packages have bad signatures:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"Er is een fout opgetreden tijdens het installeren van pakketten:\n"
+"De volgende pakketten dienen verwijderd te worden om andere te kunnen "
+"opwaarderen:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"Is het goed om door te gaan?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Size: "
-msgstr "Grootte: "
+msgid "Verifying packages signatures..."
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Security updates"
-msgstr "Beveiligingsverbeteringen"
+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"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "Ok"
+
+#: ../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]"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "Maximale informatie"
+msgid "Change medium"
+msgstr "Medium veranderen"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, c-format
+msgid "Initializing..."
+msgstr "Initialiseren..."
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Fout..."
+msgid "Package installation..."
+msgstr "Klaarmaken pakketten voor installatie"
 
-#: ../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."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Verenigd Koninkrijk"
+msgid "Unable to get source packages."
+msgstr "Niet in staat bronpakketten op te halen"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure sources"
-msgstr "Bronnen configureren"
+msgid "Inspect..."
+msgstr "Inspecteren..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "in namen"
+msgid "Installation finished"
+msgstr "Installatie voltooid"
 
-#: ../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 ""
-"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 "Do nothing"
+msgstr "Niets doen"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
-"\n"
-"\\Do you want to continue installation?"
-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?"
+#, c-format
+msgid "Use .%s as main file"
+msgstr ".%s als hoofdbestand gebruiken"
 
 #  Removable media
 #: ../rpmdrake:1
@@ -223,387 +278,383 @@ msgstr ""
 msgid "Remove .%s"
 msgstr ".%s verwijderen"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Source"
-msgstr "Bron"
+msgid "changes:"
+msgstr "veranderingen:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "Finland"
+msgid "Inspecting %s"
+msgstr "Bezig met inspecteren van %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
+msgid "Please wait, finding available packages..."
+msgstr "Even geduld, bezig met opzoeken van verkrijgbare pakketten..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "France"
-msgstr "Frankrijk"
+msgid "Please wait, adding medium..."
+msgstr "Even geduld, bezig met toevoegen medium..."
 
-#. -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 ""
-"%s\n"
+"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"
-"Is it ok to continue?"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"%s\n"
+"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"
-"Is het goed om door te gaan?"
+"Daarna herstart u Mandrake Vernieuwen."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Pakkettenlijst herladen"
+msgid "How to choose manually your mirror"
+msgstr "Hoe u handmatig uw mirror kunt kiezen"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr "Kies uw mirror..."
+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 ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Bezig met toevoegen van bron:"
+msgid "Already existing update sources"
+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?"
+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?"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Pakket `%s' kan niet worden geïnstalleerd\n"
+msgid "Fatal error"
+msgstr "Bestandsfout"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
+msgid "Software Packages Installation"
 msgstr "Klaarmaken pakketten voor installatie"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages,"
-msgstr "Alle pakketten,"
+msgid "Mandrake Update"
+msgstr "Mandrake Vernieuwen"
 
-#  Local media
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "in bestanden"
+msgid "Software Packages Removal"
+msgstr "Softwarepakketten verwijderen"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Alle gevraagde pakketten zijn succesvol geïnstalleerd."
+msgid "Quit"
+msgstr "Afsluiten"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "Proxy-hostnaam:"
+msgid "Install"
+msgstr "Installeren"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#  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 "Update source(s)"
-msgstr "Bron(nen) verversen"
+msgid "Remove"
+msgstr "Verwijderen"
 
-#  Local media
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "Lokale bestanden"
+msgid "Help"
+msgstr "Hulp"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Bezig met inspecteren van %s"
+msgid "Search"
+msgstr "Zoeken"
 
-#  Use plural for "installed" if your language
-#  * distinguish plural and singular here
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Israel"
-msgstr "Israël"
+msgid "Find:"
+msgstr "Zoek:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Help"
-msgstr "Hulp"
+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?"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "HTTP server"
+msgid "Some packages need to be removed"
+msgstr "Enkele pakketten dienen verwijderd te worden"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"Welcome to the packages source editor!\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"
-"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."
+"Do you really want to install all the selected packages?"
 msgstr ""
-"Welkom bij de pakketbron-editor!\n"
+"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"
-"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."
+"Weet u zeker dat u alle geselecteerde pakketten wilt installeren?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation failed"
-msgstr "Installatie mislukt"
+msgid "Too many packages are selected"
+msgstr "Te veel pakketten zijn geselecteerd"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr ".%s als hoofdbestand gebruiken"
+msgid "Maximum information"
+msgstr "Maximale informatie"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results"
-msgstr "Zoekresultaat"
+msgid "Normal information"
+msgstr "Normale informatie"
 
-#  Local media
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, c-format
-msgid " failed!"
-msgstr " mislukt!"
+msgid "Update source(s)"
+msgstr "Bron(nen) verversen"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Brazil"
-msgstr "Brazilië"
+msgid "Reload the packages list"
+msgstr "Pakkettenlijst herladen"
 
-#: ../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 ""
-"Er bestaat reeds een medium met die naam, weet u\n"
-"zeker dat u deze wilt vervangen?"
+msgid "Reset the selection"
+msgstr "Alle selecties opheffen"
 
+#  Local media
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Zoek:"
+msgid "in files"
+msgstr "in bestanden"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Alle pakketten, alfabetisch"
+msgid "in descriptions"
+msgstr "in omschrijvingen"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Even geduld, bezig met zoeken..."
+msgid "in names"
+msgstr "in namen"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Even geduld, bezig met lezen van pakkettendatabase..."
+msgid "by update availability"
+msgstr "op beschikbaarheid vernieuwingen"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "Kan pakket `%s' niet openen\n"
+#, c-format
+msgid "by source repository"
+msgstr "op bron"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "Alle selecties opheffen"
+msgid "by selection state"
+msgstr "op selectie-status"
 
-#: ../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 ""
-"Indien u een proxy nodig heeft, geef dan de hostnaam en optioneel eenpoort "
-"(syntax: <proxyhost[:port]>):"
+msgid "by size"
+msgstr "op grootte"
 
 #: ../rpmdrake: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 "by group"
+msgstr "op groep"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Costa Rica"
+msgid "All packages,"
+msgstr "Alle pakketten,"
 
 #: ../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"
-
-#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Even geduld, bezig met verwijderen van medium..."
+msgid "All packages, alphabetical"
+msgstr "Alle pakketten, alfabetisch"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "Wachtwoord:"
+msgid "Mandrake choices"
+msgstr "Mandrake keuzes"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "Onderzoeken van afstandsbestand van bron `%s'..."
+msgid "Normal updates"
+msgstr "Gewone vernieuwingen"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Taiwan"
+msgid "Bugfixes updates"
+msgstr "Programmareparaties vernieuwingen"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "User:"
-msgstr "Gebruiker:"
+msgid "Security updates"
+msgstr "Beveiligingsverbeteringen"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Even geduld, bezig met verversen van medium..."
+msgid "Description: "
+msgstr "Beschrijving:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Even geduld, bezig met opsommen van pakketten..."
+msgid "Reason for update: "
+msgstr "Reden voor vernieuwing: "
 
 #: ../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 "Summary: "
+msgstr "Samenvatting: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Information on packages"
-msgstr "Informatie over pakketten..."
+msgid "Importance: "
+msgstr "Belang: "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "Annuleren"
+msgid "%s KB"
+msgstr "%s KB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Alles is succesvol geïnstalleerd"
+msgid "Size: "
+msgstr "Grootte: "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Even geduld, bezig met verversen van media..."
+msgid "Version: "
+msgstr "Versie: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Name: "
+msgstr "Naam: "
 
 #: ../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 "Currently installed version: "
+msgstr "Momenteel geïnstalleerde versie: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "in omschrijvingen"
+msgid "Source: "
+msgstr "Bron: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Proxy's configureren"
+msgid "(Not available)"
+msgstr "(Niet beschikbaar)"
 
-#: ../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 "Changelog:\n"
+msgstr "Veranderingen-logboek:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Gelieve te kiezen"
+msgid "Files:\n"
+msgstr "Bestanden:\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Geselecteerde grootte: %d MB"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add a source"
-msgstr "Bron toevoegen"
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "Initialiseren..."
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Geselecteerd: %d MB / Vrije schijfruimte: %d MB"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "Veranderingen opslaan"
+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"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Error during download"
-msgstr "Fout tijdens ophalen"
+#: ../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 "Package installation..."
-msgstr "Klaarmaken pakketten voor installatie"
+msgid "%s conflicts with %s"
+msgstr "conflicteert met"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Importance: "
-msgstr "Belang: "
+#, fuzzy, c-format
+msgid "Some packages can't be installed"
+msgstr "Pakket `%s' kan niet worden geïnstalleerd\n"
 
 #: ../rpmdrake:1
 #, c-format
@@ -616,88 +667,79 @@ msgstr ""
 "pakket(ten) ook geïnstalleerd te worden:\n"
 "\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "Toevoegen..."
+msgid "Additional packages needed"
+msgstr "Extra pakketten benodigd"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Unable to create medium."
-msgstr "Niet in staat medium te creëren"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "Pakket `%s' kan niet worden geïnstalleerd\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Removing these packages would break your system, sorry:\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"
+"Sorry, maar het verwijderen van deze pakketten zou uw systeem\n"
+"beschadigen:\n"
 "\n"
-"Sommige configuratiebestanden zijn gecreëerd als `.rpmnew' of `.rpmsave',\n"
-"u kunt er nu enkele inspecteren om zonodig actie te ondernemen:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
-msgstr "Bladeren..."
+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
-#, 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 "Info..."
-msgstr "Info..."
+msgid "Some additional packages need to be removed"
+msgstr "Enkele extra pakketten dienen verwijderd te worden"
 
-#: ../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 "More information on package..."
+msgstr "Meer informatie over pakket..."
 
-#  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
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "Verwijderen"
+msgid "Information on packages"
+msgstr "Informatie over pakketten..."
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Klaarmaken pakketten voor installatie"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "No mirror"
-msgstr "Geen mirror"
-
-#: ../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."
+msgid "More info"
+msgstr "Meer info"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Installeren"
+msgid "Addable"
+msgstr "Toevoegbaar"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "Japan"
+msgid "Upgradable"
+msgstr "Opwaardeerbaar"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Niets doen"
+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:1
 #, c-format
@@ -706,348 +748,383 @@ msgstr "Geen vernieuwing"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Description: "
-msgstr "Beschrijving:"
+msgid "(none)"
+msgstr "(geen)"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"Installatie mislukt, sommige bestanden missen.\n"
-"U wilt misschien uw bronnen-database verversen."
+msgid "Please wait, listing packages..."
+msgstr "Even geduld, bezig met opsommen van pakketten..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "Kan pakket `%s' niet openen\n"
 
 #: ../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 "One of the following packages is needed:"
+msgstr "Eén van de volgende pakketten is benodigd:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "Naam: "
+msgid "Please choose"
+msgstr "Gelieve te kiezen"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "Inspecteren..."
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Klaarmaken pakketten voor installatie"
+msgid "Not selected"
+msgstr "Tegenstrijdigheden ontdekt"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Australië"
+msgid "Selected"
+msgstr "Geselecteerd"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation finished"
-msgstr "Installatie voltooid"
+msgid "Search results"
+msgstr "Zoekresultaat"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
-msgstr "op beschikbaarheid vernieuwingen"
+msgid "Stop"
+msgstr "Stoppen"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
-msgstr "Polen"
+msgid "Please wait, searching..."
+msgstr "Even geduld, bezig met zoeken..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Version: "
-msgstr "Versie: "
+msgid "Search results (none)"
+msgstr "Zoekresultaat (niets)"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Overige"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
+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 ""
-"U kunt een gebruikersnaam/wachtwoord aangeven voor de proxy-aanmelding:"
+"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."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Opslaan en afsluiten"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Editing source \\\"%s\\\":"
-msgstr "Bewerken van bron \"%s\":"
+msgid "Proxy..."
+msgstr "Fout..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Upgradable"
-msgstr "Opwaardeerbaar"
+msgid "Update..."
+msgstr "Verversen..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid " done."
-msgstr " klaar."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Klaarmaken pakketten voor installatie"
+msgid "Add..."
+msgstr "Toevoegen..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "Onderzoeken van bestand van bron `%s'..."
+msgid "Edit"
+msgstr "Bewerken"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "Extra pakketten benodigd"
+msgid "Source"
+msgstr "Bron"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Programmareparaties vernieuwingen"
+msgid "Enabled?"
+msgstr "Ingeschakeld?"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "Downloaden van `%s', tijd over:%s, snelheid:%s"
+msgid "Configure sources"
+msgstr "Bronnen configureren"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Germany"
-msgstr "Duitsland"
+msgid "Password:"
+msgstr "Wachtwoord:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Russia"
-msgstr "Rusland"
+msgid "User:"
+msgstr "Gebruiker:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Norway"
-msgstr "Noorwegen"
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+"U kunt een gebruikersnaam/wachtwoord aangeven voor de proxy-aanmelding:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Problemen tijdens de installatie"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "Proxy-hostnaam:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search"
-msgstr "Zoeken"
+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]>):"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit a source"
-msgstr "Een bron bewerken"
+msgid "Configure proxies"
+msgstr "Proxy's configureren"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Tsjechië"
+msgid "Please wait, updating medium..."
+msgstr "Even geduld, bezig met verversen van medium..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Stop"
-msgstr "Stoppen"
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr ""
+"Om de veranderingen op te kunnen slaan, dient u het medium in het station te "
+"plaatsen."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "Verversen"
+msgid "You need to insert the medium to continue"
+msgstr "U dient het medium te plaatsen om door te gaan"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "Even geduld, bezig met het verwijderen van pakketten..."
+msgid "Save changes"
+msgstr "Veranderingen opslaan"
 
-#: ../rpmdrake:1
+#  The hdlist
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal information"
-msgstr "Normale informatie"
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Relatief pad naar synthesis of hdlist: "
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Ophalen pakket `%s' (%s/%s)..."
+msgid "URL:"
+msgstr "URL: "
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing source \"%s\":"
+msgstr "Bewerken van bron \"%s\":"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Geselecteerd: %d MB / Vrije schijfruimte: %d MB"
+msgid "Edit a source"
+msgstr "Een bron bewerken"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Spain"
-msgstr "Spanje"
+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 "Type of source:"
+msgstr "Brontype:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by selection state"
-msgstr "op selectie-status"
+msgid "Adding a source:"
+msgstr "Bezig met toevoegen van bron:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 msgstr ""
-"Even geduld, bezig met downloaden van mirror-adressen van de MandrakeSoft "
-"website."
+"Er bestaat reeds een medium met die naam, weet u\n"
+"zeker dat u deze wilt vervangen?"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Login:"
-msgstr "Aanmeldnaam:"
+msgid "You need to fill up at least the two first entries."
+msgstr "U dient tenminste de eerste twee velden in te vullen."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Austria"
-msgstr "Oostenrijk"
+msgid "Name:"
+msgstr "Naam:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Bestandsfout"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
+msgstr "Aanmeldnaam:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Selecteer de bron(nen) die u wilt verversen:"
+msgid "Choose a mirror..."
+msgstr "Kies uw mirror..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update..."
-msgstr "Verversen..."
+msgid "Browse..."
+msgstr "Bladeren..."
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "Controleren handtekening van `%s'..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Pad of koppelpunt::"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
-msgstr "(geen)"
+msgid "Removable device"
+msgstr "Verwisselbaar apparaat"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-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"
+msgid "HTTP server"
+msgstr "HTTP server"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Installeren pakket `%s' (%s/%s)..."
+msgid "FTP server"
+msgstr "FTP server"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Momenteel geïnstalleerde versie: "
+msgid "Path:"
+msgstr "Pad:"
 
-#: ../rpmdrake:1
+#  Local media
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Other"
-msgstr "Overige"
+msgid "Local files"
+msgstr "Lokale bestanden"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Reden voor vernieuwing: "
+msgid "Add a source"
+msgstr "Bron toevoegen"
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Please choose the desired mirror."
-msgstr "Kies de gewenste mirror."
+#, 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."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "Bewerken"
+msgid "Unable to create medium."
+msgstr "Niet in staat medium te creëren"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Even geduld, bezig met opzoeken van verkrijgbare pakketten..."
+msgid "Update"
+msgstr "Verversen"
 
-#  The hdlist
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Relatief pad naar synthesis of hdlist: "
+msgid "Select the source(s) you wish to update:"
+msgstr "Selecteer de bron(nen) die u wilt verversen:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Zoekresultaat (niets)"
+msgid "Please wait, updating media..."
+msgstr "Even geduld, bezig met verversen van media..."
 
+#  Local media
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Danmark"
-msgstr "Denemarken"
+msgid " failed!"
+msgstr " mislukt!"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "China"
+msgid " done."
+msgstr " klaar."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United States"
-msgstr "Verenigde Staten"
+msgid "Download of `%s', speed:%s"
+msgstr "Downloaden van `%s', snelheid:%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "changes:"
-msgstr "veranderingen:"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "Downloaden van `%s', tijd over:%s, snelheid:%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "Controleren handtekening van `%s'..."
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Enkele extra pakketten dienen verwijderd te worden"
+msgid "Examining distant file of source `%s'..."
+msgstr "Onderzoeken van afstandsbestand van bron `%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Examining file of source `%s'..."
+msgstr "Onderzoeken van bestand van bron `%s'..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No"
-msgstr "Nee"
+msgid "Copying file for source `%s'..."
+msgstr "Kopiëren van bestand voor bron `%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Summary: "
-msgstr "Samenvatting: "
+msgid "Please choose the desired mirror."
+msgstr "Kies de gewenste mirror."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "Canada"
+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."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Greece"
-msgstr "Griekenland"
+msgid "No mirror"
+msgstr "Geen mirror"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1064,261 +1141,184 @@ msgstr ""
 "Het netwerk, of de MandrakeSoft-website, zijn wellicht onbereikbaar.\n"
 "Probeert u het later opnieuw."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Source: "
-msgstr "Bron: "
-
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "Kopiëren van bestand voor bron `%s'..."
-
-#: ../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 "Path:"
-msgstr "Pad:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Problem during removal"
-msgstr "Probleem bij het verwijderen"
+msgid "Error during download"
+msgstr "Fout tijdens ophalen"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by source repository"
-msgstr "op bron"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
+"Even geduld, bezig met downloaden van mirror-adressen van de MandrakeSoft "
+"website."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Selected"
-msgstr "Geselecteerd"
+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.pm:1
 #, c-format
-msgid "Netherlands"
-msgstr "Nederland"
+msgid "United States"
+msgstr "Verenigde Staten"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "Toevoegbaar"
+msgid "China"
+msgstr "China"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
-msgstr "(Niet beschikbaar)"
-
-#: ../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"
+msgid "United Kingdom"
+msgstr "Verenigd Koninkrijk"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Softwarepakketten verwijderen"
+msgid "Taiwan"
+msgstr "Taiwan"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Sweden"
 msgstr "Zweden"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
-msgstr ""
-"\n"
-"\n"
-"Gerapporteerde fout(en):\n"
-"%s"
+msgid "Russia"
+msgstr "Rusland"
 
-#: ../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."
-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 "Portugal"
+msgstr "Portugal"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "Downloaden van `%s', snelheid:%s"
+msgid "Poland"
+msgstr "Polen"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Eén van de volgende pakketten is benodigd:"
+msgid "Norway"
+msgstr "Noorwegen"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "Afsluiten"
+msgid "Netherlands"
+msgstr "Nederland"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 ""
-"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?"
+msgid "Korea"
+msgstr "Korea, Republiek"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid "Japan"
+msgstr "Japan"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#  Use plural for "installed" if your language
+#  * distinguish plural and singular here
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "Even geduld, bezig met toevoegen medium..."
+msgid "Italy"
+msgstr "Italië"
 
-#: ../edit-urpm-sources.pl:1
+#  Use plural for "installed" if your language
+#  * distinguish plural and singular here
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "Brontype:"
+msgid "Israel"
+msgstr "Israël"
 
-#: ../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]"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Griekenland"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to get source packages."
-msgstr "Niet in staat bronpakketten op te halen"
+msgid "France"
+msgstr "Frankrijk"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Te veel pakketten zijn geselecteerd"
+msgid "Finland"
+msgstr "Finland"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "conflicteert met"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "Spanje"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Danmark"
+msgstr "Denemarken"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Mandrake keuzes"
+msgid "Germany"
+msgstr "Duitsland"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 ""
-"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."
+msgid "Czech Republic"
+msgstr "Tsjechië"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Veranderingen-logboek:\n"
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Korea"
-msgstr "Korea, Republiek"
+msgid "Canada"
+msgstr "Canada"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "Verwisselbaar apparaat"
+msgid "Brazil"
+msgstr "Brazilië"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "België"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Change medium"
-msgstr "Medium veranderen"
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Mandrake Vernieuwen"
+msgid "Australia"
+msgstr "Australië"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by size"
-msgstr "op grootte"
+msgid "Austria"
+msgstr "Oostenrijk"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "FTP server"
+msgid "Info..."
+msgstr "Info..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Files:\n"
-msgstr "Bestanden:\n"
+msgid "No"
+msgstr "Nee"
 
 #: ../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."
+#, c-format
+msgid "Yes"
+msgstr "Ja"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
diff --git a/po/no.po b/po/no.po
index a82d2965..b1f3fec3 100644
--- a/po/no.po
+++ b/po/no.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grpmi\n"
-"POT-Creation-Date: 2003-05-02 20:15+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+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,20 +15,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "Slått på?"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../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:"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Er det ok å fortsette?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -47,69 +43,16 @@ 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 "Already existing update sources"
-msgstr ""
-
-#: ../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 ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"Welcome to MandrakeUpdate!\n"
 "\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
 msgstr ""
-"På grunn av disses avhengigheter, må følgende pakke(r) velges\n"
-"vekk nå:\n"
+"Velkommen til MandrakeUpdate!\n"
 "\n"
-
-#: ../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"
+"Dette verktøyet vil hjelpe deg å velge oppdateringene du skal installere\n"
+"på maskinen din."
 
 #: ../rpmdrake:1
 #, c-format
@@ -124,21 +67,40 @@ msgstr ""
 "Dette verktøyet vil hjelpe deg å velge vilken programvare du skal fjerne\n"
 "fra maskinen din."
 
-#: ../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 "For å kunne lagre endringene må du settee inn et medium i stasjonen."
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"Det var en feil under installasjonen av pakker:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
-msgstr "Lagre og avslutt"
+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"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"There was a problem during the installation:\n"
 "\n"
 "%s"
 msgstr ""
@@ -148,377 +110,299 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Size: "
-msgstr "Størrelse"
+msgid "Installation failed"
+msgstr "Installer alle"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Security updates"
-msgstr "Vis sikkerhetsoppdateringer"
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "Forbereder pakker for installasjon..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Maximum information"
-msgstr "Maksimum informasjon"
-
-#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Feil..."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "United Kingdom"
-msgstr "Storbritannia"
+msgid "No package found for installation."
+msgstr "Forbereder pakker for installasjon..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure sources"
-msgstr "Konfigurer kilder"
+msgid "All requested packages were installed successfully."
+msgstr "Alle pakker ble vellykket installert"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "i navn"
+msgid "Everything installed successfully"
+msgstr "Alt installert vellykket"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"I can't find any suitable mirror.\n"
+"The installation is finished; %s.\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."
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
 msgstr ""
-"Jeg kan ikke finne noen passende speil.\n"
+"Installasjonen er ferdig; %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."
+"Noen konfigureringsfiler ble opprettet som `.rpmnew' ellr `.rpmsave',\n"
+"du kan no sjekke noen for å utføre noen handlinger:"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "alt ble installert korrekt"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
-"\n"
-"\\Do you want to continue installation?"
-msgstr ""
-"Følgende pakker må fjernes for at andre skal bli oppgradert:\n"
-"\n"
-"%s\n"
-"\n"
-"ER det ok å fortsette?"
+msgid "Problem during installation"
+msgstr "Det oppsto problemer under installasjonen"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Fjern .%s"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Installerer pakke `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Source"
-msgstr "Kilde"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Forbereder pakker for installasjon..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "Finland"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
+msgstr ""
+"\n"
+"\n"
+"Feil rapportert:\n"
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
+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."
 
-#: ../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 ""
+"The following packages have bad signatures:\n"
+"\n"
 "%s\n"
 "\n"
-"Is it ok to continue?"
+"Do you want to continue installation?"
 msgstr ""
+"Følgende pakker må fjernes for at andre skal bli oppgradert:\n"
+"\n"
 "%s\n"
 "\n"
-"Er det ok å fortsette?"
+"ER det ok å fortsette?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Last pakkelisten på nytt"
+msgid "Verifying packages signatures..."
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr "Velg et speil..."
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "Laster ned pakke `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Legger til en kilde:"
+msgid "Cancel"
+msgstr "Avbryt"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Pakke `%s' kan ikke installeres\n"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "Ok"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Forbereder pakker for installasjon..."
+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 "All packages,"
-msgstr "Alle pakker,"
+msgid "Change medium"
+msgstr "Endre media"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "i filer"
+msgid "Initializing..."
+msgstr "Initialiserer..."
 
 #: ../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 "Proxy hostname:"
-msgstr "Proxy brukernavn:"
-
-#: ../rpmdrake:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Update source(s)"
-msgstr "Oppdaterer kilde(r)"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Local files"
-msgstr "Lokale filer"
+msgid "Package installation..."
+msgstr "Forbereder pakker for installasjon..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Inspecting %s"
-msgstr "Sjekker %s"
-
-#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Israel"
-msgstr "Installer"
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Du må være root for å installere pakker, beklager"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Help"
-msgstr "/_Hjelp"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "HTTP server"
-msgstr "HTTP tjener"
+msgid "Unable to get source packages."
+msgstr "Velg pakkene dine"
 
-#: ../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 ""
-"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."
+msgid "Inspect..."
+msgstr "Sjekk..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Installer alle"
+msgid "Installation finished"
+msgstr "Installert"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Bruk .%s som hovedfil"
+msgid "Do nothing"
+msgstr "Ikke gjør noe"
 
 #: ../rpmdrake:1
 #, c-format
-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?"
+msgid "Use .%s as main file"
+msgstr "Bruk .%s som hovedfil"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Finn:"
+msgid "Remove .%s"
+msgstr "Fjern .%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Alle pakker, alfabetisk"
+msgid "changes:"
+msgstr "endringer:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Vennligst vent, søker..."
+msgid "Inspecting %s"
+msgstr "Sjekker %s"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, reading packages database..."
+msgid "Please wait, finding available packages..."
 msgstr ""
 "Vennligst vent\n"
 "Sorterer pakker"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "ukjent"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Reset the selection"
-msgstr "Resett valget"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../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]>):"
+msgid "Please wait, adding medium..."
+msgstr "Vennligst vent, legger til media..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"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 ""
-"På grunn av disses avhengigheter, trenger følgende pakke(r) også\n"
-"å bli fjernet:\n"
+"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.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Costa Rica"
+msgid "How to choose manually your mirror"
+msgstr "Hvordan velge ditt speil manuelt"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"There was a problem during the installation:\n"
+"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"
-"%s"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"Det var en feil under installasjonen av pakker:\n"
-"\n"
-"%s"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Please wait, removing medium..."
-msgstr "Vennligst vent, fjerner media..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "Passord:"
+msgid "Already existing update sources"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "Utforsker fjern fil fra kilde `%s'..."
+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
 #, c-format
-msgid "Taiwan"
-msgstr "Taiwan"
+msgid "A fatal error occurred: %s."
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "User:"
-msgstr "Brukernavn:"
+msgid "Fatal error"
+msgstr "Fil feil"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Please wait, updating medium..."
-msgstr "Vennligst vent, oppdaterer media..."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Software Packages Installation"
+msgstr "Forbereder pakker for installasjon..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, listing packages..."
-msgstr ""
-"Vennligst vent\n"
-"Sorterer pakker"
+msgid "Mandrake Update"
+msgstr "MandrakeUpdates valg"
 
 #: ../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 "Software Packages Removal"
+msgstr "Fjerning av programvarepakker"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Avslutt"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Information on packages"
-msgstr "Velg pakkene dine"
+#, c-format
+msgid "Install"
+msgstr "Installer"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Cancel"
-msgstr "Avbryt"
+msgid "Remove"
+msgstr "Fjern"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Everything installed successfully"
-msgstr "Alt installert vellykket"
+#, fuzzy, c-format
+msgid "Help"
+msgstr "/_Hjelp"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Vennligst vent, oppdaterer media..."
+msgid "Search"
+msgstr "søk"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Find:"
+msgstr "Finn:"
 
 #: ../rpmdrake:1
 #, c-format
@@ -536,192 +420,161 @@ msgstr ""
 "ER det ok å fortsette?"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "in descriptions"
-msgstr "Beskrivelser"
-
-#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Konfigurer proxier"
+msgid "Some packages need to be removed"
+msgstr "Noen pakker må fjernes"
 
-#: ../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"
+"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"
-"Is it ok to continue?"
+"Do you really want to install all the selected packages?"
 msgstr ""
-"Jeg må kontakte MandrakeSoft website for å få listen over speil.\n"
-"Vennligst sjekk at nettverket ditt er opp og går.\n"
+"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"
-"Er det ok å fortsette?"
+"Ønsker du virkelig å installere alle valgte pakker?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Vennligst velg"
+msgid "Too many packages are selected"
+msgstr "For mange pakker er valgt"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Selected size: %d MB"
-msgstr "%d valgte pakker: %.1f MB"
+#, c-format
+msgid "Maximum information"
+msgstr "Maksimum informasjon"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add a source"
-msgstr "Legg til en kilde"
+msgid "Normal information"
+msgstr "Normal informasjon"
+
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update source(s)"
+msgstr "Oppdaterer kilde(r)"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "Initialiserer..."
+msgid "Reload the packages list"
+msgstr "Last pakkelisten på nytt"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "Lagrer endringer"
+msgid "Reset the selection"
+msgstr "Resett valget"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
-msgstr "Feil under nedlasting"
+msgid "in files"
+msgstr "i filer"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Forbereder pakker for installasjon..."
+msgid "in descriptions"
+msgstr "Beskrivelser"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Importance: "
-msgstr "Viktighet: "
+msgid "in names"
+msgstr "i navn"
 
 #: ../rpmdrake: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 "by update availability"
+msgstr "ved oppdateringstilgjengelighet"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "Legg til..."
+msgid "by source repository"
+msgstr "ved kildelager"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Unable to create medium."
-msgstr "Kan ikke opprette media."
+msgid "by selection state"
+msgstr "ved utvelgelsestilstand"
 
 #: ../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 ""
-"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:"
+msgid "by size"
+msgstr "ved størrelse"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
-msgstr "Kikke..."
+msgid "by group"
+msgstr "ved gruppe"
 
 #: ../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 "Info..."
-msgstr "Info..."
+msgid "All packages,"
+msgstr "Alle pakker,"
 
-#: ../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 "All packages, alphabetical"
+msgstr "Alle pakker, alfabetisk"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "Fjern"
+msgid "Mandrake choices"
+msgstr "Mandrake valg"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Forbereder pakker for installasjon..."
+msgid "Normal updates"
+msgstr "Normale oppdateringer"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No mirror"
-msgstr "Speil:"
+msgid "Bugfixes updates"
+msgstr "Vis bugfiks-oppdateringer"
 
-#: ../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 ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Security updates"
+msgstr "Vis sikkerhetsoppdateringer"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Install"
-msgstr "Installer"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Japan"
-msgstr "Japan"
+#, fuzzy, c-format
+msgid "Description: "
+msgstr "Beskrivelser"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Ikke gjør noe"
+msgid "Reason for update: "
+msgstr "Grunn til oppdatering: "
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No update"
-msgstr "Utfør oppdateringer"
+msgid "Summary: "
+msgstr "Oppsummering"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "Viktighet: "
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Description: "
-msgstr "Beskrivelser"
+msgid "%s KB"
+msgstr "%.1f KB"
 
 #: ../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."
+#, fuzzy, c-format
+msgid "Size: "
+msgstr "Størrelse"
 
 #: ../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 ""
-"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?"
+#, fuzzy, c-format
+msgid "Version: "
+msgstr "Versjon:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -730,68 +583,84 @@ msgstr "Navn: %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "Sjekk..."
+msgid "Currently installed version: "
+msgstr "Installert versjon: "
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Forbereder pakker for installasjon..."
+msgid "Source: "
+msgstr "Kilde"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Australia"
+msgid "(Not available)"
+msgstr "(Ingen tilgjengelig)"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
+msgstr "Changelog:\n"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Installation finished"
-msgstr "Installert"
+msgid "Files:\n"
+msgstr "/_Fil"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by update availability"
-msgstr "ved oppdateringstilgjengelighet"
+#, fuzzy, c-format
+msgid "Selected size: %d MB"
+msgstr "%d valgte pakker: %.1f MB"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
-msgstr "Polen"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Valgte: %d MB / Ledig diskplass: %d MB"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Version: "
-msgstr "Versjon:"
-
-#: ../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:"
+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"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Editing source \\\"%s\\\":"
-msgstr "Rediger kilde \"%s\":"
+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"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Upgradable"
-msgstr "Oppdater"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid " done."
-msgstr " ferdig."
+msgid "%s conflicts with %s"
+msgstr "er i konflikt"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Forbereder pakker for installasjon..."
+msgid "Some packages can't be installed"
+msgstr "Pakke `%s' kan ikke installeres\n"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "Utforsker fil fra kilde `%s'..."
+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
 #, c-format
@@ -800,514 +669,645 @@ msgstr "Ytterligere pakker trengs"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Bugfixes updates"
-msgstr "Vis bugfiks-oppdateringer"
+msgid "Some packages can't be removed"
+msgstr "Pakke `%s' kan ikke installeres\n"
 
-#: ../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 ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
+"Beklager, men fjerning av disse pakkene vil ødelegge systemet ditt:\n"
+"\n"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "Tyskland"
+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.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Russia"
-msgstr "Russland"
+msgid "Some additional packages need to be removed"
+msgstr "Noen ytterligere pakker renger å fjernes"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Norway"
-msgstr "Norge"
+msgid "More information on package..."
+msgstr "Mere informasjon om pakke..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Det oppsto problemer under installasjonen"
+msgid "Information on packages"
+msgstr "Velg pakkene dine"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
-#, c-format
-msgid "Search"
-msgstr "søk"
+#, fuzzy, c-format
+msgid "More info"
+msgstr "Mere info"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Edit a source"
-msgstr "Rediger en kilde"
+msgid "Addable"
+msgstr "Kan legge til"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Czech Republic"
-msgstr "Sjekkiske Republikk"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Upgradable"
+msgstr "Oppdater"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Stop"
-msgstr "Stopp"
+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
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "No update"
+msgstr "Utfør oppdateringer"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Update"
-msgstr "Oppdater"
+msgid "(none)"
+msgstr "(ingen)"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, removing packages..."
+msgid "Please wait, listing packages..."
 msgstr ""
 "Vennligst vent\n"
 "Sorterer pakker"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Normal information"
-msgstr "Normal informasjon"
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "ukjent"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Laster ned pakke `%s' (%s/%s)..."
+msgid "One of the following packages is needed:"
+msgstr "En av følgende pakker behøves:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Valgte: %d MB / Ledig diskplass: %d MB"
+msgid "Please choose"
+msgstr "Vennligst velg"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Spain"
-msgstr "Spania"
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Normal updates"
-msgstr "Normale oppdateringer"
+msgid "Not selected"
+msgstr "Konflikter oppdaget"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Selected"
+msgstr ""
+"Velg\n"
+"alle"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by selection state"
-msgstr "ved utvelgelsestilstand"
+msgid "Search results"
+msgstr "Søkeresultater"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
-"Vennligst vent, laster ned adresser over speil fra MandrakeSoft website."
+msgid "Stop"
+msgstr "Stopp"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Login:"
-msgstr "Logg inn:"
+msgid "Please wait, searching..."
+msgstr "Vennligst vent, søker..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "Østerrike"
+msgid "Search results (none)"
+msgstr "Søkeresultater (ingen)"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Fil feil"
+#, c-format
+msgid "Other"
+msgstr "Andre"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Velg kilden(e) du ønsker å oppdatere:"
+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 ""
+"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
+#, c-format
+msgid "Save and quit"
+msgstr "Lagre og avslutt"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Update..."
-msgstr "Oppdater"
+msgid "Proxy..."
+msgstr "Feil..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "Verifiserer signatur av `%s'..."
+msgid "Update..."
+msgstr "Oppdater"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
-msgstr "(ingen)"
+msgid "Add..."
+msgstr "Legg til..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl: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 "Edit"
+msgstr "Rediger"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Installerer pakke `%s' (%s/%s)..."
+msgid "Source"
+msgstr "Kilde"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Installert versjon: "
+msgid "Enabled?"
+msgstr "Slått på?"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Other"
-msgstr "Andre"
+msgid "Configure sources"
+msgstr "Konfigurer kilder"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Grunn til oppdatering: "
+msgid "Password:"
+msgstr "Passord:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Please choose the desired mirror."
-msgstr ""
-"Vennligst vent\n"
-"Henter liste over speil"
+msgid "User:"
+msgstr "Brukernavn:"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit"
-msgstr "Rediger"
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Du kan spesifisere en /bruker/passord for proxy autentifiseringen:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Please wait, finding available packages..."
-msgstr ""
-"Vennligst vent\n"
-"Sorterer pakker"
+msgid "Proxy hostname:"
+msgstr "Proxy brukernavn:"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Relativ sti til synthesis/hdlist:"
+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]>):"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Søkeresultater (ingen)"
+msgid "Configure proxies"
+msgstr "Konfigurer proxier"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Danmark"
-msgstr "Danmark"
+msgid "Please wait, updating medium..."
+msgstr "Vennligst vent, oppdaterer media..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "China"
-msgstr "Kina"
+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."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "United States"
-msgstr "USA"
+msgid "You need to insert the medium to continue"
+msgstr "Du må sette inn mediumet for å fortsette"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "changes:"
-msgstr "endringer:"
+msgid "Save changes"
+msgstr "Lagrer endringer"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Noen ytterligere pakker renger å fjernes"
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Relativ sti til synthesis/hdlist:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing source \"%s\":"
+msgstr "Rediger kilde \"%s\":"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "Nei"
+msgid "Edit a source"
+msgstr "Rediger en kilde"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Summary: "
-msgstr "Oppsummering"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr "Vennligst vent, fjerner media..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Canada"
-msgstr "Canada"
+msgid "Type of source:"
+msgstr "Type kilde:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Greece"
-msgstr "Hellas"
+msgid "Adding a source:"
+msgstr "Legger til en kilde:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl: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."
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 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."
+"Det er allerede et media med det navnet, vil du\n"
+"virkelig bytte det ut?"
 
-#: ../rpmdrake:1
+#: ../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."
+
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Source: "
-msgstr "Kilde"
+msgid "Name:"
+msgstr "Navn"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "Kopierer fil for kilde `%s'..."
+msgid "Login:"
+msgstr "Logg inn:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Du må være root for å installere pakker, beklager"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Velg et speil..."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Browse..."
+msgstr "Kikke..."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Sti eller monteringspunkt:"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Removable device"
+msgstr "Fjernbar enhet"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "HTTP server"
+msgstr "HTTP tjener"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "FTP tjener"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Path:"
 msgstr "Port:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Problem during removal"
-msgstr "Problem under fjerning"
+msgid "Local files"
+msgstr "Lokale filer"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by source repository"
-msgstr "ved kildelager"
+msgid "Add a source"
+msgstr "Legg til en kilde"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Selected"
-msgstr ""
-"Velg\n"
-"alle"
+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 "Netherlands"
-msgstr "Nederland"
+msgid "Unable to create medium."
+msgstr "Kan ikke opprette media."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "Kan legge til"
+msgid "Update"
+msgstr "Oppdater"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
-msgstr "(Ingen tilgjengelig)"
+msgid "Select the source(s) you wish to update:"
+msgstr "Velg kilden(e) du ønsker å oppdatere:"
 
-#: ../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"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, updating media..."
+msgstr "Vennligst vent, oppdaterer media..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid " failed!"
+msgstr " feilet!"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid " done."
+msgstr " ferdig."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Download of `%s', speed:%s"
+msgstr "Nedlastning av `%s', hastighet:%s"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "Nedlastning av `%s', tid som gjenstår:%s, hastighet:%s"
+
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Not selected"
-msgstr "Konflikter oppdaget"
+msgid "Starting download of `%s'..."
+msgstr "Verifiserer signatur av `%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Fjerning av programvarepakker"
+msgid "Examining distant file of source `%s'..."
+msgstr "Utforsker fjern fil fra kilde `%s'..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Sweden"
-msgstr "Sverige"
+msgid "Examining file of source `%s'..."
+msgstr "Utforsker fil fra kilde `%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Copying file for source `%s'..."
+msgstr "Kopierer fil for kilde `%s'..."
+
+#: ../rpmdrake.pm: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"
 "\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
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "No mirror"
+msgstr "Speil:"
+
+#: ../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."
+"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 ""
-"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."
+"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 "Download of `%s', speed:%s"
-msgstr "Nedlastning av `%s', hastighet:%s"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "One of the following packages is needed:"
-msgstr "En av følgende pakker behøves:"
+msgid "Error during download"
+msgstr "Feil under nedlasting"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "Avslutt"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
+"Vennligst vent, laster ned adresser over speil fra MandrakeSoft website."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
+"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 ""
-"Jeg må kontakte speilet for å få tak i siste oppdateringspakker.\n"
-"Vennligst sjekk at nettverket ditt er oppe og går.\n"
+"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?"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid "United States"
+msgstr "USA"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "Vennligst vent, legger til media..."
+msgid "China"
+msgstr "Kina"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "Type kilde:"
+msgid "United Kingdom"
+msgstr "Storbritannia"
 
-#: ../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]"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "Taiwan"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unable to get source packages."
-msgstr "Velg pakkene dine"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "Sverige"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "For mange pakker er valgt"
+msgid "Russia"
+msgstr "Russland"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "er i konflikt"
+msgid "Portugal"
+msgstr "Port:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 verktøyet vil hjelpe deg å velge oppdateringene du skal installere\n"
-"på maskinen din."
+msgid "Poland"
+msgstr "Polen"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Mandrake valg"
+msgid "Norway"
+msgstr "Norge"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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."
+msgid "Netherlands"
+msgstr "Nederland"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Korea"
+msgstr "Tving"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Changelog:\n"
+msgid "Japan"
+msgstr "Japan"
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Korea"
+msgid "Italy"
+msgstr "Installer"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Israel"
+msgstr "Installer"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Hellas"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "France"
 msgstr "Tving"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "Fjernbar enhet"
+msgid "Finland"
+msgstr "Finland"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "Spania"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
+msgstr "Danmark"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr "Tyskland"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
+msgstr "Sjekkiske Republikk"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Costa Rica"
+msgstr "Costa Rica"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Canada"
+msgstr "Canada"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
+msgstr "Brasil"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Belgia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Change medium"
-msgstr "Endre media"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Mandrake Update"
-msgstr "MandrakeUpdates valg"
+msgid "Australia"
+msgstr "Australia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by size"
-msgstr "ved størrelse"
+msgid "Austria"
+msgstr "Østerrike"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "FTP tjener"
+msgid "Info..."
+msgstr "Info..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Files:\n"
-msgstr "/_Fil"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
+msgstr "Nei"
 
 #: ../rpmdrake.pm: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."
+#, c-format
+msgid "Yes"
+msgstr "Ja"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
diff --git a/po/pl.po b/po/pl.po
index 52bca9a3..e00f0c18 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grpmi\n"
-"POT-Creation-Date: 2003-05-02 20:15+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+0200\n"
 "PO-Revision-Date: 2002-12-30 23:54+0200\n"
 "Last-Translator: Arkadiusz Lipiec <alipiec@elka.pw.edu.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -13,20 +13,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-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
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Portugal"
-msgstr "Portugalia"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Czy chcesz kontynuować?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -45,59 +41,104 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-msgstr "według grupy"
+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."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Name:"
-msgstr "Nazwa:"
+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.pm:1
-#, c-format
-msgid "Italy"
-msgstr "WÅ‚ochy"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"Wystąpił błąd podczas instalacji pakietów:\n"
+"\n"
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "Sposób ręcznego wyboru serwera zwierciadlanego"
+msgid "Problem during removal"
+msgstr "Problem podczas usuwania"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "Please wait, removing packages..."
+msgstr "Proszę czekać, usuwanie pakietów..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Niektóre pakiety muszą zostać usunięte"
+msgid "Please wait, reading packages database..."
+msgstr "Proszę czekać, odczytywanie bazy danych pakietów..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Already existing update sources"
-msgstr "Już istniejące źródła aktulizacyjne"
+#, fuzzy, 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"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Installation failed"
+msgstr "BÅ‚Ä…d operacji interfejsu HTTP\n"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "Przygotowywanie pakietów do instalacji..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "Przygotowywanie pakietów do instalacji..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "More information on package..."
-msgstr "Więcej informacji o pakiecie..."
+msgid "All requested packages were installed successfully."
+msgstr "Wszystkie żądane pakiety zostały pomyślnie zainstalowane."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "Tak"
+msgid "Everything installed successfully"
+msgstr "Wszystko zostało pomyślnie zainstalowane"
 
 #: ../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 ""
-"Z powodu swoich zależności, poniższe pakiety muszą zostać\n"
-"teraz odznaczone:\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
 #, c-format
@@ -105,497 +146,514 @@ msgid "everything was installed correctly"
 msgstr "wszystko zostało pomyślnie zainstalowane"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during installation"
+msgstr "Wystąpił problem podczas instalacji"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Instalowanie pakietu \"%s\" (%s/%s)..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Przygotowywanie pakietów do instalacji..."
 
 #: ../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."
+"\n"
+"Error(s) reported:\n"
+"%s"
 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."
+"\n"
+"Zgłoszono błąd(błędy):\n"
+"%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 "By zapisać zmiany, musisz włożyć nośnik do napędu."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Save and quit"
-msgstr "Zapisz i zakończ"
+"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ł."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"The following packages have bad signatures:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"Wystąpił błąd podczas instalacji pakietów:\n"
+"Poniższe pakiety muszą zostać usunięte aby inne mogły być zaktualizowane:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"Czy chcesz kontynuować?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Size: "
-msgstr "Rozmiar: "
+msgid "Verifying packages signatures..."
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Security updates"
-msgstr "Aktualizacje z dziedziny bezpieczeństwa"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "Pobieranie pakietu \"%s\" (%s/%s)..."
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
+msgstr "Anuluj"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "Ok"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+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 "Maximum information"
-msgstr "Maksimum informacji"
+msgid "Change medium"
+msgstr "Zmień nośnik"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, c-format
+msgid "Initializing..."
+msgstr "Inicjacja..."
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "BÅ‚Ä…d..."
+msgid "Package installation..."
+msgstr "Przygotowywanie pakietów do instalacji..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Niestety, aby instalować pakiety należy robić to z konta roota."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Wielka Brytania"
+msgid "Unable to get source packages."
+msgstr "Nie można pobrać pakietów źródłowych."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure sources"
-msgstr "Konfiguracja źródeł"
+msgid "Inspect..."
+msgstr "Sprawdzaj..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "w nazwach"
+msgid "Installation finished"
+msgstr "Instalacja zakończona"
 
-#: ../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 ""
-"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 "Do nothing"
+msgstr "Nic nie rób"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
-"\n"
-"\\Do you want to continue installation?"
-msgstr ""
-"Poniższe pakiety muszą zostać usunięte aby inne mogły być zaktualizowane:\n"
-"\n"
-"%s\n"
-"\n"
-"Czy chcesz kontynuować?"
+#, c-format
+msgid "Use .%s as main file"
+msgstr "Użyj .%s jako plik podstawowy"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Remove .%s"
 msgstr "Usuń %s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Source"
-msgstr "Źródło"
+msgid "changes:"
+msgstr "zmiany:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "Finlandia"
+msgid "Inspecting %s"
+msgstr "Sprawdzanie %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
+msgid "Please wait, finding available packages..."
+msgstr "Proszę czekać, wyszukiwanie dostępnych pakietów..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "France"
-msgstr "Francja"
+msgid "Please wait, adding medium..."
+msgstr "Proszę czekać, dodawanie nośnika..."
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "More info"
-msgstr "Więcej info"
+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ż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"
+"Następnie ponownie uruchom MandrakeUpdate."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Sposób ręcznego wyboru serwera zwierciadlanego"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"%s\n"
+"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"
-"Is it ok to continue?"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"%s\n"
+"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"
-"Czy chcesz kontynuować?"
+"Następnie uruchom ponownie MandrakeUpdate."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Przeładuj listę pakietów"
+msgid "Already existing update sources"
+msgstr "Już istniejące źródła aktulizacyjne"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr "Wybierz serwer zwierciadlany..."
+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ć?"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Dodawanie źródła:"
+msgid "A fatal error occurred: %s."
+msgstr "Wystąpił poważny błąd: %s."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Pakiet \"%s\" nie może zostać zainstalowany\n"
+msgid "Fatal error"
+msgstr "BÅ‚Ä…d pliku"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
+msgid "Software Packages Installation"
 msgstr "Przygotowywanie pakietów do instalacji..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages,"
-msgstr "Wszystkie pakiety,"
+msgid "Mandrake Update"
+msgstr "Aktualizacja Mandrake"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "w plikach"
+msgid "Software Packages Removal"
+msgstr "Usuwanie pakietów oprogramowania"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Wszystkie żądane pakiety zostały pomyślnie zainstalowane."
+msgid "Quit"
+msgstr "Zakończ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "Serwer proxy:"
+msgid "Install"
+msgstr "Zainstaluj"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update source(s)"
-msgstr "Aktualizacja nośnika(-ów)"
+msgid "Remove"
+msgstr "Usuń"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "Lokalne pliki"
+msgid "Help"
+msgstr "Pomoc"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Sprawdzanie %s"
+msgid "Search"
+msgstr "Wyszukaj"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Israel"
-msgstr "Izrael"
+msgid "Find:"
+msgstr "Znajdź:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Help"
-msgstr "Pomoc"
+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ć?"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "Serwer HTTP"
+msgid "Some packages need to be removed"
+msgstr "Niektóre pakiety muszą zostać usunięte"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"Welcome to the packages source editor!\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"
-"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."
+"Do you really want to install all the selected packages?"
 msgstr ""
-"Witaj w edytorze źródeł pakietów!\n"
+"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"
-"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."
+"Czy naprawdę chcesz zainstalować wszystkie zaznaczone pakiety?"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "BÅ‚Ä…d operacji interfejsu HTTP\n"
+#, c-format
+msgid "Too many packages are selected"
+msgstr "Wybrano zbyt wiele pakietów"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Użyj .%s jako plik podstawowy"
+msgid "Maximum information"
+msgstr "Maksimum informacji"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results"
-msgstr "Wyniki wyszukiwania"
+msgid "Normal information"
+msgstr "Podstawowe informacje"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, c-format
-msgid " failed!"
-msgstr " niepowodzenie!"
+msgid "Update source(s)"
+msgstr "Aktualizacja nośnika(-ów)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Brazil"
-msgstr "Brazylia"
+msgid "Reload the packages list"
+msgstr "Przeładuj listę pakietów"
 
-#: ../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 "Reset the selection"
+msgstr "Usuń zaznaczenie"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Znajdź:"
+msgid "in files"
+msgstr "w plikach"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Wszystkie pakiety, alfabetycznie"
+msgid "in descriptions"
+msgstr "w opisach"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Proszę czekać, wyszukiwanie..."
+msgid "in names"
+msgstr "w nazwach"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Proszę czekać, odczytywanie bazy danych pakietów..."
+msgid "by update availability"
+msgstr "według dostępności aktualizacji"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "Nie można otworzyć pakietu \"%s\"\n"
+#, c-format
+msgid "by source repository"
+msgstr "według repozytorium źródłowego"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "Usuń zaznaczenie"
+msgid "by selection state"
+msgstr "według stanu zaznaczenia"
 
-#: ../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 "by size"
+msgstr "według rozmiaru"
 
 #: ../rpmdrake: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 "by group"
+msgstr "według grupy"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Kostaryka"
+msgid "All packages,"
+msgstr "Wszystkie pakiety,"
 
 #: ../rpmdrake:1
-#, fuzzy, 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"
-
-#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Proszę czekać, usuwanie nośnika..."
+msgid "All packages, alphabetical"
+msgstr "Wszystkie pakiety, alfabetycznie"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "Hasło:"
+msgid "Mandrake choices"
+msgstr "Lista wyboru Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "Badanie odległego pliku źródła \"%s\"..."
+msgid "Normal updates"
+msgstr "Zwykłe aktualizacje"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Tajwan"
+msgid "Bugfixes updates"
+msgstr "Aktualizacje poprawiające błędy"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "User:"
-msgstr "Użytkownik:"
+msgid "Security updates"
+msgstr "Aktualizacje z dziedziny bezpieczeństwa"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Proszę czekać, aktualizacja nośnika..."
+msgid "Description: "
+msgstr "Opis:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Proszę czekać, wypisywanie pakietów..."
+msgid "Reason for update: "
+msgstr "Przyczyna uaktualnienia:"
 
 #: ../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 ""
-"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 "Summary: "
+msgstr "Podsumowanie: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Information on packages"
-msgstr "Informacje o pakietach"
+msgid "Importance: "
+msgstr "Ważność: "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "Anuluj"
+msgid "%s KB"
+msgstr "%s KB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Wszystko zostało pomyślnie zainstalowane"
+msgid "Size: "
+msgstr "Rozmiar: "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Proszę czekać, aktualizacja nośnika..."
+msgid "Version: "
+msgstr "Wersja: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr "Wystąpił poważny błąd: %s."
+msgid "Name: "
+msgstr "Nazwa: "
 
 #: ../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 ""
-"Poniższe pakiety muszą zostać usunięte aby inne mogły być zaktualizowane:\n"
-"\n"
-"%s\n"
-"\n"
-"Czy chcesz kontynuować?"
+msgid "Currently installed version: "
+msgstr "Aktualnie zainstalowana wersja:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "w opisach"
+msgid "Source: "
+msgstr "Źródło: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Konfiguracja serwera proxy"
+msgid "(Not available)"
+msgstr "(Niedostępne)"
 
-#: ../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 "Changelog:\n"
+msgstr "Dziennik zmian:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Proszę wybrać"
+msgid "Files:\n"
+msgstr "Plików:\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Wybrany rozmiar: %d MB"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add a source"
-msgstr "Dodawanie źródła"
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "Inicjacja..."
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Wybranych: %d MB / Miejsce na dysku: %d MB"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "Zapisz zmiany"
+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"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
-msgstr "BÅ‚Ä…d podczas pobierania"
+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:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Przygotowywanie pakietów do instalacji..."
+msgid "%s conflicts with %s"
+msgstr "koliduje z"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Importance: "
-msgstr "Ważność: "
+#, fuzzy, c-format
+msgid "Some packages can't be installed"
+msgstr "Pakiet \"%s\" nie może zostać zainstalowany\n"
 
 #: ../rpmdrake:1
 #, c-format
@@ -608,83 +666,77 @@ msgstr ""
 "zostać zainstalowane:\n"
 "\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "Dodaj..."
+msgid "Additional packages needed"
+msgstr "Wymagane sÄ… dodatkowe pakiety"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Unable to create medium."
-msgstr "Nie można utworzyć nośnika."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "Pakiet \"%s\" nie może zostać zainstalowany\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Removing these packages would break your system, sorry:\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"
+"Niestety, usunięcie tych pakietów może spowodować uszkodzenie systemu:\n"
 "\n"
-"Pewne pliki konfiguracyjne zostały utworzone jako `.rpmnew' lub `.rpmsave',\n"
-"Można je sprawdzić aby podjąć odpowiednie działanie:"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Browse..."
-msgstr "PrzeglÄ…daj..."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "Pakiet \"%s\" nie może zostać zainstalowany\n"
-
-#: ../rpmdrake.pm:1
 #, c-format
-msgid "Info..."
-msgstr "Info..."
+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"
 
-#: ../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 "Some additional packages need to be removed"
+msgstr "Zostanie usuniętych kilka dodatkowych pakietów"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "Usuń"
+msgid "More information on package..."
+msgstr "Więcej informacji o pakiecie..."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Przygotowywanie pakietów do instalacji..."
-
-#: ../rpmdrake.pm:1
 #, c-format
-msgid "No mirror"
-msgstr "Brak serwerów zwierciadlanych"
+msgid "Information on packages"
+msgstr "Informacje o pakietach"
 
-#: ../edit-urpm-sources.pl:1
+#. -PO: Keep it short, this is gonna be on a button
+#: ../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 "More info"
+msgstr "Więcej info"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Zainstaluj"
+msgid "Addable"
+msgstr "Dodawalne"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "Japonia"
+msgid "Upgradable"
+msgstr "Aktualizowalne"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Nic nie rób"
+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:1
 #, c-format
@@ -693,343 +745,379 @@ msgstr "Brak aktualizacji"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Description: "
-msgstr "Opis:"
+msgid "(none)"
+msgstr "(brak)"
 
 #: ../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ł."
+msgid "Please wait, listing packages..."
+msgstr "Proszę czekać, wypisywanie pakietów..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "Nie można otworzyć pakietu \"%s\"\n"
 
 #: ../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 ""
-"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 "One of the following packages is needed:"
+msgstr "Wymagany jest jeden z poniższych pakietów:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "Nazwa: "
+msgid "Please choose"
+msgstr "Proszę wybrać"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "Sprawdzaj..."
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Przygotowywanie pakietów do instalacji..."
+msgid "Not selected"
+msgstr "Wykryto kolizje pakietów"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Australia"
+msgid "Selected"
+msgstr "Wybrane"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation finished"
-msgstr "Instalacja zakończona"
+msgid "Search results"
+msgstr "Wyniki wyszukiwania"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
-msgstr "według dostępności aktualizacji"
+msgid "Stop"
+msgstr "Zatrzymaj"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
-msgstr "Polska"
+msgid "Please wait, searching..."
+msgstr "Proszę czekać, wyszukiwanie..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Version: "
-msgstr "Wersja: "
+msgid "Search results (none)"
+msgstr "Wyniki wyszukiwania (brak)"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Inne"
 
 #: ../edit-urpm-sources.pl: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 ""
+"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."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Zapisz i zakończ"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Editing source \\\"%s\\\":"
-msgstr "Modyfikowanie Źródła \"%s\":"
+msgid "Proxy..."
+msgstr "BÅ‚Ä…d..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Upgradable"
-msgstr "Aktualizowalne"
+msgid "Update..."
+msgstr "Aktualizuj..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid " done."
-msgstr " gotowe."
+msgid "Add..."
+msgstr "Dodaj..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Przygotowywanie pakietów do instalacji..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "Modyfikuj"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "Badanie pliku źródła \"%s\"..."
+msgid "Source"
+msgstr "Źródło"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "Wymagane sÄ… dodatkowe pakiety"
+msgid "Enabled?"
+msgstr "WÅ‚Ä…czone?"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Aktualizacje poprawiające błędy"
+msgid "Configure sources"
+msgstr "Konfiguracja źródeł"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "Pobieranie pakietu \"%s\", czas zakończenia:%s, szybkość:%s"
+msgid "Password:"
+msgstr "Hasło:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Germany"
-msgstr "Niemcy"
+msgid "User:"
+msgstr "Użytkownik:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Russia"
-msgstr "Rosja"
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Możesz podać użytkownika/hasło dla uwierzytelniania pośrednika:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Norway"
-msgstr "Norwegia"
+msgid "Proxy hostname:"
+msgstr "Serwer proxy:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Wystąpił problem podczas instalacji"
+#: ../edit-urpm-sources.pl: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]>):"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search"
-msgstr "Wyszukaj"
+msgid "Configure proxies"
+msgstr "Konfiguracja serwera proxy"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit a source"
-msgstr "Modyfikuj Źródło"
+msgid "Please wait, updating medium..."
+msgstr "Proszę czekać, aktualizacja nośnika..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Czechy"
+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
 #, c-format
-msgid "Stop"
-msgstr "Zatrzymaj"
+msgid "You need to insert the medium to continue"
+msgstr "Włóż nośnik, aby kontynuować"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "Aktualizuj"
+msgid "Save changes"
+msgstr "Zapisz zmiany"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "Proszę czekać, usuwanie pakietów..."
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Względna ścieżka do pliku syntezy/hdlist:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal information"
-msgstr "Podstawowe informacje"
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing source \"%s\":"
+msgstr "Modyfikowanie Źródła \"%s\":"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Pobieranie pakietu \"%s\" (%s/%s)..."
+msgid "Edit a source"
+msgstr "Modyfikuj Źródło"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Wybranych: %d MB / Miejsce na dysku: %d MB"
+msgid "Please wait, removing medium..."
+msgstr "Proszę czekać, usuwanie nośnika..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Spain"
-msgstr "Hiszpania"
+msgid "Type of source:"
+msgstr "Rodzaj źródła:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
-msgstr "Zwykłe aktualizacje"
+msgid "Adding a source:"
+msgstr "Dodawanie źródła:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by selection state"
-msgstr "według stanu zaznaczenia"
+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.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 "You need to fill up at least the two first entries."
+msgstr "Należy wypełnić co najmniej dwa pierwsze pola."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "Nazwa:"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Austria"
-msgstr "Austria"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Fatal error"
-msgstr "BÅ‚Ä…d pliku"
+msgid "Choose a mirror..."
+msgstr "Wybierz serwer zwierciadlany..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Wybierz źródła(-o) do aktualizacji:"
+msgid "Browse..."
+msgstr "PrzeglÄ…daj..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update..."
-msgstr "Aktualizuj..."
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "Weryfikowanie podpisu pakietu \"%s\"..."
+msgid "Path or mount point:"
+msgstr "Ścieżka lub punkt montowania:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
-msgstr "(brak)"
+msgid "Removable device"
+msgstr "Napęd wymienny"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-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"
+msgid "HTTP server"
+msgstr "Serwer HTTP"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Instalowanie pakietu \"%s\" (%s/%s)..."
+msgid "FTP server"
+msgstr "Serwer FTP"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Aktualnie zainstalowana wersja:"
+msgid "Path:"
+msgstr "Ścieżka:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Other"
-msgstr "Inne"
+msgid "Local files"
+msgstr "Lokalne pliki"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Przyczyna uaktualnienia:"
+msgid "Add a source"
+msgstr "Dodawanie źródła"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Please choose the desired mirror."
-msgstr "Wybierz serwer zwierciadlany."
+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"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "Modyfikuj"
+msgid "Unable to create medium."
+msgstr "Nie można utworzyć nośnika."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Proszę czekać, wyszukiwanie dostępnych pakietów..."
+msgid "Update"
+msgstr "Aktualizuj"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Względna ścieżka do pliku syntezy/hdlist:"
+msgid "Select the source(s) you wish to update:"
+msgstr "Wybierz źródła(-o) do aktualizacji:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Wyniki wyszukiwania (brak)"
+msgid "Please wait, updating media..."
+msgstr "Proszę czekać, aktualizacja nośnika..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Danmark"
-msgstr "Dania"
+msgid " failed!"
+msgstr " niepowodzenie!"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "Chiny"
+msgid " done."
+msgstr " gotowe."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United States"
-msgstr "Stany Zjednoczone"
+msgid "Download of `%s', speed:%s"
+msgstr "Pobieranie pakietu \"%s\", szybkość:%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "changes:"
-msgstr "zmiany:"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "Pobieranie pakietu \"%s\", czas zakończenia:%s, szybkość:%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "Weryfikowanie podpisu pakietu \"%s\"..."
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Zostanie usuniętych kilka dodatkowych pakietów"
+msgid "Examining distant file of source `%s'..."
+msgstr "Badanie odległego pliku źródła \"%s\"..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Examining file of source `%s'..."
+msgstr "Badanie pliku źródła \"%s\"..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No"
-msgstr "Nie"
+msgid "Copying file for source `%s'..."
+msgstr "Kopiowanie pliku dla źródła \"%s\"..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Summary: "
-msgstr "Podsumowanie: "
+msgid "Please choose the desired mirror."
+msgstr "Wybierz serwer zwierciadlany."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "Kanada"
+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.pm:1
 #, c-format
-msgid "Greece"
-msgstr "Grecja"
+msgid "No mirror"
+msgstr "Brak serwerów zwierciadlanych"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1046,267 +1134,179 @@ msgstr ""
 "Sieć lub strona www MandrakeSoft mogą być niedostępne.\n"
 "Spróbuj później ponownie."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Source: "
-msgstr "Źródło: "
-
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "Kopiowanie pliku dla źródła \"%s\"..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Niestety, aby instalować pakiety należy robić to z konta roota."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Path:"
-msgstr "Ścieżka:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Problem during removal"
-msgstr "Problem podczas usuwania"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "by source repository"
-msgstr "według repozytorium źródłowego"
+msgid "Error during download"
+msgstr "BÅ‚Ä…d podczas pobierania"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Selected"
-msgstr "Wybrane"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "Proszę czekać, pobieranie adresów serwerów zwierciadlanych."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Netherlands"
-msgstr "Holandia"
+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
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "Dodawalne"
+msgid "United States"
+msgstr "Stany Zjednoczone"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
-msgstr "(Niedostępne)"
+msgid "China"
+msgstr "Chiny"
 
-#: ../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"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr "Wykryto kolizje pakietów"
+msgid "United Kingdom"
+msgstr "Wielka Brytania"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Usuwanie pakietów oprogramowania"
+msgid "Taiwan"
+msgstr "Tajwan"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Sweden"
 msgstr "Szwecja"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
-msgstr ""
-"\n"
-"\n"
-"Zgłoszono błąd(błędy):\n"
-"%s"
+msgid "Russia"
+msgstr "Rosja"
 
-#: ../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."
-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."
+msgid "Portugal"
+msgstr "Portugalia"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "Pobieranie pakietu \"%s\", szybkość:%s"
+msgid "Poland"
+msgstr "Polska"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Wymagany jest jeden z poniższych pakietów:"
+msgid "Norway"
+msgstr "Norwegia"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "Zakończ"
+msgid "Netherlands"
+msgstr "Holandia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 ""
-"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ć?"
+msgid "Korea"
+msgstr "Korea"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid "Japan"
+msgstr "Japonia"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "Proszę czekać, dodawanie nośnika..."
+msgid "Italy"
+msgstr "WÅ‚ochy"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "Rodzaj źródła:"
+msgid "Israel"
+msgstr "Izrael"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please insert the medium named \\\"%s\\\" on device [%s]"
-msgstr "Wsuń nośnik oznaczony \"%s\" do urządzenia [%s]"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Grecja"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to get source packages."
-msgstr "Nie można pobrać pakietów źródłowych."
+msgid "France"
+msgstr "Francja"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Wybrano zbyt wiele pakietów"
+msgid "Finland"
+msgstr "Finlandia"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "koliduje z"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "Hiszpania"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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."
+msgid "Danmark"
+msgstr "Dania"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Lista wyboru Mandrake"
+msgid "Germany"
+msgstr "Niemcy"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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ż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"
-"Następnie ponownie uruchom MandrakeUpdate."
+msgid "Czech Republic"
+msgstr "Czechy"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Dziennik zmian:\n"
+msgid "Costa Rica"
+msgstr "Kostaryka"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Korea"
-msgstr "Korea"
+msgid "Canada"
+msgstr "Kanada"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "Napęd wymienny"
+msgid "Brazil"
+msgstr "Brazylia"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Belgia"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Change medium"
-msgstr "Zmień nośnik"
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Aktualizacja Mandrake"
+msgid "Australia"
+msgstr "Australia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by size"
-msgstr "według rozmiaru"
+msgid "Austria"
+msgstr "Austria"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "Serwer FTP"
+msgid "Info..."
+msgstr "Info..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Files:\n"
-msgstr "Plików:\n"
+msgid "No"
+msgstr "Nie"
 
 #: ../rpmdrake.pm: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 "Yes"
+msgstr "Tak"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
diff --git a/po/pt.po b/po/pt.po
index 724e793d..3d11cb79 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grpmi-pt\n"
-"POT-Creation-Date: 2003-05-02 20:15+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+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,20 +18,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-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
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Portugal"
-msgstr "Portugal"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Posso continuar?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -50,59 +46,104 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-msgstr "por grupo"
+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."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Name:"
-msgstr "Nome:"
+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."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Italy"
-msgstr "Instalar"
+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"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "Como escolher manualmente o seu mirror"
+msgid "Problem during removal"
+msgstr "Problema durante a remoção"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "Please wait, removing packages..."
+msgstr "Por favor aguarde, a remover os pacotes..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Alguns pacotes necessitamser removidos"
+msgid "Please wait, reading packages database..."
+msgstr "Por favor aguarde, a ler a base de dados dos pacotes..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Already existing update sources"
+#, 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..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "More information on package..."
-msgstr "Mais informação sobre o pacote..."
+msgid "All requested packages were installed successfully."
+msgstr "Todos os pacotes pedidos foram instalados com sucesso."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "Sim"
+msgid "Everything installed successfully"
+msgstr "Tudo se instalou com sucesso"
 
 #: ../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 ""
-"Por forma a satisfazer as dependências,estes pacotes devem ser\n"
-"deseleccionados agora:\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
 #, fuzzy, c-format
@@ -110,492 +151,504 @@ 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 "%s KB"
-msgstr "%s KB"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "A instalar o pacote '%s' (%s/%s)..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "A preparar o pacotes para a instalação..."
 
 #: ../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."
+"\n"
+"Error(s) reported:\n"
+"%s"
 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."
+"\n"
+"Erro(s) encontrados:\n"
+"%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 "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"
+"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."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"The following packages have bad signatures:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"Ocorreu um erro durante a instalação dos pacotes:\n"
+"Os pacotes seguintes têm de ser apagados para que os outros sejam "
+"actualizados:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"Posso continuar?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Size: "
-msgstr "Tamanho: "
+msgid "Verifying packages signatures..."
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Security updates"
-msgstr "Actualizações de segurança"
+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"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "Ok"
+
+#: ../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]"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "Informações completas"
+msgid "Change medium"
+msgstr "Mudar o média"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, c-format
+msgid "Initializing..."
+msgstr "A inicializar..."
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Erro..."
+msgid "Package installation..."
+msgstr "A preparar o pacotes para a instalação..."
 
-#: ../rpmdrake.pm:1
+#: ../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 "United Kingdom"
-msgstr "Reino Unido"
+msgid "Unable to get source packages."
+msgstr "Impossível descarregar os pacotes da fonte"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure sources"
-msgstr "Configurar as fontes"
+msgid "Inspect..."
+msgstr "Inspeccionar..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "nos nomes"
+msgid "Installation finished"
+msgstr "A instalação acabou"
 
-#: ../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 ""
-"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 "Do nothing"
+msgstr "Não fazer nada"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
-"\n"
-"\\Do you want to continue installation?"
-msgstr ""
-"Os pacotes seguintes têm de ser apagados para que os outros sejam "
-"actualizados:\n"
-"\n"
-"%s\n"
-"\n"
-"Posso continuar?"
+#, c-format
+msgid "Use .%s as main file"
+msgstr "Utilizar .%s como ficheiro principal"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Remove .%s"
 msgstr "Remover %s"
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Source"
-msgstr "Forçar"
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "Finlândia"
+msgid "changes:"
+msgstr "mudanças:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "France"
-msgstr "Forçar"
+msgid "Inspecting %s"
+msgstr "A inspeccionar %s"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "More info"
-msgstr "Mais informações"
+#, 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
 #, c-format
+msgid "Please wait, adding medium..."
+msgstr "Por favor aguarde, a adicionar o média..."
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"%s\n"
+"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"
-"Is it ok to continue?"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"%s\n"
+"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"
-"Posso continuar?"
+"Depois, relance MandrakeUpdate."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Recarregar a lista dos pacotes"
+msgid "How to choose manually your mirror"
+msgstr "Como escolher manualmente o seu mirror"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr "Escolha um mirror..."
+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 ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Adding a source:"
-msgstr "A adicionar uma fonte:"
+msgid "Already existing update sources"
+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?"
+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:1
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "O Pacote '%s' não pode ser instalado\n"
+msgid "Fatal error"
+msgstr "Erro de ficheiro"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
+msgid "Software Packages Installation"
 msgstr "A preparar o pacotes para a instalação..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages,"
-msgstr "Todos os pacotes,"
+msgid "Mandrake Update"
+msgstr "Actualizações Mandrake"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "nos ficheiros"
+msgid "Software Packages Removal"
+msgstr "Remover Pacotes de Programas"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Todos os pacotes pedidos foram instalados com sucesso."
+msgid "Quit"
+msgstr "Sair"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "Nome do servidor proxy:"
+msgid "Install"
+msgstr "Instalar"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update source(s)"
-msgstr "Actualizar fonte(s)"
+msgid "Remove"
+msgstr "Remover"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "Ficheiros Locais"
+msgid "Help"
+msgstr "Ajuda"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "A inspeccionar %s"
+msgid "Search"
+msgstr "Procurar"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Israel"
-msgstr "Instalar"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "Procurar:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Help"
-msgstr "Ajuda"
+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?"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "Servidor HTTP"
+msgid "Some packages need to be removed"
+msgstr "Alguns pacotes necessitamser removidos"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"Welcome to the packages source editor!\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"
-"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."
+"Do you really want to install all the selected packages?"
 msgstr ""
-"Seja Bem-vindo ao editor de fontes de pacotes!\n"
+"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"
-"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."
+"Deseja mesmo assim instalar todos os pacotes seleccionados ?"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Instalar tudo"
+#, c-format
+msgid "Too many packages are selected"
+msgstr "Demasiados pacotes seleccionados"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Utilizar .%s como ficheiro principal"
+msgid "Maximum information"
+msgstr "Informações completas"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results"
-msgstr "Resultados da Pesquisa"
+msgid "Normal information"
+msgstr "Informações normais"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, c-format
-msgid " failed!"
-msgstr " falhou!"
+msgid "Update source(s)"
+msgstr "Actualizar fonte(s)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Brazil"
-msgstr "Brasil"
+msgid "Reload the packages list"
+msgstr "Recarregar a lista dos pacotes"
 
-#: ../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 média com este nome, quere\n"
-"substituir-lo mesmo?"
+msgid "Reset the selection"
+msgstr "Inicializar a selecção"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Procurar:"
+msgid "in files"
+msgstr "nos ficheiros"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Todos os pacotes, alfabeticamente"
+msgid "in descriptions"
+msgstr "nas descrições"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Por favor aguarde, a procurar..."
+msgid "in names"
+msgstr "nos nomes"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Por favor aguarde, a ler a base de dados dos pacotes..."
+msgid "by update availability"
+msgstr "por disponibilidade de actualização"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "Impossível abrir o pacote '%s'\n"
+#, c-format
+msgid "by source repository"
+msgstr "por fonte"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "Inicializar a selecção"
+msgid "by selection state"
+msgstr "por estado de selecção"
 
-#: ../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 precisa de um proxy, escreva o nome do servidor e em opção a porta "
-"(sintaxe <servidorproxy[:porta]>):"
+msgid "by size"
+msgstr "por tamanho"
 
 #: ../rpmdrake: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 "by group"
+msgstr "por grupo"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Costa Rica"
+msgid "All packages,"
+msgstr "Todos os 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"
-
-#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Por favor aguarde, a remover o média..."
+msgid "All packages, alphabetical"
+msgstr "Todos os pacotes, alfabeticamente"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "Senha:"
+msgid "Mandrake choices"
+msgstr "Selecção da Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "A examinar o ficheiro distante da fonte `%s'..."
+msgid "Normal updates"
+msgstr "Actualizações normais"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Taiwan"
+msgid "Bugfixes updates"
+msgstr "Actualizações de Correcção de Erros"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "User:"
-msgstr "Utilizador:"
+msgid "Security updates"
+msgstr "Actualizações de segurança"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Por favor aguarde, a actualizar o média..."
+msgid "Description: "
+msgstr "Descrição: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Por favor aguarde, a listar os pacotes..."
+msgid "Reason for update: "
+msgstr "Motivo de actualização: "
 
 #: ../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 "Summary: "
+msgstr "Resumo: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Information on packages"
-msgstr "Informação sobre os pacotes..."
+msgid "Importance: "
+msgstr "Importância: "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "Cancelar"
+msgid "%s KB"
+msgstr "%s KB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Tudo se instalou com sucesso"
+msgid "Size: "
+msgstr "Tamanho: "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Por favor aguarde, a actualizar o média..."
+msgid "Version: "
+msgstr "Versão: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Name: "
+msgstr "Nome: "
 
 #: ../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 "Currently installed version: "
+msgstr "Versão actualmente instalada: "
 
 #: ../rpmdrake:1
-#, c-format
-msgid "in descriptions"
-msgstr "nas descrições"
+#, fuzzy, c-format
+msgid "Source: "
+msgstr "Forçar"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Configurar os proxies"
+msgid "(Not available)"
+msgstr "(Não disponível)"
 
-#: ../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 "Changelog:\n"
+msgstr "Evolução:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Por favor escolha"
+msgid "Files:\n"
+msgstr "Ficheiros:\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Tamanho da selecção: %d MB"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add a source"
-msgstr "Adicionar uma fonte"
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "A inicializar..."
+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
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "Gravar alterações"
+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"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Error during download"
-msgstr "Erro ao descarregar"
+#: ../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:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "A preparar o pacotes para a instalação..."
+msgid "%s conflicts with %s"
+msgstr "em conflito com"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Importance: "
-msgstr "Importância: "
+#, fuzzy, c-format
+msgid "Some packages can't be installed"
+msgstr "O Pacote '%s' não pode ser instalado\n"
 
 #: ../rpmdrake:1
 #, c-format
@@ -608,83 +661,77 @@ msgstr ""
 "instalados:\n"
 "\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "Adicionar..."
+msgid "Additional packages needed"
+msgstr "Pacotes adicionais necessários"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Unable to create medium."
-msgstr "Impossível criar o média."
+#: ../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 ""
-"The installation is finished; %s.\n"
+"Removing these packages would break your system, sorry:\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"
+"Lamento, mas a remoção estes pacotes arruinará o seu sistema :\n"
 "\n"
-"Alguns ficheiros de configuração foram criados como `.rpmnew' ou\n"
-"`.rpmsave', pode agora verificá-los para agir em conformidade:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
-msgstr "Navegar..."
+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
-#, 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 "Info..."
-msgstr "Informação..."
+msgid "Some additional packages need to be removed"
+msgstr "Alguns pacotes adicionais necessitam ser apagados"
 
-#: ../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 "More information on package..."
+msgstr "Mais informação sobre o pacote..."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "Remover"
+msgid "Information on packages"
+msgstr "Informação sobre os pacotes..."
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "A preparar o pacotes para a instalação..."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "No mirror"
-msgstr "Nenhum mirror"
-
-#: ../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."
+msgid "More info"
+msgstr "Mais informações"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
+msgid "Addable"
 msgstr "Instalar"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "Japão"
+msgid "Upgradable"
+msgstr "Actualizar"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Não fazer nada"
+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:1
 #, c-format
@@ -693,345 +740,376 @@ msgstr "Nenhuma actualização"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Description: "
-msgstr "Descrição: "
+msgid "(none)"
+msgstr "(nenhum)"
 
 #: ../rpmdrake: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."
+msgid "Please wait, listing packages..."
+msgstr "Por favor aguarde, a listar os pacotes..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "Impossível abrir o pacote '%s'\n"
 
 #: ../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 ?"
+msgid "One of the following packages is needed:"
+msgstr "Um dos pacotes seguintes é preciso:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "Nome: "
+msgid "Please choose"
+msgstr "Por favor escolha"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "Inspeccionar..."
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "A preparar o pacotes para a instalação..."
+msgid "Not selected"
+msgstr "Detectados conflitos"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Austrália"
+msgid "Selected"
+msgstr "Selecionado"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation finished"
-msgstr "A instalação acabou"
+msgid "Search results"
+msgstr "Resultados da Pesquisa"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
-msgstr "por disponibilidade de actualização"
+msgid "Stop"
+msgstr "Parar"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
-msgstr "Polónia"
+msgid "Please wait, searching..."
+msgstr "Por favor aguarde, a procurar..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Version: "
-msgstr "Versão: "
+msgid "Search results (none)"
+msgstr "Resultados da Pesquisa (nenhum)"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Outro"
 
 #: ../edit-urpm-sources.pl: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 ""
+"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."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Gravar e sair"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Editing source \\\"%s\\\":"
-msgstr "Edição da fonte \"%s\":"
+msgid "Proxy..."
+msgstr "Erro..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Upgradable"
-msgstr "Actualizar"
+msgid "Update..."
+msgstr "Actualizar..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid " done."
-msgstr " feito."
+msgid "Add..."
+msgstr "Adicionar..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "Editar"
+
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "A preparar o pacotes para a instalação..."
+msgid "Source"
+msgstr "Forçar"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "A examinar o ficheiro da fonte `%s'..."
+msgid "Enabled?"
+msgstr "Activado?"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "Pacotes adicionais necessários"
+msgid "Configure sources"
+msgstr "Configurar as fontes"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Actualizações de Correcção de Erros"
+msgid "Password:"
+msgstr "Senha:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "Descarregamento de `%s', tempo restante: %s, velocidade: %s"
+msgid "User:"
+msgstr "Utilizador:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Germany"
-msgstr "Alemanha"
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Pode indicar um utilizador/senha para a autenticação no proxy :"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Russia"
-msgstr "Rússia"
+msgid "Proxy hostname:"
+msgstr "Nome do servidor proxy:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Norway"
-msgstr "Noruega"
+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
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Ocorreram problemas durante a instalação"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "Configurar os proxies"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search"
-msgstr "Procurar"
+msgid "Please wait, updating medium..."
+msgstr "Por favor aguarde, a actualizar o média..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit a source"
-msgstr "Editar a fonte"
+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."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Republica Checa"
+msgid "You need to insert the medium to continue"
+msgstr "Necessita inserir o média para continuar"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Stop"
-msgstr "Parar"
+msgid "Save changes"
+msgstr "Gravar alterações"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "Actualizar"
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Caminho relativo para síntese/hdlist:"
 
-#: ../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
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing source \"%s\":"
+msgstr "Edição da fonte \"%s\":"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal information"
-msgstr "Informações normais"
+msgid "Edit a source"
+msgstr "Editar a fonte"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "A descarregar o pacote '%s' (%s/%s)..."
+msgid "Please wait, removing medium..."
+msgstr "Por favor aguarde, a remover o média..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl: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 "Type of source:"
+msgstr "Tipo de fonte:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Spain"
-msgstr "Espanha"
+msgid "Adding a source:"
+msgstr "A adicionar uma fonte:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
-msgstr "Actualizações normais"
+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
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by selection state"
-msgstr "por estado de selecção"
+msgid "You need to fill up at least the two first entries."
+msgstr "Necessita preencher pelo menos as duas primeiras entradas."
 
-#: ../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 "Name:"
+msgstr "Nome:"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Austria"
-msgstr "Áustria"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Erro de ficheiro"
+msgid "Choose a mirror..."
+msgstr "Escolha um mirror..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Seleccione as fontes que deseja actualizar:"
+msgid "Browse..."
+msgstr "Navegar..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update..."
-msgstr "Actualizar..."
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "A verificar a assinatura de '%s'..."
+msgid "Path or mount point:"
+msgstr "Caminho ou ponto de montagem:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
-msgstr "(nenhum)"
+msgid "Removable device"
+msgstr "Dispositivo amovível"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-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"
+msgid "HTTP server"
+msgstr "Servidor HTTP"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "A instalar o pacote '%s' (%s/%s)..."
+msgid "FTP server"
+msgstr "Servidor FTP"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Versão actualmente instalada: "
+msgid "Path:"
+msgstr "Caminho:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Other"
-msgstr "Outro"
+msgid "Local files"
+msgstr "Ficheiros Locais"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Motivo de actualização: "
+msgid "Add a source"
+msgstr "Adicionar uma fonte"
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Please choose the desired mirror."
-msgstr "Por favor escolha o mirror desejado."
+#, 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."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "Editar"
+msgid "Unable to create medium."
+msgstr "Impossível criar o média."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Por favor aguarde, a procurar os pacotes disponíveis..."
+msgid "Update"
+msgstr "Actualizar"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Caminho relativo para síntese/hdlist:"
+msgid "Select the source(s) you wish to update:"
+msgstr "Seleccione as fontes que deseja actualizar:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Resultados da Pesquisa (nenhum)"
+msgid "Please wait, updating media..."
+msgstr "Por favor aguarde, a actualizar o média..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Danmark"
-msgstr "Dinamarca"
+msgid " failed!"
+msgstr " falhou!"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "China"
+msgid " done."
+msgstr " feito."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United States"
-msgstr "Estados Unidos"
+msgid "Download of `%s', speed:%s"
+msgstr "Descarregamento de `%s', velocidade:%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "changes:"
-msgstr "mudanças:"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "Descarregamento de `%s', tempo restante: %s, velocidade: %s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "A verificar a assinatura de '%s'..."
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Alguns pacotes adicionais necessitam ser apagados"
+msgid "Examining distant file of source `%s'..."
+msgstr "A examinar o ficheiro distante da fonte `%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Examining file of source `%s'..."
+msgstr "A examinar o ficheiro da fonte `%s'..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No"
-msgstr "Não"
+msgid "Copying file for source `%s'..."
+msgstr "A copiar o ficheiro da fonte `%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Summary: "
-msgstr "Resumo: "
+msgid "Please choose the desired mirror."
+msgstr "Por favor escolha o mirror desejado."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "Canada"
+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.pm:1
 #, c-format
-msgid "Greece"
-msgstr "Grécia"
+msgid "No mirror"
+msgstr "Nenhum mirror"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1048,258 +1126,180 @@ msgstr ""
 "A rede, ou o servidor da MandrakeSoft, podem estar desligados.\n"
 "Por favor tente outra vez mais tarde."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Source: "
-msgstr "Forçar"
-
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "A copiar o ficheiro da fonte `%s'..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Necessita ser root para instalar pacotes, lamento."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Path:"
-msgstr "Caminho:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Problem during removal"
-msgstr "Problema durante a remoção"
+msgid "Error during download"
+msgstr "Erro ao descarregar"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by source repository"
-msgstr "por fonte"
+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."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Selected"
-msgstr "Selecionado"
+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.pm:1
 #, c-format
-msgid "Netherlands"
-msgstr "Holanda"
+msgid "United States"
+msgstr "Estados Unidos"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "Instalar"
+msgid "China"
+msgstr "China"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
-msgstr "(Não disponí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"
-msgstr ""
-"Lamento, os pacotes seguintes não podem ser seleccionados:\n"
-"\n"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr "Detectados conflitos"
+msgid "United Kingdom"
+msgstr "Reino Unido"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Remover Pacotes de Programas"
+msgid "Taiwan"
+msgstr "Taiwan"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Sweden"
 msgstr "Suécia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
-msgstr ""
-"\n"
-"\n"
-"Erro(s) encontrados:\n"
-"%s"
+msgid "Russia"
+msgstr "Rússia"
 
-#: ../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."
-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 "Portugal"
+msgstr "Portugal"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "Descarregamento de `%s', velocidade:%s"
+msgid "Poland"
+msgstr "Polónia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Um dos pacotes seguintes é preciso:"
+msgid "Norway"
+msgstr "Noruega"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "Sair"
+msgid "Netherlands"
+msgstr "Holanda"
 
-#: ../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 ""
-"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
+#, fuzzy, c-format
+msgid "Korea"
+msgstr "Forçar"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid "Japan"
+msgstr "Japão"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Please wait, adding medium..."
-msgstr "Por favor aguarde, a adicionar o média..."
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Italy"
+msgstr "Instalar"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Israel"
+msgstr "Instalar"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "Tipo de fonte:"
+msgid "Greece"
+msgstr "Grécia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "France"
+msgstr "Forçar"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to get source packages."
-msgstr "Impossível descarregar os pacotes da fonte"
+msgid "Finland"
+msgstr "Finlândia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Demasiados pacotes seleccionados"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "em conflito com"
+msgid "Spain"
+msgstr "Espanha"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Danmark"
+msgstr "Dinamarca"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Selecção da Mandrake"
+msgid "Germany"
+msgstr "Alemanha"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 ""
-"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."
+msgid "Czech Republic"
+msgstr "Republica Checa"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Evolução:\n"
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Korea"
-msgstr "Forçar"
+#, c-format
+msgid "Canada"
+msgstr "Canada"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "Dispositivo amovível"
+msgid "Brazil"
+msgstr "Brasil"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Bélgica"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Change medium"
-msgstr "Mudar o média"
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Actualizações Mandrake"
+msgid "Australia"
+msgstr "Austrália"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by size"
-msgstr "por tamanho"
+msgid "Austria"
+msgstr "Áustria"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "Servidor FTP"
+msgid "Info..."
+msgstr "Informação..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Files:\n"
-msgstr "Ficheiros:\n"
+msgid "No"
+msgstr "Não"
 
 #: ../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."
+#, c-format
+msgid "Yes"
+msgstr "Sim"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index b8c11431..7d166b6f 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grpmi-pt_BR\n"
-"POT-Creation-Date: 2003-05-02 20:15+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+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,20 +16,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-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
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Portugal"
-msgstr "Portugal"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Está pronto para continuar?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -48,59 +44,105 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-msgstr "por grupo"
+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."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Name:"
-msgstr "Nome:"
+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 ""
+"Bem vindo ao Desinstalador de Sofware!!\n"
+"\n"
+"Esta ferramenta irá ajudar você quando precisar remover softwares\n"
+"do seu computador."
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Italy"
-msgstr "Itália"
+# c-format
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"Houve um erro durante a instalação dos pacotes:\n"
+"\n"
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "Como selecionar manualmente o seu servidor espelho"
+msgid "Problem during removal"
+msgstr "Problema durante a remoção"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "Please wait, removing packages..."
+msgstr "Aguarde, removendo pacotes..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Alguns pacotes precisam ser removidos"
+msgid "Please wait, reading packages database..."
+msgstr "Aguarde, lendo banco de dados de pacotes..."
 
+# c-format
 #: ../rpmdrake:1
-#, c-format
-msgid "Already existing update sources"
+#, 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"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "More information on package..."
-msgstr "Mais informações no pacote..."
+msgid "Installation failed"
+msgstr "Instalação falhou"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "Preparando pacotes para instalação..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "Preparando pacotes para instalação..."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "Sim"
+msgid "All requested packages were installed successfully."
+msgstr "Todos os pacotes requisitados foram instalados com sucesso."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr "Tudo foi instalado com sucesso"
 
 #: ../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 ""
-"Devido às dependências, o(s) seguinte(s) pacote(s) precisam\n"
-"ser desselecionados:\n"
+"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
 #, c-format
@@ -108,495 +150,499 @@ 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 "%s KB"
-msgstr "%s KB"
+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..."
 
 #: ../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 ""
-"Bem vindo ao Desinstalador de Sofware!!\n"
 "\n"
-"Esta ferramenta irá ajudar você quando precisar remover softwares\n"
-"do seu computador."
+"Error(s) reported:\n"
+"%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."
-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"
+"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."
 
-# c-format
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"The following packages have bad signatures:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"Houve um erro durante a instalação dos pacotes:\n"
+"Os seguintes pacotes precisam ser removidos para outros serem atualizados:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"Deseja continuar?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Size: "
-msgstr "Tamanho: "
+msgid "Verifying packages signatures..."
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Security updates"
-msgstr "Atualizações de segurança"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "Fazendo download do pacote `%s' (%s/%s)..."
+
+#: ../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 "Ok"
+
+#: ../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 "Maximum information"
-msgstr "Informação máxima"
+msgid "Change medium"
+msgstr "Alterando mídia"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, c-format
+msgid "Initializing..."
+msgstr "Inicializando..."
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Erro..."
+msgid "Package installation..."
+msgstr "Preparando pacotes para instalação..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr "É necessário ser administrador (root) para instalar pacotes."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Inglaterra"
+msgid "Unable to get source packages."
+msgstr "Não foi possível obter fontes de pocotes."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure sources"
-msgstr "Configurar fontes"
+msgid "Inspect..."
+msgstr "Verificando..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "nos nomes"
+msgid "Installation finished"
+msgstr "Instalação concluída"
 
-#: ../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 ""
-"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."
+msgid "Do nothing"
+msgstr "Ficar parado"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
-"\n"
-"\\Do you want to continue installation?"
-msgstr ""
-"Os seguintes pacotes precisam ser removidos para outros serem atualizados:\n"
-"\n"
-"%s\n"
-"\n"
-"Deseja continuar?"
+#, c-format
+msgid "Use .%s as main file"
+msgstr "Utilize .%s como arquivo principal"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Remove .%s"
 msgstr "Remover .%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Source"
-msgstr "Fonte"
+msgid "changes:"
+msgstr "mudanças:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "Finlândia"
+msgid "Inspecting %s"
+msgstr "Verificando %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
+msgid "Please wait, finding available packages..."
+msgstr "Aguarde, procurando pacotes disponíveis..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "France"
-msgstr "França"
+msgid "Please wait, adding medium..."
+msgstr "Aguarde, adicionando mídia..."
 
-#. -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 ""
-"%s\n"
+"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"
-"Is it ok to continue?"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"%s\n"
+"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"
-"Está pronto para continuar?"
+"E por fim reinicie o MandrakeUpdate."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Recarregue a lista de pacotes"
+msgid "How to choose manually your mirror"
+msgstr "Como selecionar manualmente o seu servidor espelho"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr "Escolha um servidor..."
+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 ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Adicionando uma fonte:"
+msgid "Already existing update sources"
+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?"
+msgstr ""
+"Preciso contactar o servidor para buscar os pacotes atualizados.\n"
+"Certifique-se está atualmente conectado à Internet.\n"
+"\n"
+"Deseja continuar?"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "O pacote `%s' não pode ser instalado\n"
+msgid "Fatal error"
+msgstr "Erro de arquivo"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
+msgid "Software Packages Installation"
 msgstr "Preparando pacotes para instalação..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages,"
-msgstr "Todos os pacotes,"
+msgid "Mandrake Update"
+msgstr "Mandrake Update"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "nos arquivos"
+msgid "Software Packages Removal"
+msgstr "Gerenciador de Softwares"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Todos os pacotes requisitados foram instalados com sucesso."
+msgid "Quit"
+msgstr "Sair"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "Servidor proxy:"
+msgid "Install"
+msgstr "Instalar"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update source(s)"
-msgstr "Atualizar fonte(s)"
+msgid "Remove"
+msgstr "Remover"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "Arquivos locais"
+msgid "Help"
+msgstr "Ajuda"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Verificando %s"
+msgid "Search"
+msgstr "Procurar"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Israel"
-msgstr "Israel"
+msgid "Find:"
+msgstr "Localizar:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Help"
-msgstr "Ajuda"
+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 seguintes pacotes precisam ser removidos para outros serem atualizados:\n"
+"\n"
+"%s\n"
+"\n"
+"Deseja continuar?"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "Servidor HTTP"
+msgid "Some packages need to be removed"
+msgstr "Alguns pacotes precisam ser removidos"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"Welcome to the packages source editor!\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"
-"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."
+"Do you really want to install all the selected packages?"
 msgstr ""
-"Bem vindo ao editor de fontes de pacotes\n"
+"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"
-"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."
+"Você realmente quer instalar todos os pacotes selecionados?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation failed"
-msgstr "Instalação falhou"
+msgid "Too many packages are selected"
+msgstr "Muitos pacotes foram selecionados"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Utilize .%s como arquivo principal"
+msgid "Maximum information"
+msgstr "Informação máxima"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results"
-msgstr "Resultados da busca"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid " failed!"
-msgstr "nos arquivos"
+msgid "Normal information"
+msgstr "Informações normais"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Brazil"
-msgstr "Brasil"
+msgid "Update source(s)"
+msgstr "Atualizar fonte(s)"
 
-#: ../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 "Reload the packages list"
+msgstr "Recarregue a lista de pacotes"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Localizar:"
+msgid "Reset the selection"
+msgstr "Reiniciando a seleção"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Todos os pacotes, alfabeticamente"
+msgid "in files"
+msgstr "nos arquivos"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Aguarde,  procurando..."
+msgid "in descriptions"
+msgstr "nas descrições"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Aguarde, lendo banco de dados de pacotes..."
+msgid "in names"
+msgstr "nos nomes"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "Não foi possível abrir o pacote `%s'\n"
+#, c-format
+msgid "by update availability"
+msgstr "por disponibilidade de atualização"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "Reiniciando a seleção"
+msgid "by source repository"
+msgstr "por servidor"
 
-#: ../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 "by selection state"
+msgstr "por estado de seleção"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"Para satisfazer todas as dependências, o(s) seguinte(s) pacote(s) também\n"
-"precisam ser removidos:\n"
-"\n"
+msgid "by size"
+msgstr "por tamanho"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Costa Rica"
+msgid "by group"
+msgstr "por grupo"
 
-# 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"
+#, c-format
+msgid "All packages,"
+msgstr "Todos os pacotes,"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Aguarde, removendo mídia..."
+msgid "All packages, alphabetical"
+msgstr "Todos os pacotes, alfabeticamente"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "Senha:"
+msgid "Mandrake choices"
+msgstr "Recomendação do Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr ""
+msgid "Normal updates"
+msgstr "Atualizações normais"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Taiwan"
+msgid "Bugfixes updates"
+msgstr "Atualizações para correção de erros"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "User:"
-msgstr "Usuário:"
+msgid "Security updates"
+msgstr "Atualizações de segurança"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Aguarde, atualizando mídia..."
+msgid "Description: "
+msgstr "Descrição: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Aguarde, listando pacotes..."
+msgid "Reason for update: "
+msgstr "Razão para atualização:"
 
 #: ../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 "Summary: "
+msgstr "Resumo: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Information on packages"
-msgstr "Informação sobre os pacotes"
+msgid "Importance: "
+msgstr "Importância: "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "Cancelar"
+msgid "%s KB"
+msgstr "%s KB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Tudo foi instalado com sucesso"
+msgid "Size: "
+msgstr "Tamanho: "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Aguarde, atualizando mídia"
+msgid "Version: "
+msgstr "Versão: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Name: "
+msgstr "Nome: "
 
 #: ../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 seguintes pacotes precisam ser removidos para outros serem atualizados:\n"
-"\n"
-"%s\n"
-"\n"
-"Deseja continuar?"
+msgid "Currently installed version: "
+msgstr "Versão instalada atualmente: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "nas descrições"
+msgid "Source: "
+msgstr "Fonte: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Configurar proxy"
+msgid "(Not available)"
+msgstr "(Indisponível)"
 
-#: ../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 ""
-"Eu preciso contactar o site da MandrakeSoft para pegar a lista de "
-"servidores.\n"
-"Certifique-se está atualmente conectado à Internet.\n"
-"\n"
-"Deseja continuar?"
+msgid "Changelog:\n"
+msgstr "Histórico de atualizações:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Por favor escolha"
+msgid "Files:\n"
+msgstr "Arquivos:\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Tamanho selecionado: %d MB"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add a source"
-msgstr "Adicione uma fonte:"
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "Inicializando..."
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Selecionado: %d MB / Espaço disponível: %d MB"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "Salvar alterações"
+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"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Error during download"
-msgstr "Erro durante o download"
+#: ../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 ""
+"Desculpe, o(s) seguinte(s) pacote(s) não podem ser selecionados:\n"
+"\n"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Preparando pacotes para instalação..."
+msgid "%s conflicts with %s"
+msgstr "conflitos com"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Importance: "
-msgstr "Importância: "
+#, fuzzy, c-format
+msgid "Some packages can't be installed"
+msgstr "O pacote `%s' não pode ser instalado\n"
 
 #: ../rpmdrake:1
 #, c-format
@@ -609,83 +655,77 @@ msgstr ""
 "ser instalados:\n"
 "\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "Adicionar..."
+msgid "Additional packages needed"
+msgstr "Pacotes adicionais são necessários"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Unable to create medium."
-msgstr "Incapaz de criar a mídia."
+#: ../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 ""
-"The installation is finished; %s.\n"
+"Removing these packages would break your system, sorry:\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"
+"A remoção desses pacotes estragaria o seu sistema, desculpa:\n"
 "\n"
-"Alguns arquivos de configuração foram criados como `.rpmnew' ou `.rpmsave',\n"
-"você poderá verificar alguns agora:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
-msgstr "Procurar..."
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
+"Para satisfazer todas as dependências, o(s) seguinte(s) pacote(s) também\n"
+"precisam ser removidos:\n"
+"\n"
 
 #: ../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 "Info..."
-msgstr "Informação..."
+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 insert the medium to continue"
-msgstr "Você precisa inserir a mídia para continuar"
+msgid "More information on package..."
+msgstr "Mais informações no pacote..."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "Remover"
+msgid "Information on packages"
+msgstr "Informação sobre os pacotes"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Preparando pacotes para instalação..."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "No mirror"
-msgstr "Nenhum servidor"
-
-#: ../edit-urpm-sources.pl: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 "More info"
+msgstr "Mais informações"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Instalar"
+msgid "Addable"
+msgstr "instalável"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "Japão"
+msgid "Upgradable"
+msgstr "Atualizável"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Ficar parado"
+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 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
@@ -694,345 +734,379 @@ msgstr "Sem atualização"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Description: "
-msgstr "Descrição: "
+msgid "(none)"
+msgstr "(nenhum)"
 
 #: ../rpmdrake: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 "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"
 
 #: ../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 ""
-"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?"
+msgid "One of the following packages is needed:"
+msgstr "Um dos seguintes pacotes é necessário"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "Nome: "
+msgid "Please choose"
+msgstr "Por favor escolha"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "Verificando..."
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Preparando pacotes para instalação..."
+msgid "Not selected"
+msgstr "Conflitos detectados"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Austrália"
+msgid "Selected"
+msgstr "Selecionado"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation finished"
-msgstr "Instalação concluída"
+msgid "Search results"
+msgstr "Resultados da busca"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
-msgstr "por disponibilidade de atualização"
+msgid "Stop"
+msgstr "Parar"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
-msgstr "Polônia"
+msgid "Please wait, searching..."
+msgstr "Aguarde,  procurando..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Version: "
-msgstr "Versão: "
+msgid "Search results (none)"
+msgstr "Resultados da busca (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 "Other"
+msgstr "Outro"
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Editing source \\\"%s\\\":"
-msgstr "Editando fonte \"%s\":"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "Upgradable"
-msgstr "Atualizável"
+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 ""
+"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
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid " done."
-msgstr ""
+msgid "Save and quit"
+msgstr "Salvar e sair"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Preparando pacotes para instalação..."
+msgid "Proxy..."
+msgstr "Erro..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr ""
+msgid "Update..."
+msgstr "Atualizar..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "Pacotes adicionais são necessários"
+msgid "Add..."
+msgstr "Adicionar..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Atualizações para correção de erros"
+msgid "Edit"
+msgstr "Editar"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr ""
+msgid "Source"
+msgstr "Fonte"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Germany"
-msgstr "Alemanha"
+msgid "Enabled?"
+msgstr "Habilitar?"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Russia"
-msgstr "Rússia"
+msgid "Configure sources"
+msgstr "Configurar fontes"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Norway"
-msgstr "Noruega"
+msgid "Password:"
+msgstr "Senha:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Problemas ocorreram durante a instalação"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
+msgstr "Usuário:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search"
-msgstr "Procurar"
+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:"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit a source"
-msgstr "Editar fontes"
+msgid "Proxy hostname:"
+msgstr "Servidor proxy:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Czech Republic"
-msgstr "República Checa"
+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
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Stop"
-msgstr "Parar"
+msgid "Configure proxies"
+msgstr "Configurar proxy"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "Atualizar"
+msgid "Please wait, updating medium..."
+msgstr "Aguarde, atualizando mídia..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "Aguarde, removendo pacotes..."
+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."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal information"
-msgstr "Informações normais"
+msgid "You need to insert the medium to continue"
+msgstr "Você precisa inserir a mídia para continuar"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Fazendo download do pacote `%s' (%s/%s)..."
+msgid "Save changes"
+msgstr "Salvar alterações"
 
-#: ../rpmdrake:1
+# Translation needs reworking
+#: ../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 "Relative path to synthesis/hdlist:"
+msgstr "Caminho relativo para synthesis/hdlist: "
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Spain"
-msgstr "Espanha"
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing source \"%s\":"
+msgstr "Editando fonte \"%s\":"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
-msgstr "Atualizações normais"
+msgid "Edit a source"
+msgstr "Editar fontes"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by selection state"
-msgstr "por estado de seleção"
+msgid "Please wait, removing medium..."
+msgstr "Aguarde, removendo mídia..."
 
-#: ../rpmdrake.pm: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 "Type of source:"
+msgstr "Tipo de fonte:"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Login:"
-msgstr "Login:"
+msgid "Adding a source:"
+msgstr "Adicionando uma fonte:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Austria"
-msgstr "Áustria"
+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
-#, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Erro de arquivo"
+#: ../edit-urpm-sources.pl: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"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Escolha a fonte(s) que deseja atualizar:"
+msgid "Name:"
+msgstr "Nome:"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update..."
-msgstr "Atualizar..."
+msgid "Login:"
+msgstr "Login:"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "Verificando assinatura de `%s'..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Escolha um servidor..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
-msgstr "(nenhum)"
+msgid "Browse..."
+msgstr "Procurar..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl: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 "Path or mount point:"
+msgstr "Caminho ou ponto de montagem:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Instalando pacote `%s' (%s/%s)..."
+msgid "Removable device"
+msgstr "Dispositivo removível"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Versão instalada atualmente: "
+msgid "HTTP server"
+msgstr "Servidor HTTP"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Other"
-msgstr "Outro"
+msgid "FTP server"
+msgstr "Servidor FTP"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Razão para atualização:"
+msgid "Path:"
+msgstr "Caminho:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please choose the desired mirror."
-msgstr "Escolha o servidor desejado."
+msgid "Local files"
+msgstr "Arquivos locais"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit"
-msgstr "Editar"
+msgid "Add a source"
+msgstr "Adicione uma fonte:"
 
-#: ../rpmdrake:1
+#: ../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"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Aguarde, procurando pacotes disponíveis..."
+msgid "Unable to create medium."
+msgstr "Incapaz de criar a mídia."
 
-# Translation needs reworking
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Caminho relativo para synthesis/hdlist: "
+msgid "Update"
+msgstr "Atualizar"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Resultados da busca (nenhum)"
+msgid "Select the source(s) you wish to update:"
+msgstr "Escolha a fonte(s) que deseja atualizar:"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Danmark"
-msgstr "Dinamarca"
+msgid "Please wait, updating media..."
+msgstr "Aguarde, atualizando mídia"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid " failed!"
+msgstr "nos arquivos"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "China"
+msgid " done."
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United States"
-msgstr "Estados Unidos"
+msgid "Download of `%s', speed:%s"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "changes:"
-msgstr "mudanças:"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "Verificando assinatura de `%s'..."
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Alguns pacotes adicionais precisam ser removidos"
+msgid "Examining distant file of source `%s'..."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Examining file of source `%s'..."
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No"
-msgstr "Não"
+msgid "Copying file for source `%s'..."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Summary: "
-msgstr "Resumo: "
+msgid "Please choose the desired mirror."
+msgstr "Escolha o servidor desejado."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "Canadá"
+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 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."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Greece"
-msgstr "Grécia"
+msgid "No mirror"
+msgstr "Nenhum servidor"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1050,254 +1124,180 @@ msgstr ""
 "indisponíveis no momento.\n"
 "Por favor tente mais tarde."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Source: "
-msgstr "Fonte: "
+msgid "Error during download"
+msgstr "Erro durante o download"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
+"Aguarde, fazendo download da lista de servidores do site da MandrakeSoft."
 
-#: ../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:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Problem during removal"
-msgstr "Problema durante a remoção"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "by source repository"
-msgstr "por servidor"
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Selected"
-msgstr "Selecionado"
+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 ""
+"Eu preciso contactar o site da MandrakeSoft para pegar a lista de "
+"servidores.\n"
+"Certifique-se está atualmente conectado à Internet.\n"
+"\n"
+"Deseja continuar?"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Netherlands"
-msgstr "Países baixos"
+msgid "United States"
+msgstr "Estados Unidos"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "instalável"
+msgid "China"
+msgstr "China"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
-msgstr "(Indisponí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"
-msgstr ""
-"Desculpe, o(s) seguinte(s) pacote(s) não podem ser selecionados:\n"
-"\n"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr "Conflitos detectados"
+msgid "United Kingdom"
+msgstr "Inglaterra"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Gerenciador de Softwares"
+msgid "Taiwan"
+msgstr "Taiwan"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Sweden"
 msgstr "Suíça"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
-msgstr ""
+msgid "Russia"
+msgstr "Rússia"
 
-#: ../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."
-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."
+msgid "Portugal"
+msgstr "Portugal"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr ""
+msgid "Poland"
+msgstr "Polônia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Um dos seguintes pacotes é necessário"
+msgid "Norway"
+msgstr "Noruega"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "Sair"
+msgid "Netherlands"
+msgstr "Países baixos"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 ""
-"Preciso contactar o servidor para buscar os pacotes atualizados.\n"
-"Certifique-se está atualmente conectado à Internet.\n"
-"\n"
-"Deseja continuar?"
+msgid "Korea"
+msgstr "Coréia"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid "Japan"
+msgstr "Japão"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "Aguarde, adicionando mídia..."
+msgid "Italy"
+msgstr "Itália"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "Tipo de fonte:"
+msgid "Israel"
+msgstr "Israel"
 
-#: ../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.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Grécia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to get source packages."
-msgstr "Não foi possível obter fontes de pocotes."
+msgid "France"
+msgstr "França"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Muitos pacotes foram selecionados"
+msgid "Finland"
+msgstr "Finlândia"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "conflitos com"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "Espanha"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 ""
-"Bem vindo ao MandrakeUpdate!\n"
-"\n"
-"Esta ferramenta irá ajudar na atualização do seu sistema."
+msgid "Danmark"
+msgstr "Dinamarca"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Recomendação do Mandrake"
+msgid "Germany"
+msgstr "Alemanha"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Czech Republic"
+msgstr "República Checa"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Histórico de atualizações:\n"
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Korea"
-msgstr "Coréia"
+msgid "Canada"
+msgstr "Canadá"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "Dispositivo removível"
+msgid "Brazil"
+msgstr "Brasil"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Bélgica"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Change medium"
-msgstr "Alterando mídia"
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Mandrake Update"
+msgid "Australia"
+msgstr "Austrália"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by size"
-msgstr "por tamanho"
+msgid "Austria"
+msgstr "Áustria"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "Servidor FTP"
+msgid "Info..."
+msgstr "Informação..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Files:\n"
-msgstr "Arquivos:\n"
+msgid "No"
+msgstr "Não"
 
 #: ../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"
+#, c-format
+msgid "Yes"
+msgstr "Sim"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
diff --git a/po/ro.po b/po/ro.po
index d3b3c9d5..de15b57a 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grpmi 7.2\n"
-"POT-Creation-Date: 2003-05-02 20:15+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+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."
@@ -19,20 +19,16 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-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
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Portugal"
-msgstr "Portugalia"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Pot continua?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -52,59 +48,105 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-msgstr "dupã grup"
+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 ."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Name:"
-msgstr "Nume:"
+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.pm:1
-#, c-format
-msgid "Italy"
-msgstr "Italia"
+#: ../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"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "Cum sã selectaþi manual serverul oglindã"
+msgid "Problem during removal"
+msgstr "Problemã în timpul ºtergerii"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL: "
+msgid "Please wait, removing packages..."
+msgstr "Vã rog sã aºteptaþi, ºterg pachetele..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Unele pachete trebuie ºterse"
+msgid "Please wait, reading packages database..."
+msgstr "Vã rog sã aºteptaþi, citesc baza de date a pachetelelor..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Already existing update sources"
+#, 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
 #, c-format
-msgid "More information on package..."
-msgstr "Mai multe informaþii despre pachet..."
+msgid "Installation failed"
+msgstr "Instalare eºuatã"
 
-#: ../rpmdrake.pm:1
+#: ../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..."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "Da"
+msgid "All requested packages were installed successfully."
+msgstr "Toate pachetele cerute au fost instalate cu succes."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr "Totul a fost instalat cu succes"
 
 #: ../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 ""
-"Datoritã dependenþelor lor, urmãtoarele pachete trebuie\n"
-"deselectate acum:\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
 #, c-format
@@ -112,492 +154,503 @@ 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 "%s KB"
-msgstr "%s KB"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Instalez pachetul `%s' (%s/%s)..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Pregãtesc pachetele pentru instalare..."
 
 #: ../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."
+"\n"
+"Error(s) reported:\n"
+"%s"
 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."
+"\n"
+"Eroare(erori) raportatã(e):\n"
+"%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 "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"
+"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."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"The following packages have bad signatures:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"A fost detectatã o eroare în timpul instalãrii pachetelor:\n"
+"Urmãtoarele pachete trebuie ºterse pentru ca altele sã fie actualizate:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"Doriþi sã continuaþi?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Size: "
-msgstr "Mãrime: "
+msgid "Verifying packages signatures..."
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Security updates"
-msgstr "Actualizãri ale sistemului de securitate"
+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þã"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "OK"
+
+#: ../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 "Maximum information"
-msgstr "Informaþii maximale"
+msgid "Change medium"
+msgstr "Schimbã mediul"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, c-format
+msgid "Initializing..."
+msgstr "Iniþializez..."
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Eroare..."
+msgid "Package installation..."
+msgstr "Pregãtesc pachetele pentru instalare..."
 
-#: ../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."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Marea Britanie"
+msgid "Unable to get source packages."
+msgstr "Nu pot prelua pachetele sursã."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure sources"
-msgstr "Configurare surse"
+msgid "Inspect..."
+msgstr "Inspectez..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "în nume"
+msgid "Installation finished"
+msgstr "Instalare terminatã"
 
-#: ../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 ""
-"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 "Do nothing"
+msgstr "Nu fã nimic"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
-"\n"
-"\\Do you want to continue installation?"
-msgstr ""
-"Urmãtoarele pachete trebuie ºterse pentru ca altele sã fie actualizate:\n"
-"\n"
-"%s\n"
-"\n"
-"Doriþi sã continuaþi?"
+#, c-format
+msgid "Use .%s as main file"
+msgstr "Foloseºte .%s ca fiºier principal"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Remove .%s"
 msgstr "ªterg .%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Source"
-msgstr "Sursã"
+msgid "changes:"
+msgstr "schimbãri:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "Finlanda"
+msgid "Inspecting %s"
+msgstr "Inspectez %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
+msgid "Please wait, finding available packages..."
+msgstr "Vã rog sã aºteptaþi, caut pachetele disponibile..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "France"
-msgstr "Franþa"
+msgid "Please wait, adding medium..."
+msgstr "Vã rog sã aºteptaþi, adaug mediul..."
 
-#. -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 ""
-"%s\n"
+"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"
-"Is it ok to continue?"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"%s\n"
+"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"
-"Pot continua?"
+"Apoi reporniþi MandrakeUpdate."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Reîncarcã lista pachetelor"
+msgid "How to choose manually your mirror"
+msgstr "Cum sã selectaþi manual serverul oglindã"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr "Selectare server oglindã..."
+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 ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Adaug sursa:"
+msgid "Already existing update sources"
+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?"
+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:1
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Pachetul `%s' nu poate fi instalat\n"
+msgid "Fatal error"
+msgstr "Eroare fiºier"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
+msgid "Software Packages Installation"
 msgstr "Pregãtesc pachetele pentru instalare..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages,"
-msgstr "Toate pachetele,"
+msgid "Mandrake Update"
+msgstr "Actualizare Mandrake"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "în fiºiere "
+msgid "Software Packages Removal"
+msgstr "ªtergere pachete Software"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Toate pachetele cerute au fost instalate cu succes."
+msgid "Quit"
+msgstr "Ieºire"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "Nume gazdã proxy:"
+msgid "Install"
+msgstr "Instaleazã"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update source(s)"
-msgstr "Actualizare surse"
+msgid "Remove"
+msgstr "ªterge"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "Fiºiere locale"
+msgid "Help"
+msgstr "Ajutor"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Inspectez %s"
+msgid "Search"
+msgstr "Cãutare"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Israel"
-msgstr "Israel"
+msgid "Find:"
+msgstr "Cautã:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Help"
-msgstr "Ajutor"
+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?"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "Server HTTP"
+msgid "Some packages need to be removed"
+msgstr "Unele pachete trebuie ºterse"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"Welcome to the packages source editor!\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"
-"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."
+"Do you really want to install all the selected packages?"
 msgstr ""
-"Bun venit la editorul surselor de pachete!\n"
+"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"
-"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."
+"Chiar doriþi sã instalaþi pachetele selectate?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation failed"
-msgstr "Instalare eºuatã"
+msgid "Too many packages are selected"
+msgstr "Sunt selectate prea multe pachete"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Foloseºte .%s ca fiºier principal"
+msgid "Maximum information"
+msgstr "Informaþii maximale"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results"
-msgstr "Rezultatele cãutãrii"
+msgid "Normal information"
+msgstr "Informaþii normale"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, c-format
-msgid " failed!"
-msgstr "eºuat!"
+msgid "Update source(s)"
+msgstr "Actualizare surse"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Brazil"
-msgstr "Brazilia"
+msgid "Reload the packages list"
+msgstr "Reîncarcã lista pachetelor"
 
-#: ../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 ""
-"Existã deja un mediu cu acel nume,\n"
-"chiar doriþi sã îl înlocuiþi?"
+msgid "Reset the selection"
+msgstr "Reseteazã selecþia"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Cautã:"
+msgid "in files"
+msgstr "în fiºiere "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Toate pachetele, alfabetic"
+msgid "in descriptions"
+msgstr "în descrieri"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Vã rog sã aºteptaþi, caut..."
+msgid "in names"
+msgstr "în nume"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Vã rog sã aºteptaþi, citesc baza de date a pachetelelor..."
+msgid "by update availability"
+msgstr "dupã disponibilitatea actualizãrii"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "Nu pot deschide pachetul`%s'\n"
+#, c-format
+msgid "by source repository"
+msgstr "dupã sursã"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "Reseteazã selecþia"
+msgid "by selection state"
+msgstr "dupã stare selecþie"
 
-#: ../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 ""
-"Dacã e nevoie de proxy, introduceþi numele gazdei ºi opþional un port "
-"(sintaxã: <gazdãproxy[:port]>):"
+msgid "by size"
+msgstr "dupã mãrime"
 
 #: ../rpmdrake: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 "by group"
+msgstr "dupã grup"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Costa Rica"
+msgid "All packages,"
+msgstr "Toate pachetele,"
 
 #: ../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"
-
-#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Vã rog sã aºteptaþi, ºterg mediul..."
+msgid "All packages, alphabetical"
+msgstr "Toate pachetele, alfabetic"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "Parola:"
+msgid "Mandrake choices"
+msgstr "Opþiuni Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "Examinez fiºierul distant pentru sursa `%s'..."
+msgid "Normal updates"
+msgstr "Actualizãri normale"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Taiwan"
+msgid "Bugfixes updates"
+msgstr "Actualizãri pentru corectarea erorilor"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "User:"
-msgstr "Utilizator:"
+msgid "Security updates"
+msgstr "Actualizãri ale sistemului de securitate"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Vã rog sã aºteptaþi, actualizez mediul..."
+msgid "Description: "
+msgstr "Descriere:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Vã rog sã aºteptaþi, listez pachetele..."
+msgid "Reason for update: "
+msgstr "Motivul actualizãrii:"
 
 #: ../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 "Summary: "
+msgstr "Sumar: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Information on packages"
-msgstr "Informaþii despre pachete"
+msgid "Importance: "
+msgstr "Importanþã: "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "Renunþã"
+msgid "%s KB"
+msgstr "%s KB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Totul a fost instalat cu succes"
+msgid "Size: "
+msgstr "Mãrime: "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Vã rog sã aºteptaþi, actualizez mediul..."
+msgid "Version: "
+msgstr "Versiune: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Name: "
+msgstr "Nume: "
 
 #: ../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 "Currently installed version: "
+msgstr "Versiunea instalatã curent:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "în descrieri"
+msgid "Source: "
+msgstr "Sursã: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Configurare proxy-uri"
+msgid "(Not available)"
+msgstr "(Indisponibil)"
 
-#: ../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 "Changelog:\n"
+msgstr "Jurnal schimbãri:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Vã rog sã alegeþi"
+msgid "Files:\n"
+msgstr "Fiºiere:\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Mãrime selecþie: %d MB"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add a source"
-msgstr "Adaugã o sursã"
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "Iniþializez..."
+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
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "Salveazã schimbãrile"
+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"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Error during download"
-msgstr "Eroare în timpul descãrcãrii."
+#: ../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 "Package installation..."
-msgstr "Pregãtesc pachetele pentru instalare..."
+msgid "%s conflicts with %s"
+msgstr "e în conflict cu"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Importance: "
-msgstr "Importanþã: "
+#, fuzzy, c-format
+msgid "Some packages can't be installed"
+msgstr "Pachetul `%s' nu poate fi instalat\n"
 
 #: ../rpmdrake:1
 #, c-format
@@ -610,83 +663,77 @@ msgstr ""
 "trebuie de asemenea instalate\n"
 "\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "Adaugã..."
+msgid "Additional packages needed"
+msgstr "Pachete adiþionale necesare"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Unable to create medium."
-msgstr "Nu pot creea mediul."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "Pachetul `%s' nu poate fi instalat\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Removing these packages would break your system, sorry:\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"
+"ªtergerea acestor pachete ar corupe sistemul, îmi pare rãu:\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:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
-msgstr "Rãsfoieºte..."
+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
-#, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "Pachetul `%s' nu poate fi instalat\n"
-
-#: ../rpmdrake.pm:1
 #, c-format
-msgid "Info..."
-msgstr "Informaþii... "
+msgid "Some additional packages need to be removed"
+msgstr "Trebuie ºterse unele pachete adiþionale"
 
-#: ../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 "More information on package..."
+msgstr "Mai multe informaþii despre pachet..."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "ªterge"
+msgid "Information on packages"
+msgstr "Informaþii despre pachete"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Pregãtesc pachetele pentru instalare..."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "No mirror"
-msgstr "Nu existã servere oglindã"
-
-#: ../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."
+msgid "More info"
+msgstr "Mai multe informaþii"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Instaleazã"
+msgid "Addable"
+msgstr "Disponibile pt. adãugare"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "Japonia"
+msgid "Upgradable"
+msgstr "Actualizabile"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Nu fã nimic"
+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:1
 #, c-format
@@ -695,345 +742,377 @@ msgstr "Nu sunt actualizãri"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Description: "
-msgstr "Descriere:"
+msgid "(none)"
+msgstr "(nimic)"
 
 #: ../rpmdrake: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."
+msgid "Please wait, listing packages..."
+msgstr "Vã rog sã aºteptaþi, listez pachetele..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "Nu pot deschide pachetul`%s'\n"
 
 #: ../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 "One of the following packages is needed:"
+msgstr "Unul din urmãtoarele pachete e necesar:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "Nume: "
+msgid "Please choose"
+msgstr "Vã rog sã alegeþi"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "Inspectez..."
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Pregãtesc pachetele pentru instalare..."
+msgid "Not selected"
+msgstr "Conflicte detectate"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Australia"
+msgid "Selected"
+msgstr "Selectate"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation finished"
-msgstr "Instalare terminatã"
+msgid "Search results"
+msgstr "Rezultatele cãutãrii"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
-msgstr "dupã disponibilitatea actualizãrii"
+msgid "Stop"
+msgstr "Opreºte"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
-msgstr "Polonia"
+msgid "Please wait, searching..."
+msgstr "Vã rog sã aºteptaþi, caut..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Version: "
-msgstr "Versiune: "
+msgid "Search results (none)"
+msgstr "Rezultatele cãutãrii (nimic)"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Diverse"
 
 #: ../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:"
+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."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Salvare ºi ieºire"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Editing source \\\"%s\\\":"
-msgstr "Editez sursa \"%s\":"
+msgid "Proxy..."
+msgstr "Eroare..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Upgradable"
-msgstr "Actualizabile"
+msgid "Update..."
+msgstr "Actualizeazã..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid " done."
-msgstr " terminat."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Pregãtesc pachetele pentru instalare..."
+msgid "Add..."
+msgstr "Adaugã..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "Examinez fiºierul pentru sursa `%s'..."
+msgid "Edit"
+msgstr "Editeazã"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "Pachete adiþionale necesare"
+msgid "Source"
+msgstr "Sursã"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Actualizãri pentru corectarea erorilor"
+msgid "Enabled?"
+msgstr "Activat?"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "Descarc `%s', timp rãmas: %s, vitezã: %s"
+msgid "Configure sources"
+msgstr "Configurare surse"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Germany"
-msgstr "Germania"
+msgid "Password:"
+msgstr "Parola:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Russia"
-msgstr "Rusia"
+msgid "User:"
+msgstr "Utilizator:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Norway"
-msgstr "Norvegia"
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Puteþi specifica un utilizator/parolã pentru autentificarea la proxy:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Probleme apãrute în timpul instalãrii"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "Nume gazdã proxy:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search"
-msgstr "Cãutare"
+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]>):"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit a source"
-msgstr "Editare surse"
+msgid "Configure proxies"
+msgstr "Configurare proxy-uri"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Cehia"
+msgid "Please wait, updating medium..."
+msgstr "Vã rog sã aºteptaþi, actualizez mediul..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Stop"
-msgstr "Opreºte"
+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."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "Actualizeazã"
+msgid "You need to insert the medium to continue"
+msgstr "Trebuie sã introduceþi mediul pentru a continua"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "Vã rog sã aºteptaþi, ºterg pachetele..."
+msgid "Save changes"
+msgstr "Salveazã schimbãrile"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal information"
-msgstr "Informaþii normale"
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Calea relativã la synthesis sau hdlist:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Descarc pachetul `%s' (%s/%s)..."
+msgid "URL:"
+msgstr "URL: "
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing source \"%s\":"
+msgstr "Editez sursa \"%s\":"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Selectat: %d MB / Spaþiu liber pe disc: %d MB"
+msgid "Edit a source"
+msgstr "Editare surse"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Spain"
-msgstr "Spania"
+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 "Type of source:"
+msgstr "Tipul sursei:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by selection state"
-msgstr "dupã stare selecþie"
+msgid "Adding a source:"
+msgstr "Adaug sursa:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 msgstr ""
-"Vã rog sã aºteptaþi, descarc adresele serverelor oglindã de pe situl "
-"MandrakeSoft."
+"Existã deja un mediu cu acel nume,\n"
+"chiar doriþi sã îl înlocuiþi?"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Login:"
-msgstr "Logare:"
+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.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Austria"
-msgstr "Austria"
+msgid "Name:"
+msgstr "Nume:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Eroare fiºier"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
+msgstr "Logare:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Selectaþi sursele de actualizat:"
+msgid "Choose a mirror..."
+msgstr "Selectare server oglindã..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update..."
-msgstr "Actualizeazã..."
+msgid "Browse..."
+msgstr "Rãsfoieºte..."
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "Verific semnãtura digitalã pt: `%s'..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Calea sau punctul de montare: "
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
-msgstr "(nimic)"
+msgid "Removable device"
+msgstr "Dispozitiv detaºabil"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
-"ªtergerea acestor pachete ar corupe sistemul, îmi pare rãu:\n"
-"\n"
+msgid "HTTP server"
+msgstr "Server HTTP"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Instalez pachetul `%s' (%s/%s)..."
+msgid "FTP server"
+msgstr "Server FTP"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Versiunea instalatã curent:"
+msgid "Path:"
+msgstr "Cale:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Other"
-msgstr "Diverse"
+msgid "Local files"
+msgstr "Fiºiere locale"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Motivul actualizãrii:"
+msgid "Add a source"
+msgstr "Adaugã o sursã"
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Please choose the desired mirror."
-msgstr "Vã rog sã selectaþi serverul oglindã dorit."
+#, 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."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "Editeazã"
+msgid "Unable to create medium."
+msgstr "Nu pot creea mediul."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Vã rog sã aºteptaþi, caut pachetele disponibile..."
+msgid "Update"
+msgstr "Actualizeazã"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Calea relativã la synthesis sau hdlist:"
+msgid "Select the source(s) you wish to update:"
+msgstr "Selectaþi sursele de actualizat:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Rezultatele cãutãrii (nimic)"
+msgid "Please wait, updating media..."
+msgstr "Vã rog sã aºteptaþi, actualizez mediul..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Danmark"
-msgstr "Danemarca"
+msgid " failed!"
+msgstr "eºuat!"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "China"
+msgid " done."
+msgstr " terminat."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United States"
-msgstr "Statele Unite"
+msgid "Download of `%s', speed:%s"
+msgstr "Descarc `%s', vitezã: %s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "changes:"
-msgstr "schimbãri:"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "Descarc `%s', timp rãmas: %s, vitezã: %s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "Verific semnãtura digitalã pt: `%s'..."
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Trebuie ºterse unele pachete adiþionale"
+msgid "Examining distant file of source `%s'..."
+msgstr "Examinez fiºierul distant pentru sursa `%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Examining file of source `%s'..."
+msgstr "Examinez fiºierul pentru sursa `%s'..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No"
-msgstr "Nu"
+msgid "Copying file for source `%s'..."
+msgstr "Copiez fiºierul pentru sursa `%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Summary: "
-msgstr "Sumar: "
+msgid "Please choose the desired mirror."
+msgstr "Vã rog sã selectaþi serverul oglindã dorit."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "Canada"
+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.pm:1
 #, c-format
-msgid "Greece"
-msgstr "Grecia"
+msgid "No mirror"
+msgstr "Nu existã servere oglindã"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1050,260 +1129,181 @@ msgstr ""
 "Probabil reþeaua sau situl Web al MandrakeSoft nu sunt disponibile.\n"
 "Vã rog sã încercaþi din nou mai târziu."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Source: "
-msgstr "Sursã: "
-
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "Copiez fiºierul pentru sursa `%s'..."
-
-#: ../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 "Path:"
-msgstr "Cale:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Problem during removal"
-msgstr "Problemã în timpul ºtergerii"
+msgid "Error during download"
+msgstr "Eroare în timpul descãrcãrii."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by source repository"
-msgstr "dupã sursã"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
+"Vã rog sã aºteptaþi, descarc adresele serverelor oglindã de pe situl "
+"MandrakeSoft."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Selected"
-msgstr "Selectate"
+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.pm:1
 #, c-format
-msgid "Netherlands"
-msgstr "Olanda"
+msgid "United States"
+msgstr "Statele Unite"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "Disponibile pt. adãugare"
+msgid "China"
+msgstr "China"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
-msgstr "(Indisponibil)"
-
-#: ../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"
+msgid "United Kingdom"
+msgstr "Marea Britanie"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "ªtergere pachete Software"
+msgid "Taiwan"
+msgstr "Taiwan"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Sweden"
 msgstr "Suedia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
-msgstr ""
-"\n"
-"\n"
-"Eroare(erori) raportatã(e):\n"
-"%s"
+msgid "Russia"
+msgstr "Rusia"
 
-#: ../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."
-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 "Portugal"
+msgstr "Portugalia"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "Descarc `%s', vitezã: %s"
+msgid "Poland"
+msgstr "Polonia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Unul din urmãtoarele pachete e necesar:"
+msgid "Norway"
+msgstr "Norvegia"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "Ieºire"
+msgid "Netherlands"
+msgstr "Olanda"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 ""
-"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?"
+msgid "Korea"
+msgstr "Coreea"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "OK"
+msgid "Japan"
+msgstr "Japonia"
 
-#: ../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 "Italy"
+msgstr "Italia"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "Tipul sursei:"
+msgid "Israel"
+msgstr "Israel"
 
-#: ../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.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Grecia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to get source packages."
-msgstr "Nu pot prelua pachetele sursã."
+msgid "France"
+msgstr "Franþa"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Sunt selectate prea multe pachete"
+msgid "Finland"
+msgstr "Finlanda"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "e în conflict cu"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "Spania"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Danmark"
+msgstr "Danemarca"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Opþiuni Mandrake"
+msgid "Germany"
+msgstr "Germania"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 ""
-"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."
+msgid "Czech Republic"
+msgstr "Cehia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Jurnal schimbãri:\n"
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Korea"
-msgstr "Coreea"
+msgid "Canada"
+msgstr "Canada"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "Dispozitiv detaºabil"
+msgid "Brazil"
+msgstr "Brazilia"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Belgia"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Change medium"
-msgstr "Schimbã mediul"
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Actualizare Mandrake"
+msgid "Australia"
+msgstr "Australia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by size"
-msgstr "dupã mãrime"
+msgid "Austria"
+msgstr "Austria"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "Server FTP"
+msgid "Info..."
+msgstr "Informaþii... "
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Files:\n"
-msgstr "Fiºiere:\n"
+msgid "No"
+msgstr "Nu"
 
 #: ../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."
+#, c-format
+msgid "Yes"
+msgstr "Da"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
diff --git a/po/rpmdrake.pot b/po/rpmdrake.pot
index f57b703c..e4a83fe8 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-02 20:15+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+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,19 +14,12 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr ""
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Path or mount point:"
-msgstr ""
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Portugal"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -41,934 +34,963 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Name:"
+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.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Italy"
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
+msgid "Problem during removal"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
+msgid "Please wait, removing packages..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages need to be removed"
+msgid "Please wait, reading packages database..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Already existing update sources"
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "More information on package..."
+msgid "Installation failed"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
+msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
+msgid "No package found for installation."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "everything was installed correctly"
+msgid "All requested packages were installed successfully."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
+msgid "Everything installed successfully"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Welcome to the software removal tool!\n"
+"The installation is finished; %s.\n"
 "\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
+"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
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
+msgid "everything was installed correctly"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
+msgid "Problem during installation"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Preparing packages installation..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
 "\n"
+"\n"
+"Error(s) reported:\n"
 "%s"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Size: "
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Security updates"
+msgid ""
+"The following packages have bad signatures:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
+msgid "Verifying packages signatures..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy..."
+msgid "Downloading package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "United Kingdom"
+msgid "Cancel"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Configure sources"
+msgid "Ok"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
+msgid "Please insert the medium named \"%s\" on device [%s]"
 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."
+msgid "Change medium"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
-"\n"
-"\\Do you want to continue installation?"
+msgid "Initializing..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Remove .%s"
+msgid "Package installation..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Source"
+msgid "Unable to get source packages, sorry. %s"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
+msgid "Unable to get source packages."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
+msgid "Inspect..."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "France"
+msgid "Installation finished"
 msgstr ""
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "More info"
+msgid "Do nothing"
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
+msgid "Use .%s as main file"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reload the packages list"
+msgid "Remove .%s"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
+msgid "changes:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Adding a source:"
+msgid "Inspecting %s"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages can't be installed"
+msgid "Please wait, finding available packages..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
+msgid "Please wait, adding medium..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages,"
+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 ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
+msgid "How to choose manually your mirror"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
+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 ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
+msgid "Already existing update sources"
 msgstr ""
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Update source(s)"
+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 ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
+msgid "A fatal error occurred: %s."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
+msgid "Fatal error"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Israel"
+msgid "Software Packages Installation"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Help"
+msgid "Mandrake Update"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
+msgid "Software Packages Removal"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../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 "Quit"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation failed"
+msgid "Install"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Use .%s as main file"
+msgid "Remove"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results"
+msgid "Help"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " failed!"
+msgid "Search"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Brazil"
+msgid "Find:"
 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?"
+"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 "Find:"
+msgid "Some packages need to be removed"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
+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 wait, searching..."
+msgid "Too many packages are selected"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, reading packages database..."
+msgid "Maximum information"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "unknown package "
+msgid "Normal information"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Reset the selection"
+msgid "Update source(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]>):"
+msgid "Reload the packages list"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
+msgid "Reset the selection"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
+msgid "in files"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
+msgid "in descriptions"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing medium..."
+msgid "in names"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
+msgid "by update availability"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
+msgid "by source repository"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
+msgid "by selection state"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "User:"
+msgid "by size"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating medium..."
+msgid "by group"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
+msgid "All packages,"
 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 "All packages, alphabetical"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Information on packages"
+msgid "Mandrake choices"
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
+msgid "Normal updates"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
+msgid "Bugfixes updates"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, updating media..."
+msgid "Security updates"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
+msgid "Description: "
 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 "Reason for update: "
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
+msgid "Summary: "
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
+msgid "Importance: "
 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 "%s KB"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
+msgid "Size: "
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
+msgid "Version: "
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add a source"
+msgid "Name: "
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
+msgid "Currently installed version: "
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
+msgid "Source: "
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
+msgid "(Not available)"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Package installation..."
+msgid "Changelog:\n"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Importance: "
+msgid "Files:\n"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
+msgid "Selected size: %d MB"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
+msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Unable to create medium."
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Sorry, the following package(s) can't be selected:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
+msgid "%s conflicts with %s"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages can't be removed"
+msgid "Some packages can't be installed"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
+msgid ""
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
+msgid "Additional packages needed"
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
+msgid "Some packages can't be removed"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Preparing packages installation..."
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "No mirror"
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\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 "Some additional packages need to be removed"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
+msgid "More information on package..."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
+msgid "Information on packages"
 msgstr ""
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
+msgid "More info"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "No update"
+msgid "Addable"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Description: "
+msgid "Upgradable"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"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: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 "No update"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
+msgid "(none)"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
+msgid "Please wait, listing packages..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "No package found for installation."
+msgid "unknown package "
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
+msgid "One of the following packages is needed:"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation finished"
+msgid "Please choose"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
+msgid "rpmdrake"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
+msgid "Not selected"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Version: "
+msgid "Selected"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
+msgid "Search results"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Editing source \\\"%s\\\":"
+msgid "Stop"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Upgradable"
+msgid "Please wait, searching..."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " done."
+msgid "Search results (none)"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Software Packages Installation"
+msgid "Other"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Examining file of source `%s'..."
+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 ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
+msgid "Save and quit"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Bugfixes updates"
+msgid "Proxy..."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
+msgid "Update..."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Germany"
+msgid "Add..."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Russia"
+msgid "Edit"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Norway"
+msgid "Source"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Problem during installation"
+msgid "Enabled?"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search"
+msgid "Configure sources"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit a source"
+msgid "Password:"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Czech Republic"
+msgid "User:"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Stop"
+msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
+msgid "Proxy hostname:"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing packages..."
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal information"
+msgid "Configure proxies"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
+msgid "Please wait, updating medium..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Spain"
+msgid "You need to insert the medium to continue"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
+msgid "Save changes"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by selection state"
+msgid "Relative path to synthesis/hdlist:"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgid "URL:"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Login:"
+msgid "Editing source \"%s\":"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Austria"
+msgid "Edit a source"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Fatal error"
+msgid "Please wait, removing medium..."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
+msgid "Type of source:"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update..."
+msgid "Adding a source:"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Starting download of `%s'..."
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
+msgid "You need to fill up at least the two first entries."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
+msgid "Name:"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
+msgid "Login:"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
+msgid "Choose a mirror..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Other"
+msgid "Browse..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reason for update: "
+msgid "Path or mount point:"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please choose the desired mirror."
+msgid "Removable device"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit"
+msgid "HTTP server"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, finding available packages..."
+msgid "FTP server"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
+msgid "Path:"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search results (none)"
+msgid "Local files"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add a source"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Danmark"
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
+msgid "Unable to create medium."
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United States"
+msgid "Update"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "changes:"
+msgid "Select the source(s) you wish to update:"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
+msgid "Please wait, updating media..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "rpmdrake"
+msgid " failed!"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No"
+msgid " done."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Summary: "
+msgid "Download of `%s', speed:%s"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
+msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Greece"
+msgid "Starting download of `%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 "Examining distant file of source `%s'..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Source: "
+msgid "Examining file of source `%s'..."
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -976,66 +998,73 @@ msgstr ""
 msgid "Copying file for source `%s'..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to get source packages, sorry. %s"
+msgid "Please choose the desired mirror."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Path:"
+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
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Problem during removal"
+msgid "No mirror"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by source repository"
+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:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Selected"
+msgid "Error during download"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Netherlands"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
+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
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
+msgid "United States"
 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 "China"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Not selected"
+msgid "United Kingdom"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
+msgid "Taiwan"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1043,119 +1072,99 @@ msgstr ""
 msgid "Sweden"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+msgid "Russia"
 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 "Portugal"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
+msgid "Poland"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
+msgid "Norway"
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
+msgid "Netherlands"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Korea"
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
+msgid "Japan"
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
+msgid "Italy"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
+msgid "Israel"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \\\"%s\\\" on device [%s]"
+msgid "Greece"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to get source packages."
+msgid "France"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Too many packages are selected"
+msgid "Finland"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "%s conflicts with %s"
+msgid "Spain"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Danmark"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
+msgid "Germany"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Czech Republic"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
+msgid "Costa Rica"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Korea"
+msgid "Canada"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
+msgid "Brazil"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1163,38 +1172,29 @@ msgstr ""
 msgid "Belgium"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Change medium"
-msgstr ""
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake Update"
+msgid "Australia"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by size"
+msgid "Austria"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
+msgid "Info..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Files:\n"
+msgid "No"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
+msgid "Yes"
 msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:86
diff --git a/po/ru.po b/po/ru.po
index 43d71dfb..d66eb803 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grpmi\n"
-"POT-Creation-Date: 2003-05-02 20:15+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+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,20 +15,16 @@ msgstr ""
 "Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "÷ËÌÀÞÅÎ?"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Path or mount point:"
-msgstr "ðÕÔØ ÉÌÉ ÔÏÞËÁ ÍÏÎÔÉÒÏ×ÁÎÉÑ:"
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Portugal"
-msgstr "ðÏÒÔÕÇÁÌÉÑ"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"÷ÓÅ × ÐÏÒÑÄËÅ? íÏÖÎÏ ÐÒÏÄÏÌÖÁÔØ?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -47,59 +43,104 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-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"
+"ËÏÍÐØÀÔÅÒ."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Name:"
-msgstr "éÍÑ:"
+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.pm:1
-#, c-format
-msgid "Italy"
-msgstr "éÔÁÌÉÑ"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"÷Ï ×ÒÅÍÑ ÕÓÔÁÎÏ×ËÉ ÐÁËÅÔÏ× ×ÏÚÎÉËÌÁ ÏÛÉÂËÁ:\n"
+"\n"
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "ëÁË ×ÒÕÞÎÕÀ ×ÙÂÒÁÔØ Ó×ÏÅ ÚÅÒËÁÌÏ"
+msgid "Problem during removal"
+msgstr "ðÒÏÂÌÅÍÁ ×Ï ×ÒÅÍÑ ÕÄÁÌÅÎÉÑ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "Please wait, removing packages..."
+msgstr "ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÏÖÄÉÔÅ, ÕÄÁÌÑÀÔÓÑ ÐÁËÅÔÙ..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "îÅËÏÔÏÒÙÅ ÐÁËÅÔÙ ÄÏÌÖÎÙ ÂÙÔØ ÕÄÁÌÅÎÙ"
+msgid "Please wait, reading packages database..."
+msgstr "ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÏÖÄÉÔÅ, ÞÉÔÁÅÔÓÑ ÂÁÚÁ ÐÁËÅÔÏ×..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Already existing update sources"
-msgstr "õÖÅ ÓÕÝÅÓÔ×ÕÀÝÉÅ ÉÓÔÏÞÎÉËÉ ÏÂÎÏ×ÌÅÎÉÑ"
+#, 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 "ðÏÄÇÏÔÏ×ËÁ ÐÁËÅÔÏ× Ë ÕÓÔÁÎÏ×ËÅ..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "ðÏÄÇÏÔÏ×ËÁ ÐÁËÅÔÏ× Ë ÕÓÔÁÎÏ×ËÅ..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "More information on package..."
-msgstr "äÏÐÏÌÎÉÔÅÌØÎÁÑ ÉÎÆÏÒÍÁÃÉÑ Ï ÐÁËÅÔÅ..."
+msgid "All requested packages were installed successfully."
+msgstr "÷ÓÅ ÚÁÐÒÏÛÅÎÎÙÅ ÐÁËÅÔÙ ÂÙÌÉ ÕÓÐÅÛÎÏ ÕÓÔÁÎÏ×ÌÅÎÙ."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "äÁ"
+msgid "Everything installed successfully"
+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 ""
-"óÌÅÄÕÀÝÉÅ ÐÁËÅÔÙ ÎÅ ÍÏÇÕÔ ÂÙÔØ ×ÙÂÒÁÎÙ ÐÏ ÐÒÉÞÉÎÅ Ó×ÏÉÈ\n"
-"ÚÁ×ÉÓÉÍÏÓÔÅÊ:\n"
+"õÓÔÁÎÏ×ËÁ ÚÁ×ÅÒÛÅÎÁ; %s.\n"
 "\n"
+"îÅËÏÔÏÒÙÅ ÆÁÊÌÙ ÎÁÓÔÒÏÊËÉ ÂÙÌÉ ÓÏÚÄÁÎÙ ËÁË `.rpmnew' ÉÌÉ `.rpmsave',\n"
+"ÔÅÐÅÒØ ×Ù ÍÏÖÅÔÅ ÐÒÏÓÍÏÔÒÅÔØ ÉÈ ÞÔÏÂÙ ÐÒÉÎÑÔØ ÍÅÒÙ:"
 
 #: ../rpmdrake:1
 #, c-format
@@ -107,498 +148,514 @@ msgid "everything was installed correctly"
 msgstr "×ÓÅ ÂÙÌÏ ÕÓÔÁÎÏ×ÌÅÎÏ ÐÒÁ×ÉÌØÎÏ"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during installation"
+msgstr "÷Ï ×ÒÅÍÑ ÕÓÔÁÎÏ×ËÉ ×ÏÚÎÉËÌÉ ÐÒÏÂÌÅÍÙ"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s ëâ"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "õÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ ÐÁËÅÔ `%s' (%s/%s)..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+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."
+"\n"
+"Error(s) reported:\n"
+"%s"
 msgstr ""
-"äÏÂÒÏ ÐÏÖÁÌÏ×ÁÔØ × ÉÎÓÔÒÕÍÅÎÔ ÕÄÁÌÅÎÉÑ ÐÒÏÇÒÁÍÍÎÏÇÏ ÏÂÅÓÐÅÞÅÎÉÑ!\n"
 "\n"
-"üÔÏÔ ÉÎÓÔÒÕÍÅÎÔ ÐÏÍÏÖÅÔ ×ÁÍ ×ÙÂÒÁÔØ ÐÁËÅÔÙ ÄÌÑ ÕÄÁÌÅÎÉÑ Ó ×ÁÛÅÇÏ\n"
-"ËÏÍÐØÀÔÅÒÁ."
+"\n"
+"ï ÏÛÉÂËÅ(ÁÈ) ÓÏÏÂÝÅÎÏ:\n"
+"%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."
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
 msgstr ""
-"þÔÏÂÙ ÓÏÈÒÁÎÉÔØ ÉÚÍÅÎÅÎÉÑ, ×ÁÍ ÎÅÏÂÈÏÄÉÍÏ ×ÓÔÁ×ÉÔØ ÎÏÓÉÔÅÌØ × ÕÓÔÒÏÊÓÔ×Ï."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Save and quit"
-msgstr "óÏÈÒÁÎÉÔØ É ×ÙÊÔÉ"
+"õÓÔÁÎÏ×ËÁ ÂÙÌÁ ÐÒÅÒ×ÁÎÁ, ÏÔÓÕÔÓÔ×ÕÀÔ ÎÅËÏÔÏÒÙÅ ÆÁÊÌÙ.\n"
+"÷ÁÍ ÍÏÖÅÔ ÐÏÎÁÄÏÂÉÔØÓÑ ÏÂÎÏ×ÉÔØ ×ÁÛÕ ÂÁÚÕ ÄÁÎÎÙÈ ÉÓÔÏÞÎÉËÏ×."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"The following packages have bad signatures:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"÷Ï ×ÒÅÍÑ ÕÓÔÁÎÏ×ËÉ ÐÁËÅÔÏ× ×ÏÚÎÉËÌÁ ÏÛÉÂËÁ:\n"
+"óÌÅÄÕÀÝÉÅ ÐÁËÅÔÙ ÄÏÌÖÎÙ ÂÙÔØ ÕÄÁÌÅÎÙ ÞÔÏÂÙ ÐÏÚ×ÏÌÉÔØ ÏÂÎÏ×ÌÑÔØÓÑ ÏÓÔÁÌØÎÙÍ:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"÷ÓÅ × ÐÏÒÑÄËÅ? íÏÖÎÏ ÐÒÏÄÏÌÖÁÔØ?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Size: "
-msgstr "òÁÚÍÅÒ: "
+msgid "Verifying packages signatures..."
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Security updates"
-msgstr "ïÂÎÏ×ÌÅÎÉÑ ÐÏ ÂÅÚÏÐÁÓÎÏÓÔÉ"
+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 "ïÔÍÅÎÁ"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl: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]"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "íÁËÓÉÍÕÍ ÉÎÆÏÒÍÁÃÉÉ"
+msgid "Change medium"
+msgstr "éÚÍÅÎÉÔØ ÎÏÓÉÔÅÌØ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, c-format
+msgid "Initializing..."
+msgstr "éÎÉÃÉÁÌÉÚÁÃÉÑ..."
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "ïÛÉÂËÁ..."
+msgid "Package installation..."
+msgstr "ðÏÄÇÏÔÏ×ËÁ ÐÁËÅÔÏ× Ë ÕÓÔÁÎÏ×ËÅ..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr "÷Ù ÄÏÌÖÎÙ ÉÍÅÔØ ÐÒÁ×Á root'Á ÄÌÑ ÕÓÔÁÎÏ×ËÉ ÐÁËÅÔÏ×, ÉÚ×ÉÎÉÔÅ."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "ïÂßÅÄÉÎÅÎÎÏÅ ëÏÒÏÌÅ×ÓÔ×Ï"
+msgid "Unable to get source packages."
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÉÓÈÏÄÎÙÅ ÐÁËÅÔÙ."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure sources"
-msgstr "îÁÓÔÒÏÉÔØ ÉÓÔÏÞÎÉËÉ"
+msgid "Inspect..."
+msgstr "éÚÕÞÅÎÉÅ..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "× ÉÍÅÎÁÈ"
+msgid "Installation finished"
+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 ""
-"îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ËÁËÏÅ-ÌÉÂÏ ÐÏÄÈÏÄÑÝÅÅ ÚÅÒËÁÌÏ.\n"
-"\n"
-"ðÒÉÞÉÎ, ×ÙÚ×Á×ÛÉÈ ÜÔÕ ÐÒÏÂÌÅÍÕ, ÍÏÖÅÔ ÂÙÔØ ÎÅÓËÏÌØËÏ; ÎÁÉÂÏÌÅÅ\n"
-"ÞÁÓÔÙÍ Ñ×ÌÑÅÔÓÑ ÓÌÕÞÁÊ, ËÏÇÄÁ ÁÒÈÉÔÅËÔÕÒÁ ×ÁÛÅÇÏ ÐÒÏÃÅÓÓÏÒÁ ÎÅ\n"
-"ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ ïÆÉÃÉÁÌØÎÙÍÉ ïÂÎÏ×ÌÅÎÉÑÍÉ Mandrake Linux."
+msgid "Do nothing"
+msgstr "îÉÞÅÇÏ ÎÅ ÄÅÌÁÔØ"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
-"\n"
-"\\Do you want to continue installation?"
-msgstr ""
-"óÌÅÄÕÀÝÉÅ ÐÁËÅÔÙ ÄÏÌÖÎÙ ÂÙÔØ ÕÄÁÌÅÎÙ ÞÔÏÂÙ ÐÏÚ×ÏÌÉÔØ ÏÂÎÏ×ÌÑÔØÓÑ ÏÓÔÁÌØÎÙÍ:\n"
-"\n"
-"%s\n"
-"\n"
-"÷ÓÅ × ÐÏÒÑÄËÅ? íÏÖÎÏ ÐÒÏÄÏÌÖÁÔØ?"
+#, c-format
+msgid "Use .%s as main file"
+msgstr "éÓÐÏÌØÚÏ×ÁÔØ .%s × ËÁÞÅÓÔ×Å ÇÌÁ×ÎÏÇÏ ÆÁÊÌÁ"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Remove .%s"
 msgstr "õÄÁÌÉÔØ .%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Source"
-msgstr "éÓÔÏÞÎÉË"
+msgid "changes:"
+msgstr "ÉÚÍÅÎÅÎÉÑ:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "æÉÎÌÑÎÄÉÑ"
+msgid "Inspecting %s"
+msgstr "éÚÕÞÁÅÔÓÑ %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
+msgid "Please wait, finding available packages..."
+msgstr "ðÏÄÏÖÄÉÔÅ, ÐÏÖÁÌÕÊÓÔÁ, ×ÙÐÏÌÎÑÅÔÓÑ ÐÏÉÓË ÄÏÓÔÕÐÎÙÈ ÐÁËÅÔÏ×..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "France"
-msgstr "æÒÁÎÃÉÑ"
+msgid "Please wait, adding medium..."
+msgstr "ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÏÖÄÉÔÅ, ÄÏÂÁ×ÌÑÅÔÓÑ ÎÏÓÉÔÅÌØ..."
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "More info"
-msgstr "äÏÐÏÌÎÉÔÅÌØÎÏ"
+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."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "ëÁË ×ÒÕÞÎÕÀ ×ÙÂÒÁÔØ Ó×ÏÅ ÚÅÒËÁÌÏ"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"%s\n"
+"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"
-"Is it ok to continue?"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"%s\n"
+"õ ×ÁÓ ÕÖÅ ÅÓÔØ ÐÏ ËÒÁÊÎÅÊ ÍÅÒÅ ÏÄÉÎ ÎÁÓÔÒÏÅÎÎÙÊ\n"
+"ÉÓÔÏÞÎÉË ÏÂÎÏ×ÌÅÎÉÊ, ÎÏ ×ÓÅ ÏÎÉ ÎÁ ÄÁÎÎÙÊ ÍÏÍÅÎÔ\n"
+"ÏÔËÌÀÞÅÎÙ. ÷Ù ÄÏÌÖÎÙ ÚÁÐÕÓÔÉÔØ íÅÎÅÄÖÅÒ ÉÓÔÏÞÎÉËÏ×\n"
+"ÐÒÏÇÒÁÍÍÎÏÇÏ ÏÂÅÓÐÅÞÅÎÉÑ, ÞÔÏÂÙ ×ËÌÀÞÉÔØ ÐÏ ËÒÁÊÎÅÊ\n"
+"ÍÅÒÅ ÏÄÉÎ ÉÚ ÎÉÈ (ÐÒÏ×ÅÒØÔÅ ÜÔÏ × ËÏÌÏÎËÅ '÷ËÌÀÞÅÎ?')\n"
 "\n"
-"÷ÓÅ × ÐÏÒÑÄËÅ? íÏÖÎÏ ÐÒÏÄÏÌÖÁÔØ?"
+"úÁÔÅÍ ÐÅÒÅÚÁÐÕÓÔÉÔÅ MandrakeUpdate."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "ðÅÒÅÚÁÇÒÕÚÉÔØ ÓÐÉÓÏË ÐÁËÅÔÏ×"
+msgid "Already existing update sources"
+msgstr "õÖÅ ÓÕÝÅÓÔ×ÕÀÝÉÅ ÉÓÔÏÞÎÉËÉ ÏÂÎÏ×ÌÅÎÉÑ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
-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"
+"÷ÓÅ × ÐÏÒÑÄËÅ? íÏÖÎÏ ÐÒÏÄÏÌÖÁÔØ?"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Adding a source:"
-msgstr "äÏÂÁ×ÌÅÎÉÅ ÉÓÔÏÞÎÉËÁ:"
+msgid "A fatal error occurred: %s."
+msgstr "ðÒÏÉÚÏÛÌÁ ËÒÉÔÉÞÅÓËÁÑ ÏÛÉÂËÁ: %s."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "ðÁËÅÔ `%s' ÎÅ ÍÏÖÅÔ ÂÙÔØ ÕÓÔÁÎÏ×ÌÅÎ\n"
+msgid "Fatal error"
+msgstr "ïÛÉÂËÁ ÆÁÊÌÁ"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
+msgid "Software Packages Installation"
 msgstr "ðÏÄÇÏÔÏ×ËÁ ÐÁËÅÔÏ× Ë ÕÓÔÁÎÏ×ËÅ..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages,"
-msgstr "÷ÓÅ ÐÁËÅÔÙ,"
+msgid "Mandrake Update"
+msgstr "ïÂÎÏ×ÌÅÎÉÅ Mandrake"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "× ÆÁÊÌÁÈ"
+msgid "Software Packages Removal"
+msgstr "õÄÁÌÅÎÉÅ ÐÁËÅÔÏ× ÐÒÏÇÒÁÍÍÎÏÇÏ ÏÂÅÓÐÅÞÅÎÉÑ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "÷ÓÅ ÚÁÐÒÏÛÅÎÎÙÅ ÐÁËÅÔÙ ÂÙÌÉ ÕÓÐÅÛÎÏ ÕÓÔÁÎÏ×ÌÅÎÙ."
+msgid "Quit"
+msgstr "÷ÙÊÔÉ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "éÍÑ ÈÏÓÔÁ ÐÒÏËÓÉ:"
+msgid "Install"
+msgstr "õÓÔÁÎÏ×ÉÔØ"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update source(s)"
-msgstr "ïÂÎÏ×ÉÔØ ÉÓÔÏÞÎÉË(É)"
+msgid "Remove"
+msgstr "õÄÁÌÉÔØ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "ìÏËÁÌØÎÙÅ ÆÁÊÌÙ"
+msgid "Help"
+msgstr "óÐÒÁ×ËÁ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "éÚÕÞÁÅÔÓÑ %s"
+msgid "Search"
+msgstr "ðÏÉÓË"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Israel"
-msgstr "éÚÒÁÉÌØ"
+msgid "Find:"
+msgstr "îÁÊÔÉ:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Help"
-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"
+"÷ÓÅ × ÐÏÒÑÄËÅ? íÏÖÎÏ ÐÒÏÄÏÌÖÁÔØ?"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "HTTP ÓÅÒ×ÅÒ"
+msgid "Some packages need to be removed"
+msgstr "îÅËÏÔÏÒÙÅ ÐÁËÅÔÙ ÄÏÌÖÎÙ ÂÙÔØ ÕÄÁÌÅÎÙ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"Welcome to the packages source editor!\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"
-"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."
+"Do you really want to install all the selected packages?"
 msgstr ""
-"äÏÂÒÏ ÐÏÖÁÌÏ×ÁÔØ × ÒÅÄÁËÔÏÒ ÉÓÔÏÞÎÉËÏ× ÐÁËÅÔÏ×!\n"
+"ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÐÏÈÏÖÅ, ÞÔÏ ×Ù ÐÙÔÁÅÔÅÓØ ÄÏÂÁ×ÉÔØ ÓÌÉÛËÏÍ\n"
+"ÍÎÏÇÏ ÐÁËÅÔÏ×, ÉÚ-ÚÁ ÞÅÇÏ ×ÁÛÅÊ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÅ ÎÅ È×ÁÔÉÔ\n"
+"Ó×ÏÂÏÄÎÏÇÏ ÍÅÓÔÁ ×Ï ×ÒÅÍÑ ÉÌÉ ÐÏÓÌÅ ÕÓÔÁÎÏ×ËÉ ÐÁËÅÔÏ×; ÜÔÏ\n"
+"ÞÒÅÚ×ÙÞÁÊÎÏ ÏÐÁÓÎÏ É ÄÏÌÖÎÏ ÂÙÔØ ÕÞÔÅÎÏ Ó ÏÓÔÏÒÏÖÎÏÓÔØÀ.\n"
 "\n"
-"üÔÏÔ ÉÎÓÔÒÕÍÅÎÔ ÐÏÍÏÖÅÔ ×ÁÍ ÎÁÓÔÒÏÉÔØ ÉÓÔÏÞÎÉËÉ ÐÁËÅÔÏ×, ËÏÔÏÒÙÅ ×Ù\n"
-"ÖÅÌÁÅÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÎÁ Ó×ÏÅÍ ËÏÍÐØÀÔÅÒÅ. úÁÔÅÍ ÏÎÉ ÂÕÄÕÔ ÄÏÓÔÕÐÎÙ ÄÌÑ\n"
-"ÕÓÔÁÎÏ×ËÉ ÎÏ×ÙÈ ÐÁËÅÔÏ× Ó ÐÒÏÇÒÁÍÍÎÙÍ ÏÂÅÓÐÅÞÅÎÉÅÍ ÉÌÉ ÄÌÑ ×ÙÐÏÌÎÅÎÉÑ\n"
-"ÏÂÎÏ×ÌÅÎÉÊ."
+"÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ÕÓÔÁÎÏ×ÉÔØ ×ÓÅ ×ÙÂÒÁÎÎÙÅ ÐÁËÅÔÙ?"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "ïÐÅÒÁÃÉÑ HTTP Interface ÚÁ×ÅÒÛÉÌÁÓØ ÎÅÕÄÁÞÅÊ\n"
+#, c-format
+msgid "Too many packages are selected"
+msgstr "÷ÙÂÒÁÎÏ ÓÌÉÛËÏÍ ÍÎÏÇÏ ÐÁËÅÔÏ×"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "éÓÐÏÌØÚÏ×ÁÔØ .%s × ËÁÞÅÓÔ×Å ÇÌÁ×ÎÏÇÏ ÆÁÊÌÁ"
+msgid "Maximum information"
+msgstr "íÁËÓÉÍÕÍ ÉÎÆÏÒÍÁÃÉÉ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results"
-msgstr "òÅÚÕÌØÔÁÔÙ ÐÏÉÓËÁ"
+msgid "Normal information"
+msgstr "óÔÁÎÄÁÒÔÎÁÑ ÉÎÆÏÒÍÁÃÉÑ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, c-format
-msgid " failed!"
-msgstr " ÎÅ ÕÄÁÌÏÓØ!"
+msgid "Update source(s)"
+msgstr "ïÂÎÏ×ÉÔØ ÉÓÔÏÞÎÉË(É)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Brazil"
-msgstr "âÒÁÚÉÌÉÑ"
+msgid "Reload the packages list"
+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 "Reset the selection"
+msgstr "óÂÒÏÓÉÔØ ×ÙÂÏÒ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "îÁÊÔÉ:"
+msgid "in files"
+msgstr "× ÆÁÊÌÁÈ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "÷ÓÅ ÐÁËÅÔÙ, ÐÏ ÁÌÆÁ×ÉÔÕ"
+msgid "in descriptions"
+msgstr "× ÏÐÉÓÁÎÉÑÈ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÏÖÄÉÔÅ, ×ÙÐÏÌÎÑÅÔÓÑ ÐÏÉÓË..."
+msgid "in names"
+msgstr "× ÉÍÅÎÁÈ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÏÖÄÉÔÅ, ÞÉÔÁÅÔÓÑ ÂÁÚÁ ÐÁËÅÔÏ×..."
+msgid "by update availability"
+msgstr "ÐÏ ÄÏÓÔÕÐÎÏÓÔÉ ÏÂÎÏ×ÌÅÎÉÊ"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÐÁËÅÔ `%s'\n"
+#, c-format
+msgid "by source repository"
+msgstr "ÐÏ ÉÓÔÏÞÎÉËÕ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "óÂÒÏÓÉÔØ ×ÙÂÏÒ"
+msgid "by selection state"
+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 ""
-"åÓÌÉ ×ÁÍ ÎÕÖÅÎ ÐÒÏËÓÉ, ××ÅÄÉÔÅ ÉÍÑ ÈÏÓÔÁ É ÐÒÉ ÎÅÏÂÈÏÄÉÍÏÓÔÉ ÐÏÒÔ "
-"(ÓÉÎÔÁËÓÉÓ: <ÈÏÓÔ_ÐÒÏËÓÉ[:ÐÏÒÔ]>):"
+msgid "by size"
+msgstr "ÐÏ ÒÁÚÍÅÒÕ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"ðÏ ÐÒÉÞÉÎÅ Ó×ÏÉÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ, ÓÌÅÄÕÀÝÉÅ ÐÁËÅÔÙ ÔÁËÖÅ ÄÏÌÖÎÙ ÂÙÔØ ÕÄÁÌÅÎÙ\n"
-"\n"
+msgid "by group"
+msgstr "ÐÏ ÇÒÕÐÐÅ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "ëÏÓÔÁ-òÉËÁ"
+msgid "All packages,"
+msgstr "÷ÓÅ ÐÁËÅÔÙ,"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"÷Ï ×ÒÅÍÑ ÕÓÔÁÎÏ×ËÉ ÐÁËÅÔÏ× ×ÏÚÎÉËÌÁ ÏÛÉÂËÁ:\n"
-"\n"
-"%s"
-
-#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÏÖÄÉÔÅ, ÕÄÁÌÑÅÔÓÑ ÎÏÓÉÔÅÌØ..."
+msgid "All packages, alphabetical"
+msgstr "÷ÓÅ ÐÁËÅÔÙ, ÐÏ ÁÌÆÁ×ÉÔÕ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "ðÁÒÏÌØ:"
+msgid "Mandrake choices"
+msgstr "÷ÙÂÏÒ Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "ðÒÏ×ÅÒÑÅÔÓÑ ÄÁÌØÎÉÊ ÆÁÊÌ ÉÓÔÏÞÎÉËÁ `%s'..."
+msgid "Normal updates"
+msgstr "îÏÒÍÁÌØÎÙÅ ÏÂÎÏ×ÌÅÎÉÑ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "ôÁÊ×ÁÎØ"
+msgid "Bugfixes updates"
+msgstr "ïÂÎÏ×ÌÅÎÉÑ ÂÁÇ-ÆÉËÓÏ×"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "User:"
-msgstr "ðÏÌØÚÏ×ÁÔÅÌØ:"
+msgid "Security updates"
+msgstr "ïÂÎÏ×ÌÅÎÉÑ ÐÏ ÂÅÚÏÐÁÓÎÏÓÔÉ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÏÖÄÉÔÅ, ÏÂÎÏ×ÌÑÅÔÓÑ ÎÏÓÉÔÅÌØ..."
+msgid "Description: "
+msgstr "ïÐÉÓÁÎÉÅ:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÏÖÄÉÔÅ, ÓÏÓÔÁ×ÌÑÅÔÓÑ ÓÐÉÓÏË ÐÁËÅÔÏ×..."
+msgid "Reason for update: "
+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 ""
-"õ ×ÁÓ ÕÖÅ ÅÓÔØ ÐÏ ËÒÁÊÎÅÊ ÍÅÒÅ ÏÄÉÎ ÎÁÓÔÒÏÅÎÎÙÊ\n"
-"ÉÓÔÏÞÎÉË ÏÂÎÏ×ÌÅÎÉÊ, ÎÏ ×ÓÅ ÏÎÉ ÎÁ ÄÁÎÎÙÊ ÍÏÍÅÎÔ\n"
-"ÏÔËÌÀÞÅÎÙ. ÷Ù ÄÏÌÖÎÙ ÚÁÐÕÓÔÉÔØ íÅÎÅÄÖÅÒ ÉÓÔÏÞÎÉËÏ×\n"
-"ÐÒÏÇÒÁÍÍÎÏÇÏ ÏÂÅÓÐÅÞÅÎÉÑ, ÞÔÏÂÙ ×ËÌÀÞÉÔØ ÐÏ ËÒÁÊÎÅÊ\n"
-"ÍÅÒÅ ÏÄÉÎ ÉÚ ÎÉÈ (ÐÒÏ×ÅÒØÔÅ ÜÔÏ × ËÏÌÏÎËÅ '÷ËÌÀÞÅÎ?')\n"
-"\n"
-"úÁÔÅÍ ÐÅÒÅÚÁÐÕÓÔÉÔÅ MandrakeUpdate."
+msgid "Summary: "
+msgstr "ó×ÏÄËÁ: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Information on packages"
-msgstr "éÎÆÏÒÍÁÃÉÑ Ï ÐÁËÅÔÁÈ"
+msgid "Importance: "
+msgstr "÷ÁÖÎÏÓÔØ: "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "ïÔÍÅÎÁ"
+msgid "%s KB"
+msgstr "%s ëâ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "÷ÓÅ ÕÓÔÁÎÏ×ÌÅÎÏ ÕÓÐÅÛÎÏ."
+msgid "Size: "
+msgstr "òÁÚÍÅÒ: "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÏÖÄÉÔÅ, ÏÂÎÏ×ÌÑÅÔÓÑ ÎÏÓÉÔÅÌØ..."
+msgid "Version: "
+msgstr "÷ÅÒÓÉÑ:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr "ðÒÏÉÚÏÛÌÁ ËÒÉÔÉÞÅÓËÁÑ ÏÛÉÂËÁ: %s."
+msgid "Name: "
+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 "Currently installed version: "
+msgstr "õÓÔÁÎÏ×ÌÅÎÎÁÑ ×ÅÒÓÉÑ:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "× ÏÐÉÓÁÎÉÑÈ"
+msgid "Source: "
+msgstr "éÓÔÏÞÎÉË: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "îÁÓÔÒÏÉÔØ ÐÒÏËÓÉ"
+msgid "(Not available)"
+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 "Changelog:\n"
+msgstr "Changelog:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "ðÏÖÁÌÕÊÓÔÁ, ×ÙÂÅÒÉÔÅ"
+msgid "Files:\n"
+msgstr "æÁÊÌÙ:\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "÷ÙÂÒÁÎÎÙÊ ÒÁÚÍÅÒ: %d íâ"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add a source"
-msgstr "äÏÂÁ×ÉÔØ ÉÓÔÏÞÎÉË"
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "éÎÉÃÉÁÌÉÚÁÃÉÑ..."
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "÷ÙÂÒÁÎÏ: %d íâ / ó×ÏÂÏÄÎÏ ÎÁ ÄÉÓËÅ: %d íâ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "óÏÈÒÁÎÉÔØ ÉÚÍÅÎÅÎÉÑ"
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
+msgstr ""
+"óÌÅÄÕÀÝÉÅ ÐÁËÅÔÙ ÎÅ ÍÏÇÕÔ ÂÙÔØ ×ÙÂÒÁÎÙ ÐÏ ÐÒÉÞÉÎÅ Ó×ÏÉÈ\n"
+"ÚÁ×ÉÓÉÍÏÓÔÅÊ:\n"
+"\n"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
-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 "Package installation..."
-msgstr "ðÏÄÇÏÔÏ×ËÁ ÐÁËÅÔÏ× Ë ÕÓÔÁÎÏ×ËÅ..."
+msgid "%s conflicts with %s"
+msgstr "ËÏÎÆÌÉËÔÕÅÔ Ó"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Importance: "
-msgstr "÷ÁÖÎÏÓÔØ: "
+#, fuzzy, c-format
+msgid "Some packages can't be installed"
+msgstr "ðÁËÅÔ `%s' ÎÅ ÍÏÖÅÔ ÂÙÔØ ÕÓÔÁÎÏ×ÌÅÎ\n"
 
 #: ../rpmdrake:1
 #, c-format
@@ -611,83 +668,76 @@ msgstr ""
 "ÓÌÅÄÕÀÝÉÅ ÐÁËÅÔÙ:\n"
 "\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "äÏÂÁ×ÉÔØ..."
+msgid "Additional packages needed"
+msgstr "ôÒÅÂÕÀÔÓÑ ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÐÁËÅÔÙ"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Unable to create medium."
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÎÏÓÉÔÅÌØ."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "ðÁËÅÔ `%s' ÎÅ ÍÏÖÅÔ ÂÙÔØ ÕÓÔÁÎÏ×ÌÅÎ\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Removing these packages would break your system, sorry:\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"
-"ÔÅÐÅÒØ ×Ù ÍÏÖÅÔÅ ÐÒÏÓÍÏÔÒÅÔØ ÉÈ ÞÔÏÂÙ ÐÒÉÎÑÔØ ÍÅÒÙ:"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Browse..."
-msgstr "ðÒÏÓÍÏÔÒÅÔØ..."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "ðÁËÅÔ `%s' ÎÅ ÍÏÖÅÔ ÂÙÔØ ÕÓÔÁÎÏ×ÌÅÎ\n"
-
-#: ../rpmdrake.pm:1
 #, c-format
-msgid "Info..."
-msgstr "éÎÆÏÒÍÁÃÉÑ..."
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\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 "Some additional packages need to be removed"
+msgstr "îÅËÏÔÏÒÙÅ ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÐÁËÅÔÙ ÄÏÌÖÎÙ ÂÙÔØ ÕÄÁÌÅÎÙ"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "õÄÁÌÉÔØ"
+msgid "More information on package..."
+msgstr "äÏÐÏÌÎÉÔÅÌØÎÁÑ ÉÎÆÏÒÍÁÃÉÑ Ï ÐÁËÅÔÅ..."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "ðÏÄÇÏÔÏ×ËÁ ÐÁËÅÔÏ× Ë ÕÓÔÁÎÏ×ËÅ..."
-
-#: ../rpmdrake.pm:1
 #, c-format
-msgid "No mirror"
-msgstr "îÅÔ ÚÅÒËÁÌÁ"
+msgid "Information on packages"
+msgstr "éÎÆÏÒÍÁÃÉÑ Ï ÐÁËÅÔÁÈ"
 
-#: ../edit-urpm-sources.pl:1
+#. -PO: Keep it short, this is gonna be on a button
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "÷ÁÍ ÎÅÏÂÈÏÄÉÍÏ ÚÁÐÏÌÎÉÔØ ÐÏ ËÒÁÊÎÅÊ ÍÅÒÅ Ä×Á ÐÅÒ×ÙÈ ÐÕÎËÔÁ."
+msgid "More info"
+msgstr "äÏÐÏÌÎÉÔÅÌØÎÏ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "õÓÔÁÎÏ×ÉÔØ"
+msgid "Addable"
+msgstr "íÏÖÎÏ ÄÏÂÁ×ÉÔØ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "ñÐÏÎÉÑ"
+msgid "Upgradable"
+msgstr "íÏÖÎÏ ÏÂÎÏ×ÉÔØ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-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:1
 #, c-format
@@ -696,345 +746,382 @@ msgstr "ïÂÎÏ×ÌÅÎÉÊ ÎÅÔ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Description: "
-msgstr "ïÐÉÓÁÎÉÅ:"
+msgid "(none)"
+msgstr "(ÎÅÔ)"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"õÓÔÁÎÏ×ËÁ ÂÙÌÁ ÐÒÅÒ×ÁÎÁ, ÏÔÓÕÔÓÔ×ÕÀÔ ÎÅËÏÔÏÒÙÅ ÆÁÊÌÙ.\n"
-"÷ÁÍ ÍÏÖÅÔ ÐÏÎÁÄÏÂÉÔØÓÑ ÏÂÎÏ×ÉÔØ ×ÁÛÕ ÂÁÚÕ ÄÁÎÎÙÈ ÉÓÔÏÞÎÉËÏ×."
+msgid "Please wait, listing packages..."
+msgstr "ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÏÖÄÉÔÅ, ÓÏÓÔÁ×ÌÑÅÔÓÑ ÓÐÉÓÏË ÐÁËÅÔÏ×..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÐÁËÅÔ `%s'\n"
 
 #: ../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"
-"÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ÕÓÔÁÎÏ×ÉÔØ ×ÓÅ ×ÙÂÒÁÎÎÙÅ ÐÁËÅÔÙ?"
+msgid "One of the following packages is needed:"
+msgstr "îÕÖÅÎ ÏÄÉÎ ÉÚ ÓÌÅÄÕÀÝÉÈ ÐÁËÅÔÏ×:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "îÁÚ×ÁÎÉÅ: "
+msgid "Please choose"
+msgstr "ðÏÖÁÌÕÊÓÔÁ, ×ÙÂÅÒÉÔÅ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "éÚÕÞÅÎÉÅ..."
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "ðÏÄÇÏÔÏ×ËÁ ÐÁËÅÔÏ× Ë ÕÓÔÁÎÏ×ËÅ..."
+msgid "Not selected"
+msgstr "ïÂÎÁÒÕÖÅÎÙ ËÏÎÆÌÉËÔÙ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "á×ÓÔÒÁÌÉÑ"
+msgid "Selected"
+msgstr "÷ÙÂÒÁÎÎÙÅ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation finished"
-msgstr "õÓÔÁÎÏ×ËÁ ÚÁ×ÅÒÛÅÎÁ"
+msgid "Search results"
+msgstr "òÅÚÕÌØÔÁÔÙ ÐÏÉÓËÁ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
-msgstr "ÐÏ ÄÏÓÔÕÐÎÏÓÔÉ ÏÂÎÏ×ÌÅÎÉÊ"
+msgid "Stop"
+msgstr "ïÓÔÁÎÏ×ÉÔØ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
-msgstr "ðÏÌØÛÁ"
+msgid "Please wait, searching..."
+msgstr "ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÏÖÄÉÔÅ, ×ÙÐÏÌÎÑÅÔÓÑ ÐÏÉÓË..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Version: "
-msgstr "÷ÅÒÓÉÑ:"
+msgid "Search results (none)"
+msgstr "òÅÚÕÌØÔÁÔÙ ÐÏÉÓËÁ (ÎÅÔ)"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "äÒÕÇÏÅ"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "÷Ù ÍÏÖÅÔÅ ÕËÁÚÁÔØ ÐÏÌØÚÏ×ÁÔÅÌÑ/ÐÁÒÏÌØ ÄÌÑ ÁÕÔÅÎÔÉÆÉËÁÃÉÉ ÎÁ ÐÒÏËÓÉ:"
+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"
+"ÏÂÎÏ×ÌÅÎÉÊ."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "óÏÈÒÁÎÉÔØ É ×ÙÊÔÉ"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Editing source \\\"%s\\\":"
-msgstr "òÅÄÁËÔÉÒÏ×ÁÎÉÅ ÉÓÔÏÞÎÉËÁ \"%s\":"
+msgid "Proxy..."
+msgstr "ïÛÉÂËÁ..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Upgradable"
-msgstr "íÏÖÎÏ ÏÂÎÏ×ÉÔØ"
+msgid "Update..."
+msgstr "ïÂÎÏ×ÉÔØ..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid " done."
-msgstr " ÇÏÔÏ×Ï."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "ðÏÄÇÏÔÏ×ËÁ ÐÁËÅÔÏ× Ë ÕÓÔÁÎÏ×ËÅ..."
+msgid "Add..."
+msgstr "äÏÂÁ×ÉÔØ..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "ðÒÏ×ÅÒÑÅÔÓÑ ÆÁÊÌ ÉÓÔÏÞÎÉËÁ `%s'..."
+msgid "Edit"
+msgstr "òÅÄÁËÔÉÒÏ×ÁÔØ"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "ôÒÅÂÕÀÔÓÑ ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÐÁËÅÔÙ"
+msgid "Source"
+msgstr "éÓÔÏÞÎÉË"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "ïÂÎÏ×ÌÅÎÉÑ ÂÁÇ-ÆÉËÓÏ×"
+msgid "Enabled?"
+msgstr "÷ËÌÀÞÅÎ?"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "úÁÇÒÕÚËÁ `%s', ÏÓÔÁÌÏÓØ ×ÒÅÍÅÎÉ:%s, ÓËÏÒÏÓÔØ:%s"
+msgid "Configure sources"
+msgstr "îÁÓÔÒÏÉÔØ ÉÓÔÏÞÎÉËÉ"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Germany"
-msgstr "çÅÒÍÁÎÉÑ"
+msgid "Password:"
+msgstr "ðÁÒÏÌØ:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Russia"
-msgstr "òÏÓÓÉÑ"
+msgid "User:"
+msgstr "ðÏÌØÚÏ×ÁÔÅÌØ:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Norway"
-msgstr "îÏÒ×ÅÇÉÑ"
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "÷Ù ÍÏÖÅÔÅ ÕËÁÚÁÔØ ÐÏÌØÚÏ×ÁÔÅÌÑ/ÐÁÒÏÌØ ÄÌÑ ÁÕÔÅÎÔÉÆÉËÁÃÉÉ ÎÁ ÐÒÏËÓÉ:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "÷Ï ×ÒÅÍÑ ÕÓÔÁÎÏ×ËÉ ×ÏÚÎÉËÌÉ ÐÒÏÂÌÅÍÙ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "éÍÑ ÈÏÓÔÁ ÐÒÏËÓÉ:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search"
-msgstr "ðÏÉÓË"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"åÓÌÉ ×ÁÍ ÎÕÖÅÎ ÐÒÏËÓÉ, ××ÅÄÉÔÅ ÉÍÑ ÈÏÓÔÁ É ÐÒÉ ÎÅÏÂÈÏÄÉÍÏÓÔÉ ÐÏÒÔ "
+"(ÓÉÎÔÁËÓÉÓ: <ÈÏÓÔ_ÐÒÏËÓÉ[:ÐÏÒÔ]>):"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit a source"
-msgstr "òÅÄÁËÔÉÒÏ×ÁÔØ ÉÓÔÏÞÎÉË"
+msgid "Configure proxies"
+msgstr "îÁÓÔÒÏÉÔØ ÐÒÏËÓÉ"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Czech Republic"
-msgstr "þÅÛÓËÁÑ òÅÓÐÕÂÌÉËÁ"
+msgid "Please wait, updating medium..."
+msgstr "ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÏÖÄÉÔÅ, ÏÂÎÏ×ÌÑÅÔÓÑ ÎÏÓÉÔÅÌØ..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Stop"
-msgstr "ïÓÔÁÎÏ×ÉÔØ"
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr ""
+"þÔÏÂÙ ÓÏÈÒÁÎÉÔØ ÉÚÍÅÎÅÎÉÑ, ×ÁÍ ÎÅÏÂÈÏÄÉÍÏ ×ÓÔÁ×ÉÔØ ÎÏÓÉÔÅÌØ × ÕÓÔÒÏÊÓÔ×Ï."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "ïÂÎÏ×ÉÔØ"
+msgid "You need to insert the medium to continue"
+msgstr "÷ÁÍ ÎÅÏÂÈÏÄÉÍÏ ×ÓÔÁ×ÉÔØ ÎÏÓÉÔÅÌØ ÄÌÑ ÐÒÏÄÏÌÖÅÎÉÑ"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÏÖÄÉÔÅ, ÕÄÁÌÑÀÔÓÑ ÐÁËÅÔÙ..."
+msgid "Save changes"
+msgstr "óÏÈÒÁÎÉÔØ ÉÚÍÅÎÅÎÉÑ"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal information"
-msgstr "óÔÁÎÄÁÒÔÎÁÑ ÉÎÆÏÒÍÁÃÉÑ"
+msgid "Relative path to synthesis/hdlist:"
+msgstr "ïÔÎÏÓÉÔÅÌØÎÙÊ ÐÕÔØ Ë synthesis/hdlist: "
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "óËÁÞÉ×ÁÅÔÓÑ ÐÁËÅÔ `%s' (%s/%s)..."
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing source \"%s\":"
+msgstr "òÅÄÁËÔÉÒÏ×ÁÎÉÅ ÉÓÔÏÞÎÉËÁ \"%s\":"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "÷ÙÂÒÁÎÏ: %d íâ / ó×ÏÂÏÄÎÏ ÎÁ ÄÉÓËÅ: %d íâ"
+msgid "Edit a source"
+msgstr "òÅÄÁËÔÉÒÏ×ÁÔØ ÉÓÔÏÞÎÉË"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Spain"
-msgstr "éÓÐÁÎÉÑ"
+msgid "Please wait, removing medium..."
+msgstr "ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÏÖÄÉÔÅ, ÕÄÁÌÑÅÔÓÑ ÎÏÓÉÔÅÌØ..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
-msgstr "îÏÒÍÁÌØÎÙÅ ÏÂÎÏ×ÌÅÎÉÑ"
+msgid "Type of source:"
+msgstr "ôÉÐ ÉÓÔÏÞÎÉËÁ:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by selection state"
-msgstr "ÐÏ ÓÏÓÔÏÑÎÉÀ ×ÙÂÏÒÁ"
+msgid "Adding a source:"
+msgstr "äÏÂÁ×ÌÅÎÉÅ ÉÓÔÏÞÎÉËÁ:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 msgstr ""
-"ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÏÖÄÉÔÅ, ÚÁÇÒÕÖÁÀÔÓÑ ÁÄÒÅÓÁ ÚÅÒËÁÌ Ó ×ÅÂ-ÓÁÊÔÁ\n"
-"MandrakeSoft"
+"îÏÓÉÔÅÌØ Ó ÔÁËÉÍ ÎÁÚ×ÁÎÉÅÍ ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ,\n"
+"×Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ÅÇÏ ÚÁÍÅÎÉÔØ?"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Login:"
-msgstr "ìÏÇÉÎ:"
+msgid "You need to fill up at least the two first entries."
+msgstr "÷ÁÍ ÎÅÏÂÈÏÄÉÍÏ ÚÁÐÏÌÎÉÔØ ÐÏ ËÒÁÊÎÅÊ ÍÅÒÅ Ä×Á ÐÅÒ×ÙÈ ÐÕÎËÔÁ."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Austria"
-msgstr "á×ÓÔÒÉÑ"
+msgid "Name:"
+msgstr "éÍÑ:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Fatal error"
-msgstr "ïÛÉÂËÁ ÆÁÊÌÁ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
+msgstr "ìÏÇÉÎ:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "÷ÙÂÅÒÉÔÅ ÉÓÔÏÞÎÉË(É) ÄÌÑ ÏÂÎÏ×ÌÅÎÉÑ:"
+msgid "Choose a mirror..."
+msgstr "÷ÙÂÅÒÉÔÅ ÚÅÒËÁÌÏ..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update..."
-msgstr "ïÂÎÏ×ÉÔØ..."
+msgid "Browse..."
+msgstr "ðÒÏÓÍÏÔÒÅÔØ..."
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "ðÒÏ×ÅÒÑÅÔÓÑ ÐÏÄÐÉÓØ `%s'..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "ðÕÔØ ÉÌÉ ÔÏÞËÁ ÍÏÎÔÉÒÏ×ÁÎÉÑ:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
-msgstr "(ÎÅÔ)"
+msgid "Removable device"
+msgstr "óßÅÍÎÏÅ ÕÓÔÒÏÊÓÔ×Ï"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
-"ë ÓÏÖÁÌÅÎÉÀ ÕÄÁÌÅÎÉÅ ÜÔÉÈ ÐÁËÅÔÏ× ÎÁÒÕÛÉÔ ÒÁÂÏÔÕ ÓÉÓÔÅÍÙ:\n"
-"\n"
+msgid "HTTP server"
+msgstr "HTTP ÓÅÒ×ÅÒ"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "õÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ ÐÁËÅÔ `%s' (%s/%s)..."
+msgid "FTP server"
+msgstr "FTP ÓÅÒ×ÅÒ"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "õÓÔÁÎÏ×ÌÅÎÎÁÑ ×ÅÒÓÉÑ:"
+msgid "Path:"
+msgstr "ðÕÔØ:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Other"
-msgstr "äÒÕÇÏÅ"
+msgid "Local files"
+msgstr "ìÏËÁÌØÎÙÅ ÆÁÊÌÙ"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reason for update: "
-msgstr "ðÒÉÞÉÎÁ ÏÂÎÏ×ÌÅÎÉÑ:"
+msgid "Add a source"
+msgstr "äÏÂÁ×ÉÔØ ÉÓÔÏÞÎÉË"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Please choose the desired mirror."
-msgstr "ðÏÖÁÌÕÊÓÔÁ, ×ÙÂÅÒÉÔÅ ÖÅÌÁÅÍÏÅ ÚÅÒËÁÌÏ."
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr ""
+"îÅ×ÏÚÍÏÖÎÏ ÏÂÎÏ×ÉÔØ ÎÏÓÉÔÅÌØ, ÏÎ ÂÕÄÅÔ Á×ÔÏÍÁÔÉÞÅÓËÉ ÏÔËÌÀÞÅÎ.\n"
+"\n"
+"ïÛÉÂËÉ:\n"
+"%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "òÅÄÁËÔÉÒÏ×ÁÔØ"
+msgid "Unable to create medium."
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÎÏÓÉÔÅÌØ."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, finding available packages..."
-msgstr "ðÏÄÏÖÄÉÔÅ, ÐÏÖÁÌÕÊÓÔÁ, ×ÙÐÏÌÎÑÅÔÓÑ ÐÏÉÓË ÄÏÓÔÕÐÎÙÈ ÐÁËÅÔÏ×..."
+msgid "Update"
+msgstr "ïÂÎÏ×ÉÔØ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "ïÔÎÏÓÉÔÅÌØÎÙÊ ÐÕÔØ Ë synthesis/hdlist: "
+msgid "Select the source(s) you wish to update:"
+msgstr "÷ÙÂÅÒÉÔÅ ÉÓÔÏÞÎÉË(É) ÄÌÑ ÏÂÎÏ×ÌÅÎÉÑ:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results (none)"
-msgstr "òÅÚÕÌØÔÁÔÙ ÐÏÉÓËÁ (ÎÅÔ)"
+msgid "Please wait, updating media..."
+msgstr "ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÏÖÄÉÔÅ, ÏÂÎÏ×ÌÑÅÔÓÑ ÎÏÓÉÔÅÌØ..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Danmark"
-msgstr "äÁÎÉÑ"
+msgid " failed!"
+msgstr " ÎÅ ÕÄÁÌÏÓØ!"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "ëÉÔÁÊ"
+msgid " done."
+msgstr " ÇÏÔÏ×Ï."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United States"
-msgstr "óÏÅÄÉÎÅÎÎÙÅ ûÔÁÔÙ"
+msgid "Download of `%s', speed:%s"
+msgstr "úÁÇÒÕÚËÁ `%s', ÓËÏÒÏÓÔØ:%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "changes:"
-msgstr "ÉÚÍÅÎÅÎÉÑ:"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "úÁÇÒÕÚËÁ `%s', ÏÓÔÁÌÏÓØ ×ÒÅÍÅÎÉ:%s, ÓËÏÒÏÓÔØ:%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "ðÒÏ×ÅÒÑÅÔÓÑ ÐÏÄÐÉÓØ `%s'..."
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "îÅËÏÔÏÒÙÅ ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÐÁËÅÔÙ ÄÏÌÖÎÙ ÂÙÔØ ÕÄÁÌÅÎÙ"
+msgid "Examining distant file of source `%s'..."
+msgstr "ðÒÏ×ÅÒÑÅÔÓÑ ÄÁÌØÎÉÊ ÆÁÊÌ ÉÓÔÏÞÎÉËÁ `%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Examining file of source `%s'..."
+msgstr "ðÒÏ×ÅÒÑÅÔÓÑ ÆÁÊÌ ÉÓÔÏÞÎÉËÁ `%s'..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No"
-msgstr "îÅÔ"
+msgid "Copying file for source `%s'..."
+msgstr "ëÏÐÉÒÕÅÔÓÑ ÆÁÊÌ ÄÌÑ ÉÓÔÏÞÎÉËÁ `%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Summary: "
-msgstr "ó×ÏÄËÁ: "
+msgid "Please choose the desired mirror."
+msgstr "ðÏÖÁÌÕÊÓÔÁ, ×ÙÂÅÒÉÔÅ ÖÅÌÁÅÍÏÅ ÚÅÒËÁÌÏ."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "ëÁÎÁÄÁ"
+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.pm:1
 #, c-format
-msgid "Greece"
-msgstr "çÒÅÃÉÑ"
+msgid "No mirror"
+msgstr "îÅÔ ÚÅÒËÁÌÁ"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1051,267 +1138,180 @@ msgstr ""
 "÷ÏÚÍÏÖÎÏ ÓÅÔØ ÉÌÉ ×ÅÂ-ÓÁÊÔ MandrakeSoft ÎÅÄÏÓÔÕÐÎÙ.\n"
 "ðÏÖÁÌÕÊÓÔÁ, ÐÏÐÙÔÁÊÔÅÓØ ÓÎÏ×Á ÞÕÔØ ÐÏÚÖÅ."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Source: "
-msgstr "éÓÔÏÞÎÉË: "
-
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "ëÏÐÉÒÕÅÔÓÑ ÆÁÊÌ ÄÌÑ ÉÓÔÏÞÎÉËÁ `%s'..."
-
-#: ../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 "ðÕÔØ:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Problem during removal"
-msgstr "ðÒÏÂÌÅÍÁ ×Ï ×ÒÅÍÑ ÕÄÁÌÅÎÉÑ"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "by source repository"
-msgstr "ÐÏ ÉÓÔÏÞÎÉËÕ"
+msgid "Error during download"
+msgstr "ïÛÉÂËÁ ÐÒÉ ÓËÁÞÉ×ÁÎÉÉ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Selected"
-msgstr "÷ÙÂÒÁÎÎÙÅ"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
+"ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÏÖÄÉÔÅ, ÚÁÇÒÕÖÁÀÔÓÑ ÁÄÒÅÓÁ ÚÅÒËÁÌ Ó ×ÅÂ-ÓÁÊÔÁ\n"
+"MandrakeSoft"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Netherlands"
-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, ÞÔÏÂÙ ÐÏÌÕÞÉÔØ\n"
+" ÓÐÉÓÏË ÚÅÒËÁÌ. ðÏÖÁÌÕÊÓÔÁ, ÕÂÅÄÉÔÅÓØ, ÞÔÏ ×ÁÛÁ ÓÅÔØ × ÎÁÓÔÏÑÝÉÊ\n"
+"ÍÏÍÅÎÔ ÒÁÂÏÔÁÅÔ.\n"
+"÷ÓÅ × ÐÏÒÑÄËÅ? íÏÖÎÏ ÐÒÏÄÏÌÖÁÔØ?"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "íÏÖÎÏ ÄÏÂÁ×ÉÔØ"
+msgid "United States"
+msgstr "óÏÅÄÉÎÅÎÎÙÅ ûÔÁÔÙ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
-msgstr "(îÅÄÏÓÔÕÐÅÎ)"
+msgid "China"
+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"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr "ïÂÎÁÒÕÖÅÎÙ ËÏÎÆÌÉËÔÙ"
+msgid "United Kingdom"
+msgstr "ïÂßÅÄÉÎÅÎÎÏÅ ëÏÒÏÌÅ×ÓÔ×Ï"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "õÄÁÌÅÎÉÅ ÐÁËÅÔÏ× ÐÒÏÇÒÁÍÍÎÏÇÏ ÏÂÅÓÐÅÞÅÎÉÑ"
+msgid "Taiwan"
+msgstr "ôÁÊ×ÁÎØ"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Sweden"
 msgstr "û×ÅÃÉÑ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
-msgstr ""
-"\n"
-"\n"
-"ï ÏÛÉÂËÅ(ÁÈ) ÓÏÏÂÝÅÎÏ:\n"
-"%s"
+msgid "Russia"
+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."
-msgstr ""
-"óÐÉÓÏË ÐÁËÅÔÏ× ÐÕÓÔ. üÔÏ ÏÚÎÁÞÁÅÔ, ÞÔÏ ÌÉÂÏ ÎÅÔ ÏÂÎÏ×ÌÅÎÉÊ ÄÌÑ\n"
-"ÐÁËÅÔÏ×, ÕÓÔÁÎÏ×ÌÅÎÎÙÈ ÎÁ ×ÁÛÅÍ ËÏÍÐØÀÔÅÒÅ, ÌÉÂÏ ÏÎÉ ÕÖÅ ×ÓÅ\n"
-"ÕÓÔÁÎÏ×ÌÅÎÙ."
+msgid "Portugal"
+msgstr "ðÏÒÔÕÇÁÌÉÑ"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "úÁÇÒÕÚËÁ `%s', ÓËÏÒÏÓÔØ:%s"
+msgid "Poland"
+msgstr "ðÏÌØÛÁ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "îÕÖÅÎ ÏÄÉÎ ÉÚ ÓÌÅÄÕÀÝÉÈ ÐÁËÅÔÏ×:"
+msgid "Norway"
+msgstr "îÏÒ×ÅÇÉÑ"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "÷ÙÊÔÉ"
+msgid "Netherlands"
+msgstr "îÉÄÅÒÌÁÎÄÙ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 ""
-"íÎÅ ÎÅÏÂÈÏÄÉÍÏ Ó×ÑÚÁÔØÓÑ Ó ÚÅÒËÁÌÏÍ, ÞÔÏÂÙ ÐÏÌÕÞÉÔØ ÓÁÍÙÅ\n"
-"ÐÏÓÌÅÄÎÉÅ ÐÁËÅÔÙ ÏÂÎÏ×ÌÅÎÉÊ. ðÏÖÁÌÕÊÓÔÁ, ÕÂÅÄÉÔÅÓØ,\n"
-"ÞÔÏ ×ÁÛÁ ÓÅÔØ × ÄÁÎÎÙÊ ÍÏÍÅÎÔ ÒÁÂÏÔÁÅÔ.\n"
-"÷ÓÅ × ÐÏÒÑÄËÅ? íÏÖÎÏ ÐÒÏÄÏÌÖÁÔØ?"
+msgid "Korea"
+msgstr "ëÏÒÅÑ"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "ïë"
+msgid "Japan"
+msgstr "ñÐÏÎÉÑ"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÏÖÄÉÔÅ, ÄÏÂÁ×ÌÑÅÔÓÑ ÎÏÓÉÔÅÌØ..."
+msgid "Italy"
+msgstr "éÔÁÌÉÑ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "ôÉÐ ÉÓÔÏÞÎÉËÁ:"
+msgid "Israel"
+msgstr "éÚÒÁÉÌØ"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please insert the medium named \\\"%s\\\" on device [%s]"
-msgstr "ðÏÖÁÌÕÊÓÔÁ, ×ÓÔÁ×ØÔÅ ÎÏÓÉÔÅÌØ Ó ÉÍÅÎÅÍ \"%s\" × ÕÓÔÒÏÊÓÔ×Ï [%s]"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "çÒÅÃÉÑ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to get source packages."
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÉÓÈÏÄÎÙÅ ÐÁËÅÔÙ."
+msgid "France"
+msgstr "æÒÁÎÃÉÑ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "÷ÙÂÒÁÎÏ ÓÌÉÛËÏÍ ÍÎÏÇÏ ÐÁËÅÔÏ×"
+msgid "Finland"
+msgstr "æÉÎÌÑÎÄÉÑ"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "ËÏÎÆÌÉËÔÕÅÔ Ó"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "éÓÐÁÎÉÑ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Danmark"
+msgstr "äÁÎÉÑ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "÷ÙÂÏÒ Mandrake"
+msgid "Germany"
+msgstr "çÅÒÍÁÎÉÑ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Czech Republic"
+msgstr "þÅÛÓËÁÑ òÅÓÐÕÂÌÉËÁ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Changelog:\n"
+msgid "Costa Rica"
+msgstr "ëÏÓÔÁ-òÉËÁ"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Korea"
-msgstr "ëÏÒÅÑ"
+msgid "Canada"
+msgstr "ëÁÎÁÄÁ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "óßÅÍÎÏÅ ÕÓÔÒÏÊÓÔ×Ï"
+msgid "Brazil"
+msgstr "âÒÁÚÉÌÉÑ"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "âÅÌØÇÉÑ"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Change medium"
-msgstr "éÚÍÅÎÉÔØ ÎÏÓÉÔÅÌØ"
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "ïÂÎÏ×ÌÅÎÉÅ Mandrake"
+msgid "Australia"
+msgstr "á×ÓÔÒÁÌÉÑ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by size"
-msgstr "ÐÏ ÒÁÚÍÅÒÕ"
+msgid "Austria"
+msgstr "á×ÓÔÒÉÑ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "FTP ÓÅÒ×ÅÒ"
+msgid "Info..."
+msgstr "éÎÆÏÒÍÁÃÉÑ..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Files:\n"
-msgstr "æÁÊÌÙ:\n"
+msgid "No"
+msgstr "îÅÔ"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr ""
-"îÅ×ÏÚÍÏÖÎÏ ÏÂÎÏ×ÉÔØ ÎÏÓÉÔÅÌØ, ÏÎ ÂÕÄÅÔ Á×ÔÏÍÁÔÉÞÅÓËÉ ÏÔËÌÀÞÅÎ.\n"
-"\n"
-"ïÛÉÂËÉ:\n"
-"%s"
+msgid "Yes"
+msgstr "äÁ"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
diff --git a/po/sk.po b/po/sk.po
index b14ccf53..80b052c6 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-02 20:15+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+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,20 +14,16 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "Povolené?"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Path or mount point:"
-msgstr "Cesta alebo bod pripojenia:"
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Portugal"
-msgstr "Portugalsko"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Je možné pokra�ovať?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -47,58 +43,105 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-msgstr "podľa skupiny"
+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."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Name:"
-msgstr "Meno:"
+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.pm:1
-#, c-format
-msgid "Italy"
-msgstr "Taliansko"
+#: ../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"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "Ako si zvoliť miror manuálne"
+msgid "Problem during removal"
+msgstr "Problém po�as odstraňovania"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "Please wait, removing packages..."
+msgstr "Prosím �akajte, odstraňujú balí�ky..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Je potrebné odstrániť niektoré balí�ky"
+msgid "Please wait, reading packages database..."
+msgstr "Prosím �akajte, na�ítavam databázu balí�kov..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Already existing update sources"
+#, 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
 #, c-format
-msgid "More information on package..."
-msgstr "Viac informácii o balí�ku..."
+msgid "Installation failed"
+msgstr "Inštalácia neúspešná"
 
-#: ../rpmdrake.pm:1
+#: ../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..."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "Ano"
+msgid "All requested packages were installed successfully."
+msgstr "Všetky požadované balí�ky boli úspešne nainštalované."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr "Všetko bolo úspešne nainštalované"
 
 #: ../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 ""
-"Kvôli závislostiam musia byť nasledujúce balí�ky teraz odzna�ené:\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
 #, c-format
@@ -106,489 +149,501 @@ 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 "%s KB"
-msgstr "%s KB"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Inštalácia balí�ka `%s' (%s/%s)..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Príprava balí�kov na inštaláciu..."
 
 #: ../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."
+"\n"
+"Error(s) reported:\n"
+"%s"
 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."
+"\n"
+"Ohlásená chyba:\n"
+"%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 "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ť"
+"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."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"The following packages have bad signatures:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"Vyskytol sa problém po�as inštalácie balí�kov:\n"
+"Nasledovné balíky budú odstránené aby bolo možné iné aktualizovať:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"Je možné pokra�ovať?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Size: "
-msgstr "Veľkosť: "
+msgid "Verifying packages signatures..."
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Security updates"
-msgstr "Bezpe�nostné aktualizácie"
+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ť"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "Ok"
+
+#: ../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]"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "Maximálne informácie"
+msgid "Change medium"
+msgstr "Vymeniť médium"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, c-format
+msgid "Initializing..."
+msgstr "Inicializácia..."
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Chyba..."
+msgid "Package installation..."
+msgstr "Príprava balí�kov na inštaláciu..."
 
-#: ../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."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Veľká Británia"
+msgid "Unable to get source packages."
+msgstr "Nie je možné prebrať zdrojové balí�ky."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure sources"
-msgstr "Nastaviť zdroje"
+msgid "Inspect..."
+msgstr "Preveriť.."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "v menách"
+msgid "Installation finished"
+msgstr "Inštalácia ukon�ená"
 
-#: ../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 ""
-"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 "Do nothing"
+msgstr "Neurobiť ni�"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
-"\n"
-"\\Do you want to continue installation?"
-msgstr ""
-"Nasledovné balíky budú odstránené aby bolo možné iné aktualizovať:\n"
-"\n"
-"%s\n"
-"\n"
-"Je možné pokra�ovať?"
+#, c-format
+msgid "Use .%s as main file"
+msgstr "Použite .%s ako hlavný súbor"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Remove .%s"
 msgstr "Odstrániť .%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Source"
-msgstr "Zdroj"
+msgid "changes:"
+msgstr "zmeny:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "Fínsko"
+msgid "Inspecting %s"
+msgstr "Preverujem %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
+msgid "Please wait, finding available packages..."
+msgstr "Prosím �akajte, hľadám dostupné balí�ky..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "France"
-msgstr "Francúzsko"
+msgid "Please wait, adding medium..."
+msgstr "Prosím �akajte, pridávam médium..."
 
-#. -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 ""
-"%s\n"
+"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"
-"Is it ok to continue?"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"%s\n"
+"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"
-"Je možné pokra�ovať?"
+"Potom je potrebné reštartovať MandrakeUpdate."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Znovu na�íta� zoznam balí�kov"
+msgid "How to choose manually your mirror"
+msgstr "Ako si zvoliť miror manuálne"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr "Zvoľte si miror..."
+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 ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Pridávam zdroj:"
+msgid "Already existing update sources"
+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?"
+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:1
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Balí�ek `%s' nie je možné nainštalovať\n"
+msgid "Fatal error"
+msgstr "Chyba súboru"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
+msgid "Software Packages Installation"
 msgstr "Príprava balí�kov na inštaláciu..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages,"
-msgstr "Všetky balí�ky,"
+msgid "Mandrake Update"
+msgstr "Mandrake Update"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "v súboroch"
+msgid "Software Packages Removal"
+msgstr "Odstránenie softvérových balí�kov"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Všetky požadované balí�ky boli úspešne nainštalované."
+msgid "Quit"
+msgstr "Ukon�iť"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "Hostiteľ proxy:"
+msgid "Install"
+msgstr "Inštaluj"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update source(s)"
-msgstr "Aktualizácia zdrojov"
+msgid "Remove"
+msgstr "Odstrániť"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "Lokálne súbory"
+msgid "Help"
+msgstr "Pomoc"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Preverujem %s"
+msgid "Search"
+msgstr "Hľadať"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Israel"
-msgstr "Izrael"
+msgid "Find:"
+msgstr "Hľadaj:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Help"
-msgstr "Pomoc"
+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ť?"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "HTTP server"
+msgid "Some packages need to be removed"
+msgstr "Je potrebné odstrániť niektoré balí�ky"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"Welcome to the packages source editor!\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"
-"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."
+"Do you really want to install all the selected packages?"
 msgstr ""
-"Vitajte v editore zdrojov pre balí�ky!\n"
+"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"
-"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í."
+"Skuto�ne si želáte nainštalovať všetky zvolené balí�ky?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation failed"
-msgstr "Inštalácia neúspešná"
+msgid "Too many packages are selected"
+msgstr "Vybrali ste príliš veľa balí�kov"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Použite .%s ako hlavný súbor"
+msgid "Maximum information"
+msgstr "Maximálne informácie"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results"
-msgstr "Výsledky vyhľadávania"
+msgid "Normal information"
+msgstr "Normálne informácie"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, c-format
-msgid " failed!"
-msgstr " chyba!"
+msgid "Update source(s)"
+msgstr "Aktualizácia zdrojov"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Brazil"
-msgstr "Brazília"
+msgid "Reload the packages list"
+msgstr "Znovu na�íta� zoznam balí�kov"
 
-#: ../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 ""
-"Už existuje zdroj s takýmto menom, chcete ho\n"
-"skuto�ne prepísať?"
+msgid "Reset the selection"
+msgstr "Zrušiť výber"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Hľadaj:"
+msgid "in files"
+msgstr "v súboroch"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Všetky balí�ky, abecedne"
+msgid "in descriptions"
+msgstr "v popisoch"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Prosím �akajte, vyhľadávam..."
+msgid "in names"
+msgstr "v menách"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Prosím �akajte, na�ítavam databázu balí�kov..."
+msgid "by update availability"
+msgstr "podľa dostupnosti zdroja"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "Nieje možné otvoriť balí�ek `%s'\n"
+#, c-format
+msgid "by source repository"
+msgstr "podľa zdroja"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "Zrušiť výber"
+msgid "by selection state"
+msgstr "podľa stavu výberu"
 
-#: ../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 ""
-"Ak potrebujete proxy, zadajte meno hostiteľa a voliteľne aj port (syntax: "
-"<proxyhost[:port]>):"
+msgid "by size"
+msgstr "podľa veľkosti"
 
 #: ../rpmdrake: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 "by group"
+msgstr "podľa skupiny"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Costa Rica"
+msgid "All packages,"
+msgstr "Všetky balí�ky,"
 
 #: ../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"
-
-#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Prosím �akajte, odstraňujem médium..."
+msgid "All packages, alphabetical"
+msgstr "Všetky balí�ky, abecedne"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "Heslo:"
+msgid "Mandrake choices"
+msgstr "Voľby Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "Zisťujem vzdialenosť súboru od zdroja '%s'..."
+msgid "Normal updates"
+msgstr "Normálne aktualizácie"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Taiwan"
+msgid "Bugfixes updates"
+msgstr "Aktualizácie opravujúce chyby"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "User:"
-msgstr "Užívateľ:"
+msgid "Security updates"
+msgstr "Bezpe�nostné aktualizácie"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Prosím �akajte, aktualizujem médium..."
+msgid "Description: "
+msgstr "Popis:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Prosím �akajte, vypisujem balí�ky..."
+msgid "Reason for update: "
+msgstr "Dôvod pre aktualizáciu:"
 
 #: ../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 "Summary: "
+msgstr "Stru�ný obsah: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Information on packages"
-msgstr "Informácie o balí�koch"
+msgid "Importance: "
+msgstr "Dôležitosť: "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "Zrušiť"
+msgid "%s KB"
+msgstr "%s KB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Všetko bolo úspešne nainštalované"
+msgid "Size: "
+msgstr "Veľkosť: "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Prosím �akajte, aktualizujem média..."
+msgid "Version: "
+msgstr "Verzia: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Name: "
+msgstr "Názov: "
 
 #: ../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 "Currently installed version: "
+msgstr "Aktuálne nainštalovaná verzia:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "v popisoch"
+msgid "Source: "
+msgstr "Zdroj: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Nastaviť proxy"
+msgid "(Not available)"
+msgstr "(Nedostupné)"
 
-#: ../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 "Changelog:\n"
+msgstr "Záznam zmien:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Prosím zvoľte"
+msgid "Files:\n"
+msgstr "Súbory:\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Vybraná veľkosť: %d Mb"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add a source"
-msgstr "Pridať zdroj"
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "Inicializácia..."
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Vybrané: %d MB / Dostupné: %d MB"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "Uložiť zmeny"
+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"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Error during download"
-msgstr "Chyba po�as sťahovania"
+#: ../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 "Package installation..."
-msgstr "Príprava balí�kov na inštaláciu..."
+msgid "%s conflicts with %s"
+msgstr "konfliktuje s"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Importance: "
-msgstr "Dôležitosť: "
+#, fuzzy, c-format
+msgid "Some packages can't be installed"
+msgstr "Balí�ek `%s' nie je možné nainštalovať\n"
 
 #: ../rpmdrake:1
 #, c-format
@@ -600,83 +655,76 @@ msgstr ""
 "Pre vyriešenie závislosti, sú potrebné nainštalovať tieto balí�ky:\n"
 "\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "Pridať..."
+msgid "Additional packages needed"
+msgstr "Sú potrebné �alšie balí�ky"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Unable to create medium."
-msgstr "Nemôžem vytvoriť médium."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "Balí�ek `%s' nie je možné nainštalovať\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Removing these packages would break your system, sorry:\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"
+"Odstránenie týchto balí�kov naruší váš systém, prepá�te:\n"
 "\n"
-"Niektoré konfigura�né súbory boli vytvorené ako `.rpmnew' alebo `.rpmsave',\n"
-"mali by ste ich prezrieš:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
-msgstr "Prechádzať..."
+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
-#, 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 "Info..."
-msgstr "Info..."
+msgid "Some additional packages need to be removed"
+msgstr "Je potrebné odstrániť niektoré 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 "More information on package..."
+msgstr "Viac informácii o balí�ku..."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "Odstrániť"
+msgid "Information on packages"
+msgstr "Informácie o balí�koch"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Príprava balí�kov na inštaláciu..."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "No mirror"
-msgstr "Žiaden miror"
-
-#: ../edit-urpm-sources.pl: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 "More info"
+msgstr "Viac informácií"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Inštaluj"
+msgid "Addable"
+msgstr "Pridateľné"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "Japonsko"
+msgid "Upgradable"
+msgstr "Aktualizovateľné"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Neurobiť ni�"
+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:1
 #, c-format
@@ -685,343 +733,376 @@ msgstr "Žiadna aktualizácia"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Description: "
-msgstr "Popis:"
+msgid "(none)"
+msgstr "(žiaden)"
 
 #: ../rpmdrake: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."
+msgid "Please wait, listing packages..."
+msgstr "Prosím �akajte, vypisujem balí�ky..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "Nieje možné otvoriť balí�ek `%s'\n"
 
 #: ../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 "One of the following packages is needed:"
+msgstr "Jeden z nasledujúcich balí�kov je potrebný:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "Názov: "
+msgid "Please choose"
+msgstr "Prosím zvoľte"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "Preveriť.."
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Príprava balí�kov na inštaláciu..."
+msgid "Not selected"
+msgstr "Nájdené konflikty"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Austrália"
+msgid "Selected"
+msgstr "Vybrané"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation finished"
-msgstr "Inštalácia ukon�ená"
+msgid "Search results"
+msgstr "Výsledky vyhľadávania"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
-msgstr "podľa dostupnosti zdroja"
+msgid "Stop"
+msgstr "Stop"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
-msgstr "Poľsko"
+msgid "Please wait, searching..."
+msgstr "Prosím �akajte, vyhľadávam..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Version: "
-msgstr "Verzia: "
+msgid "Search results (none)"
+msgstr "Výsledky vyhľadávania (žiadne)"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Iné"
 
 #: ../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:"
+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í."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Uložiť a ukon�iť"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Editing source \\\"%s\\\":"
-msgstr "Zmena zdroja \"%s\":"
+msgid "Proxy..."
+msgstr "Chyba..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Upgradable"
-msgstr "Aktualizovateľné"
+msgid "Update..."
+msgstr "Aktualizácia..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid " done."
-msgstr " hotovo."
+msgid "Add..."
+msgstr "Pridať..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Príprava balí�kov na inštaláciu..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "Zmeň"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "Preverujem súbory zo zdroja '%s'..."
+msgid "Source"
+msgstr "Zdroj"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "Sú potrebné �alšie balí�ky"
+msgid "Enabled?"
+msgstr "Povolené?"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Aktualizácie opravujúce chyby"
+msgid "Configure sources"
+msgstr "Nastaviť zdroje"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl: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 "Password:"
+msgstr "Heslo:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Germany"
-msgstr "Nemecko"
+msgid "User:"
+msgstr "Užívateľ:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Russia"
-msgstr "Rusko"
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Môžete zadať užívateľské meno/heslo pre proxy autentifikáciu:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Norway"
-msgstr "Nórsko"
+msgid "Proxy hostname:"
+msgstr "Hostiteľ proxy:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Vyskytol sa problém po�as inštalácie"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+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
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search"
-msgstr "Hľadať"
+msgid "Configure proxies"
+msgstr "Nastaviť proxy"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit a source"
-msgstr "Zmeniť zdroj"
+msgid "Please wait, updating medium..."
+msgstr "Prosím �akajte, aktualizujem médium..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Česká Republika"
+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."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Stop"
-msgstr "Stop"
+msgid "You need to insert the medium to continue"
+msgstr "Vložte médium ak chcete pokra�ovať"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "Aktualizácia"
+msgid "Save changes"
+msgstr "Uložiť zmeny"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "Prosím �akajte, odstraňujú balí�ky..."
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Relatívna cesta k synthesis/hdlist: "
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal information"
-msgstr "Normálne informácie"
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing source \"%s\":"
+msgstr "Zmena zdroja \"%s\":"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Sťahovanie balí�ka `%s' (%s/%s)..."
+msgid "Edit a source"
+msgstr "Zmeniť zdroj"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Vybrané: %d MB / Dostupné: %d MB"
+msgid "Please wait, removing medium..."
+msgstr "Prosím �akajte, odstraňujem médium..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Spain"
-msgstr "Å panielsko"
+msgid "Type of source:"
+msgstr "Typ zdroja:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
-msgstr "Normálne aktualizácie"
+msgid "Adding a source:"
+msgstr "Pridávam zdroj:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by selection state"
-msgstr "podľa stavu výberu"
+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.pm:1
+#: ../edit-urpm-sources.pl: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 "You need to fill up at least the two first entries."
+msgstr "Je potrebné vyplniť najmenej prvé dve položky."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "Meno:"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Austria"
-msgstr "Rakúsko"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Chyba súboru"
+msgid "Choose a mirror..."
+msgstr "Zvoľte si miror..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Prosím zvoľte zdroj ktorý chcete aktualizovať:"
+msgid "Browse..."
+msgstr "Prechádzať..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update..."
-msgstr "Aktualizácia..."
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "Overovanie signatúry `%s'..."
+msgid "Path or mount point:"
+msgstr "Cesta alebo bod pripojenia:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
-msgstr "(žiaden)"
+msgid "Removable device"
+msgstr "Vymeniteľné zariadenie"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-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"
+msgid "HTTP server"
+msgstr "HTTP server"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Inštalácia balí�ka `%s' (%s/%s)..."
+msgid "FTP server"
+msgstr "FTP server"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Aktuálne nainštalovaná verzia:"
+msgid "Path:"
+msgstr "Cesta:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Other"
-msgstr "Iné"
+msgid "Local files"
+msgstr "Lokálne súbory"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Dôvod pre aktualizáciu:"
+msgid "Add a source"
+msgstr "Pridať zdroj"
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Please choose the desired mirror."
-msgstr "Prosím zvoľte si jeden z mirorov."
+#, 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é."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "Zmeň"
+msgid "Unable to create medium."
+msgstr "Nemôžem vytvoriť médium."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Prosím �akajte, hľadám dostupné balí�ky..."
+msgid "Update"
+msgstr "Aktualizácia"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Relatívna cesta k synthesis/hdlist: "
+msgid "Select the source(s) you wish to update:"
+msgstr "Prosím zvoľte zdroj ktorý chcete aktualizovať:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Výsledky vyhľadávania (žiadne)"
+msgid "Please wait, updating media..."
+msgstr "Prosím �akajte, aktualizujem média..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Danmark"
-msgstr "Dánsko"
+msgid " failed!"
+msgstr " chyba!"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "Čína"
+msgid " done."
+msgstr " hotovo."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United States"
-msgstr "Spojené Štáty"
+msgid "Download of `%s', speed:%s"
+msgstr "Získavanie '%s', rýchlosťou: %s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "changes:"
-msgstr "zmeny:"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "Získavanie '%s', �as do konca: %s, rýchlosť: %s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "Overovanie signatúry `%s'..."
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Je potrebné odstrániť niektoré balí�ky"
+msgid "Examining distant file of source `%s'..."
+msgstr "Zisťujem vzdialenosť súboru od zdroja '%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Examining file of source `%s'..."
+msgstr "Preverujem súbory zo zdroja '%s'..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No"
-msgstr "Nie"
+msgid "Copying file for source `%s'..."
+msgstr "Kopírujem súbor pre zdroj '%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Summary: "
-msgstr "Stru�ný obsah: "
+msgid "Please choose the desired mirror."
+msgstr "Prosím zvoľte si jeden z mirorov."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "Kanada"
+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.pm:1
 #, c-format
-msgid "Greece"
-msgstr "Grécko"
+msgid "No mirror"
+msgstr "Žiaden miror"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1038,259 +1119,178 @@ msgstr ""
 "Sieť, alebo websajt MandrakeSoft sú zrejme nedostupné.\n"
 "Prosím, skúste neskôr"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Source: "
-msgstr "Zdroj: "
-
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "Kopírujem súbor pre zdroj '%s'..."
-
-#: ../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 "Path:"
-msgstr "Cesta:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Problem during removal"
-msgstr "Problém po�as odstraňovania"
+msgid "Error during download"
+msgstr "Chyba po�as sťahovania"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by source repository"
-msgstr "podľa zdroja"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "Prosím �akajte, sťahujem adresy mirorov z web stránky MandrakeSoft."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Selected"
-msgstr "Vybrané"
+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.pm:1
 #, c-format
-msgid "Netherlands"
-msgstr "Holandsko"
+msgid "United States"
+msgstr "Spojené Štáty"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "Pridateľné"
+msgid "China"
+msgstr "Čína"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
-msgstr "(Nedostupné)"
-
-#: ../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"
+msgid "United Kingdom"
+msgstr "Veľká Británia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Odstránenie softvérových balí�kov"
+msgid "Taiwan"
+msgstr "Taiwan"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Sweden"
 msgstr "Švédsko"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
-msgstr ""
-"\n"
-"\n"
-"Ohlásená chyba:\n"
-"%s"
+msgid "Russia"
+msgstr "Rusko"
 
-#: ../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."
-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 "Portugal"
+msgstr "Portugalsko"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "Získavanie '%s', rýchlosťou: %s"
+msgid "Poland"
+msgstr "Poľsko"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Jeden z nasledujúcich balí�kov je potrebný:"
+msgid "Norway"
+msgstr "Nórsko"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "Ukon�iť"
+msgid "Netherlands"
+msgstr "Holandsko"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 ""
-"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ť?"
+msgid "Korea"
+msgstr "Korea"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid "Japan"
+msgstr "Japonsko"
 
-#: ../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 "Italy"
+msgstr "Taliansko"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "Typ zdroja:"
+msgid "Israel"
+msgstr "Izrael"
 
-#: ../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]"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Grécko"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to get source packages."
-msgstr "Nie je možné prebrať zdrojové balí�ky."
+msgid "France"
+msgstr "Francúzsko"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Vybrali ste príliš veľa balí�kov"
+msgid "Finland"
+msgstr "Fínsko"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "konfliktuje s"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "Å panielsko"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Danmark"
+msgstr "Dánsko"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Voľby Mandrake"
+msgid "Germany"
+msgstr "Nemecko"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 ""
-"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."
+msgid "Czech Republic"
+msgstr "Česká Republika"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Záznam zmien:\n"
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Korea"
-msgstr "Korea"
+msgid "Canada"
+msgstr "Kanada"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "Vymeniteľné zariadenie"
+msgid "Brazil"
+msgstr "Brazília"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Belgicko"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Change medium"
-msgstr "Vymeniť médium"
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Mandrake Update"
+msgid "Australia"
+msgstr "Austrália"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by size"
-msgstr "podľa veľkosti"
+msgid "Austria"
+msgstr "Rakúsko"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "FTP server"
+msgid "Info..."
+msgstr "Info..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Files:\n"
-msgstr "Súbory:\n"
+msgid "No"
+msgstr "Nie"
 
 #: ../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é."
+#, c-format
+msgid "Yes"
+msgstr "Ano"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
diff --git a/po/sl.po b/po/sl.po
index 01953f4f..febe3123 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grpmi\n"
-"POT-Creation-Date: 2003-05-02 20:15+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+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,20 +14,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-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
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Portugal"
-msgstr "Portugalska"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Lahko nadaljujem?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -46,59 +42,104 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-msgstr "po skupini"
+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."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Name:"
-msgstr "Ime:"
+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."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Italy"
-msgstr "Namesti"
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"Med namestitvijo paketov se je pojavila napaka:\n"
+"\n"
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "Kako roèno izbrati zrcalni stre¾nik"
+msgid "Problem during removal"
+msgstr "Te¾ave med odstranjevanjem"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "Please wait, removing packages..."
+msgstr "Prosim poèakajte, paketi se odstranjujejo..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Nekaj paketov je potrebno odstraniti"
+msgid "Please wait, reading packages database..."
+msgstr "Prosim poèakajte, paketi se berejo iz baze..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Already existing update sources"
+#, 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..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "More information on package..."
-msgstr "Ve¹ informacij o paketu..."
+msgid "All requested packages were installed successfully."
+msgstr "Vsi zahtevani paketi so bil uspe¹no name¹èeni."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "Da"
+msgid "Everything installed successfully"
+msgstr "Vse je bilo uspe¹no name¹èeno"
 
 #: ../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 ""
-"Zaradi njihovih odvisnosti naslednji paketi ne morejo\n"
-"biti izbrani:\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
 #, c-format
@@ -106,491 +147,502 @@ 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 "%s KB"
-msgstr "%s KB"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Name¹èam pakete `%s' (%s/%s)..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Pripravljam pakete za namestitev..."
 
 #: ../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."
+"\n"
+"Error(s) reported:\n"
+"%s"
 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."
+"\n"
+"Javljene napake:\n"
+"%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 "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"
+"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."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"The following packages have bad signatures:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"Med namestitvijo paketov se je pojavila napaka:\n"
+"Naslednje pakete je potrebno odstraniti, da bo mo¾no nadgraditi druge:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"Lahko nadaljujem?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Size: "
-msgstr "Velikost: "
+msgid "Verifying packages signatures..."
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Security updates"
-msgstr "Varnostna nadgradnje"
+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"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "V redu"
+
+#: ../rpmdrake:1
+#, 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 "Maximum information"
-msgstr "Maksimalne informacije"
+msgid "Change medium"
+msgstr "Zamenjajte medij"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, c-format
+msgid "Initializing..."
+msgstr "Nastavljam zaèetne nastavitve..."
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Napaka..."
+msgid "Package installation..."
+msgstr "Pripravljam pakete za namestitev..."
 
-#: ../rpmdrake.pm:1
+#: ../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 "United Kingdom"
-msgstr "Zdru¾eno kraljestvo"
+msgid "Unable to get source packages."
+msgstr "Dostop do paketov vira ni mogoè."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure sources"
-msgstr "Nastavite vire"
+msgid "Inspect..."
+msgstr "Preverjam..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "v imenih"
+msgid "Installation finished"
+msgstr "Namestitev je konèana"
 
-#: ../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 ""
-"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 "Do nothing"
+msgstr "Ne naredi niè"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
-"\n"
-"\\Do you want to continue installation?"
-msgstr ""
-"Naslednje pakete je potrebno odstraniti, da bo mo¾no nadgraditi druge:\n"
-"\n"
-"%s\n"
-"\n"
-"Lahko nadaljujem?"
+#, c-format
+msgid "Use .%s as main file"
+msgstr "Uporabi .%s kot glavno datoteko"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Remove .%s"
 msgstr "Odstrani .%s"
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Source"
-msgstr "Prisili"
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "Finska"
+msgid "changes:"
+msgstr "spremembe:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "France"
-msgstr "Prisili"
+msgid "Inspecting %s"
+msgstr "Preverjam %s"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "More info"
-msgstr "Veè informacij"
+#, c-format
+msgid "Please wait, finding available packages..."
+msgstr "Prosim poèakajte, i¹èem dostopne pakete..."
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
+msgid "Please wait, adding medium..."
+msgstr "Pro"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"%s\n"
+"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"
-"Is it ok to continue?"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"%s\n"
+"Zrcalni stre¾nik lahko izberete tudi roèno:\n"
+"po¾enite Upravnika virov programske opreme in dodajte\n"
+"vir varnostnih nadgradenj (Security).\n"
 "\n"
-"Lahko nadaljujem?"
+"Potem ponovno za¾enite MandrakeUpdate."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Ponovno nalo¾i spisek paketov"
+msgid "How to choose manually your mirror"
+msgstr "Kako roèno izbrati zrcalni stre¾nik"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr "Izberite zrcalni stre¾nik:"
+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 ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Dodajam vir:"
+msgid "Already existing update sources"
+msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Paketa `%s' ni mogoèe namestiti\n"
+#, 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 ""
+"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:1
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Pripravljam pakete za namestitev..."
+msgid "Fatal error"
+msgstr "Datoteèna napaka"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "All packages,"
-msgstr "Vsi paketi,"
+#, fuzzy, c-format
+msgid "Software Packages Installation"
+msgstr "Pripravljam pakete za namestitev..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "v datotekah"
+msgid "Mandrake Update"
+msgstr "Mandrake nadgradnja"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Vsi zahtevani paketi so bil uspe¹no name¹èeni."
+msgid "Software Packages Removal"
+msgstr "Odstranjevanje paketov programske opreme"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "Proksi ime gostitelja (hostname):"
+msgid "Quit"
+msgstr "Konèaj"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Update source(s)"
-msgstr "Obnovi vir(e)"
+msgid "Install"
+msgstr "Namesti"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Local files"
-msgstr "Lokalne datoteke"
+msgid "Remove"
+msgstr "Odstrani"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Preverjam %s"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Israel"
-msgstr "Namesti"
+msgid "Help"
+msgstr "Pomoè"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Help"
-msgstr "Pomoè"
+msgid "Search"
+msgstr "Iskanje"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "HTTP stre¾nik"
+msgid "Find:"
+msgstr "Najdi:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"Welcome to the packages source editor!\n"
+"The following packages have to be removed for others to be upgraded:\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."
+"%s\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
-"Dobrodo¹li v upravnika virov paketov!\n"
+"Naslednje pakete je potrebno odstraniti, da bo mo¾no nadgraditi druge:\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."
+"%s\n"
+"\n"
+"Lahko nadaljujem?"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "namesti vse"
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "Nekaj paketov je potrebno odstraniti"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Uporabi .%s kot glavno datoteko"
+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 "Search results"
-msgstr "Rezultati iskanja"
+msgid "Too many packages are selected"
+msgstr "Preveè paketov je izbranih"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " failed!"
-msgstr " neuspeh!"
+msgid "Maximum information"
+msgstr "Maksimalne informacije"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Brazil"
-msgstr "Brazilija"
+msgid "Normal information"
+msgstr "Normalne informacije"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, c-format
-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?"
+msgid "Update source(s)"
+msgstr "Obnovi vir(e)"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Najdi:"
+msgid "Reload the packages list"
+msgstr "Ponovno nalo¾i spisek paketov"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Vsi paketi, po abecedi"
+msgid "Reset the selection"
+msgstr "Ponastavi izbiro"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Prosim poèakajte, iskanje v teku..."
+msgid "in files"
+msgstr "v datotekah"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Prosim poèakajte, paketi se berejo iz baze..."
+msgid "in descriptions"
+msgstr "v opisih"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "Ni mogoèe odpreti paketa `%s'\n"
+#, c-format
+msgid "in names"
+msgstr "v imenih"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "Ponastavi izbiro"
+msgid "by update availability"
+msgstr "po dostopnih nadgradnjah"
 
-#: ../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 ""
-"Èe potrebujete proksi, vpi¹ite ime gostitelja in izbirno port (sintaksa: "
-"<ime gostitelja[:port]>):"
+msgid "by source repository"
+msgstr "po skladi¹èih virov"
 
 #: ../rpmdrake: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 "by selection state"
+msgstr "po stanju izbire"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Kosta Rika"
+msgid "by size"
+msgstr "po velikosti"
 
 #: ../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"
+#, c-format
+msgid "by group"
+msgstr "po skupini"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Prosim poèakajte, odstranjevanje medija..."
+msgid "All packages,"
+msgstr "Vsi paketi,"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "Geslo:"
+msgid "All packages, alphabetical"
+msgstr "Vsi paketi, po abecedi"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "Pregled oddaljene datotke vira `%s'..."
+msgid "Mandrake choices"
+msgstr "Mandrake izbire"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Tajvan"
+msgid "Normal updates"
+msgstr "Normalna nadgradnje"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "User:"
-msgstr "Uporabnik:"
+msgid "Bugfixes updates"
+msgstr "Popravki napak"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Prosim poèakajte, medij se obnavlja..."
+msgid "Security updates"
+msgstr "Varnostna nadgradnje"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Prosim poèakajte, paketi se izpisujejo..."
+msgid "Description: "
+msgstr "Opis:"
 
 #: ../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 "Reason for update: "
+msgstr "Razlog za nadgradnjo: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Information on packages"
-msgstr "Informacije o paketih"
+msgid "Summary: "
+msgstr "Povzetek:"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "Preklièi"
+msgid "Importance: "
+msgstr "Pomembnost:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Vse je bilo uspe¹no name¹èeno"
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Prosim poèakajte, medij se obnavlja..."
+msgid "Size: "
+msgstr "Velikost: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Version: "
+msgstr "Razlièica: "
 
 #: ../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 "Name: "
+msgstr "Ime: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "v opisih"
+msgid "Currently installed version: "
+msgstr "Trenutno name¹èena razlièica: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Source: "
+msgstr "Prisili"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Nastavite proksije"
+msgid "(Not available)"
+msgstr "(Ni na voljo)"
 
-#: ../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 "Changelog:\n"
+msgstr "Seznam sprememb:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Prosim izberite"
+msgid "Files:\n"
+msgstr "Datoteke:\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Izbrana velikost: %d MB"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add a source"
-msgstr "Dodaj vir"
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "Nastavljam zaèetne nastavitve..."
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Izbrano: %d MB / Prosti disk: %d MB"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "Shrani spremembe"
+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"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Error during download"
-msgstr "Napaka pri prenosu"
+#: ../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:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Pripravljam pakete za namestitev..."
+msgid "%s conflicts with %s"
+msgstr "je v sporu z"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Importance: "
-msgstr "Pomembnost:"
+#, fuzzy, c-format
+msgid "Some packages can't be installed"
+msgstr "Paketa `%s' ni mogoèe namestiti\n"
 
 #: ../rpmdrake:1
 #, c-format
@@ -603,83 +655,77 @@ msgstr ""
 "naslednje pakete:\n"
 "\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "Dodaj..."
+msgid "Additional packages needed"
+msgstr "Potrebni so dodatni paketi"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Unable to create medium."
-msgstr "Medija ni mogoèe ustvariti"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "Paketa `%s' ni mogoèe namestiti\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Removing these packages would break your system, sorry:\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"
+"Odstranitev teh paketov bi onesposobila va¹ sistem:\n"
 "\n"
-"Ustvarjene so bile nekatere nastavitvene datoteke .rpmnew ali .rpmsave,\n"
-"lahko jih pregledate in se odloèite za nadaljna dejanja:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
-msgstr "Brskaj..."
+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
-#, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "Paketa `%s' ni mogoèe namestiti\n"
-
-#: ../rpmdrake.pm:1
 #, c-format
-msgid "Info..."
-msgstr "Info..."
+msgid "Some additional packages need to be removed"
+msgstr "Nekaj dodatnih paketov je potrebno odstraniti"
 
-#: ../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 "More information on package..."
+msgstr "Ve¹ informacij o paketu..."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "Odstrani"
+msgid "Information on packages"
+msgstr "Informacije o paketih"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Pripravljam pakete za namestitev..."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "No mirror"
-msgstr "Ni zrcalnega stre¾nika"
-
-#: ../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."
+msgid "More info"
+msgstr "Veè informacij"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Namesti"
+msgid "Addable"
+msgstr "Za dodajanje"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "Japonska"
+msgid "Upgradable"
+msgstr "Za nadgradnjo"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Ne naredi niè"
+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:1
 #, c-format
@@ -688,344 +734,376 @@ msgstr "Brez nadgradnje"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Description: "
-msgstr "Opis:"
+msgid "(none)"
+msgstr "(noben)"
 
 #: ../rpmdrake: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."
+msgid "Please wait, listing packages..."
+msgstr "Prosim poèakajte, paketi se izpisujejo..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "Ni mogoèe odpreti paketa `%s'\n"
 
 #: ../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?"
+msgid "One of the following packages is needed:"
+msgstr "Potrebujete enega od naslednjih paketov:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "Ime: "
+msgid "Please choose"
+msgstr "Prosim izberite"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "Preverjam..."
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Pripravljam pakete za namestitev..."
+msgid "Not selected"
+msgstr "Zaznani so spori"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Avstralija"
+msgid "Selected"
+msgstr "Izbran"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation finished"
-msgstr "Namestitev je konèana"
+msgid "Search results"
+msgstr "Rezultati iskanja"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
-msgstr "po dostopnih nadgradnjah"
+msgid "Stop"
+msgstr "Ustavi"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
-msgstr "Poljska"
+msgid "Please wait, searching..."
+msgstr "Prosim poèakajte, iskanje v teku..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Version: "
-msgstr "Razlièica: "
+msgid "Search results (none)"
+msgstr "Rezultati iskanja (brez)"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Drugo"
 
 #: ../edit-urpm-sources.pl: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 ""
+"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."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Shrani in konèaj"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Editing source \\\"%s\\\":"
-msgstr "Uredi vir \"%s\":"
+msgid "Proxy..."
+msgstr "Napaka..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Upgradable"
-msgstr "Za nadgradnjo"
+msgid "Update..."
+msgstr "Nadgradnja..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid " done."
-msgstr " opravljeno."
+msgid "Add..."
+msgstr "Dodaj..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "Uredi"
+
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Pripravljam pakete za namestitev..."
+msgid "Source"
+msgstr "Prisili"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "Pregled datoteke vira `%s'..."
+msgid "Enabled?"
+msgstr "Omogoèen?"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "Potrebni so dodatni paketi"
+msgid "Configure sources"
+msgstr "Nastavite vire"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Popravki napak"
+msgid "Password:"
+msgstr "Geslo:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "Prenos `%s', preostanek èasa:%s, hitrost:%s"
+msgid "User:"
+msgstr "Uporabnik:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Germany"
-msgstr "Nem¹ija"
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Lahko doloèite uporabnika/geslo za proksi overitev (authentication):"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Russia"
-msgstr "Rusija"
+msgid "Proxy hostname:"
+msgstr "Proksi ime gostitelja (hostname):"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Norway"
-msgstr "Norve¹ka"
+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
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Problem se je pojavil med namestitvijo"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "Nastavite proksije"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search"
-msgstr "Iskanje"
+msgid "Please wait, updating medium..."
+msgstr "Prosim poèakajte, medij se obnavlja..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit a source"
-msgstr "Uredi vir"
+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."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Èe¹ka"
+msgid "You need to insert the medium to continue"
+msgstr "Za nadaljevanje morate vstaviti medij"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Stop"
-msgstr "Ustavi"
+msgid "Save changes"
+msgstr "Shrani spremembe"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "Obnova"
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Relativna pot do synthesis/hdlist:"
 
-#: ../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
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing source \"%s\":"
+msgstr "Uredi vir \"%s\":"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal information"
-msgstr "Normalne informacije"
+msgid "Edit a source"
+msgstr "Uredi vir"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Prena¹am paket `%s' (%s/%s)..."
+msgid "Please wait, removing medium..."
+msgstr "Prosim poèakajte, odstranjevanje medija..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Izbrano: %d MB / Prosti disk: %d MB"
+msgid "Type of source:"
+msgstr "Vrsta vira:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Spain"
-msgstr "©panija"
+msgid "Adding a source:"
+msgstr "Dodajam vir:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
-msgstr "Normalna nadgradnje"
+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
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by selection state"
-msgstr "po stanju izbire"
+msgid "You need to fill up at least the two first entries."
+msgstr "Izpolniti morate najmanj prvi dve polji."
 
-#: ../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 "Name:"
+msgstr "Ime:"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "Uporabni¹ko ime:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Austria"
-msgstr "Avstrija"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Datoteèna napaka"
+msgid "Choose a mirror..."
+msgstr "Izberite zrcalni stre¾nik:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Prosimo izberite vir, ki ga ¾elite obnoviti:"
+msgid "Browse..."
+msgstr "Brskaj..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update..."
-msgstr "Nadgradnja..."
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "Preverjanje podpisa `%s'..."
+msgid "Path or mount point:"
+msgstr "Pot do priklopne toèke:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
-msgstr "(noben)"
+msgid "Removable device"
+msgstr "Naprava oz. pogon"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
-"Odstranitev teh paketov bi onesposobila va¹ sistem:\n"
-"\n"
+msgid "HTTP server"
+msgstr "HTTP stre¾nik"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Name¹èam pakete `%s' (%s/%s)..."
+msgid "FTP server"
+msgstr "FTP stre¾nik"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Trenutno name¹èena razlièica: "
+msgid "Path:"
+msgstr "Pot:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Other"
-msgstr "Drugo"
+msgid "Local files"
+msgstr "Lokalne datoteke"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Razlog za nadgradnjo: "
+msgid "Add a source"
+msgstr "Dodaj vir"
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Please choose the desired mirror."
-msgstr "Prosim izberite ¾eljen zrcalni stre¾nik"
+#, 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"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "Uredi"
+msgid "Unable to create medium."
+msgstr "Medija ni mogoèe ustvariti"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Prosim poèakajte, i¹èem dostopne pakete..."
+msgid "Update"
+msgstr "Obnova"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Relativna pot do synthesis/hdlist:"
+msgid "Select the source(s) you wish to update:"
+msgstr "Prosimo izberite vir, ki ga ¾elite obnoviti:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Rezultati iskanja (brez)"
+msgid "Please wait, updating media..."
+msgstr "Prosim poèakajte, medij se obnavlja..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Danmark"
-msgstr "Danska"
+msgid " failed!"
+msgstr " neuspeh!"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "Kitajska"
+msgid " done."
+msgstr " opravljeno."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United States"
-msgstr "Zdru¾ene dr¾ave"
+msgid "Download of `%s', speed:%s"
+msgstr "Prenos `%s', hitrost:%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "changes:"
-msgstr "spremembe:"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "Prenos `%s', preostanek èasa:%s, hitrost:%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "Preverjanje podpisa `%s'..."
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Nekaj dodatnih paketov je potrebno odstraniti"
+msgid "Examining distant file of source `%s'..."
+msgstr "Pregled oddaljene datotke vira `%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Examining file of source `%s'..."
+msgstr "Pregled datoteke vira `%s'..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No"
-msgstr "Ne"
+msgid "Copying file for source `%s'..."
+msgstr "Prepisovanje datoteke za vir `%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Summary: "
-msgstr "Povzetek:"
+msgid "Please choose the desired mirror."
+msgstr "Prosim izberite ¾eljen zrcalni stre¾nik"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "Kanada"
+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.pm:1
 #, c-format
-msgid "Greece"
-msgstr "Grèija"
+msgid "No mirror"
+msgstr "Ni zrcalnega stre¾nika"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1042,259 +1120,181 @@ msgstr ""
 "Mre¾a oz. MandrakeSoft spletna stran sta mogoèe nedostopni.\n"
 "Prosim poskusite znova pozneje."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Source: "
-msgstr "Prisili"
-
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "Prepisovanje datoteke za vir `%s'..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Za name¹èane paketov morate biti root."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Path:"
-msgstr "Pot:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Problem during removal"
-msgstr "Te¾ave med odstranjevanjem"
+msgid "Error during download"
+msgstr "Napaka pri prenosu"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by source repository"
-msgstr "po skladi¹èih virov"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
+"Poèakajte prosim, prenos naslovov zrcalnih stre¾nikov z MandrakeSoft spletne "
+"strani"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Selected"
-msgstr "Izbran"
+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.pm:1
 #, c-format
-msgid "Netherlands"
-msgstr "Nizozemska"
+msgid "United States"
+msgstr "Zdru¾ene dr¾ave"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "Za dodajanje"
+msgid "China"
+msgstr "Kitajska"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
-msgstr "(Ni na voljo)"
-
-#: ../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:1
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr "Zaznani so spori"
+msgid "United Kingdom"
+msgstr "Zdru¾eno kraljestvo"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Odstranjevanje paketov programske opreme"
+msgid "Taiwan"
+msgstr "Tajvan"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Sweden"
 msgstr "©vedska"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
-msgstr ""
-"\n"
-"\n"
-"Javljene napake:\n"
-"%s"
+msgid "Russia"
+msgstr "Rusija"
 
-#: ../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."
-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 "Portugal"
+msgstr "Portugalska"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "Prenos `%s', hitrost:%s"
+msgid "Poland"
+msgstr "Poljska"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Potrebujete enega od naslednjih paketov:"
+msgid "Norway"
+msgstr "Norve¹ka"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "Konèaj"
+msgid "Netherlands"
+msgstr "Nizozemska"
 
-#: ../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 ""
-"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
+#, fuzzy, c-format
+msgid "Korea"
+msgstr "Prisili"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "V redu"
+msgid "Japan"
+msgstr "Japonska"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Please wait, adding medium..."
-msgstr "Pro"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Italy"
+msgstr "Namesti"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Israel"
+msgstr "Namesti"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "Vrsta vira:"
+msgid "Greece"
+msgstr "Grèija"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Please insert the medium named \\\"%s\\\" on device [%s]"
-msgstr "Prosim vstavite medij imenovan \"%s\" v napravo [%s]"
+msgid "France"
+msgstr "Prisili"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to get source packages."
-msgstr "Dostop do paketov vira ni mogoè."
+msgid "Finland"
+msgstr "Finska"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Preveè paketov je izbranih"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "je v sporu z"
+msgid "Spain"
+msgstr "©panija"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Danmark"
+msgstr "Danska"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Mandrake izbire"
+msgid "Germany"
+msgstr "Nem¹ija"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 ""
-"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."
+msgid "Czech Republic"
+msgstr "Èe¹ka"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Seznam sprememb:\n"
+msgid "Costa Rica"
+msgstr "Kosta Rika"
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Korea"
-msgstr "Prisili"
+#, c-format
+msgid "Canada"
+msgstr "Kanada"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "Naprava oz. pogon"
+msgid "Brazil"
+msgstr "Brazilija"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Belgija"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Change medium"
-msgstr "Zamenjajte medij"
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Mandrake nadgradnja"
+msgid "Australia"
+msgstr "Avstralija"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by size"
-msgstr "po velikosti"
+msgid "Austria"
+msgstr "Avstrija"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "FTP stre¾nik"
+msgid "Info..."
+msgstr "Info..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Files:\n"
-msgstr "Datoteke:\n"
+msgid "No"
+msgstr "Ne"
 
 #: ../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"
+#, c-format
+msgid "Yes"
+msgstr "Da"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
diff --git a/po/sq.po b/po/sq.po
index d07908b7..db49a05e 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -1,34 +1,29 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# Naim Daka <naim70@freesurf.ch>, 2003.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# Naim Daka <naim70@freesurf.ch>, 2002.
 #
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: grpmi 8.2\n"
-"POT-Creation-Date: 2003-05-02 20:15+0200\n"
-"PO-Revision-Date: 2003-01-27 22:05+0200\n"
-"Last-Translator: Naim Daka <naim70@freesurf.ch>\n"
-"Language-Team: Albanian <sq@li.org>\n"
+"Project-Id-Version: rpmdrake 1.3\n"
+"POT-Creation-Date: 2003-05-13 13:06+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"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Type: text/plain; charset=iso-8859-15\n"
+"Content-Transfer-Encoding: 8-bit\n"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "Activ?"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Path or mount point:"
-msgstr "Shtegu apo pika montuese:"
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Portugal"
-msgstr "Portugalia"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"A pajtoheni për të vazhduar?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -39,68 +34,113 @@ msgid ""
 "packages on CDROM or DVD. This tool will help you choose which software\n"
 "you want to install on your computer."
 msgstr ""
-"Mirë se vini në instalimit software me vegël!\n"
+"Mirësevini në instalimin me vegël softver!\n"
 "\n"
 "Sistemi i juaj Mandrake Linux është i furnizuar me mijëra pako\n"
-"sofware, në CDROM ose DVD. Kjo vegël do të ju ndihmojë për të zgjedhur, "
+"sofver, në CDROM ose DVD. Kjo vegël do të ju ndihmojë për të zgjedhur, "
 "cilin\n"
-"sofware dëshironi ta instaloni në kompjuterin tuaj."
+"sofver dëshironi ta instaloni në kompjuterin tuaj."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-msgstr "simbas grupit"
+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."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Name:"
-msgstr "Emri:"
+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 ""
+"Mirësevini tek vegla softver për zhdukje!\n"
+"\n"
+"Kjo vegël do të ju ndihmojë në zhdukjen e softverëve të dëshiruar nga "
+"kompjuteri juaj."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Italy"
-msgstr "Italia"
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"Një problem është paraqitur gjatë zhdukjes së pakove:\n"
+"\n"
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "Si ta zgjedhni pasqyrën nga ana juaj"
+msgid "Problem during removal"
+msgstr "Një problem është paraqitur gjatë zhdukjes"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "Please wait, removing packages..."
+msgstr "Një moment ju lutemi, zhdukja pakove..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Kemi ndjesë pakot duhet të zhduken"
+msgid "Please wait, reading packages database..."
+msgstr "Një moment ju lutemi, lexim i pakove në bazën e të dhënave..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Already existing update sources"
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
 msgstr ""
+"Një problem është paraqitur gjatë instalimit:\n"
+"\n"
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "More information on package..."
-msgstr "Më shumë informacione në pako..."
+msgid "Installation failed"
+msgstr "Instalimi dështoi"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "Po"
+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 "No package found for installation."
+msgstr "Asnjë pako s'është gjetur për Instalim"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "Të gjitha pakot e zgjedhura janë instaluar si duhet."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr "Gjdo gjë është instaluar si duhet"
 
 #: ../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 ""
-"Me rastin e mbushjes së mvarësisë, pakot e radhitura nuk duhet të jenë të "
-"zgjedhura:\n"
+"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
@@ -109,495 +149,512 @@ msgstr "gjdo gjë është instaluar si duhet"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Problem during installation"
+msgstr "Një problem është paraqitur gjatë instalimit"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr ""
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Instalimi i Pakove Software"
 
 #: ../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."
+"\n"
+"Error(s) reported:\n"
+"%s"
 msgstr ""
-"Mirë se vini në veglën e software për zhdukje!\n"
 "\n"
-"Kjo vegël do të ju ndihmojë se cilin software dëshironi ta zhdukni nga "
-"kompjuteri\n"
-"juaj."
+"\n"
+"Gabim(et) i(e) raportuar(a):\n"
+"%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."
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
 msgstr ""
-"Më në fund për ti regjistruar ndryshimet, ju duhet ta futni burimin në "
-"lexues."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Save and quit"
-msgstr "Regjistro dhe braktise"
+"Dështim i instalimit, disa skedare mungojnë.\n"
+"A dëshironi ti azhurnoni burimet tuaja të bazës së të dhënave."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"The following packages have bad signatures:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"Një gabim është paraqitur gjatë instalimit të pakove:\n"
+"Pakot e radhitura, duhet të zhduken që të tjerat të mund të azhurnohen:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"A dëshironi të vazhdoni?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Size: "
-msgstr "Madhësia: "
+msgid "Verifying packages signatures..."
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Security updates"
-msgstr "Azhurnim i sigurisë"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr ""
+
+#: ../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
+#, c-format
+msgid "Ok"
+msgstr "Ok"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "Infomacione maksimale"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Ju lutemi futni emrin e burimit \"%s\" në mjetin [%s]"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr "Ndrryshim i burimit"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Initializing..."
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Gabim..."
+msgid "Package installation..."
+msgstr "Instalimi i Pakove Software"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Britania e Madhe"
+msgid "Unable to get source packages, sorry. %s"
+msgstr "E pa mundur marrja e burimeve mbi pakot, kemi ndjesë. %s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure sources"
-msgstr "Konfigurim i burimeve"
+msgid "Unable to get source packages."
+msgstr "E pa mundur marrja e burimeve mbi pakot."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "mes emrave"
+msgid "Inspect..."
+msgstr "Inspektim..."
 
-#: ../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 ""
-"E pa mundur gjetja e një pasqyre.\n"
-"\n"
-"Është e mudur 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 Zyrtar"
+msgid "Installation finished"
+msgstr "Instalimi përfundoi"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
-"\n"
-"\\Do you want to continue installation?"
-msgstr ""
-"Pakot e zgjedhura me radhë, duhet të zhduken që të tjerat të kenë mundësi\n"
-"për azhurnim:\n"
-"\n"
-"%s\n"
-"\n"
-"A dëshironi të vazhdoni?"
+#, c-format
+msgid "Do nothing"
+msgstr "Asnjë veprim"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
+msgstr "Përdore .%s si skedare kryesore"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Remove .%s"
 msgstr "Zhduke .%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Source"
-msgstr "Burim"
+msgid "changes:"
+msgstr "ndryshimet:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "Finlanda"
+msgid "Inspecting %s"
+msgstr "Inspektimi i %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
+msgid "Please wait, finding available packages..."
+msgstr "Një moment ju lutemi, gjetja e pakove të lira..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "France"
-msgstr "Franca"
+msgid "Please wait, adding medium..."
+msgstr "Një moment ju lutemi, shtimi i burimit..."
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "More info"
-msgstr "Më shumë informacione"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"%s\n"
+"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"
-"Is it ok to continue?"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"%s\n"
+"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"
-"A jeni në pajtim për të vazhduar?"
+"Dhe, riniseni MandrakeUpdate."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Ringarko listën e pakove"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Choose a mirror..."
-msgstr "Zgjedheni pasqyren tuaj..."
+msgid "How to choose manually your mirror"
+msgstr "Si ta zgjedhni pasqyrën nga ana juaj"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Shtim i burimit:"
+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."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Pakoja `%s' nuk mund të instalohet\n"
+#, c-format
+msgid "Already existing update sources"
+msgstr "Burimet azhurnuese ekzistojnë më parë"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Pregatitja e instalimit të pakove..."
+#, 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?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages,"
-msgstr "Të gjitha pakot, "
+msgid "A fatal error occurred: %s."
+msgstr "Një gabim fatal është paraqitur: %s."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "mes skedareve"
+msgid "Fatal error"
+msgstr "Gabim fatal"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Të gjitha pakot e zgjedhura janë instaluar si duhet."
+msgid "Software Packages Installation"
+msgstr "Instalimi i Pakove Software"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "Emri i serverit proxy:"
+msgid "Mandrake Update"
+msgstr "Azhurnimi Mandrake"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Update source(s)"
-msgstr "Azhurnim i burimeve"
+msgid "Software Packages Removal"
+msgstr "Zhdukja e Pakove Software"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Local files"
-msgstr "Skedaret lokale"
+msgid "Quit"
+msgstr "Braktise"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Inspektim i %s"
+msgid "Install"
+msgstr "Instaloje"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Israel"
-msgstr "Izraeli"
+msgid "Remove"
+msgstr "Zhduke"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Help"
 msgstr "Ndihmë"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "Serveri HTTP"
+msgid "Search"
+msgstr "Hetim"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "Gjetja:"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"Welcome to the packages source editor!\n"
+"The following packages have to be removed for others to be upgraded:\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."
+"%s\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
-"Mirë se vini në botuesin e burimet të pakove!\n"
+"Pakot e radhitura, duhet të zhduken që të tjerat të mund të azhurnohen:\n"
+"\n"
+"%s\n"
 "\n"
-"Kjo vegël do të ju ndihmojë për konfigurimin e pakove në burime, të cilat\n"
-"ju dëshironi ti përdorni në kompjuterin tuaj. Ato do të ju mundësojnë të "
-"instaloni\n"
-"pako të reja software ose azhurnimin e tyre."
+"A dëshironi të vazhdoni?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation failed"
-msgstr "Dështim i instalimit"
+msgid "Some packages need to be removed"
+msgstr "Disa pako duhet të zhduken"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Përdore .%s si skedare kryesore"
+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 ""
+"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 "Search results"
-msgstr "Kërkues i rezultateve"
+msgid "Too many packages are selected"
+msgstr "Numër shumë i madhë i pakove të zgjedhura"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " failed!"
-msgstr " dështim!"
+msgid "Maximum information"
+msgstr "Infomacione maksimale"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Brazil"
-msgstr "Brazili"
+msgid "Normal information"
+msgstr "Infomacione normale"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, c-format
-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ë?"
+msgid "Update source(s)"
+msgstr "Azhurnimi i burimeve"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Gjetje:"
+msgid "Reload the packages list"
+msgstr "Ringarkoje listën e pakove"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Të gjitha pakot, janë të radhitura simbas alfabetit"
+msgid "Reset the selection"
+msgstr "Vërja në fillim e zgjedhjeve"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Një moment, hetimet në vazhdim e sipër..."
+msgid "in files"
+msgstr "mes skedareve"
 
 #: ../rpmdrake: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 "in descriptions"
+msgstr "mes përshkrimeve"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "Nuk mund ta hapër pakon `%s'\n"
+#, c-format
+msgid "in names"
+msgstr "mes emrave"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "Vërja në fillim e zgjedhjeve"
+msgid "by update availability"
+msgstr "i lirë simbas azhurnimit"
 
-#: ../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 ""
-"Nëse keni nevojë për proxy, hyni emrin e makinës dhe të portës zgjedhëse"
-"(sintaksa është:<emriimakinës[:porta]>):"
+msgid "by source repository"
+msgstr "depo simbas burimit"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"Me rastin e mbushjes së mvarësisë, pakot e radhitura duhet të zhduken:\n"
-"\n"
+msgid "by selection state"
+msgstr "gjendje simbas zgjedhjes"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Kosta Rika"
+msgid "by size"
+msgstr "simbas madhësisë"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Një gabim është paraqitur gjatë instalimit të pakove:\n"
-"\n"
-"%s"
+#, c-format
+msgid "by group"
+msgstr "simbas grupit"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Ju lutemi një moment, zhdukje e burimit..."
+msgid "All packages,"
+msgstr "Gjitha pakot,"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "Parulla:"
+msgid "All packages, alphabetical"
+msgstr "Gjitha pakot, të radhitura simbas alfabetit"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "Verifikim në distancë i burimit të skedares `%s'..."
+msgid "Mandrake choices"
+msgstr "Mundësit Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Taivani"
+msgid "Normal updates"
+msgstr "Azhurnimet normale"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "User:"
-msgstr "Emri i përdoruesit:"
+msgid "Bugfixes updates"
+msgstr "Korigjim i bug(it) azhurnues"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Ju lutemi një moment, azhurnim i burimit..."
+msgid "Security updates"
+msgstr "Azhurnimi i sigurisë"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Një moment ju lutemi, numërim i pakove..."
+msgid "Description: "
+msgstr "Përshkrim: "
 
 #: ../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 "Reason for update: "
+msgstr "Arësyja për azhurnim: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Information on packages"
-msgstr "Informacione në pako"
+msgid "Summary: "
+msgstr "Titulli: "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "Anulo"
+msgid "Importance: "
+msgstr "Rëndësia: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Gjdo gjë është instaluar si duhet"
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Një moment ju lutemi, azhurnim i burimeve..."
+msgid "Size: "
+msgstr "Madhësia: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Version: "
+msgstr "Versioni: "
 
 #: ../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 ""
-"Pakot e zgjedhura me radhë, duhet të zhduken që të tjerat të kenë mundësi\n"
-"për azhurnim:\n"
-"\n"
-"%s\n"
-"\n"
-"A dëshironi të vazhdoni?"
+msgid "Name: "
+msgstr "Emri: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "mes përshkrimeve"
+msgid "Currently installed version: "
+msgstr "Versioni i tanishëm i instaluar: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Konfigurim i proxies"
+msgid "Source: "
+msgstr "Burimi: "
 
-#: ../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"
-"Verifikoni rrjetin (network) ju lutemi, nëse ai punon si duhet.\n"
-"\n"
-"A jeni në pajtim për të vazhduar?"
+msgid "(Not available)"
+msgstr "(I nxënë)"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Ju lutemi zgjedheni"
+msgid "Changelog:\n"
+msgstr "Changelog:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "Madhësia e zgjedhur: %d MB"
+msgid "Files:\n"
+msgstr "Skedaret:\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add a source"
-msgstr "Shtim i një burimi:"
+msgid "Selected size: %d MB"
+msgstr "Madhësia e zgjedhur: %d MB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "Inicializimi..."
+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
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "Regjistro ndryshimet"
+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"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
-msgstr "Gabim gjatë shkarkimit"
+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:1
-#, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Pregatitja e instalimit të pakove..."
+#, c-format
+msgid "%s conflicts with %s"
+msgstr "%s është në konflikt me %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Importance: "
-msgstr "Rëndësia: "
+msgid "Some packages can't be installed"
+msgstr "Disa nga pakot nuk mund të instalohen"
 
 #: ../rpmdrake:1
 #, c-format
@@ -606,437 +663,466 @@ msgid ""
 "to be installed:\n"
 "\n"
 msgstr ""
-"Me rastin e mbushjes së mvarësisë, pakot e radhitura duhet të instalohen\n"
-":\n"
+"Me rastin e mbushjes së mvarësisë, pako(t) e radhitura duhet të\n"
+"instalohen:\n"
 "\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "Shto..."
+msgid "Additional packages needed"
+msgstr "Keni nevojë për pakot shtuese"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Unable to create medium."
-msgstr "I pa mundur krijimi i burimit."
+msgid "Some packages can't be removed"
+msgstr "Disa nga pakot nuk mund të zhduken"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Removing these packages would break your system, sorry:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
 msgstr ""
-"Mbarim i instalimit; %s.\n"
+"Zhdukja e këtyre pakove do të dëmtojë sistemin tuaj, kemi ndjesë:\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: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
-msgstr "Shfletues..."
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
+"Me rastin e mbushjes së mvarësisë, pako(t) e radhitura duhet të zhduken:\n"
+"\n"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "Pakoja `%s' nuk mund të instalohet\n"
-
-#: ../rpmdrake.pm:1
 #, c-format
-msgid "Info..."
-msgstr "Infomacion..."
+msgid "Some additional packages need to be removed"
+msgstr "Disa nga pakot e mbledhura duhet të zhduken"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "Ju duhet ta futni burimin për të vazhduar"
+msgid "More information on package..."
+msgstr "Më shumë informacione mbi pakon..."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "Zhduke"
+msgid "Information on packages"
+msgstr "Informacion mbi pakon"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Pregatitja e instalimit të pakove..."
+#, c-format
+msgid "More info"
+msgstr "Shumë informacione"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "No mirror"
-msgstr "Asnjë pasqyre"
+msgid "Addable"
+msgstr "Të reja"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Ju duhet ti mbushni më së paku dy hyrjet e para."
+msgid "Upgradable"
+msgstr "Azhurnuar"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Instalo"
+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
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "Japonia"
+msgid "No update"
+msgstr "Asnjë azhurnim"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Asnjë ndryshim"
+msgid "(none)"
+msgstr "(asnjë)"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "No update"
-msgstr "Asnjë azhurnim"
+msgid "Please wait, listing packages..."
+msgstr "Një moment ju lutemi, numërimi i pakove..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Description: "
-msgstr "Përshkrim: "
+msgid "unknown package "
+msgstr "pako a pa njoftur"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"Dështim gjatë instalimit, disa skedare mungojnë.\n"
-"A dëshironi ti azhurnoni burimet tuaja."
+msgid "One of the following packages is needed:"
+msgstr "Një nga pakot vijuese është e nevojshme:"
 
 #: ../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 ""
-"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 mbasandej apo gjatë instalimit; kjo metodë është tejet e "
-"rrezikshme\n"
-"e cila duhet të shqyrtohet me kujdes të madhë.\n"
-"\n"
-"A me të vërtetë dëshironi ti instaloni të gjitha pakot e zgjedhura?"
+msgid "Please choose"
+msgstr "Ju lutemi zgjedheni"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "Emri: "
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "Inspektim..."
+msgid "Not selected"
+msgstr "I pa zgjedhur"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Pregatitja e instalimit të pakove..."
+#, c-format
+msgid "Selected"
+msgstr "Zgjedhur"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Australia"
+msgid "Search results"
+msgstr "Kërkues i rezultateve"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation finished"
-msgstr "Instalimi mbaroj"
+msgid "Stop"
+msgstr "Ndale"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
-msgstr "simbas azhurnimit apo të reja"
+msgid "Please wait, searching..."
+msgstr "Një moment, hetimet në vazhdim e sipër..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
-msgstr "Polonia"
+msgid "Search results (none)"
+msgstr "Rezultatet e hetimeve (asnjë)"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Version: "
-msgstr "Versioni: "
+msgid "Other"
+msgstr "Tjetri"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
+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 ""
-"Ju keni mundësi të përdorni një emër të përdoruesit/parullën për tu kyqur\n"
-"në serverin proxy"
+"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."
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Editing source \\\"%s\\\":"
-msgstr "Botim i burimit \"%s\":"
+#, c-format
+msgid "Save and quit"
+msgstr "Shpëtoje dhe braktise"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Upgradable"
-msgstr "Azhurnues"
+msgid "Proxy..."
+msgstr "Proxy..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid " done."
-msgstr " bërë."
+msgid "Update..."
+msgstr "Azhurnimi..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Pregatitja e instalimit të pakove..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "Shto..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "Verifikim i burimit të skedares `%s'..."
+msgid "Edit"
+msgstr "Botues"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "Keni nevojë për pakot shtuesë"
+msgid "Source"
+msgstr "Burimi"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Korigjim i bug(it) azhurnues"
+msgid "Enabled?"
+msgstr "Aktiv?"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "Shkarkim i `%s', koha për të shkuar:%s, shpejtësia:%s"
+msgid "Configure sources"
+msgstr "Konfigurim i burimeve"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Germany"
-msgstr "Gjermania"
+msgid "Password:"
+msgstr "Parulla:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Russia"
-msgstr "Rusia"
+msgid "User:"
+msgstr "Emri i përdoruesit:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Norway"
-msgstr "Norvegjia"
+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
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Disa probleme janë paraqitur gjatë instalimit"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "Emri i serverit proxy:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search"
-msgstr "Hetim"
+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]>):"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit a source"
-msgstr "Boto një burim"
+msgid "Configure proxies"
+msgstr "Konfigurimi i proxies"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Republika Çeke"
+msgid "Please wait, updating medium..."
+msgstr "Ju lutemi një moment, azhurnimi i burimit..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Stop"
-msgstr "Ndalë"
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr ""
+"Më në fund për ti regjistruar ndryshimet, ju duhet ta futni burimin në "
+"lexues."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "Azhurnim"
+msgid "You need to insert the medium to continue"
+msgstr "Ju duhet të futni burimin për të vazhduar më tutje"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "Një moment ju lutemi, zhdukja pakove..."
+msgid "Save changes"
+msgstr "Regjistroi ndryshimet"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal information"
-msgstr "Infomacione normale"
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Shtegu që ka të bëjë me synthesis/hdlist:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Shkarkim i pakove `%s' (%s/%s)..."
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Zgjedheni: %d MB / Vendë të lirë në disk: %d MB"
+msgid "Editing source \"%s\":"
+msgstr "Botimi i burimit \"%s\":"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Spain"
-msgstr "Spanja"
+msgid "Edit a source"
+msgstr "Boto një burim"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
-msgstr "Azhurnim normale"
+msgid "Please wait, removing medium..."
+msgstr "Një moment ju lutemi, zhdukja e burimit..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by selection state"
-msgstr "të zgjedhura apo të pa zgjedhur"
+msgid "Type of source:"
+msgstr "Tip i burimit:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgid "Adding a source:"
+msgstr "Shtimi i burimit:"
+
+#: ../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 ""
-"Një moment ju lutemi, transferimi i adresave të pasqyreve nga web "
-"MandrakeSoft."
+"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:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Austria"
-msgstr "Austria"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Skedare gabimi"
+msgid "Choose a mirror..."
+msgstr "Zgjedheni një pasqyre..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Zgjedheni burimin të cilin dëshironi ta azhurnoni:"
+msgid "Browse..."
+msgstr "Shfletues..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update..."
-msgstr "Azhurnim..."
+msgid "Path or mount point:"
+msgstr "Shtegu apo pika montuese:"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "Verifikim i nënshkrimit të `%s'..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Removable device"
+msgstr "Mjet i lëvizshëm"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
-msgstr "(asnjë)"
+msgid "HTTP server"
+msgstr "Serveri HTTP"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl: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 "FTP server"
+msgstr "Serveri FTP"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Instalimi i pakove `%s' (%s/%s)..."
+msgid "Path:"
+msgstr "Shtegu:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Versioni i tanishëm i instaluar: "
+msgid "Local files"
+msgstr "Skedaret lokale"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Other"
-msgstr "Tjetri"
+msgid "Add a source"
+msgstr "Shto një burim:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Arësyja për azhurnim: "
+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 "Please choose the desired mirror."
-msgstr "Zgjedheni pasqyrën tuaj."
+msgid "Unable to create medium."
+msgstr "I pa mundur krijimi i burimit."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "Botues"
+msgid "Update"
+msgstr "Azhurnimi"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Një moment ju lutemi, gjetja e pakove të lira..."
+msgid "Select the source(s) you wish to update:"
+msgstr "Zgjedheni burimin të cilin dëshironi t'azhurnoni:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Shtegu që ka të bëjë me synthesis/hdlist:"
+msgid "Please wait, updating media..."
+msgstr "Një moment ju lutemi, azhurnimi i burimeve..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Rezultatet e hetimeve (asnjë)"
+msgid " failed!"
+msgstr " dështim!"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Danmark"
-msgstr "Danimarka"
+msgid " done."
+msgstr " bërë."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "Kina"
+msgid "Download of `%s', speed:%s"
+msgstr "Shkarkimi i `%s', shpejtësia:%s"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United States"
-msgstr "Shtetet e Bashkuara"
+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 "changes:"
-msgstr "ndryshimet"
+msgid "Starting download of `%s'..."
+msgstr "Nisja e shkarkimit të `%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Disa nga pakot e shumta duhet të zhduken"
+msgid "Examining distant file of source `%s'..."
+msgstr "Verifikim i distancës së burimit të skedares `%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Examining file of source `%s'..."
+msgstr "Verifikim i burimit të skedares `%s'..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No"
-msgstr "Jo"
+msgid "Copying file for source `%s'..."
+msgstr "Kopjim i skedares për burimin `%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Summary: "
-msgstr "Titull: "
+msgid "Please choose the desired mirror."
+msgstr "Zgjedheni pasqyrën tuaj."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "Kanada"
+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"
+"Është e mudur 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.pm:1
 #, c-format
-msgid "Greece"
-msgstr "Greqia"
+msgid "No mirror"
+msgstr "Asnjë pasqyre"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1047,455 +1133,379 @@ msgid ""
 "The network, or MandrakeSoft website, are maybe unavailable.\n"
 "Please try again later."
 msgstr ""
-"Një gabim është paraqitur gjatë transferimit të listës së pasqyreve:\n"
+"Një gabim është paraqitur gjatë shkarkimit të listës së pasqyreve:\n"
 "\n"
 "%s\n"
 "Rrjeti apo adresa web e MandrakeSoft, e mundur që janë të nxënë\n"
 "Ju lutemi provoni më vonë."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Source: "
-msgstr "Burim:"
+msgid "Error during download"
+msgstr "Gabim gjatë shkarkimit"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "Kopjim i skedares për burimin `%s'..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
-"Ju duhet të jeni administrator (root) për të instaluar pakot, kemi ndjesë."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Path:"
-msgstr "Shtegu:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Problem during removal"
-msgstr "Një problem është paraqitur gjatë zhdukjes"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "by source repository"
-msgstr "simbas burimit"
+"Një moment ju lutemi, shkarkimi i adresave të pasqyreve nga web siti "
+"MandrakeSoft."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Selected"
-msgstr "Zgjedhur"
+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.pm:1
 #, c-format
-msgid "Netherlands"
-msgstr "Holanda"
+msgid "United States"
+msgstr "Shtetet e Bashkuara"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "Të reja"
+msgid "China"
+msgstr "Kina"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
-msgstr "(I nxë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 ""
-"Kemi ndjesë, pako(t) e radhitur(a) nuk mundë të zgjedhe(n):\n"
-"\n"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr "Konflikte të zbuluara"
+msgid "United Kingdom"
+msgstr "Britania e Madhe"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Zhdukja e Pakove Software"
+msgid "Taiwan"
+msgstr "Taivani"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Sweden"
 msgstr "Suedia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
-msgstr ""
-"\n"
-"\n"
-"Gabim(et) raportuara:\n"
-"%s"
+msgid "Russia"
+msgstr "Rusia"
 
-#: ../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."
-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 "Portugal"
+msgstr "Portugalia"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "Shkarkim i `%s', shpejtësia:%s"
+msgid "Poland"
+msgstr "Polonia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Një nga pakot vijuese është e nevojshme:"
+msgid "Norway"
+msgstr "Norvegjia"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "Braktise"
+msgid "Netherlands"
+msgstr "Holanda"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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ë reja "
-"mbi\n"
-"azhurnimin. Verifikoni rrjetin dhe funksionimin e tij.\n"
-"\n"
-"A dëshironi të vazhdoni?"
+msgid "Korea"
+msgstr "Korea"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid "Japan"
+msgstr "Japonia"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "Ju letemi keni durim, shtim i burimit..."
+msgid "Italy"
+msgstr "Italia"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "Tip i burimit:"
+msgid "Israel"
+msgstr "Izraeli"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please insert the medium named \\\"%s\\\" on device [%s]"
-msgstr "Ju lutemi futni emrimin e burimit \"%s\" në mjetë [%s]"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Greqia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to get source packages."
-msgstr "E pa mundur marrja e burimeve mbi pakot."
+msgid "France"
+msgstr "Franca"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Numër shumë i madhë i pakove të zgjedhura"
+msgid "Finland"
+msgstr "Finlanda"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "është në konfliktë me"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "Spanja"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 ""
-"Mirë se vini në MandrakeUpdate!\n"
-"\n"
-"Kjo vegël do të ju ndihmojë për intalimin e zgjedhjeve për azhurnimin e\n"
-"kompjuterit tuaj."
+msgid "Danmark"
+msgstr "Danimarka"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Mandrake zgjedhjet"
+msgid "Germany"
+msgstr "Gjermania"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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"
-"startoni Software Sources Manager, dhe shtoni një 'Azhurnim\n"
-"të sigurisë'.\n"
-"\n"
-"Dhe, ristartoni MandrakeUpdate."
+msgid "Czech Republic"
+msgstr "Republika Çeke"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Changelog:\n"
+msgid "Costa Rica"
+msgstr "Kosta Rika"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Korea"
-msgstr "Korea"
+msgid "Canada"
+msgstr "Kanada"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "Mjet i lëvizshëm"
+msgid "Brazil"
+msgstr "Brazili"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Belgjika"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Change medium"
-msgstr "Ndërrim i burimit"
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Mandrake Update"
+msgid "Australia"
+msgstr "Australia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by size"
-msgstr "simbas madhësisë"
+msgid "Austria"
+msgstr "Austria"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "Serveri FTP"
+msgid "Info..."
+msgstr "Infomacion..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Files:\n"
-msgstr "Skedaret:\n"
+msgid "No"
+msgstr "Jo"
 
 #: ../rpmdrake.pm:1
-#, fuzzy, 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ë çkyqet automatikisht."
+#, c-format
+msgid "Yes"
+msgstr "Po"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
-msgstr "Repertori për transferime duhet të ekzistoj"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:89
 #: ../grpmi/curl_download/curl_download.xs:213
 msgid "Out of memory\n"
-msgstr "Mungesë e memorisë\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:102
 msgid "Could not open output file in append mode"
-msgstr "Nuk mund ta hapë skedaren për dalje në modë shtues"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:133
 msgid "Unsupported protocol\n"
-msgstr "Protokol i pa përkrahur\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:136
 msgid "Failed init\n"
-msgstr "Dështim i inicializimit\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:139
 msgid "Bad URL format\n"
-msgstr "Formë e gabuar për URL\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:142
 msgid "Bad user format in URL\n"
-msgstr "Formë e gabuar e përdoruesit për URL\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:145
 msgid "Couldn't resolve proxy\n"
-msgstr "Nuk mund ta rregulloj emrin e proxit\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:148
 msgid "Couldn't resolve host\n"
-msgstr "Nuk mund ta rregulloj emrin e ftuesit\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:151
 msgid "Couldn't connect\n"
-msgstr "E pa mundur kyqja\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:154
 msgid "FTP unexpected server reply\n"
-msgstr "Përgjisgje Ftp. server i pa njoftur\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:157
 msgid "FTP access denied\n"
-msgstr "Serveri Ftp e ka rrefutuar kyqjen\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:160
 msgid "FTP user password incorrect\n"
-msgstr "Parulla FTP nuk është e saktë\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:163
 msgid "FTP unexpected PASS reply\n"
-msgstr "FTP parullë e pa njoftur\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:166
 msgid "FTP unexpected USER reply\n"
-msgstr "FTP emri i pëdoruesit i pa njoftur\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:169
 msgid "FTP unexpected PASV reply\n"
-msgstr "FTP modë trasferimi pasiv (PASV) i pa njoftur\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:172
 msgid "FTP unexpected 227 format\n"
-msgstr "FTP formë 227 e pa njoftur\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:175
 msgid "FTP can't get host\n"
-msgstr "FTP nuk mund të bashkangjitet në ftuesin\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:178
 msgid "FTP can't reconnect\n"
-msgstr "FTP nuk mund të rikyqet\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:181
 msgid "FTP couldn't set binary\n"
-msgstr "FTP nuk mund të kalojë në modë binar\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:184
 msgid "Partial file\n"
-msgstr "Skedare e pa kompletuar\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:187
 msgid "FTP couldn't RETR file\n"
-msgstr "FTP i pa mundur rikuperimi i skedares\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:190
 msgid "FTP write error\n"
-msgstr "Gabim gjatë shkrimit Ftp\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:195
 msgid "FTP quote error\n"
-msgstr "FTP gabim në urdhërin quote\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:198
 msgid "HTTP not found\n"
-msgstr "HTTP a pa gjindshme\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:201
+#, fuzzy
 msgid "Write error\n"
-msgstr "Gabim në shkrim\n"
+msgstr "Gabim fatal"
 
 #: ../grpmi/curl_download/curl_download.xs:204
 msgid "User name illegally specified\n"
-msgstr "Emëri i pëdoruesit është specifikuar gabimisht\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:207
 msgid "FTP couldn't STOR file\n"
-msgstr "FTP nuk mund ta regjistrojë skedaren\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:210
+#, fuzzy
 msgid "Read error\n"
-msgstr "Gabim në lexim\n"
+msgstr "Gabim fatal"
 
 #: ../grpmi/curl_download/curl_download.xs:216
 msgid "Time out\n"
-msgstr "Koha kaloi\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:219
 msgid "FTP couldn't set ASCII\n"
-msgstr "FTP nuk mund në kalojë në modës ASCII\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:222
 msgid "FTP PORT failed\n"
-msgstr "FTP dështim në portë\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:225
 msgid "FTP couldn't use REST\n"
-msgstr "FTP nuk mund të përdor urdhërin pritës (REST)\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:228
 msgid "FTP couldn't get size\n"
-msgstr "FTP nuk mund ta njefë madhësinë\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:231
 msgid "HTTP range error\n"
-msgstr "Gabim në intervalin HTTP\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:234
 msgid "HTTP POST error\n"
-msgstr "HTTP gabim i dërgimit (POST)\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:237
 msgid "SSL connect error\n"
-msgstr "GAbim gjatë kyqjes së SSL\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:240
 msgid "FTP bad download resume\n"
-msgstr "FTP gabim gjatë rimarrjes së transferimit\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:243
 msgid "File couldn't read file\n"
-msgstr "Skedarja nuk mund të lexon skedaren\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:246
 msgid "LDAP cannot bind\n"
-msgstr "LDAP nuk mund të lidhet\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:249
 msgid "LDAP search failed\n"
-msgstr "LDAP kërkim i dështuar\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:252
 msgid "Library not found\n"
-msgstr "Bibloteka nuk gjindet\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:255
 msgid "Function not found\n"
-msgstr "Funksioni nuk gjindet\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:258
 msgid "Aborted by callback\n"
-msgstr "Avortohet duke thirrur (callback)\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:261
 msgid "Bad function argument\n"
-msgstr "Argument i gabuar funksionimi\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:264
 msgid "Bad calling order\n"
-msgstr "Urdhër thirrës i gabuar\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:267
+#, fuzzy
 msgid "HTTP Interface operation failed\n"
-msgstr ""
+msgstr "Instalimi dështoi"
 
 #: ../grpmi/curl_download/curl_download.xs:270
 msgid "my_getpass() returns fail\n"
@@ -1526,9 +1536,8 @@ msgid "when this is a specific error\n"
 msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:291
-#, fuzzy
 msgid "SSL crypto engine not found\n"
-msgstr "Funksioni nuk gjindet\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:294
 msgid "can not set SSL crypto engine as default\n"
@@ -1565,19 +1574,19 @@ msgstr ""
 #: ../grpmi/curl_download/curl_download.xs:320
 #, c-format
 msgid "Unknown error code %d\n"
-msgstr "Kodë gabimi i pa njoftur %d\n"
+msgstr ""
 
 #: data/rpmdrake.desktop.in.h:1
 msgid "Install Software"
-msgstr "Instalo Softverin"
+msgstr "Instaloje Softverin"
 
 #: data/rpmdrake-remove.desktop.in.h:1
 msgid "Remove Software"
-msgstr "Zhdukje e Software"
+msgstr "Zhduke Softverin"
 
 #: data/rpmdrake-sources.desktop.in.h:1
 msgid "Software Sources Manager"
-msgstr "Administrim i Burimeve Software"
+msgstr "Administrim i Burimeve Softver"
 
 #~ msgid ""
 #~ "some packages failed to install\n"
@@ -1589,13 +1598,13 @@ msgstr "Administrim i Burimeve Software"
 #~ msgid "Please wait, removing packages to allow others to be upgraded..."
 #~ msgstr ""
 #~ "Një moment ju lutemi, të mbaroj zhdukjen e pakove, që të tjerat të mund "
-#~ "të instalohen..."
+#~ "të azhurnohen..."
 
 #~ msgid "A required program is missing (grpmi). Check your installation."
-#~ msgstr "Një program i nevojshëm mungon (grmpi). Verifikoni instalimin tuaj."
+#~ msgstr "Një program i nevojshëm mungon (grmpi). Verifikone instalimin tuaj."
 
 #~ msgid "Program missing"
-#~ msgstr "Munges i programit"
+#~ msgstr "Programi mungon"
 
 #~ msgid ""
 #~ "There was an error while adding the update medium via urpmi.\n"
@@ -1625,25 +1634,24 @@ msgstr "Administrim i Burimeve Software"
 #~ "Një moment ju lutemi, kyqje në pasqyre që më në fund ti gjeni pakot për "
 #~ "ti azhurnuar."
 
-#, fuzzy
 #~ msgid ""
 #~ "There was an unrecoverable error while updating packages information."
 #~ msgstr ""
-#~ "Një gabim është paraqitur gjatë instalimit të pakove:\n"
-#~ "\n"
-#~ "%s"
+#~ "Një gabim fatal është paraqitur gjatë azhrunimit, të pakove me "
+#~ "infomacione."
 
-#, fuzzy
 #~ msgid "Error updating medium"
-#~ msgstr "Gabim gjatë leximit të skedares\n"
+#~ msgstr "Gabim mbi azhurnimin e burimit"
 
 #~ msgid "Please wait, contacting mirror to update packages information."
 #~ msgstr ""
-#~ "Një moment ju lutemi, kyqja në pasqyre, që më në fund të bëhet azhurnimi "
+#~ "Një moment ju lutemi, kyqje në pasqyre, që më në fund të bëhet azhurnimi "
 #~ "i informacoineve mbi pakot"
 
 #~ msgid "Everything already installed (is this supposed to happen at all?)."
-#~ msgstr "Janë instaluar më heret (a duhej të arritej me të vërtet?)."
+#~ msgstr ""
+#~ "Janë instaluar më heret (a është dashur, të arrihej me të vërtet e tërë "
+#~ "kjo?)."
 
 #~ msgid "Everything already installed."
 #~ msgstr "Janë instaluar më heret"
@@ -1653,139 +1661,3 @@ msgstr "Administrim i Burimeve Software"
 
 #~ msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
 #~ msgstr "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
-
-#~ msgid "Couldn't read RPM config files"
-#~ msgstr "I pa mundur leximi i skedareve konfiguruese RPM"
-
-#~ msgid "Couldn't open file\n"
-#~ msgstr "Nuk mund ta hapë skedaren\n"
-
-#~ msgid "Could not read lead bytes\n"
-#~ msgstr "Nuk mund ti lexoj bytet në fillim\n"
-
-#~ msgid "RPM version of package doesn't support signatures\n"
-#~ msgstr "Versioni i pakov RPM nuk i përkrahë nënshkrimet\n"
-
-#~ msgid "Could not read signature block (`rpmReadSignature' failed)\n"
-#~ msgstr "Nuk mund ta laxoj nënshkrimin blok (`rpmReadSignature' dështoi)\n"
-
-#~ msgid "No signatures\n"
-#~ msgstr "Asnjë nënshkrim\n"
-
-#~ msgid "`makeTempFile' failed!\n"
-#~ msgstr "`makeTempFile' dështoi!\n"
-
-#~ msgid "Error writing temp file\n"
-#~ msgstr "Gabim gjatë shkrimit të skedares tmp\n"
-
-#~ msgid "No GPG signature in package\n"
-#~ msgstr "Asnjë nënshkrim GPG në pakon\n"
-
-#~ msgid "Couldn't open RPM DB for writing (not superuser?)"
-#~ msgstr "Nuk mund ta hapë RPM DB në shkrim (jo-root?)"
-
-#~ msgid "Couldn't open RPM DB for writing"
-#~ msgstr "Nuk mund ta hapë RPM DB për shkrim"
-
-#~ msgid "Couldn't start transaction"
-#~ msgstr "E pa mundur nisja e transaction"
-
-#~ msgid "Package `%s' is corrupted\n"
-#~ msgstr "Pakoja `%s' është e korrumpuar\n"
-
-#~ msgid "Error while checking dependencies"
-#~ msgstr "Gabim gjatë verifikimit të mvarësive"
-
-#~ msgid "is needed by"
-#~ msgstr "nevojitet nga"
-
-#~ msgid "Error while checking dependencies 2"
-#~ msgstr "Gabim gjatë verifikimit të mvarësive 2"
-
-#~ msgid "Problems occurred during installation:\n"
-#~ msgstr "Disa probleme janë paraqitur gjatë instalimit:\n"
-
-#~ msgid ""
-#~ "Cleanup question: there was an error during installation, do you want to\n"
-#~ "remove the %d downloaded package(s)?\n"
-#~ "(they are located in %s)"
-#~ msgstr ""
-#~ "Pyetje pastruese: një gabim është paraqitur gjatë instalimit, a dëshironi "
-#~ "ta\n"
-#~ "zhdukni pakon %d e shkarkuar ?\n"
-#~ "(ato janë lokalizuar në %s)"
-
-#~ msgid "Cleanup"
-#~ msgstr "Pastro"
-
-#~ msgid ""
-#~ "Conflicts were detected:\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Install aborted."
-#~ msgstr ""
-#~ "Konfliktet janë zbuluar:\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Instalimi është ndërprer."
-
-#~ msgid ""
-#~ "The following file is not valid:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Do you want to continue anyway (skipping this package)?"
-#~ msgstr ""
-#~ "Skedarja në vazhdim është invalide:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "A dëshironi të vazhdoni (duke injoruar këtë pako)?"
-
-#~ msgid "Yes to all"
-#~ msgstr "Po në të gjitha"
-
-#~ msgid ""
-#~ "The signature of the package `%s' is not correct:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "Do you want to install it anyway?"
-#~ msgstr ""
-#~ "Nënshkrimi i pakos `%s' nuk është i saktë:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "Pa marrë para sysh, a dëshironi ta instaloni?"
-
-#~ msgid "Signature verification error"
-#~ msgstr "Gabim gjatë verifikimit të nënshkrimit"
-
-#~ msgid "Retry download"
-#~ msgstr "Riprovo transferimin"
-
-#~ msgid ""
-#~ "There was an error downloading package:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Error: %s\n"
-#~ "Do you want to continue (skipping this package)?"
-#~ msgstr ""
-#~ "Një gabim është paraqitur gjatë shkarkimit të pakos:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Gabim: %s\n"
-#~ "A dëshironi të vazhdoni (duke injoruar këtë pako)?"
-
-#~ msgid "The initialization of config files of RPM was not possible, sorry."
-#~ msgstr ""
-#~ "Inicializimi i skedareve konfiguruese RPM nuk është i mundur, kemi ndjesë."
-
-#~ msgid "RPM initialization error"
-#~ msgstr "Gabim gjatë inicializimit RPM"
-
-#~ msgid "Directory where to put download must be existing"
-#~ msgstr "Repertori për transferime duhet të ekzistoj"
-
-#~ msgid "ftp weird PASV reply\n"
-#~ msgstr "ftp modë trasferimi pasiv (PASV) i pa njoftur\n"
diff --git a/po/sr.po b/po/sr.po
index 2152102d..8cf52d93 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grpmi\n"
-"POT-Creation-Date: 2003-05-02 20:15+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+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,20 +14,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-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
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Portugal"
-msgstr "Portugal"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Da li je U redu da nastavim?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -46,59 +42,106 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-msgstr "po grupi"
+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."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Name:"
-msgstr "Ime:"
+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.pm:1
-#, c-format
-msgid "Italy"
-msgstr "Italija"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"Pojavila se gre¹ka tokom instalacije:\n"
+"\n"
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "Kako ruèno izabrati svoj miror sajt"
+msgid "Problem during removal"
+msgstr "Problem prilikom uklanjanja"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "Please wait, removing packages..."
+msgstr "Molim Vas saèekajte, uklanjam pakete..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Neki paketi moraju da se uklone"
+msgid "Please wait, reading packages database..."
+msgstr "Molim vas saèekajte, uèitavam bazu podataka o paketima..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Already existing update sources"
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
 msgstr ""
+"Pojavila se gre¹ka tokom instalacije:\n"
+"\n"
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "More information on package..."
-msgstr "Dodatne informacije o paketu..."
+msgid "Installation failed"
+msgstr "Instalacija neuspela"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "Pripremam pakete za instalaciju..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "Pripremam pakete za instalaciju..."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "Da"
+msgid "All requested packages were installed successfully."
+msgstr "Svi paketi, koji ste zahtevali, su uspe¹no instalirani."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr "Sve je dobro instalirano"
 
 #: ../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 ""
-"Zbog meðuzavisnosti, sledeæi paket(i) moraju\n"
-"da budu neizabrani:\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
 #, c-format
@@ -106,492 +149,502 @@ msgid "everything was installed correctly"
 msgstr "svi paketi su dobro instalirani"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during installation"
+msgstr "Pojavili su se problemi u toku instalacije"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+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..."
 
 #: ../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."
+"\n"
+"Error(s) reported:\n"
+"%s"
 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."
+"\n"
+"Prijavljena Gre¹ka(e):\n"
+"%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 "Da bi ste saèuvali izmene, morate da ubacite medijum u ureðaj."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Save and quit"
-msgstr "Saèuvaj i izaði"
+"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 ""
-"There was a problem during the removal of packages:\n"
+"The following packages have bad signatures:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"Pojavila se gre¹ka tokom instalacije:\n"
+"SledeKji paketi treba da budu uklonjeni da bi se drugi instalirali:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"da li je U redu da nastavim?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Size: "
-msgstr "Velièina: "
+msgid "Verifying packages signatures..."
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Security updates"
-msgstr "Sigurnosne nadogradnje"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "Download-ujem pakete `%s' (%s/%s)..."
+
+#: ../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 "OK"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+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 "Maximum information"
-msgstr "Potpuna informacija"
+msgid "Change medium"
+msgstr "Promeni medijum"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, c-format
+msgid "Initializing..."
+msgstr "Inicijalizacija..."
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Gre¹ka..."
+msgid "Package installation..."
+msgstr "Pripremam pakete za instalaciju..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Morate imati root ovla¹æenja da bi instalirali pakete."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Ujedinjeno Kraljevstvo"
+msgid "Unable to get source packages."
+msgstr "Ne mogu da dobavim izvorne pakete."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure sources"
-msgstr "Pode¹avanje izvora"
+msgid "Inspect..."
+msgstr "Proveri..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "u imenima"
+msgid "Installation finished"
+msgstr "Instalacija gotova"
 
-#: ../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 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 "Do nothing"
+msgstr "Ne radi ni¹ta"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
-"\n"
-"\\Do you want to continue installation?"
-msgstr ""
-"SledeKji paketi treba da budu uklonjeni da bi se drugi instalirali:\n"
-"\n"
-"%s\n"
-"\n"
-"da li je U redu da nastavim?"
+#, c-format
+msgid "Use .%s as main file"
+msgstr "Koristi %s kao glavni fajl"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Remove .%s"
 msgstr "Ukloni: %s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Source"
-msgstr "Izvor"
+msgid "changes:"
+msgstr "izmene:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "Finska"
+msgid "Inspecting %s"
+msgstr "Proveravam %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
+msgid "Please wait, finding available packages..."
+msgstr "Molim Vas saèekajte, pronalazim dostupne pakete..."
 
-#: ../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..."
 
-#. -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 ""
-"%s\n"
+"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"
-"Is it ok to continue?"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"%s\n"
+"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"
-"Da li je U redu da nastavim?"
+"Zatim, restarujte MandrakeUpdate."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Ponovo uèitaj listu paketa"
+msgid "How to choose manually your mirror"
+msgstr "Kako ruèno izabrati svoj miror sajt"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr "Izaberite svoj miror sajt..."
+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 ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Dodajem izvor:"
+msgid "Already existing update sources"
+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?"
+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:1
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Paket `%s' ne mo¾e biti instaliran\n"
+msgid "Fatal error"
+msgstr "Gre¹ka u fajlu"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
+msgid "Software Packages Installation"
 msgstr "Pripremam pakete za instalaciju..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages,"
-msgstr "Svi paketi,"
+msgid "Mandrake Update"
+msgstr "Mandrake Update"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "u fajlovima"
+msgid "Software Packages Removal"
+msgstr "Uklanjanje paketa"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Svi paketi, koji ste zahtevali, su uspe¹no instalirani."
+msgid "Quit"
+msgstr "Kraj"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "Ime proksi domaæina(hostname):"
+msgid "Install"
+msgstr "Instaliraj"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update source(s)"
-msgstr "A¾uriranje izvora"
+msgid "Remove"
+msgstr "Ukloni"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "Lokalni fajlovi"
+msgid "Help"
+msgstr "Pomoæ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Proveravam %s"
+msgid "Search"
+msgstr "Tra¾i"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Israel"
-msgstr "Izrael"
+msgid "Find:"
+msgstr "Pronaði: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Help"
-msgstr "Pomoæ"
+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?"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "HTTP server"
+msgid "Some packages need to be removed"
+msgstr "Neki paketi moraju da se uklone"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"Welcome to the packages source editor!\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"
-"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."
+"Do you really want to install all the selected packages?"
 msgstr ""
-"Dobrodo¹li u Editor izvornog koda u Paketima!\n"
+"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"
-"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."
+"Da li zaista ¾elite da instalirate izabrane pakete?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation failed"
-msgstr "Instalacija neuspela"
+msgid "Too many packages are selected"
+msgstr "Izabrali ste previ¹e paketa"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Koristi %s kao glavni fajl"
+msgid "Maximum information"
+msgstr "Potpuna informacija"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results"
-msgstr "Rezultati pretrage"
+msgid "Normal information"
+msgstr "Normalana informacija"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, c-format
-msgid " failed!"
-msgstr " neuspelo!"
+msgid "Update source(s)"
+msgstr "A¾uriranje izvora"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Brazil"
-msgstr "Brazil"
+msgid "Reload the packages list"
+msgstr "Ponovo uèitaj listu paketa"
 
-#: ../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 "Reset the selection"
+msgstr "Ponovo izaberi"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Pronaði: "
+msgid "in files"
+msgstr "u fajlovima"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Svi paketi, po abecedi"
+msgid "in descriptions"
+msgstr "u opisima"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Molim Vas saèekajte, tra¾im..."
+msgid "in names"
+msgstr "u imenima"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Molim vas saèekajte, uèitavam bazu podataka o paketima..."
+msgid "by update availability"
+msgstr "po dostupnosti"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "Ne mogu da otvorim paket `%s'\n"
+#, c-format
+msgid "by source repository"
+msgstr "po stanju izvornog koda"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "Ponovo izaberi"
+msgid "by selection state"
+msgstr "po izabranosti"
 
-#: ../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 "by size"
+msgstr "po velièini"
 
 #: ../rpmdrake: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 "by group"
+msgstr "po grupi"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Kostarika"
+msgid "All packages,"
+msgstr "Svi paketi,"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Pojavila se gre¹ka tokom instalacije:\n"
-"\n"
-"%s"
-
-#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Molimo Vas da saèekate, uklanjam medijum..."
+msgid "All packages, alphabetical"
+msgstr "Svi paketi, po abecedi"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "Lozinka:"
+msgid "Mandrake choices"
+msgstr "Mandrake-ov izbor"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "Ispitujem udaljrni fajl za izvor `%s'..."
+msgid "Normal updates"
+msgstr "Obiène nadogradnje"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Tajvan"
+msgid "Bugfixes updates"
+msgstr "Nadogradnje sa ispravkama"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "User:"
-msgstr "Korisnik:"
+msgid "Security updates"
+msgstr "Sigurnosne nadogradnje"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Molim Vas saèekajte, a¾uriram medijum..."
+msgid "Description: "
+msgstr "Opis:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Molim Vas saèekajte, prikazujem pakete..."
+msgid "Reason for update: "
+msgstr "Razlog a¾uriranja:"
 
 #: ../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 "Summary: "
+msgstr "Sa¾etak: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Information on packages"
-msgstr "Informacije o paketima"
+msgid "Importance: "
+msgstr "Va¾nost: "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "Odustani"
+msgid "%s KB"
+msgstr "%s KB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Sve je dobro instalirano"
+msgid "Size: "
+msgstr "Velièina: "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Molim Vas saèekajte, a¾uriram medijum..."
+msgid "Version: "
+msgstr "Verzija: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Name: "
+msgstr "Ime: "
 
 #: ../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 ""
-"SledeKji paketi treba da budu uklonjeni da bi se drugi instalirali:\n"
-"\n"
-"%s\n"
-"\n"
-"da li je U redu da nastavim?"
+msgid "Currently installed version: "
+msgstr "Trenutno instalirana verzija: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "u opisima"
+msgid "Source: "
+msgstr "Izvor: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Pode¹avanje proksija"
+msgid "(Not available)"
+msgstr "(Nije dostupno)"
 
-#: ../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 "Changelog:\n"
+msgstr "Izmene:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Izaberite"
+msgid "Files:\n"
+msgstr "Fajlovi:\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Velièina izabranog: %d MB"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add a source"
-msgstr "Dodaj izvor"
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "Inicijalizacija..."
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Izabrano: %d MB / Slobodan prostor na disku: %d MB"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "Saèuvaj izmene"
+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"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Error during download"
-msgstr "Gre¹ka tokom download-a"
+#: ../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
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Pripremam pakete za instalaciju..."
+msgid "%s conflicts with %s"
+msgstr "konflikti sa"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Importance: "
-msgstr "Va¾nost: "
+#, fuzzy, c-format
+msgid "Some packages can't be installed"
+msgstr "Paket `%s' ne mo¾e biti instaliran\n"
 
 #: ../rpmdrake:1
 #, c-format
@@ -604,84 +657,78 @@ msgstr ""
 "da se instaliraju:\n"
 "\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "Dodaj..."
+msgid "Additional packages needed"
+msgstr "Potrebni su dodatni paketi"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Unable to create medium."
-msgstr "Ne mogu da napravim medijum."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "Paket `%s' ne mo¾e biti instaliran\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Removing these packages would break your system, sorry:\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"
+"®alim, ali uklanjanjem ovih paketa bi ste o¹tetiti sistem:\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:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
-msgstr "Tra¾i..."
+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
-#, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "Paket `%s' ne mo¾e biti instaliran\n"
-
-#: ../rpmdrake.pm:1
 #, c-format
-msgid "Info..."
-msgstr "Informacije..."
+msgid "Some additional packages need to be removed"
+msgstr "Jo¹ neki paketi moraju biti uklonjeni"
 
-#: ../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 "More information on package..."
+msgstr "Dodatne informacije o paketu..."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "Ukloni"
+msgid "Information on packages"
+msgstr "Informacije o paketima"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Pripremam pakete za instalaciju..."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "No mirror"
-msgstr "Nema mirora"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Morate da popunite najmanje prva dva polja."
+msgid "More info"
+msgstr "Vi¹e informacija"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Instaliraj"
+msgid "Addable"
+msgstr "Mogu se dodati"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "Japan"
+msgid "Upgradable"
+msgstr "Mogu se a¾urirati"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Ne radi ni¹ta"
+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:1
 #, c-format
@@ -690,345 +737,378 @@ msgstr "Bez a¾uriranja"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Description: "
-msgstr "Opis:"
+msgid "(none)"
+msgstr "(nijedan)"
 
 #: ../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."
+msgid "Please wait, listing packages..."
+msgstr "Molim Vas saèekajte, prikazujem pakete..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "Ne mogu da otvorim paket `%s'\n"
 
 #: ../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 ""
-"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 "One of the following packages is needed:"
+msgstr "Jedan od sledeæih paketa je potreban:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "Ime: "
+msgid "Please choose"
+msgstr "Izaberite"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "Proveri..."
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Pripremam pakete za instalaciju..."
+msgid "Not selected"
+msgstr "Konflikt detektovan"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Australija"
+msgid "Selected"
+msgstr "Izabrani"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation finished"
-msgstr "Instalacija gotova"
+msgid "Search results"
+msgstr "Rezultati pretrage"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
-msgstr "po dostupnosti"
+msgid "Stop"
+msgstr "Stop"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
-msgstr "Poljska"
+msgid "Please wait, searching..."
+msgstr "Molim Vas saèekajte, tra¾im..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Version: "
-msgstr "Verzija: "
+msgid "Search results (none)"
+msgstr "Rezultat pretrage (nema)"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Ostalo"
 
 #: ../edit-urpm-sources.pl: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 ""
+"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."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Saèuvaj i izaði"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Editing source \\\"%s\\\":"
-msgstr "Menjam izvor \"%s\":"
+msgid "Proxy..."
+msgstr "Gre¹ka..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Upgradable"
-msgstr "Mogu se a¾urirati"
+msgid "Update..."
+msgstr "A¾uriraj..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid " done."
-msgstr " uraðeno."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Pripremam pakete za instalaciju..."
+msgid "Add..."
+msgstr "Dodaj..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "Ispitujem fajl za izvor `%s'..."
+msgid "Edit"
+msgstr "Izmeni"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "Potrebni su dodatni paketi"
+msgid "Source"
+msgstr "Izvor"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Nadogradnje sa ispravkama"
+msgid "Enabled?"
+msgstr "Ukljuèi?"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "Download sa `%s', vreme do kraja:%s, brzina:%s"
+msgid "Configure sources"
+msgstr "Pode¹avanje izvora"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Germany"
-msgstr "Nemaèka"
+msgid "Password:"
+msgstr "Lozinka:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Russia"
-msgstr "Rusija"
+msgid "User:"
+msgstr "Korisnik:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Norway"
-msgstr "Norve¹ka"
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Mo¾ete da podesite korisnika/lozinku za identifikaciju proksija:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Pojavili su se problemi u toku instalacije"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "Ime proksi domaæina(hostname):"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search"
-msgstr "Tra¾i"
+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]>):"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit a source"
-msgstr "Izmeni izvor"
+msgid "Configure proxies"
+msgstr "Pode¹avanje proksija"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Èe¹ka"
+msgid "Please wait, updating medium..."
+msgstr "Molim Vas saèekajte, a¾uriram medijum..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Stop"
-msgstr "Stop"
+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.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "A¾uriranje"
+msgid "You need to insert the medium to continue"
+msgstr "Morate da ubacite medijum kako bi ste nastavili"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "Molim Vas saèekajte, uklanjam pakete..."
+msgid "Save changes"
+msgstr "Saèuvaj izmene"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal information"
-msgstr "Normalana informacija"
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Relativna putanja ka synthesis/hdlist:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Download-ujem pakete `%s' (%s/%s)..."
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing source \"%s\":"
+msgstr "Menjam izvor \"%s\":"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Izabrano: %d MB / Slobodan prostor na disku: %d MB"
+msgid "Edit a source"
+msgstr "Izmeni izvor"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Spain"
-msgstr "©panija"
+msgid "Please wait, removing medium..."
+msgstr "Molimo Vas da saèekate, uklanjam medijum..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
-msgstr "Obiène nadogradnje"
+msgid "Type of source:"
+msgstr "Tip izvora:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by selection state"
-msgstr "po izabranosti"
+msgid "Adding a source:"
+msgstr "Dodajem izvor:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 msgstr ""
-"Molim Vas saèekajte, skidam listu dodatnih adresa sa MandrakeSoft-ovog veb "
-"sajta."
+"VeKj postoji medij sa tim imenom, da li\n"
+"zaista ¾elite da je zamenite?"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Login:"
-msgstr "Prijava:"
+msgid "You need to fill up at least the two first entries."
+msgstr "Morate da popunite najmanje prva dva polja."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Austria"
-msgstr "Austrija"
+msgid "Name:"
+msgstr "Ime:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Gre¹ka u fajlu"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
+msgstr "Prijava:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Izaberite koje paket(e) ¾elite da a¾urirate:"
+msgid "Choose a mirror..."
+msgstr "Izaberite svoj miror sajt..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update..."
-msgstr "A¾uriraj..."
+msgid "Browse..."
+msgstr "Tra¾i..."
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "Provera potpisa za `%s'..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Putanja ili taèka montiranja:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
-msgstr "(nijedan)"
+msgid "Removable device"
+msgstr "Prenosni ureðaj"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
-"®alim, ali uklanjanjem ovih paketa bi ste o¹tetiti sistem:\n"
-"\n"
+msgid "HTTP server"
+msgstr "HTTP server"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Instaliram paket `%s' (%s/%s)..."
+msgid "FTP server"
+msgstr "FTP server"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Trenutno instalirana verzija: "
+msgid "Path:"
+msgstr "Putanja:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Other"
-msgstr "Ostalo"
+msgid "Local files"
+msgstr "Lokalni fajlovi"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Razlog a¾uriranja:"
+msgid "Add a source"
+msgstr "Dodaj izvor"
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Please choose the desired mirror."
-msgstr "Izaberite sajt po ¾elji."
+#, 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."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "Izmeni"
+msgid "Unable to create medium."
+msgstr "Ne mogu da napravim medijum."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Molim Vas saèekajte, pronalazim dostupne pakete..."
+msgid "Update"
+msgstr "A¾uriranje"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Relativna putanja ka synthesis/hdlist:"
+msgid "Select the source(s) you wish to update:"
+msgstr "Izaberite koje paket(e) ¾elite da a¾urirate:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Rezultat pretrage (nema)"
+msgid "Please wait, updating media..."
+msgstr "Molim Vas saèekajte, a¾uriram medijum..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Danmark"
-msgstr "Danska"
+msgid " failed!"
+msgstr " neuspelo!"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "Kina"
+msgid " done."
+msgstr " uraðeno."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United States"
-msgstr "Sjedinjene Amerièke Dr¾ave"
+msgid "Download of `%s', speed:%s"
+msgstr "Download sa `%s', brzina:%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "changes:"
-msgstr "izmene:"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "Download sa `%s', vreme do kraja:%s, brzina:%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "Provera potpisa za `%s'..."
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Jo¹ neki paketi moraju biti uklonjeni"
+msgid "Examining distant file of source `%s'..."
+msgstr "Ispitujem udaljrni fajl za izvor `%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Examining file of source `%s'..."
+msgstr "Ispitujem fajl za izvor `%s'..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No"
-msgstr "Ne"
+msgid "Copying file for source `%s'..."
+msgstr "Kopiram fajl za izvor `%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Summary: "
-msgstr "Sa¾etak: "
+msgid "Please choose the desired mirror."
+msgstr "Izaberite sajt po ¾elji."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "Kanada"
+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.pm:1
 #, c-format
-msgid "Greece"
-msgstr "Grèka"
+msgid "No mirror"
+msgstr "Nema mirora"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1045,260 +1125,180 @@ msgstr ""
 "Internet, ili MandrakeSoft-ov veb sajt mo¾da nisu trenutno dostupni.\n"
 "Poku¹ajte kasnije ponovo."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Source: "
-msgstr "Izvor: "
-
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "Kopiram fajl za izvor `%s'..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Morate imati root ovla¹æenja da bi instalirali pakete."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Path:"
-msgstr "Putanja:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Problem during removal"
-msgstr "Problem prilikom uklanjanja"
+msgid "Error during download"
+msgstr "Gre¹ka tokom download-a"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by source repository"
-msgstr "po stanju izvornog koda"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
+"Molim Vas saèekajte, skidam listu dodatnih adresa sa MandrakeSoft-ovog veb "
+"sajta."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Selected"
-msgstr "Izabrani"
+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.pm:1
 #, c-format
-msgid "Netherlands"
-msgstr "Holandija"
+msgid "United States"
+msgstr "Sjedinjene Amerièke Dr¾ave"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "Mogu se dodati"
+msgid "China"
+msgstr "Kina"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
-msgstr "(Nije dostupno)"
-
-#: ../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
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr "Konflikt detektovan"
+msgid "United Kingdom"
+msgstr "Ujedinjeno Kraljevstvo"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Uklanjanje paketa"
+msgid "Taiwan"
+msgstr "Tajvan"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Sweden"
 msgstr "©vedska"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
-msgstr ""
-"\n"
-"\n"
-"Prijavljena Gre¹ka(e):\n"
-"%s"
+msgid "Russia"
+msgstr "Rusija"
 
-#: ../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."
-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."
+msgid "Portugal"
+msgstr "Portugal"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "Download sa `%s', brzina:%s"
+msgid "Poland"
+msgstr "Poljska"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Jedan od sledeæih paketa je potreban:"
+msgid "Norway"
+msgstr "Norve¹ka"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "Kraj"
+msgid "Netherlands"
+msgstr "Holandija"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 ""
-"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?"
+msgid "Korea"
+msgstr "Koreja"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "OK"
+msgid "Japan"
+msgstr "Japan"
 
-#: ../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 "Italy"
+msgstr "Italija"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "Tip izvora:"
+msgid "Israel"
+msgstr "Izrael"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please insert the medium named \\\"%s\\\" on device [%s]"
-msgstr "Ubacite medijum sa imenom \"%s\" u ureðaj [%s]"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Grèka"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to get source packages."
-msgstr "Ne mogu da dobavim izvorne pakete."
+msgid "France"
+msgstr "Francuska"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Izabrali ste previ¹e paketa"
+msgid "Finland"
+msgstr "Finska"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "konflikti sa"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "©panija"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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."
+msgid "Danmark"
+msgstr "Danska"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Mandrake-ov izbor"
+msgid "Germany"
+msgstr "Nemaèka"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 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"
-"Zatim, restarujte MandrakeUpdate."
+msgid "Czech Republic"
+msgstr "Èe¹ka"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Izmene:\n"
+msgid "Costa Rica"
+msgstr "Kostarika"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Korea"
-msgstr "Koreja"
+msgid "Canada"
+msgstr "Kanada"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "Prenosni ureðaj"
+msgid "Brazil"
+msgstr "Brazil"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Belgija"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Change medium"
-msgstr "Promeni medijum"
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Mandrake Update"
+msgid "Australia"
+msgstr "Australija"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by size"
-msgstr "po velièini"
+msgid "Austria"
+msgstr "Austrija"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "FTP server"
+msgid "Info..."
+msgstr "Informacije..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Files:\n"
-msgstr "Fajlovi:\n"
+msgid "No"
+msgstr "Ne"
 
 #: ../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."
+#, c-format
+msgid "Yes"
+msgstr "Da"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index 6d124089..9741f39a 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-04-17 16:13+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+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"
@@ -107,8 +107,8 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Problem during installation"
-msgstr "Problem za vreme instaliranja"
+msgid "Installation failed"
+msgstr "Instalacija neuspela"
 
 #: ../rpmdrake:1
 #, c-format
@@ -151,17 +151,18 @@ msgstr "svi paketi su dobro instalirani"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"some packages failed to install\n"
-"correctly"
-msgstr ""
-"neki paketi se nisu ispravno\n"
-"instalirati"
+msgid "Problem during installation"
+msgstr "Problem za vreme instaliranja"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr "Molim Vas saèekajte, uklanjam pakete da bih omoguæio drugih paketa..."
+msgid "Installing package `%s' (%s/%s)..."
+msgstr ""
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Instalacija paketa"
 
 #: ../rpmdrake:1
 #, c-format
@@ -186,9 +187,29 @@ msgstr ""
 "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"
+"\n"
+"Do you want to continue installation?"
+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 "Installation failed"
-msgstr "Instalacija neuspela"
+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
 #, c-format
@@ -212,23 +233,23 @@ msgstr "Promeni medijum"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Ne mogu da dobavim izvorne pakete, ¾ao mi je. %s"
+msgid "Initializing..."
+msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Unable to get source packages."
-msgstr "Ne mogu da dobavim izvorne pakete."
+#, fuzzy, c-format
+msgid "Package installation..."
+msgstr "Instalacija paketa"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A required program is missing (grpmi). Check your installation."
-msgstr "Nedostaje potrebni program (grpmi). Proverite svoju instalaciju."
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Ne mogu da dobavim izvorne pakete, ¾ao mi je. %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Program missing"
-msgstr "Program nedostaje"
+msgid "Unable to get source packages."
+msgstr "Ne mogu da dobavim izvorne pakete."
 
 #: ../rpmdrake:1
 #, c-format
@@ -1280,6 +1301,265 @@ msgstr "Ne"
 msgid "Yes"
 msgstr "Da"
 
+#: ../grpmi/curl_download/curl_download.xs:86
+msgid "Download directory does not exist"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:89
+#: ../grpmi/curl_download/curl_download.xs:213
+msgid "Out of memory\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:102
+msgid "Could not open output file in append mode"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:133
+msgid "Unsupported protocol\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:136
+msgid "Failed init\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:139
+msgid "Bad URL format\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:142
+msgid "Bad user format in URL\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:145
+msgid "Couldn't resolve proxy\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:148
+msgid "Couldn't resolve host\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:151
+msgid "Couldn't connect\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:154
+msgid "FTP unexpected server reply\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:157
+msgid "FTP access denied\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:160
+msgid "FTP user password incorrect\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:163
+msgid "FTP unexpected PASS reply\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:166
+msgid "FTP unexpected USER reply\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:169
+msgid "FTP unexpected PASV reply\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:172
+msgid "FTP unexpected 227 format\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:175
+msgid "FTP can't get host\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:178
+msgid "FTP can't reconnect\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:181
+msgid "FTP couldn't set binary\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:184
+msgid "Partial file\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:187
+msgid "FTP couldn't RETR file\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:190
+msgid "FTP write error\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:195
+msgid "FTP quote error\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:198
+msgid "HTTP not found\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:201
+msgid "Write error\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:204
+msgid "User name illegally specified\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:207
+msgid "FTP couldn't STOR file\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:210
+msgid "Read error\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:216
+msgid "Time out\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:219
+msgid "FTP couldn't set ASCII\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:222
+msgid "FTP PORT failed\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:225
+msgid "FTP couldn't use REST\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:228
+msgid "FTP couldn't get size\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:231
+msgid "HTTP range error\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:234
+msgid "HTTP POST error\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:237
+msgid "SSL connect error\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:240
+msgid "FTP bad download resume\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:243
+msgid "File couldn't read file\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:246
+msgid "LDAP cannot bind\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:249
+msgid "LDAP search failed\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:252
+msgid "Library not found\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:255
+msgid "Function not found\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:258
+msgid "Aborted by callback\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:261
+msgid "Bad function argument\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:264
+msgid "Bad calling order\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:267
+#, fuzzy
+msgid "HTTP Interface operation failed\n"
+msgstr "Instalacija neuspela"
+
+#: ../grpmi/curl_download/curl_download.xs:270
+msgid "my_getpass() returns fail\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:273
+msgid "catch endless re-direct loops\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:276
+msgid "User specified an unknown option\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:279
+msgid "Malformed telnet option\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:282
+msgid "removed after 7.7.3\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:285
+msgid "peer's certificate wasn't ok\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:288
+msgid "when this is a specific error\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:291
+msgid "SSL crypto engine not found\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:294
+msgid "can not set SSL crypto engine as default\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:297
+msgid "failed sending network data\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:300
+msgid "failure in receiving network data\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:303
+msgid "share is in use\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:306
+msgid "problem with the local certificate\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:309
+msgid "couldn't use specified cipher\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:312
+msgid "problem with the CA cert (path?)\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:315
+msgid "Unrecognized transfer encoding\n"
+msgstr ""
+
+#: ../grpmi/curl_download/curl_download.xs:320
+#, c-format
+msgid "Unknown error code %d\n"
+msgstr ""
+
 #: data/rpmdrake.desktop.in.h:1
 msgid "Install Software"
 msgstr "Instaliraj softver"
@@ -1293,6 +1573,23 @@ msgid "Software Sources Manager"
 msgstr "Menad¾er Softverskog Koda"
 
 #~ msgid ""
+#~ "some packages failed to install\n"
+#~ "correctly"
+#~ msgstr ""
+#~ "neki paketi se nisu ispravno\n"
+#~ "instalirati"
+
+#~ msgid "Please wait, removing packages to allow others to be upgraded..."
+#~ msgstr ""
+#~ "Molim Vas saèekajte, uklanjam pakete da bih omoguæio drugih paketa..."
+
+#~ msgid "A required program is missing (grpmi). Check your installation."
+#~ msgstr "Nedostaje potrebni program (grpmi). Proverite svoju instalaciju."
+
+#~ msgid "Program missing"
+#~ msgstr "Program nedostaje"
+
+#~ msgid ""
 #~ "There was an error while adding the update medium via urpmi.\n"
 #~ "\n"
 #~ "This may be due to a broken or temporary unavailable mirror, or when "
diff --git a/po/sv.po b/po/sv.po
index ba27ded2..aedaacea 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grpmi-sv\n"
-"POT-Creation-Date: 2003-05-02 20:15+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+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,20 +17,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-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
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Portugal"
-msgstr "Portugal"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Är det OK att fortsätta?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -49,59 +45,104 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-msgstr "efter grupp"
+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."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Name:"
-msgstr "Namn:"
+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.pm:1
-#, c-format
-msgid "Italy"
-msgstr "Italien"
+#: ../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"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "Hur du manuellt väljer en spegel"
+msgid "Problem during removal"
+msgstr "Problem vid borttag"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "Please wait, removing packages..."
+msgstr "Vänta, tar bort paket..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Vissa paket måste tas bort"
+msgid "Please wait, reading packages database..."
+msgstr "Vänta, läser paketdatabas..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Already existing update sources"
+#, 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
 #, c-format
-msgid "More information on package..."
-msgstr "Mer information om paket..."
+msgid "Installation failed"
+msgstr "Installationen misslyckades"
 
-#: ../rpmdrake.pm:1
+#: ../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..."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "Ja"
+msgid "All requested packages were installed successfully."
+msgstr "Alla begärda paket installerades utan problem."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr "Allt installerades utan problem"
 
 #: ../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 ""
-"På grund av deras beroenden måste följande paket\n"
-"avmarkeras:\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
 #, c-format
@@ -109,488 +150,500 @@ 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 "%s KB"
-msgstr "%s KB"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Installerar paket \"%s\" (%s/%s)..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Förbereder paket för installation..."
 
 #: ../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."
+"\n"
+"Error(s) reported:\n"
+"%s"
 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."
+"\n"
+"Fel rapporterade:\n"
+"%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ö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"
+"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."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"The following packages have bad signatures:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"Det uppstod ett fel vid paketinstallation:\n"
+"Följande paket måste tas bort för att andra ska kunna uppdateras.\n"
+"%s\n"
 "\n"
-"%s"
+"Är det OK att fortsätta?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Size: "
-msgstr "Storlek: "
+msgid "Verifying packages signatures..."
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Security updates"
-msgstr "Säkerhetsuppdateringar"
+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"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "OK"
+
+#: ../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]"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "Maximal information"
+msgid "Change medium"
+msgstr "Byt media"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, c-format
+msgid "Initializing..."
+msgstr "Initierar..."
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Fel..."
+msgid "Package installation..."
+msgstr "Förbereder paket för installation..."
 
-#: ../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."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Storbritannien"
+msgid "Unable to get source packages."
+msgstr "Kunde inte hämta källpaket."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure sources"
-msgstr "Anpassa källor"
+msgid "Inspect..."
+msgstr "Undersök..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "i namn"
+msgid "Installation finished"
+msgstr "Installation slutförd"
 
-#: ../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 ""
-"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 "Do nothing"
+msgstr "Gör ingenting"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
-"\n"
-"\\Do you want to continue installation?"
-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?"
+#, c-format
+msgid "Use .%s as main file"
+msgstr "Använd .%s som huvudfil"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Remove .%s"
 msgstr "Ta bort .%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Source"
-msgstr "Källa"
+msgid "changes:"
+msgstr "ändringar:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "Finland"
+msgid "Inspecting %s"
+msgstr "Undersöker %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
+msgid "Please wait, finding available packages..."
+msgstr "Vänta, hittar tillgängliga paket..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "France"
-msgstr "Frankrike"
+msgid "Please wait, adding medium..."
+msgstr "Vänta, lägger till media..."
 
-#. -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 ""
-"%s\n"
+"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"
-"Is it ok to continue?"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"%s\n"
+"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"
-"Är det OK att fortsätta?"
+"Starta sedan om MandrakeUpdate."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Ladda om paketlistan"
+msgid "How to choose manually your mirror"
+msgstr "Hur du manuellt väljer en spegel"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr "Välj en spegel..."
+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 ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Lägger till en källa:"
+msgid "Already existing update sources"
+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?"
+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:1
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Paketet \"%s\" kan inte installeras\n"
+msgid "Fatal error"
+msgstr "Filfel"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
+msgid "Software Packages Installation"
 msgstr "Förbereder paket för installation..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages,"
-msgstr "Alla paket,"
+msgid "Mandrake Update"
+msgstr "Uppdatera Mandrake"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "i filer"
+msgid "Software Packages Removal"
+msgstr "Paketborttag"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Alla begärda paket installerades utan problem."
+msgid "Quit"
+msgstr "Avsluta"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "Proxyvärddatornamn:"
+msgid "Install"
+msgstr "Installera"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update source(s)"
-msgstr "Uppdatera källor"
+msgid "Remove"
+msgstr "Ta bort"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "Lokala filer"
+msgid "Help"
+msgstr "Hjälp"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Undersöker %s"
+msgid "Search"
+msgstr "Sök"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Israel"
-msgstr "Israel"
+msgid "Find:"
+msgstr "Hitta:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Help"
-msgstr "Hjälp"
+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?"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "HTTP-server"
+msgid "Some packages need to be removed"
+msgstr "Vissa paket måste tas bort"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"Welcome to the packages source editor!\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"
-"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."
+"Do you really want to install all the selected packages?"
 msgstr ""
-"Välkommen till editorn för paketkällor.\n"
+"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"
-"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."
+"Vill du verkligen installera alla valda paket?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation failed"
-msgstr "Installationen misslyckades"
+msgid "Too many packages are selected"
+msgstr "För många paket är valda"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Använd .%s som huvudfil"
+msgid "Maximum information"
+msgstr "Maximal information"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results"
-msgstr "Sökresultat"
+msgid "Normal information"
+msgstr "Normal information"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, c-format
-msgid " failed!"
-msgstr " misslyckades."
+msgid "Update source(s)"
+msgstr "Uppdatera källor"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Brazil"
-msgstr "Brasilien"
+msgid "Reload the packages list"
+msgstr "Ladda om paketlistan"
 
-#: ../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 ""
-"Det finns redan ett media med det namnet.\n"
-"Vill du verkligen ersätta det?"
+msgid "Reset the selection"
+msgstr "Återställ valet"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Hitta:"
+msgid "in files"
+msgstr "i filer"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Alla paket, alfabetiskt"
+msgid "in descriptions"
+msgstr "i beskrivningar"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Vänta, söker..."
+msgid "in names"
+msgstr "i namn"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Vänta, läser paketdatabas..."
+msgid "by update availability"
+msgstr "efter uppdateringstillgänglighet"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "Kan inte öppna paket \"%s\"\n"
+#, c-format
+msgid "by source repository"
+msgstr "efter källagringsplats"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "Återställ valet"
+msgid "by selection state"
+msgstr "efter valstatus"
 
-#: ../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 ""
-"Om du behöver en proxy, ange värddatornamnet och en valfi port (syntax: "
-"<proxyhost[:port]>):"
+msgid "by size"
+msgstr "efter storlek"
 
 #: ../rpmdrake: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 "by group"
+msgstr "efter grupp"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Costa Rica"
+msgid "All packages,"
+msgstr "Alla paket,"
 
 #: ../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"
-
-#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Vänta, tar bort media..."
+msgid "All packages, alphabetical"
+msgstr "Alla paket, alfabetiskt"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "Lösenord:"
+msgid "Mandrake choices"
+msgstr "Mandrake-val"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "Undersöker fjärrfil för källa \"%s\"..."
+msgid "Normal updates"
+msgstr "Normala uppdateringar"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Taiwan"
+msgid "Bugfixes updates"
+msgstr "Felrättningsuppdateringar"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "User:"
-msgstr "Användare:"
+msgid "Security updates"
+msgstr "Säkerhetsuppdateringar"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Vänta, uppdaterar media..."
+msgid "Description: "
+msgstr "Beskrivning: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Vänta, listar paket..."
+msgid "Reason for update: "
+msgstr "Orsak för uppdatering: "
 
 #: ../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 "Summary: "
+msgstr "Sammanfattning: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Information on packages"
-msgstr "Information om paket"
+msgid "Importance: "
+msgstr "Viktighet: "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "Avbryt"
+msgid "%s KB"
+msgstr "%s KB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Allt installerades utan problem"
+msgid "Size: "
+msgstr "Storlek: "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Vänta, uppdaterar media..."
+msgid "Version: "
+msgstr "Version: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Name: "
+msgstr "Namn: "
 
 #: ../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 "Currently installed version: "
+msgstr "Installerad version: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "i beskrivningar"
+msgid "Source: "
+msgstr "Källa: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Anpassa proxy"
+msgid "(Not available)"
+msgstr "(Ingen tillgänglig)"
 
-#: ../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 "Changelog:\n"
+msgstr "Ändringslogg:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Välj"
+msgid "Files:\n"
+msgstr "Filer:\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Vald storlek: %d MB"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add a source"
-msgstr "Lägg till en källa"
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "Initierar..."
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Valda: %d MB / ledigt diskutrymme: %d MB"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "Spara ändringar"
+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"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Error during download"
-msgstr "Fel vid nerladdning"
+#: ../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 "Package installation..."
-msgstr "Förbereder paket för installation..."
+msgid "%s conflicts with %s"
+msgstr "i konflikt med"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Importance: "
-msgstr "Viktighet: "
+#, fuzzy, c-format
+msgid "Some packages can't be installed"
+msgstr "Paketet \"%s\" kan inte installeras\n"
 
 #: ../rpmdrake:1
 #, c-format
@@ -602,83 +655,76 @@ msgstr ""
 "För att uppfylla beroenden måste följande paket också installeras:\n"
 "\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "Lägg till..."
+msgid "Additional packages needed"
+msgstr "Ytterligare paket krävs"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Unable to create medium."
-msgstr "Kan inte skapa media."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "Paketet \"%s\" kan inte installeras\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Removing these packages would break your system, sorry:\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"
+"Om du tar bort dessa paket kommer systemet att sluta fungera:\n"
 "\n"
-"Några konfigurationsfiler skapades som \".rpmnew\" eller \".rpmsave\",\n"
-"du kan nu undersöka några för att vidta åtgärder:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
-msgstr "Bläddra..."
+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
-#, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "Paketet \"%s\" kan inte installeras\n"
-
-#: ../rpmdrake.pm:1
 #, c-format
-msgid "Info..."
-msgstr "Information..."
+msgid "Some additional packages need to be removed"
+msgstr "Några ytterligare paket måste tas bort"
 
-#: ../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 "More information on package..."
+msgstr "Mer information om paket..."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "Ta bort"
+msgid "Information on packages"
+msgstr "Information om paket"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Förbereder paket för installation..."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "No mirror"
-msgstr "Ingen spegel"
-
-#: ../edit-urpm-sources.pl: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 "More info"
+msgstr "Mer information"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Installera"
+msgid "Addable"
+msgstr "Kan läggas till"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "Japan"
+msgid "Upgradable"
+msgstr "Kan uppdateras"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Gör ingenting"
+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:1
 #, c-format
@@ -687,343 +733,377 @@ msgstr "Ingen uppdatering"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Description: "
-msgstr "Beskrivning: "
+msgid "(none)"
+msgstr "(inget)"
 
 #: ../rpmdrake: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."
+msgid "Please wait, listing packages..."
+msgstr "Vänta, listar paket..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "Kan inte öppna paket \"%s\"\n"
 
 #: ../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 "One of the following packages is needed:"
+msgstr "Ett av följande paket krävs:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "Namn: "
+msgid "Please choose"
+msgstr "Välj"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "Undersök..."
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Förbereder paket för installation..."
+msgid "Not selected"
+msgstr "Konflikter identifierade"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Australien"
+msgid "Selected"
+msgstr "Vald"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation finished"
-msgstr "Installation slutförd"
+msgid "Search results"
+msgstr "Sökresultat"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
-msgstr "efter uppdateringstillgänglighet"
+msgid "Stop"
+msgstr "Stoppa"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
-msgstr "Polen"
+msgid "Please wait, searching..."
+msgstr "Vänta, söker..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Version: "
-msgstr "Version: "
+msgid "Search results (none)"
+msgstr "Sökresultat (inget)"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Annan"
 
 #: ../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:"
+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."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Spara och avsluta"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Editing source \\\"%s\\\":"
-msgstr "Redigerar källa \"%s\":"
+msgid "Proxy..."
+msgstr "Fel..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Upgradable"
-msgstr "Kan uppdateras"
+msgid "Update..."
+msgstr "Uppdatera..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid " done."
-msgstr " klar."
+msgid "Add..."
+msgstr "Lägg till..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Förbereder paket för installation..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "Redigera"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "Undersöker fil för källa \"%s\"..."
+msgid "Source"
+msgstr "Källa"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "Ytterligare paket krävs"
+msgid "Enabled?"
+msgstr "Aktiverad?"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Felrättningsuppdateringar"
+msgid "Configure sources"
+msgstr "Anpassa källor"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "Nedladdnig av \"%s\", återstående tid:%s, hastighet:%s"
+msgid "Password:"
+msgstr "Lösenord:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Germany"
-msgstr "Tyskland"
+msgid "User:"
+msgstr "Användare:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Russia"
-msgstr "Ryssland"
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Du kan specificera ett användarnamn/lösenord för proxyautentiseringen:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Norway"
-msgstr "Norge"
+msgid "Proxy hostname:"
+msgstr "Proxyvärddatornamn:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Problem uppstod under installationen"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+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
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search"
-msgstr "Sök"
+msgid "Configure proxies"
+msgstr "Anpassa proxy"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit a source"
-msgstr "Redigera en källa"
+msgid "Please wait, updating medium..."
+msgstr "Vänta, uppdaterar media..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Tjeckien"
+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."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Stop"
-msgstr "Stoppa"
+msgid "You need to insert the medium to continue"
+msgstr "Du måste lägga i mediet för att fortsätta"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "Uppdatera"
+msgid "Save changes"
+msgstr "Spara ändringar"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "Vänta, tar bort paket..."
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Relativ sökväg till synthesis eller hdlist:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal information"
-msgstr "Normal information"
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing source \"%s\":"
+msgstr "Redigerar källa \"%s\":"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Laddar ner paket \"%s\" (%s/%s)..."
+msgid "Edit a source"
+msgstr "Redigera en källa"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Valda: %d MB / ledigt diskutrymme: %d MB"
+msgid "Please wait, removing medium..."
+msgstr "Vänta, tar bort media..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Spain"
-msgstr "Spanien"
+msgid "Type of source:"
+msgstr "Typ av källa:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
-msgstr "Normala uppdateringar"
+msgid "Adding a source:"
+msgstr "Lägger till en källa:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by selection state"
-msgstr "efter valstatus"
+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.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr "Vänta, laddar ner spegeladresser från MandrakeSofts webbplats."
+msgid "You need to fill up at least the two first entries."
+msgstr "Du måste fylla i åtminstone de två första posterna."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "Namn:"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "Användarnamn:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Austria"
-msgstr "Österrike"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Filfel"
+msgid "Choose a mirror..."
+msgstr "Välj en spegel..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Välj källan/källorna du vill uppdatera:"
+msgid "Browse..."
+msgstr "Bläddra..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update..."
-msgstr "Uppdatera..."
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "Verifierar signatur för \"%s\"..."
+msgid "Path or mount point:"
+msgstr "Sökväg eller monteringspunkt:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
-msgstr "(inget)"
+msgid "Removable device"
+msgstr "Flyttbar enhet"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-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"
+msgid "HTTP server"
+msgstr "HTTP-server"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Installerar paket \"%s\" (%s/%s)..."
+msgid "FTP server"
+msgstr "FTP-server"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Installerad version: "
+msgid "Path:"
+msgstr "Sökväg:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Other"
-msgstr "Annan"
+msgid "Local files"
+msgstr "Lokala filer"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Orsak för uppdatering: "
+msgid "Add a source"
+msgstr "Lägg till en källa"
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Please choose the desired mirror."
-msgstr "Välj önskad spegel."
+#, 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."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "Redigera"
+msgid "Unable to create medium."
+msgstr "Kan inte skapa media."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Vänta, hittar tillgängliga paket..."
+msgid "Update"
+msgstr "Uppdatera"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Relativ sökväg till synthesis eller hdlist:"
+msgid "Select the source(s) you wish to update:"
+msgstr "Välj källan/källorna du vill uppdatera:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Sökresultat (inget)"
+msgid "Please wait, updating media..."
+msgstr "Vänta, uppdaterar media..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Danmark"
-msgstr "Danmark"
+msgid " failed!"
+msgstr " misslyckades."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "Kina"
+msgid " done."
+msgstr " klar."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United States"
-msgstr "Amerikas förenta stater"
+msgid "Download of `%s', speed:%s"
+msgstr "Nedladdnig av \"%s\", hastighet:%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "changes:"
-msgstr "ändringar:"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "Nedladdnig av \"%s\", återstående tid:%s, hastighet:%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "Verifierar signatur för \"%s\"..."
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Några ytterligare paket måste tas bort"
+msgid "Examining distant file of source `%s'..."
+msgstr "Undersöker fjärrfil för källa \"%s\"..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Examining file of source `%s'..."
+msgstr "Undersöker fil för källa \"%s\"..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No"
-msgstr "Nej"
+msgid "Copying file for source `%s'..."
+msgstr "Kopierar fil för källa \"%s\"..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Summary: "
-msgstr "Sammanfattning: "
+msgid "Please choose the desired mirror."
+msgstr "Välj önskad spegel."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "Kanada"
+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.pm:1
 #, c-format
-msgid "Greece"
-msgstr "Grekland"
+msgid "No mirror"
+msgstr "Ingen spegel"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1040,258 +1120,178 @@ msgstr ""
 "Nätverket eller MandrakeSofts webbplats är kanske inte tillgängligt.\n"
 "Försök igen senare."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Source: "
-msgstr "Källa: "
-
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "Kopierar fil för källa \"%s\"..."
-
-#: ../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 "Path:"
-msgstr "Sökväg:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Problem during removal"
-msgstr "Problem vid borttag"
+msgid "Error during download"
+msgstr "Fel vid nerladdning"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by source repository"
-msgstr "efter källagringsplats"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "Vänta, laddar ner spegeladresser från MandrakeSofts webbplats."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Selected"
-msgstr "Vald"
+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.pm:1
 #, c-format
-msgid "Netherlands"
-msgstr "Nederländerna"
+msgid "United States"
+msgstr "Amerikas förenta stater"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "Kan läggas till"
+msgid "China"
+msgstr "Kina"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
-msgstr "(Ingen tillgänglig)"
-
-#: ../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"
+msgid "United Kingdom"
+msgstr "Storbritannien"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Paketborttag"
+msgid "Taiwan"
+msgstr "Taiwan"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Sweden"
 msgstr "Sverige"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
-msgstr ""
-"\n"
-"\n"
-"Fel rapporterade:\n"
-"%s"
+msgid "Russia"
+msgstr "Ryssland"
 
-#: ../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."
-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 "Portugal"
+msgstr "Portugal"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "Nedladdnig av \"%s\", hastighet:%s"
+msgid "Poland"
+msgstr "Polen"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Ett av följande paket krävs:"
+msgid "Norway"
+msgstr "Norge"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "Avsluta"
+msgid "Netherlands"
+msgstr "Nederländerna"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 ""
-"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?"
+msgid "Korea"
+msgstr "Korea"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "OK"
+msgid "Japan"
+msgstr "Japan"
 
-#: ../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 "Italy"
+msgstr "Italien"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "Typ av källa:"
+msgid "Israel"
+msgstr "Israel"
 
-#: ../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]"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Grekland"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to get source packages."
-msgstr "Kunde inte hämta källpaket."
+msgid "France"
+msgstr "Frankrike"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "För många paket är valda"
+msgid "Finland"
+msgstr "Finland"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "i konflikt med"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "Spanien"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Danmark"
+msgstr "Danmark"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Mandrake-val"
+msgid "Germany"
+msgstr "Tyskland"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 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."
+msgid "Czech Republic"
+msgstr "Tjeckien"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Ändringslogg:\n"
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Korea"
-msgstr "Korea"
+msgid "Canada"
+msgstr "Kanada"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "Flyttbar enhet"
+msgid "Brazil"
+msgstr "Brasilien"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Belgien"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Change medium"
-msgstr "Byt media"
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Uppdatera Mandrake"
+msgid "Australia"
+msgstr "Australien"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by size"
-msgstr "efter storlek"
+msgid "Austria"
+msgstr "Österrike"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "FTP-server"
+msgid "Info..."
+msgstr "Information..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Files:\n"
-msgstr "Filer:\n"
+msgid "No"
+msgstr "Nej"
 
 #: ../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."
+#, c-format
+msgid "Yes"
+msgstr "Ja"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
diff --git a/po/ta.po b/po/ta.po
index 2fdd5410..bad8678a 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grpmi 1.0 \n"
-"POT-Creation-Date: 2003-05-02 20:15+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+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,20 +14,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "ெசயல�பட�த�தப�பட�ட�ள�ளதா?"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Path or mount point:"
-msgstr "பாதை அல�லத� �ற�றப�ப�ள�ளி"
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Portugal"
-msgstr "போர�ச�கல�"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"இப�படியே தொடரலாமா?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -45,59 +41,104 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-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"
+" ம�டிய�ம�"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Name:"
-msgstr "பெயர�:"
+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.pm:1
-#, c-format
-msgid "Italy"
-msgstr "இத�தாலி"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"பொதி நிற�வலின� போத� பிழை நேர�ந�த�ள�ளத�:\n"
+"\n"
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "உங�கள� இணைபதிப�ைப ைகம�ைறயாக எப�படித� தேர�வ�ச� செய�வத�"
+msgid "Problem during removal"
+msgstr "நீக�க�தலில� பிழை நேர�ந�த�ள�ளத�"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "Please wait, removing packages..."
+msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�...பொதிகள� நீக�கப�பட�கின�றன..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "சில பொதிகள� நீக�கப�படவேண�ட�ம�"
+msgid "Please wait, reading packages database..."
+msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�...பொதித� தரவ� வாசிக�கப�பட�கிறத�..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Already existing update sources"
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
 msgstr ""
+"பொதி நிற�வலின� போத� பிழை நேர�ந�த�ள�ளத�:\n"
+"\n"
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "More information on package..."
-msgstr "பொதிகளைப� பற�றிய மேல�ம� விவரங�கள�"
+msgid "Installation failed"
+msgstr "நிற�வ�தலில� பிழை நேர�ந�த�ள�ளத�"
 
-#: ../rpmdrake.pm:1
+#: ../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 "நிற�வ�வதற�காக பொதிகள� தயாராகின�றன..."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "ஆம�"
+msgid "All requested packages were installed successfully."
+msgstr "நீங�கள� கேட�ட அனைத�த� பொதிகள�ம� வெற�றிகரமாக நிற�வப�பட�டத�"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+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 ""
-"சில கட�ட�ப�பாட�களினால� கீேழ ெகாட�க�கப�பட�ட�ள�ள பொதிகள� \n"
-"நிற�வப�படக�கூடாத�, அவற�ைற ேதர�விலிர�ந�த� விலக�க�ங�கள�:\n"
+"நிற�வ�தல� ம�டிந�த� விட�டத�; %s.\n"
 "\n"
+"சில வடிவமைப�ப�க� கோப�ப�கள�  `.rpmnew அல�லத� rpmsave',\n"
+"என�ற பெயர�களில� உர�வாக�கப�பட�டத�. அவற�ைறப� பார�த�த� தேவையான நடவடிக�கை எட�க�கவ�ம�"
 
 #: ../rpmdrake:1
 #, c-format
@@ -105,490 +146,495 @@ msgid "everything was installed correctly"
 msgstr "அனைத�த�ம� சரியாக நிற�வப�பட�ட�ள�ளத�"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during installation"
+msgstr "பொதி நிற�வலின� போத� பிழை நேர�ந�த�ள�ளத�"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "பின�வர�ம� பொதி நிற�வப�பட�கிறத�  `%s' (%s/%s)..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+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."
+"\n"
+"Error(s) reported:\n"
+"%s"
 msgstr ""
-"ெமன�ெபார�ள� நீக�கக� கர�விக�க� வர�க!\n"
 "\n"
-"இக�கர�வி மூலம� தேவையில�லாத ெமன�ெபார�ளை உங�கள� கணினியில� இர�ந�த�\n"
-" நீக�க ம�டிய�ம�"
+"\n"
+"பிழை ேநர�ந�த�ள�ளத�:\n"
+"%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 "நீங�கள� செய�த மாற�றங�களை சேமிக�க, நீங�கள� ஊடகத�ைத உள�ளீட� செய�ய வேண�ட�ம�"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Save and quit"
-msgstr "சேமித�த�விட�ட� ெவளிச�ெசல�"
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
+msgstr ""
+"நிற�வ�தலில� பிழை நேர�ந�த�ள�ளத� சில கோப�ப�கள� கானப�படவில�ைல.\n"
+"உங�கள� மூலத�தரவ�களை ப�த�ப�பித�த� பார�ங�கள�"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"The following packages have bad signatures:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"பொதி நிற�வலின� போத� பிழை நேர�ந�த�ள�ளத�:\n"
+"ேதர�ந�ெதட�த�த�ள�ள பொதிகளை நிற�வ இந�த பொதிகள� நீக�கப�படவேண�ட�ம�:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"தொடர�ந�த� செல�ல சம�மதமா?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Size: "
-msgstr "அளவ�: "
+msgid "Verifying packages signatures..."
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Security updates"
-msgstr "பாத�காப�ப� ப�த�ப�பித�தல�"
+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 "தவிர�"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl: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] என�ற சாதனத�தில� வைக�கவ�ம�."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "அதிகபட�ச விவரம�"
+msgid "Change medium"
+msgstr "ஊடகத�ைத மாற�றவ�ம�"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, c-format
+msgid "Initializing..."
+msgstr "த�வக�கப�பட�கிறத�..."
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr " பிழை நேர�ந�த�ள�ளத�..."
+msgid "Package installation..."
+msgstr "நிற�வ�வதற�காக பொதிகள� தயாராகின�றன..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr "பொதிகளை நிற�வ�வதற�க� நீங�கள� நிர�வாகியாக இர�க�க வேண�ட�ம�"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "பிரிட�டன�"
+msgid "Unable to get source packages."
+msgstr "மூலப� பொதிகள� கிடைக�கவில�ைல"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure sources"
-msgstr "மூலங�களை வடிவமை"
+msgid "Inspect..."
+msgstr "சோதிக�கப�பட�கிறத�..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "பெயர�களில�"
+msgid "Installation finished"
+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 ""
-"மாற�ற� இணைப� பதிப�ப� �த�மில�ைல\n"
-"\n"
-"நீங�கள� வேற� வழியில� ம�யற�சி செய�த� பார�ங�கள�.\n"
-"இணையத�தில� www.google.com சென�ற� தேடி\n"
-"பார�ங�கள�"
+msgid "Do nothing"
+msgstr "ஒன�ற�ம� செய�யாதே"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
-"\n"
-"\\Do you want to continue installation?"
-msgstr ""
-"ேதர�ந�ெதட�த�த�ள�ள பொதிகளை நிற�வ இந�த பொதிகள� நீக�கப�படவேண�ட�ம�:\n"
-"\n"
-"%s\n"
-"\n"
-"தொடர�ந�த� செல�ல சம�மதமா?"
+#, c-format
+msgid "Use .%s as main file"
+msgstr ".%s என�பதை ம�க�கிய கோப�பாக பயன�பட�த�த�"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Remove .%s"
 msgstr "நீக�க�  .%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Source"
-msgstr "மூலம�"
+msgid "changes:"
+msgstr "மாற�றங�கள�:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "பின�லாந�த�"
+msgid "Inspecting %s"
+msgstr "சோதிக�கப�பட�கிறத�  %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
+msgid "Please wait, finding available packages..."
+msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�..இர�க�க�ம� பொதிகளை கண�ட�பிடிக�கப� பட�கிறத�"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "France"
-msgstr "பிரான�ஸ�"
+msgid "Please wait, adding medium..."
+msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�.... ப�திய ஊடகம� சேர�க�கப�பட�கிறத�"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "More info"
-msgstr "ேமலதிக விவரம�"
+#, 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 "உங�கள� இணை பதிப�ைப எப�படித� தேர�வ�ச� செய�வத�"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "உங�கள� இணைபதிப�ைப ைகம�ைறயாக எப�படித� தேர�வ�ச� செய�வத�"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"%s\n"
+"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"
-"Is it ok to continue?"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"%s\n"
-"\n"
-"இப�படியே தொடரலாமா?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "பொதிகளின� பட�டியலை மீலேற�றவ�ம�"
+msgid "Already existing update sources"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
-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"
+"தொடர�ந�த� செல�ல சம�மதமா?"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Adding a source:"
-msgstr "ப�திய மூலம� சேர�க�கப�பட�கிறத�"
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr " `%s'  என�ற பொதியை நிற�வ ம�டியவில�ைல\n"
+msgid "Fatal error"
+msgstr "கோப�பில� பிழை"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
+msgid "Software Packages Installation"
 msgstr "நிற�வ�வதற�காக பொதிகள� தயாராகின�றன..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages,"
-msgstr "அனைத�த� பொதிகள�ம�"
+msgid "Mandrake Update"
+msgstr "மாண�ட�ேரக� ப�த�ப�பித�தல�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "கோப�ப�களில�"
+msgid "Software Packages Removal"
+msgstr "ெமன�ெபார�ள� நீக�கம�"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "நீங�கள� கேட�ட அனைத�த� பொதிகள�ம� வெற�றிகரமாக நிற�வப�பட�டத�"
+msgid "Quit"
+msgstr "ெவளிச�ெசல�"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "பினாமியின� பெயர�"
+msgid "Install"
+msgstr "நிற�வ�"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update source(s)"
-msgstr "ப�த�ப�பிக�கப�பட வேண�டிய மூல(ங�கள�)"
+msgid "Remove"
+msgstr "நீக�க�"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "உள�ளமைக� கோப�ப�கள�"
+msgid "Help"
+msgstr "உதவி"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "சோதிக�கப�பட�கிறத�  %s"
+msgid "Search"
+msgstr "தேட�"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Israel"
-msgstr "இஸ�ேரல�"
+msgid "Find:"
+msgstr "கண�ட�பிடி:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Help"
-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"
+"தொடர�ந�த� செல�ல சம�மதமா?"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "HTTP பாிமாறி"
+msgid "Some packages need to be removed"
+msgstr "சில பொதிகள� நீக�கப�படவேண�ட�ம�"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"Welcome to the packages source editor!\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"
-"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."
+"Do you really want to install all the selected packages?"
 msgstr ""
-"மூல பொதிகளின� தொக�ப�பாளர� உங�களை வரவேற�கிறத�\n"
+"எச�சரிக�கை; நீங�கள� அளவ�க�கதிகமான பொதிகளை தேர�வ� செய�த�ள�ளீர�கள�. உங�கள� \n"
+"வன�தட�டில� இதற�க� தேவையான இடமில�ைல,\n"
 "\n"
-"இதன� ம�லம� பொதிகள� உள�ள மூலங�களை வடிவமைக�கலாம�\n"
-"வடிவமைத�த பிறக� இந�த பொதிகளை நிரல�களை நிற�வ அல�லத� \n"
-"நிகழ�நிலைப�பட�த�தலாம�"
+"நீங�கள� இந�த எச�சரிக�கையை மீறி இவை அனைத�ைதய�ம� நிற�வ விர�ம�ப�கிறீர�களா?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation failed"
-msgstr "நிற�வ�தலில� பிழை நேர�ந�த�ள�ளத�"
+msgid "Too many packages are selected"
+msgstr "அளவ�க�கதிகமான பொதிகள� தேர�வ� செய�யப�பட�ட�ள�ளத�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr ".%s என�பதை ம�க�கிய கோப�பாக பயன�பட�த�த�"
+msgid "Maximum information"
+msgstr "அதிகபட�ச விவரம�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results"
-msgstr "தேடலின� ம�டிவ�கள�"
+msgid "Normal information"
+msgstr "சாதரன விவரம�"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, c-format
-msgid " failed!"
-msgstr "ெவற�றியடையவில�ைல"
+msgid "Update source(s)"
+msgstr "ப�த�ப�பிக�கப�பட வேண�டிய மூல(ங�கள�)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Brazil"
-msgstr "பிரேசில�"
+msgid "Reload the packages list"
+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 "Reset the selection"
+msgstr "தேர�வ�களை மறந�த� விட�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "கண�ட�பிடி:"
+msgid "in files"
+msgstr "கோப�ப�களில�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "அனைத�த� பொதிகள�ம�,அகர வரிசைப�படி"
+msgid "in descriptions"
+msgstr "விளக�கங�களில� "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�..தேடப�பட�கிறத�"
+msgid "in names"
+msgstr "பெயர�களில�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�...பொதித� தரவ� வாசிக�கப�பட�கிறத�..."
+msgid "by update availability"
+msgstr "ப�த�ப�பிக�கப�பட வேண�டியவையின�படி"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr " `%s'  என�ற பொதியை திறக�க ம�டியவில�ைல\n"
+#, c-format
+msgid "by source repository"
+msgstr "மூலங�களின� இர�ப�ப�ப�படி"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "தேர�வ�களை மறந�த� விட�"
+msgid "by selection state"
+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 "by size"
+msgstr "அளவ�ப�படி"
 
 #: ../rpmdrake: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 "by group"
+msgstr "க�ழ�ப�படி"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "கோஸ�டா ரிகா"
+msgid "All packages,"
+msgstr "அனைத�த� பொதிகள�ம�"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"பொதி நிற�வலின� போத� பிழை நேர�ந�த�ள�ளத�:\n"
-"\n"
-"%s"
-
-#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�.... ஊடகம� நீக�கப�பட�கிறத�"
+msgid "All packages, alphabetical"
+msgstr "அனைத�த� பொதிகள�ம�,அகர வரிசைப�படி"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "கடவ�ச�செல�:"
+msgid "Mandrake choices"
+msgstr "மாண�ட�ேரக� தேர�வ�கள�"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "`%s'... என�ற ெதாைலவில�ள�ள நிரலின� மூலம� ஆராயப�பட�கிறத�"
+msgid "Normal updates"
+msgstr "சாதரன ப�த�ப�பித�தல�"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "தைவான�"
+msgid "Bugfixes updates"
+msgstr "பிழைநீக�க ப�த�ப�பித�தல�"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "User:"
-msgstr "பயனர�:"
+msgid "Security updates"
+msgstr "பாத�காப�ப� ப�த�ப�பித�தல�"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�.... ஊடகம� ப�த�ப�பிக�கப�பட�கிறத�"
+msgid "Description: "
+msgstr "விளக�கம�: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�, பொதிகள� பட�டியலிடப�பட�கிறத�"
+msgid "Reason for update: "
+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 ""
+msgid "Summary: "
+msgstr "விவரம�: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Information on packages"
-msgstr "பொதிகளைப� பற�றிய மேலதிக விவரங�கள�"
+msgid "Importance: "
+msgstr "ம�க�கியத�த�வம�: "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "தவிர�"
+msgid "%s KB"
+msgstr "%s KB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "அனைத�த�ம� வெற�றிகரமாக நிற�வப�பட�ட�ள�ளத�"
+msgid "Size: "
+msgstr "அளவ�: "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�.... ஊடகம� ப�த�ப�பிக�கப�பட�கிறத�"
+msgid "Version: "
+msgstr "வெளியீட�: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Name: "
+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 "Currently installed version: "
+msgstr "தற�ேபாத� நிற�வப�பட�ட�ள�ள பொதியின� வெளியீட�: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "விளக�கங�களில� "
+msgid "Source: "
+msgstr "மூலம�: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "பினாமிகளை வடிவமை"
+msgid "(Not available)"
+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 "Changelog:\n"
+msgstr "மாற�றப�பதிவ�:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "தயவ�செய�த� ேதர�ந�ெதட�க�கவ�ம�"
+msgid "Files:\n"
+msgstr "கோப�ப�கள�:\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "ேதர�ந�ெதட�த�த�ள�ள அளவ�: %d MB"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add a source"
-msgstr "ப�திய மூலம� சேர�க�கப�பட�கிறத�"
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "த�வக�கப�பட�கிறத�..."
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "ேதர�ந�ெதட�த�த�ள�ளவற�றின� அளவ�: %d MB / தற�ேபாத�ள�ள இடம�: %d MB"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "மாற�றங�களை சேமி"
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
+msgstr ""
+"சில கட�ட�ப�பாட�களினால� கீேழ ெகாட�க�கப�பட�ட�ள�ள பொதிகள� \n"
+"நிற�வப�படக�கூடாத�, அவற�ைற ேதர�விலிர�ந�த� விலக�க�ங�கள�:\n"
+"\n"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Error during download"
-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:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "நிற�வ�வதற�காக பொதிகள� தயாராகின�றன..."
+msgid "%s conflicts with %s"
+msgstr "பிரச�சினைகள� எழ�கிறத�"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Importance: "
-msgstr "ம�க�கியத�த�வம�: "
+#, fuzzy, c-format
+msgid "Some packages can't be installed"
+msgstr " `%s'  என�ற பொதியை நிற�வ ம�டியவில�ைல\n"
 
 #: ../rpmdrake:1
 #, c-format
@@ -601,83 +647,77 @@ msgstr ""
 "வேண�ட�ம�:\n"
 "\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "சேர�..."
+msgid "Additional packages needed"
+msgstr "மேல�ம� சில பொதிகள� தேவை"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Unable to create medium."
-msgstr "ஊடகத�ைத உர�வாக�க ம�டியவில�ைல"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr " `%s'  என�ற பொதியை நிற�வ ம�டியவில�ைல\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Removing these packages would break your system, sorry:\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"
-"என�ற பெயர�களில� உர�வாக�கப�பட�டத�. அவற�ைறப� பார�த�த� தேவையான நடவடிக�கை எட�க�கவ�ம�"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
-msgstr "ேமலோட�..."
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
+"சில கட�ட�ப�பாட�களினால� கீேழ ெகாட�க�கப�பட�ட�ள�ள பொதிகள� நீக�கப�பட \n"
+"வேண�ட�ம�:\n"
+"\n"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr " `%s'  என�ற பொதியை நிற�வ ம�டியவில�ைல\n"
-
-#: ../rpmdrake.pm:1
 #, c-format
-msgid "Info..."
-msgstr "தகவல�..."
+msgid "Some additional packages need to be removed"
+msgstr "மேல�ம� சில பொதிகள� நீக�கப�பட வேண�ட�ம�"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "தொடர�ந�த� செல�ல நீங�கள� ஊடகத�ைத உள�ளீட� செய�ய வேண�ட�ம�"
+msgid "More information on package..."
+msgstr "பொதிகளைப� பற�றிய மேல�ம� விவரங�கள�"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "நீக�க�"
+msgid "Information on packages"
+msgstr "பொதிகளைப� பற�றிய மேலதிக விவரங�கள�"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-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 "நீங�கள� க�ைறந�தபட�சம� மேலிர�க�க�ம� ம�தல� இரண�ட� கேள�விக�க� பதில� அளிக�கவ�ம�"
+msgid "More info"
+msgstr "ேமலதிக விவரம�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "நிற�வ�"
+msgid "Addable"
+msgstr "சேர�க�கப�படக�கூடிய"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "ஜப�பான�"
+msgid "Upgradable"
+msgstr "ப�த�ப�பிக�கக�கூடிய"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-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:1
 #, c-format
@@ -686,341 +726,376 @@ msgstr "ப�த�ப�பிக�க ஒன�ற�மில�ைல"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Description: "
-msgstr "விளக�கம�: "
+msgid "(none)"
+msgstr "(ஒன�ற�மில�ைல)"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"நிற�வ�தலில� பிழை நேர�ந�த�ள�ளத� சில கோப�ப�கள� கானப�படவில�ைல.\n"
-"உங�கள� மூலத�தரவ�களை ப�த�ப�பித�த� பார�ங�கள�"
+msgid "Please wait, listing packages..."
+msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�, பொதிகள� பட�டியலிடப�பட�கிறத�"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr " `%s'  என�ற பொதியை திறக�க ம�டியவில�ைல\n"
 
 #: ../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 "One of the following packages is needed:"
+msgstr "கீழ�ள�ள பொதிகளில� ஒன�ற� தேவை"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "பெயர�: "
+msgid "Please choose"
+msgstr "தயவ�செய�த� ேதர�ந�ெதட�க�கவ�ம�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "சோதிக�கப�பட�கிறத�..."
+msgid "rpmdrake"
+msgstr "டிேரக�ெமன�ெபார�ள�"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "நிற�வ�வதற�காக பொதிகள� தயாராகின�றன..."
+msgid "Not selected"
+msgstr "பொதிகளிடையே பிரச�சினைகள� எழ�கிறத�"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "ஆஸ�திரேலியா"
+msgid "Selected"
+msgstr "தேர�வ� ெசய�யப�பட�ட�ள�ளத�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation finished"
-msgstr "நிற�வ�தல� ம�டிந�தத�"
+msgid "Search results"
+msgstr "தேடலின� ம�டிவ�கள�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
-msgstr "ப�த�ப�பிக�கப�பட வேண�டியவையின�படி"
+msgid "Stop"
+msgstr "நிற�த�த�"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
-msgstr "போலாந�த�"
+msgid "Please wait, searching..."
+msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�..தேடப�பட�கிறத�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Version: "
-msgstr "வெளியீட�: "
+msgid "Search results (none)"
+msgstr "தேடலின� ம�டிவ�கள�(ஒன�ற�மில�ைல)"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "மற�ற"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "நீங�கள� பயனர�/கடவ�ச�ெசால�ைல கொட�த�தால� தான� பினாமியை பயன�பட�த�த ம�டிய�ம�"
+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 "Editing source \\\"%s\\\":"
-msgstr "\"%s\": என�ற மூலத�ைத திர�த�தியமை"
+msgid "Proxy..."
+msgstr " பிழை நேர�ந�த�ள�ளத�..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Upgradable"
-msgstr "ப�த�ப�பிக�கக�கூடிய"
+msgid "Update..."
+msgstr "ப�த�ப�பிக�கவ�ம�..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid " done."
-msgstr "ம�டிந�தத�"
+msgid "Add..."
+msgstr "சேர�..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "நிற�வ�வதற�காக பொதிகள� தயாராகின�றன..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "தொக�"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "`%s'... என�ற நிரலின� மூலம� ஆராயப�பட�கிறத�"
+msgid "Source"
+msgstr "மூலம�"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "மேல�ம� சில பொதிகள� தேவை"
+msgid "Enabled?"
+msgstr "ெசயல�பட�த�தப�பட�ட�ள�ளதா?"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "பிழைநீக�க ப�த�ப�பித�தல�"
+msgid "Configure sources"
+msgstr "மூலங�களை வடிவமை"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "`%s' இறக�கத�திற�க�, ேதவைப�பட�ம� ேநரம�:%s, ேவகம�:%s"
+msgid "Password:"
+msgstr "கடவ�ச�செல�:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Germany"
-msgstr "ெஜர�மனி"
+msgid "User:"
+msgstr "பயனர�:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Russia"
-msgstr "ரஷ�யா"
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "நீங�கள� பயனர�/கடவ�ச�ெசால�ைல கொட�த�தால� தான� பினாமியை பயன�பட�த�த ம�டிய�ம�"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Norway"
-msgstr "நார�ேவ"
+msgid "Proxy hostname:"
+msgstr "பினாமியின� பெயர�"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-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]>):"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search"
-msgstr "தேட�"
+msgid "Configure proxies"
+msgstr "பினாமிகளை வடிவமை"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit a source"
-msgstr "மூலத�ைத திர�த�தி அமை"
+msgid "Please wait, updating medium..."
+msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�.... ஊடகம� ப�த�ப�பிக�கப�பட�கிறத�"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Czech Republic"
-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 "Stop"
-msgstr "நிற�த�த�"
+msgid "You need to insert the medium to continue"
+msgstr "தொடர�ந�த� செல�ல நீங�கள� ஊடகத�ைத உள�ளீட� செய�ய வேண�ட�ம�"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "ப�த�ப�பிக�கவ�ம�"
+msgid "Save changes"
+msgstr "மாற�றங�களை சேமி"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�...பொதிகள� நீக�கப�பட�கின�றன..."
+msgid "Relative path to synthesis/hdlist:"
+msgstr "synthesis/hdlist ேகாப�ப�களின� சார�ப� பாதை"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal information"
-msgstr "சாதரன விவரம�"
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing source \"%s\":"
+msgstr "\"%s\": என�ற மூலத�ைத திர�த�தியமை"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "பின�வர�ம� பொதிகள�  இறக�கப�பட�கிறத� `%s' (%s/%s)..."
+msgid "Edit a source"
+msgstr "மூலத�ைத திர�த�தி அமை"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "ேதர�ந�ெதட�த�த�ள�ளவற�றின� அளவ�: %d MB / தற�ேபாத�ள�ள இடம�: %d MB"
+msgid "Please wait, removing medium..."
+msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�.... ஊடகம� நீக�கப�பட�கிறத�"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Spain"
-msgstr "ஸ�ெபயின�"
+msgid "Type of source:"
+msgstr "மூலத�தின� வகை"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
-msgstr "சாதரன ப�த�ப�பித�தல�"
+msgid "Adding a source:"
+msgstr "ப�திய மூலம� சேர�க�கப�பட�கிறத�"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by selection state"
-msgstr "தேர�வாகிய�ள�ளபடி"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"இதே பெயரில� ஊடகம� ஒன�ற�ள�ளத�,நீங�கள� \n"
+"நிச�சயமாக இதனை மாற�ற போகிறிர�களா?"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�... இணைப�பதிப�ப� விவரங�கள� இறக�கப�பட�கிறத�"
+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
 msgid "Login:"
 msgstr "பயனர�கணக�க�"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Austria"
-msgstr "ஆஸ�திரியா"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Fatal error"
-msgstr "கோப�பில� பிழை"
+msgid "Choose a mirror..."
+msgstr "அர�கில� உள�ள இணைப�பதிப�ைப தேர�வ�ச� செய�..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "நீங�கள� ப�த�ப�பிக�க விர�ம�ப�கிற  மூலங�களை தேர�வ� செய�யவ�ம�"
+msgid "Browse..."
+msgstr "ேமலோட�..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update..."
-msgstr "ப�த�ப�பிக�கவ�ம�..."
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "பொதி கையெழ�த�த� சோதனையில� உள�ளத�  `%s'.."
+msgid "Path or mount point:"
+msgstr "பாதை அல�லத� �ற�றப�ப�ள�ளி"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
-msgstr "(ஒன�ற�மில�ைல)"
+msgid "Removable device"
+msgstr "கழற�ற� சாதனங�கள�"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
-"மன�னிக�கவ�ம�, இந�த ெபாதிகளை நீக�கினால� அத� உங�கள� கணினியை பழ�தாக�கி விட�ம�\n"
-"\n"
+msgid "HTTP server"
+msgstr "HTTP பாிமாறி"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "பின�வர�ம� பொதி நிற�வப�பட�கிறத�  `%s' (%s/%s)..."
+msgid "FTP server"
+msgstr "FTP பாிமாறி"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "தற�ேபாத� நிற�வப�பட�ட�ள�ள பொதியின� வெளியீட�: "
+msgid "Path:"
+msgstr "பாதை:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Other"
-msgstr "மற�ற"
+msgid "Local files"
+msgstr "உள�ளமைக� கோப�ப�கள�"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reason for update: "
-msgstr "ப�த�ப�பிக�க வேண�டிய காரனம�"
+msgid "Add a source"
+msgstr "ப�திய மூலம� சேர�க�கப�பட�கிறத�"
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Please choose the desired mirror."
-msgstr "தயவ�செய�த� உங�கள�க�க� அர�கில�ள�ள இணைப�பதிப�ைப ேதர�ந�ெதட�ங�கள�"
+#, fuzzy, c-format
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr "ஊடகத�ைத ப�த�ப�பிக�க ம�டியவில�ைல,அத� தானாகவே ம�டக�கப�பட�ம�"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "தொக�"
+msgid "Unable to create medium."
+msgstr "ஊடகத�ைத உர�வாக�க ம�டியவில�ைல"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, finding available packages..."
-msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�..இர�க�க�ம� பொதிகளை கண�ட�பிடிக�கப� பட�கிறத�"
+msgid "Update"
+msgstr "ப�த�ப�பிக�கவ�ம�"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "synthesis/hdlist ேகாப�ப�களின� சார�ப� பாதை"
+msgid "Select the source(s) you wish to update:"
+msgstr "நீங�கள� ப�த�ப�பிக�க விர�ம�ப�கிற  மூலங�களை தேர�வ� செய�யவ�ம�"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results (none)"
-msgstr "தேடலின� ம�டிவ�கள�(ஒன�ற�மில�ைல)"
+msgid "Please wait, updating media..."
+msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�.... ஊடகம� ப�த�ப�பிக�கப�பட�கிறத�"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Danmark"
-msgstr "டென�மார�க�"
+msgid " failed!"
+msgstr "ெவற�றியடையவில�ைல"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "சீனா"
+msgid " done."
+msgstr "ம�டிந�தத�"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United States"
-msgstr "அமெரிக�கா"
+msgid "Download of `%s', speed:%s"
+msgstr "`%s' இறக�கத�தின� ேவகம�:%s , "
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "changes:"
-msgstr "மாற�றங�கள�:"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "`%s' இறக�கத�திற�க�, ேதவைப�பட�ம� ேநரம�:%s, ேவகம�:%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "பொதி கையெழ�த�த� சோதனையில� உள�ளத�  `%s'.."
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "மேல�ம� சில பொதிகள� நீக�கப�பட வேண�ட�ம�"
+msgid "Examining distant file of source `%s'..."
+msgstr "`%s'... என�ற ெதாைலவில�ள�ள நிரலின� மூலம� ஆராயப�பட�கிறத�"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "rpmdrake"
-msgstr "டிேரக�ெமன�ெபார�ள�"
+msgid "Examining file of source `%s'..."
+msgstr "`%s'... என�ற நிரலின� மூலம� ஆராயப�பட�கிறத�"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No"
-msgstr "இல�ைல"
+msgid "Copying file for source `%s'..."
+msgstr "`%s'... என�ற மூலத�திற�க� ேகாப�ப� நகலிடப�பட�கிறத�"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Summary: "
-msgstr "விவரம�: "
+msgid "Please choose the desired mirror."
+msgstr "தயவ�செய�த� உங�கள�க�க� அர�கில�ள�ள இணைப�பதிப�ைப ேதர�ந�ெதட�ங�கள�"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "கனடா"
+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.pm:1
 #, c-format
-msgid "Greece"
-msgstr "கிரேக�கம�"
+msgid "No mirror"
+msgstr "இணைப�பதிப�ப� �த�மில�ைல"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1037,253 +1112,178 @@ msgstr ""
 "நீங�கள� இணையத�தில� இல�லாதிர�க�கலாம�;இல�ைல மாண�ட�ேரக� இணையதளத�தில�.\n"
 "பிரச�சினையிர�க�கலாம�.தயவ�செய�த� பிறக� ம�யற�சி செய�யவ�ம�"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Source: "
-msgstr "மூலம�: "
-
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "`%s'... என�ற மூலத�திற�க� ேகாப�ப� நகலிடப�பட�கிறத�"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "பொதிகளை நிற�வ�வதற�க� நீங�கள� நிர�வாகியாக இர�க�க வேண�ட�ம�"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Path:"
-msgstr "பாதை:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Problem during removal"
-msgstr "நீக�க�தலில� பிழை நேர�ந�த�ள�ளத�"
+msgid "Error during download"
+msgstr "பொதியை இறக�க�வதில� பிழை நேர�ந�த�ள�ளத�"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by source repository"
-msgstr "மூலங�களின� இர�ப�ப�ப�படி"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�... இணைப�பதிப�ப� விவரங�கள� இறக�கப�பட�கிறத�"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Selected"
-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 ""
+"நான� மாண�ட�ேரக�இணையதளத�திற�க�ச� சென�ற� இணைப� பதிப�ப� விவரங�களை \n"
+"இறக�க வேண�ட�ம�.இதற�க� நீங�கள� இணையத�தில� இனைந�திர�க�கவேண�ட�ம�.\n"
+"\n"
+"தொடர�ந�த� செல�ல சம�மதமா?"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Netherlands"
-msgstr "நெதர�லாந�த�"
+msgid "United States"
+msgstr "அமெரிக�கா"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "சேர�க�கப�படக�கூடிய"
+msgid "China"
+msgstr "சீனா"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
-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:1
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr "பொதிகளிடையே பிரச�சினைகள� எழ�கிறத�"
+msgid "United Kingdom"
+msgstr "பிரிட�டன�"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "ெமன�ெபார�ள� நீக�கம�"
+msgid "Taiwan"
+msgstr "தைவான�"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Sweden"
 msgstr "ச�விடன�"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
-msgstr ""
-"\n"
-"\n"
-"பிழை ேநர�ந�த�ள�ளத�:\n"
-"%s"
+msgid "Russia"
+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."
-msgstr ""
-"நிகழ�நிலைப�பட�த�த ஒன�ற�மில�ைல\n"
-"அப�படியென�றால� நிகழ�நிலைப�பட�த�த ப�திய பொதிகள� �த�மில�ைல,\n"
-"அல�லத� அனைத�த�ம� நிற�வப�பட�ட�விட�டன."
+msgid "Portugal"
+msgstr "போர�ச�கல�"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "`%s' இறக�கத�தின� ேவகம�:%s , "
+msgid "Poland"
+msgstr "போலாந�த�"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "கீழ�ள�ள பொதிகளில� ஒன�ற� தேவை"
+msgid "Norway"
+msgstr "நார�ேவ"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "ெவளிச�ெசல�"
+msgid "Netherlands"
+msgstr "நெதர�லாந�த�"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 ""
-"நான� இணைப� பதிப�பிற�க�க� சென�ற� ப�திய பொதிகளை \n"
-"இறக�க வேண�ட�ம�.இதற�க� நீங�கள� இணையத�தில� இனைந�திர�க�கவேண�ட�ம�.\n"
-"\n"
-"தொடர�ந�த� செல�ல சம�மதமா?"
+msgid "Korea"
+msgstr "கொரியா"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "சரி"
+msgid "Japan"
+msgstr "ஜப�பான�"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�.... ப�திய ஊடகம� சேர�க�கப�பட�கிறத�"
+msgid "Italy"
+msgstr "இத�தாலி"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "மூலத�தின� வகை"
+msgid "Israel"
+msgstr "இஸ�ேரல�"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please insert the medium named \\\"%s\\\" on device [%s]"
-msgstr " \"%s\" என�ற ஊடகத�ைத [%s] என�ற சாதனத�தில� வைக�கவ�ம�."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "கிரேக�கம�"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to get source packages."
-msgstr "மூலப� பொதிகள� கிடைக�கவில�ைல"
+msgid "France"
+msgstr "பிரான�ஸ�"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "அளவ�க�கதிகமான பொதிகள� தேர�வ� செய�யப�பட�ட�ள�ளத�"
+msgid "Finland"
+msgstr "பின�லாந�த�"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "பிரச�சினைகள� எழ�கிறத�"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "ஸ�ெபயின�"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Danmark"
+msgstr "டென�மார�க�"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "மாண�ட�ேரக� தேர�வ�கள�"
+msgid "Germany"
+msgstr "ெஜர�மனி"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Czech Republic"
+msgstr "செக� க�டியரச�"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "மாற�றப�பதிவ�:\n"
+msgid "Costa Rica"
+msgstr "கோஸ�டா ரிகா"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Korea"
-msgstr "கொரியா"
+msgid "Canada"
+msgstr "கனடா"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "கழற�ற� சாதனங�கள�"
+msgid "Brazil"
+msgstr "பிரேசில�"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "பெல�ஜியம�"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Change medium"
-msgstr "ஊடகத�ைத மாற�றவ�ம�"
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "மாண�ட�ேரக� ப�த�ப�பித�தல�"
+msgid "Australia"
+msgstr "ஆஸ�திரேலியா"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by size"
-msgstr "அளவ�ப�படி"
+msgid "Austria"
+msgstr "ஆஸ�திரியா"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "FTP பாிமாறி"
+msgid "Info..."
+msgstr "தகவல�..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Files:\n"
-msgstr "கோப�ப�கள�:\n"
+msgid "No"
+msgstr "இல�ைல"
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr "ஊடகத�ைத ப�த�ப�பிக�க ம�டியவில�ைல,அத� தானாகவே ம�டக�கப�பட�ம�"
+#, c-format
+msgid "Yes"
+msgstr "ஆம�"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
diff --git a/po/tg.po b/po/tg.po
index 079fdb8a..dd6223ab 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grpmi 8.2\n"
-"POT-Creation-Date: 2003-05-02 20:15+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+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,20 +15,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "Даргирифта?"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Path or mount point:"
-msgstr "Роҳ ё нуқтаи ва�лкунӣ:"
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Portugal"
-msgstr "Пуртуқол"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Давом додан гирем?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -47,59 +43,104 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-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"
+"Шумо ёрӣ медиҳад."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Name:"
-msgstr "�ом:"
+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.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Italy"
-msgstr "Коргузорӣ"
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"Хатогӣ ҳангоми коргузории қуттиҳо рӯй дод:\n"
+"\n"
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "Чӣ тавр оинаатонро да�тӣ интихоб мекунед"
+msgid "Problem during removal"
+msgstr "Муаммо ҳангоми хориҷкунӣ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "Please wait, removing packages..."
+msgstr "Интизор шавед, хориҷи қуттиҳо..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Баъзе қуттиҳо бо�д хориҷ шаванд"
+msgid "Please wait, reading packages database..."
+msgstr "Интизор шавед, хониши манбаи маълумоти қуттиҳо..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Already existing update sources"
-msgstr "Сарчашмаи %s дар таҳлил а�т"
+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 "Тайёркунии қуттиҳо барои коргузорӣ..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "More information on package..."
-msgstr "Маълумоти иловагӣ барои қуттӣ..."
+msgid "All requested packages were installed successfully."
+msgstr "Ҳамаи қуттиҳои талабшуда бомуваффақи�т коргузошташуданд."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "Ҳа"
+msgid "Everything installed successfully"
+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 ""
-"�з барои тобеи�тҳо�шон, қуттиҳои зерин бо�д ноинтихоб хоҳанд\n"
-"шуд, ҳозир:\n"
+"Коргузориш ба итмом ра�ид; %s.\n"
 "\n"
+"Баъзе файлҳои танзимдарорӣ ҳамчун `.rpmnew' ё `.rpmsave' офаридашуда\n"
+"буданд, акнун метавонед баъзеашонро барои амалиётҳо бозра�ӣ кунед:"
 
 #: ../rpmdrake:1
 #, c-format
@@ -107,495 +148,504 @@ msgid "everything was installed correctly"
 msgstr "ҳамачиз дуру�т коргузошта шуд"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during installation"
+msgstr "Муаммоҳо ҳангоми коргузориш рӯй доданд"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KБ"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Коргузории қуттии `%s' (%s/%s)..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+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."
+"\n"
+"Error(s) reported:\n"
+"%s"
 msgstr ""
-"Марҳамат ба а�боби хориҷи нармафзор!\n"
 "\n"
-"Ин а�боб ба шумо барои интихоби нармафзор барои хориҷ аз компютери Шумо\n"
-"ёрӣ медиҳад."
+"\n"
+"Ҳи�оботи Хатогӣ(ҳо):\n"
+"%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."
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
 msgstr ""
-"Барои нигоҳ доштани тағирот, Шумо бо�д ба ҳаракатовар миёна дохил кунед."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Save and quit"
-msgstr "�игоҳ дошта бароед"
+"Коргузориш нагузашт, баъзе файлҳо не�танд.\n"
+"Мумкин Шумо бо�д манбаи маълумоти �арчашмаҳо�тонро нав кунед."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"The following packages have bad signatures:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"Хатогӣ ҳангоми коргузории қуттиҳо рӯй дод:\n"
+"Қуттиҳои зерин бо�д хориҷ карда шаванд барои навкунии дигаронаш:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"Давом додан гирем?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Size: "
-msgstr "Ҳаҷм: "
+msgid "Verifying packages signatures..."
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Security updates"
-msgstr "�авигариҳои бехатарӣ"
+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 "Бекор кардан"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "Ok"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Лутфан миёнаи номаш \"%s\" бударо дар да�тгоҳи [%s] гузоред"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "Маълумоти калонтарин"
+msgid "Change medium"
+msgstr "Ивази миёна"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, c-format
+msgid "Initializing..."
+msgstr "Коргузорӣ..."
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Хатогӣ..."
+msgid "Package installation..."
+msgstr "Тайёркунии қуттиҳо барои коргузорӣ..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Барои коргузории қуттиҳо Шумо бо�д root бошед, узр."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Подшоҳии Муттаҳида"
+msgid "Unable to get source packages."
+msgstr "Қуттиҳои �арчашмавӣ гирифта нашуд."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure sources"
-msgstr "Танзимдарории �арчашмаҳо"
+msgid "Inspect..."
+msgstr "Бозра�(�азорат)..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "дар номҳо"
+msgid "Installation finished"
+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 ""
-"Ин �гон оинаи мувофиқ ёфта наметавонад.\n"
-"\n"
-"Барои ин муаммо �кчанд а�о�ҳо шуданаш мумкин; аз ҳама би�ёртараш ин\n"
-"ҳолате ки �охти пардозандаи шумо бо �авигариҳои Ра�мии Mandrake Linux\n"
-"да�тгир нашудаа�т."
+msgid "Do nothing"
+msgstr "Ҳеҷ кор накунед"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
-"\n"
-"\\Do you want to continue installation?"
-msgstr ""
-"Қуттиҳои зерин бо�д хориҷ карда шаванд барои навкунии дигаронаш:\n"
-"\n"
-"%s\n"
-"\n"
-"Давом додан гирем?"
+#, c-format
+msgid "Use .%s as main file"
+msgstr "И�тифодаи .%s ҳамчун файли а�о�ӣ"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Remove .%s"
 msgstr "Хориҷи .%s"
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Source"
-msgstr "Маҷбурӣ"
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "Финлонд"
+msgid "changes:"
+msgstr "тағиротҳо:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "France"
-msgstr "Маҷбурӣ"
+msgid "Inspecting %s"
+msgstr "Бозра�ии(�азорати) %s"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "More info"
-msgstr "Маълумоти изофа"
+#, c-format
+msgid "Please wait, finding available packages..."
+msgstr "Интизор шавед, ёфтани қуттиҳои да�тра�..."
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
+msgid "Please wait, adding medium..."
+msgstr "Интизор шавед, иловаи миёна..."
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"%s\n"
+"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"
-"Is it ok to continue?"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"%s\n"
+"Ҳамчунин метавонед оинаи хо�тагиатонро да�тӣ интихоб кунед: барои ин,\n"
+"Мудири Сарчашмаҳои �армафзорро �ар диҳед ва па� �арчашмаи `�авигариҳои\n"
+"бехатарӣ' илова кунед.\n"
 "\n"
-"Давом додан гирем?"
+"Па�, MandrakeUpdate-ро бозоғоз кунед."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Бозборкунии рӯйхати қуттиҳо"
+msgid "How to choose manually your mirror"
+msgstr "Чӣ тавр оинаатонро да�тӣ интихоб мекунед"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr "Оина интихоб кунед..."
+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 ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Already existing update sources"
+msgstr "Сарчашмаи %s дар таҳлил а�т"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Adding a source:"
-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:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Қуттӣ коргузорӣ шуда наметавонад"
+msgid "A fatal error occurred: %s."
+msgstr ""
+"Хатогии дохили рух дод :\n"
+"%s"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Тайёркунии қуттиҳо барои коргузорӣ..."
+msgid "Fatal error"
+msgstr "Хатогии файл"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "All packages,"
-msgstr "Ҳаммаи қуттиҳо,"
+#, fuzzy, c-format
+msgid "Software Packages Installation"
+msgstr "Тайёркунии қуттиҳо барои коргузорӣ..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "дар файлҳо"
+msgid "Mandrake Update"
+msgstr "�авигарии Mandrake"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Ҳамаи қуттиҳои талабшуда бомуваффақи�т коргузошташуданд."
+msgid "Software Packages Removal"
+msgstr "Хориҷкунии Қуттиҳои �армафзор"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "�оиби номихидматгор:"
+msgid "Quit"
+msgstr "Баромад"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Update source(s)"
-msgstr "�авкунии �арчашма(ҳо)"
+msgid "Install"
+msgstr "Коргузорӣ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Local files"
-msgstr "Файлҳои маҳаллӣ"
+msgid "Remove"
+msgstr "Хориҷ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Бозра�ии(�азорати) %s"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Israel"
-msgstr "Коргузорӣ"
+msgid "Help"
+msgstr "�рӣ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Help"
-msgstr "�рӣ"
+msgid "Search"
+msgstr "Ҷу�туҷӯ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "Хидматра�они HTTP"
+msgid "Find:"
+msgstr "�фтан:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"Welcome to the packages source editor!\n"
+"The following packages have to be removed for others to be upgraded:\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."
+"%s\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
-"Марҳамат ба муҳаррири �арчашмаи қуттиҳо!\n"
+"Қуттиҳои зерин бо�д хориҷ карда шаванд барои навкунии дигаронаш:\n"
 "\n"
-"Ин а�боб барои танзими �арчашмаҳои қуттиҳое ки шумо дар компютери худ "
-"и�тифода\n"
-"бурдан мехоҳед ёрӣ медиҳад. Онҳо па� барои коргузоштани қуттии нармафзори "
-"нав\n"
-"ё иҷрои навигариҳо да�тра� мешаванд."
+"%s\n"
+"\n"
+"Давом додан гирем?"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Коргузории ҳамааш"
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "Баъзе қуттиҳо бо�д хориҷ шаванд"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "И�тифодаи .%s ҳамчун файли а�о�ӣ"
+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 "Search results"
-msgstr "�атиҷаҳои ҷу�туҷӯ"
+msgid "Too many packages are selected"
+msgstr "�з ҳад зиёд қуттиҳо интихоб шудаанд"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " failed!"
-msgstr " нагузашт!"
+msgid "Maximum information"
+msgstr "Маълумоти калонтарин"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Brazil"
-msgstr "Бразил"
+msgid "Normal information"
+msgstr "Маълумоти оддӣ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
-msgstr ""
-"�ллакай миёна бо ин ном вуҷуд дорад, шумо ҳақиқатан\n"
-"онро иваз кардан мехоҳед?"
+msgid "Update source(s)"
+msgstr "�авкунии �арчашма(ҳо)"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "�фтан:"
+msgid "Reload the packages list"
+msgstr "Бозборкунии рӯйхати қуттиҳо"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Ҳамаи қуттиҳо, аз рӯи алифбо"
+msgid "Reset the selection"
+msgstr "Бознишондодани интихоб"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Интизор шавед, ҷу�туҷӯ..."
+msgid "in files"
+msgstr "дар файлҳо"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Интизор шавед, хониши манбаи маълумоти қуттиҳо..."
+msgid "in descriptions"
+msgstr "дар тав�ифҳо"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "Қуттиро кушода намешавад"
+#, c-format
+msgid "in names"
+msgstr "дар номҳо"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "Бознишондодани интихоб"
+msgid "by update availability"
+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 ""
-"Ба Шумо ноиб лозим бошад, номихидматгор ва даргоҳи ихтиёрӣ гузоред (наҳв: "
-"<хидматгорноиб[:даргоҳ]>):"
+msgid "by source repository"
+msgstr "аз рӯи анбори �арчашма"
 
 #: ../rpmdrake: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 "by selection state"
+msgstr "аз рӯи вазъи�ти интихоб"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Ко�то Рико"
+msgid "by size"
+msgstr "бо ҳаҷм"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Хатогӣ ҳангоми коргузории қуттиҳо рӯй дод:\n"
-"\n"
-"%s"
+#, c-format
+msgid "by group"
+msgstr "аз рӯи қуттӣ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Интизор шавед, хориҷи миёна..."
+msgid "All packages,"
+msgstr "Ҳаммаи қуттиҳо,"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "Гузарвожа:"
+msgid "All packages, alphabetical"
+msgstr "Ҳамаи қуттиҳо, аз рӯи алифбо"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "Санҷидани файли дурда�ти �арчашмаи `%s'..."
+msgid "Mandrake choices"
+msgstr "Интихоботи Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Тойвон"
+msgid "Normal updates"
+msgstr "�авигариҳои оддӣ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "User:"
-msgstr "Корванд:"
+msgid "Bugfixes updates"
+msgstr "�авигариҳои Ғалати�лоҳ (Bugfixes)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Интизор шавед, навкунии миёна..."
+msgid "Security updates"
+msgstr "�авигариҳои бехатарӣ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Интизор шавед, рӯйхат�озии қуттиҳо..."
+msgid "Description: "
+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 ""
+msgid "Reason for update: "
+msgstr "��о� барои навигарӣ: "
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Information on packages"
-msgstr "Қуттиро кушода намешавад"
+#, c-format
+msgid "Summary: "
+msgstr "Маълумот: "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "Бекор кардан"
+msgid "Importance: "
+msgstr "Зарури�т: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Ҳамачиз бомуваффақи�т кор гузошта шуд"
+msgid "%s KB"
+msgstr "%s KБ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Интизор шавед, навкунии муҳит..."
+msgid "Size: "
+msgstr "Ҳаҷм: "
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
-"Хатогии дохили рух дод :\n"
-"%s"
+#, c-format
+msgid "Version: "
+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 "Name: "
+msgstr "�ом: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "дар тав�ифҳо"
+msgid "Currently installed version: "
+msgstr "�у�хаи коргузошта шуда: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Source: "
+msgstr "Маҷбурӣ"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Танзимдарории ноибҳо"
+msgid "(Not available)"
+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 "Changelog:\n"
+msgstr "Changelog:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Илтимо� интихоб кунед"
+msgid "Files:\n"
+msgstr "Файлҳо:\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Ҳаҷми интихобшуда %d МБ"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add a source"
-msgstr "Иловаи �арчашма"
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "Коргузорӣ..."
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Интихобшуда: %d МБ / Фо�илаи озоди ди�к: %d МБ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "�игоҳдории тағиротҳо"
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
+msgstr ""
+"�з барои тобеи�тҳо�шон, қуттиҳои зерин бо�д ноинтихоб хоҳанд\n"
+"шуд, ҳозир:\n"
+"\n"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Error during download"
-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:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Тайёркунии қуттиҳо барои коргузорӣ..."
+msgid "%s conflicts with %s"
+msgstr "зидди�тҳо бо"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Importance: "
-msgstr "Зарури�т: "
+#, fuzzy, c-format
+msgid "Some packages can't be installed"
+msgstr "Қуттӣ коргузорӣ шуда наметавонад"
 
 #: ../rpmdrake:1
 #, c-format
@@ -608,83 +658,77 @@ msgstr ""
 "коргузошта шаванд:\n"
 "\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "Илова..."
+msgid "Additional packages needed"
+msgstr "Қуттиҳои иловагӣ лозиманд"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Unable to create medium."
-msgstr "Сохтани миёна номумкин."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "Қуттӣ коргузорӣ шуда наметавонад"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Removing these packages would break your system, sorry:\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"
-"буданд, акнун метавонед баъзеашонро барои амалиётҳо бозра�ӣ кунед:"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Browse..."
-msgstr "Барра�ии..."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "Қуттӣ коргузорӣ шуда наметавонад"
-
-#: ../rpmdrake.pm:1
 #, c-format
-msgid "Info..."
-msgstr "Маълумот..."
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
+"�з барои тобеи�тҳо�шон, қуттиҳои зерин ҳамчунин хориҷ хоҳанд\n"
+"шуд:\n"
+"\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "Барои давом Шумо бо�д миёна дохил кунед"
+msgid "Some additional packages need to be removed"
+msgstr "Баъзе қуттиҳои иловагӣ бо�д хориҷ карда шаванд"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "Хориҷ"
+msgid "More information on package..."
+msgstr "Маълумоти иловагӣ барои қуттӣ..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Тайёркунии қуттиҳо барои коргузорӣ..."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "No mirror"
-msgstr "Оина не�т"
+msgid "Information on packages"
+msgstr "Қуттиро кушода намешавад"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Шумо бо�д ақалан ду оинаи авваларо пур кунед."
+#. -PO: Keep it short, this is gonna be on a button
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "More info"
+msgstr "Маълумоти изофа"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Коргузорӣ"
+msgid "Addable"
+msgstr "Иловашаванда"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "Ҷопон"
+msgid "Upgradable"
+msgstr "�фзоишшаванда"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-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:1
 #, c-format
@@ -693,344 +737,379 @@ msgstr "�авигарӣ не�т"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Description: "
-msgstr "Тав�иф: "
+msgid "(none)"
+msgstr "(ҳеҷ)"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"Коргузориш нагузашт, баъзе файлҳо не�танд.\n"
-"Мумкин Шумо бо�д манбаи маълумоти �арчашмаҳо�тонро нав кунед."
+msgid "Please wait, listing packages..."
+msgstr "Интизор шавед, рӯйхат�озии қуттиҳо..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "unknown package "
+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?"
-msgstr ""
-"Огоҳӣ: шумо кӯшиши иловаи қуттиҳоро аз ҳад зиёд карда и�тодагӣ\n"
-"барин, ки ба файл�и�теми шумо дар ди�к ҷои холӣ нара�иданаш мумкин,\n"
-"ҳангоми ё баъди коргузоштани қуттиҳо; ин хеле хатарнок а�т ва\n"
-"бо�д бо �ҳтиёт ба назар гирифта шавад.\n"
-"\n"
-"Шумо ҳақиқатан ҳамаи қуттиҳои интихобшударо коргузоштан мехоҳед?"
+msgid "One of the following packages is needed:"
+msgstr "Яке аз қуттиҳои зерин лозим а�т:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "�ом: "
+msgid "Please choose"
+msgstr "Илтимо� интихоб кунед"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "Бозра�(�азорат)..."
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Тайёркунии қуттиҳо барои коргузорӣ..."
+msgid "Not selected"
+msgstr "Зидди�тҳо пайдо шуданд"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "О�тролиё"
+msgid "Selected"
+msgstr "Интихобшуда"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation finished"
-msgstr "Коргузориш шуд"
+msgid "Search results"
+msgstr "�атиҷаҳои ҷу�туҷӯ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
-msgstr "аз рӯи да�тра�ии навигарӣ"
+msgid "Stop"
+msgstr "И�т"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
-msgstr "Лаҳи�тон"
+msgid "Please wait, searching..."
+msgstr "Интизор шавед, ҷу�туҷӯ..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Version: "
-msgstr "�у�ха: "
+msgid "Search results (none)"
+msgstr "�атиҷаҳои ҷу�туҷӯ (ҳеҷ)"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Дигар"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "Шумо метавонед барои а�лшино�ии ноиб корванд/гузарвожа муай�н кунед:"
+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 "Editing source \\\"%s\\\":"
-msgstr "Таҳрири �арчашмаи \"%s\":"
+msgid "Proxy..."
+msgstr "Хатогӣ..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Upgradable"
-msgstr "�фзоишшаванда"
+msgid "Update..."
+msgstr "�авкунӣ..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid " done."
-msgstr " шуд."
+msgid "Add..."
+msgstr "Илова..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "Таҳрир кардан"
+
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Тайёркунии қуттиҳо барои коргузорӣ..."
+msgid "Source"
+msgstr "Маҷбурӣ"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "Санҷидани файли �арчашмаи `%s'..."
+msgid "Enabled?"
+msgstr "Даргирифта?"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "Қуттиҳои иловагӣ лозиманд"
+msgid "Configure sources"
+msgstr "Танзимдарории �арчашмаҳо"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "�авигариҳои Ғалати�лоҳ (Bugfixes)"
+msgid "Password:"
+msgstr "Гузарвожа:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "Фаровири `%s', вақт:%s, �уръат:%s"
+msgid "User:"
+msgstr "Корванд:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Germany"
-msgstr "Олмон"
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Шумо метавонед барои а�лшино�ии ноиб корванд/гузарвожа муай�н кунед:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Russia"
-msgstr "Ру�и�"
+msgid "Proxy hostname:"
+msgstr "�оиби номихидматгор:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Norway"
-msgstr "�орвеж"
+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
+#, c-format
+msgid "Configure proxies"
+msgstr "Танзимдарории ноибҳо"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search"
-msgstr "Ҷу�туҷӯ"
+msgid "Please wait, updating medium..."
+msgstr "Интизор шавед, навкунии миёна..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit a source"
-msgstr "Таҳрири �арчашма"
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr ""
+"Барои нигоҳ доштани тағирот, Шумо бо�д ба ҳаракатовар миёна дохил кунед."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Ҷумҳурии Чех"
+msgid "You need to insert the medium to continue"
+msgstr "Барои давом Шумо бо�д миёна дохил кунед"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Stop"
-msgstr "И�т"
+msgid "Save changes"
+msgstr "�игоҳдории тағиротҳо"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "�ав кардан"
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Роҳи ни�би ба synthesis/hdlist:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "Интизор шавед, хориҷи қуттиҳо..."
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing source \"%s\":"
+msgstr "Таҳрири �арчашмаи \"%s\":"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal information"
-msgstr "Маълумоти оддӣ"
+msgid "Edit a source"
+msgstr "Таҳрири �арчашма"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Фаровиркунии қутии `%s' (%s/%s)..."
+msgid "Please wait, removing medium..."
+msgstr "Интизор шавед, хориҷи миёна..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Интихобшуда: %d МБ / Фо�илаи озоди ди�к: %d МБ"
+msgid "Type of source:"
+msgstr "�авъи �арчашма:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Spain"
-msgstr "У�паниё"
+msgid "Adding a source:"
+msgstr "Иловаи �арчашма:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
-msgstr "�авигариҳои оддӣ"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"�ллакай миёна бо ин ном вуҷуд дорад, шумо ҳақиқатан\n"
+"онро иваз кардан мехоҳед?"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by selection state"
-msgstr "аз рӯи вазъи�ти интихоб"
+msgid "You need to fill up at least the two first entries."
+msgstr "Шумо бо�д ақалан ду оинаи авваларо пур кунед."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
-"Лутфан интизор шавед, фаровири адре�ҳои оинаҳо аз пойгоҳи MandrakeSoft."
+msgid "Name:"
+msgstr "�ом:"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "�оми дохилӣ (login):"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Austria"
-msgstr "Утришш"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Хатогии файл"
+msgid "Choose a mirror..."
+msgstr "Оина интихоб кунед..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Сарчашмаҳое, ки афзоиш додан мехоҳед, интихоб кунед:"
+msgid "Browse..."
+msgstr "Барра�ии..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update..."
-msgstr "�авкунӣ..."
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "Та�диқкунии имзои `%s'..."
+msgid "Path or mount point:"
+msgstr "Роҳ ё нуқтаи ва�лкунӣ:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
-msgstr "(ҳеҷ)"
+msgid "Removable device"
+msgstr "Да�тгоҳи хориҷ шаванда"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
-"Хориҷи ин қуттиҳо �и�теми Шуморо вайрон ме�озад, узр:\n"
-"\n"
+msgid "HTTP server"
+msgstr "Хидматра�они HTTP"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Коргузории қуттии `%s' (%s/%s)..."
+msgid "FTP server"
+msgstr "Хидматра�они FTP"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "�у�хаи коргузошта шуда: "
+msgid "Path:"
+msgstr "Роҳ:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Other"
-msgstr "Дигар"
+msgid "Local files"
+msgstr "Файлҳои маҳаллӣ"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reason for update: "
-msgstr "��о� барои навигарӣ: "
+msgid "Add a source"
+msgstr "Иловаи �арчашма"
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Please choose the desired mirror."
-msgstr "Лутфан оинаи хоҳиширо интихоб кунед."
+#, fuzzy, c-format
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr "�авкунии миёна номумкин, ин автоматикӣ хомӯш карда мешавад."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "Таҳрир кардан"
+msgid "Unable to create medium."
+msgstr "Сохтани миёна номумкин."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Интизор шавед, ёфтани қуттиҳои да�тра�..."
+msgid "Update"
+msgstr "�ав кардан"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Роҳи ни�би ба synthesis/hdlist:"
+msgid "Select the source(s) you wish to update:"
+msgstr "Сарчашмаҳое, ки афзоиш додан мехоҳед, интихоб кунед:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results (none)"
-msgstr "�атиҷаҳои ҷу�туҷӯ (ҳеҷ)"
+msgid "Please wait, updating media..."
+msgstr "Интизор шавед, навкунии муҳит..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Danmark"
-msgstr "Донморк"
+msgid " failed!"
+msgstr " нагузашт!"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "Хитой"
+msgid " done."
+msgstr " шуд."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United States"
-msgstr "Иолоти Муттаҳида"
+msgid "Download of `%s', speed:%s"
+msgstr "Фаровири `%s', �уръат:%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "changes:"
-msgstr "тағиротҳо:"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "Фаровири `%s', вақт:%s, �уръат:%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "Та�диқкунии имзои `%s'..."
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Баъзе қуттиҳои иловагӣ бо�д хориҷ карда шаванд"
+msgid "Examining distant file of source `%s'..."
+msgstr "Санҷидани файли дурда�ти �арчашмаи `%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Examining file of source `%s'..."
+msgstr "Санҷидани файли �арчашмаи `%s'..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No"
-msgstr "�е"
+msgid "Copying file for source `%s'..."
+msgstr "�у�хабардории файл барои �арчашма `%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Summary: "
-msgstr "Маълумот: "
+msgid "Please choose the desired mirror."
+msgstr "Лутфан оинаи хоҳиширо интихоб кунед."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "Канада"
+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.pm:1
 #, c-format
-msgid "Greece"
-msgstr "Юнон"
+msgid "No mirror"
+msgstr "Оина не�т"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1047,258 +1126,179 @@ msgstr ""
 "Шабака, ё пойгоҳи MandrakeSoft, мумкин да�тра� набошанд.\n"
 "Лутфан дертар такрор кунед."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Source: "
-msgstr "Маҷбурӣ"
-
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "�у�хабардории файл барои �арчашма `%s'..."
-
-#: ../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 "Роҳ:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Problem during removal"
-msgstr "Муаммо ҳангоми хориҷкунӣ"
+msgid "Error during download"
+msgstr "Хатогӣ ҳангоми фаровир"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by source repository"
-msgstr "аз рӯи анбори �арчашма"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
+"Лутфан интизор шавед, фаровири адре�ҳои оинаҳо аз пойгоҳи MandrakeSoft."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Selected"
-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 пайва�т шудан лозим.\n"
+"Лутфан тафтиш кунед ки шабакаи шумо кор карда и�тодаа�т.\n"
+"\n"
+"Давом додан гирем?"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Netherlands"
-msgstr "Ҳуланд"
+msgid "United States"
+msgstr "Иолоти Муттаҳида"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "Иловашаванда"
+msgid "China"
+msgstr "Хитой"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
-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:1
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr "Зидди�тҳо пайдо шуданд"
+msgid "United Kingdom"
+msgstr "Подшоҳии Муттаҳида"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Хориҷкунии Қуттиҳои �армафзор"
+msgid "Taiwan"
+msgstr "Тойвон"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Sweden"
 msgstr "Суид"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
-msgstr ""
-"\n"
-"\n"
-"Ҳи�оботи Хатогӣ(ҳо):\n"
-"%s"
+msgid "Russia"
+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."
-msgstr ""
-"Рӯйхати навигариҳо холӣ. Ин маънои онро дорад ки ё навигарӣ да�тра�\n"
-"не�т барои қуттиҳои дар компютери шумо коргузошта шуда, ё шумо аллакай\n"
-"ҳамаашро коргузошта шудаед."
+msgid "Portugal"
+msgstr "Пуртуқол"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "Фаровири `%s', �уръат:%s"
+msgid "Poland"
+msgstr "Лаҳи�тон"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Яке аз қуттиҳои зерин лозим а�т:"
+msgid "Norway"
+msgstr "�орвеж"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "Баромад"
+msgid "Netherlands"
+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?"
-msgstr ""
-"Барои гирифтани қуттиҳои навтарин, ба оина пайва�т шуданам даркор.\n"
-"Лутфан мӯътақид шавед, ки шабакаи шумо кор карда и�тодаа�т.\n"
-"\n"
-"Давом додан гирем?"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Korea"
+msgstr "Маҷбурӣ"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid "Japan"
+msgstr "Ҷопон"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Please wait, adding medium..."
-msgstr "Интизор шавед, иловаи миёна..."
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Italy"
+msgstr "Коргузорӣ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Israel"
+msgstr "Коргузорӣ"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "�авъи �арчашма:"
+msgid "Greece"
+msgstr "Юнон"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Please insert the medium named \\\"%s\\\" on device [%s]"
-msgstr "Лутфан миёнаи номаш \"%s\" бударо дар да�тгоҳи [%s] гузоред"
+msgid "France"
+msgstr "Маҷбурӣ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to get source packages."
-msgstr "Қуттиҳои �арчашмавӣ гирифта нашуд."
+msgid "Finland"
+msgstr "Финлонд"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "�з ҳад зиёд қуттиҳо интихоб шудаанд"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "зидди�тҳо бо"
+msgid "Spain"
+msgstr "У�паниё"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Danmark"
+msgstr "Донморк"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Интихоботи Mandrake"
+msgid "Germany"
+msgstr "Олмон"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Czech Republic"
+msgstr "Ҷумҳурии Чех"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Changelog:\n"
+msgid "Costa Rica"
+msgstr "Ко�то Рико"
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Korea"
-msgstr "Маҷбурӣ"
+#, c-format
+msgid "Canada"
+msgstr "Канада"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "Да�тгоҳи хориҷ шаванда"
+msgid "Brazil"
+msgstr "Бразил"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Белжик"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Change medium"
-msgstr "Ивази миёна"
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "�авигарии Mandrake"
+msgid "Australia"
+msgstr "О�тролиё"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by size"
-msgstr "бо ҳаҷм"
+msgid "Austria"
+msgstr "Утришш"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "Хидматра�они FTP"
+msgid "Info..."
+msgstr "Маълумот..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Files:\n"
-msgstr "Файлҳо:\n"
+msgid "No"
+msgstr "�е"
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr "�авкунии миёна номумкин, ин автоматикӣ хомӯш карда мешавад."
+#, c-format
+msgid "Yes"
+msgstr "Ҳа"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
diff --git a/po/th.po b/po/th.po
index 42a03b3e..cfe86b12 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-02 20:15+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+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,20 +14,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "เปิดใช้?"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Path or mount point:"
-msgstr "ที่อยู่หรือจุดเมาท์:"
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Portugal"
-msgstr "โปรตุเ�ส"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"คุณต้อง�ารจะทำต่อหรือไม่?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -46,58 +42,102 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-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 ลงในเครื่อง"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Name:"
-msgstr "ชื่อ:"
+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 ""
+"ยินดีต้อนรับสู่ software removal tool!\n"
+"\n"
+"โปร��รมนี้จะช่วยคุณใน�ารเลือ�โปร��รมที่คุณต้อง�ารลบออ�จา�เครื่อง"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"เ�ิดปั�หาขณะ install:\n"
+"\n"
+"%s"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during removal"
+msgstr "เ�ิดปั�หาขณะ install"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Italy"
-msgstr "อิตาลี"
+msgid "Please wait, removing packages..."
+msgstr "�ำลังลบเพ�เ�จ, �รุณารอสั�ครู่..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "วิธีเลือ� mirror ของคุณเอง"
+msgid "Please wait, reading packages database..."
+msgstr "�ำลังอ่านจา��านข้อมูลเพ�เ�จ, �รุณารอสั�ครู่..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "๊URL:"
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"เ�ิดปั�หาขณะ install:\n"
+"\n"
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "เพ�เ�จบางตัวต้องถู�ลบออ�"
+msgid "Installation failed"
+msgstr "install ไม่สำเร็จ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Already existing update sources"
+msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr ""
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "�าร install package"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "More information on package..."
-msgstr "ข้อมูลเพื่มเติมบน�พ�เ�จ..."
+msgid "All requested packages were installed successfully."
+msgstr "เพ�เ�จทุ�ตัวที่เลือ�ไว้ถู� install เรียบร้อย"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "ใช่"
+msgid "Everything installed successfully"
+msgstr "ทุ�อย่างถู� install เรียบร้อย"
 
 #: ../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 ""
-"เนื่องจา� dependencies จา�เพจเ�จเหล่านี้ ทำให้ต้องเลือ�ออ�ตอนนี้:\n"
+"install เสร็จสมบูรณ์; %s\n"
 "\n"
+"ไฟล์ configuration บางตัวถู�สร้างในชื่อ '.rpmnew' หรือ '.rpmsave', \n"
+"คุณอาจจะต้องตรวจสอบไฟล์เหล่านี้หา�ต้อง�ารทำอย่างอื่นต่อไป"
 
 #: ../rpmdrake:1
 #, c-format
@@ -106,484 +146,494 @@ msgstr "ทุ�อย่างถู� install เรียบร้อย"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Problem during installation"
+msgstr "เ�ิดปั�หาขณะ install"
 
 #: ../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 "Installing package `%s' (%s/%s)..."
 msgstr ""
-"ยินดีต้อนรับสู่ software removal tool!\n"
-"\n"
-"โปร��รมนี้จะช่วยคุณใน�ารเลือ�โปร��รมที่คุณต้อง�ารลบออ�จา�เครื่อง"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "�าร install package"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "ถ้าคุณต้อง�ารบันทึ��ารเปลี่ยน�ปลง, คุณต้องใส่�ผ่นข้อมูล"
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
-msgstr "บันทึ��ล้วออ�"
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
+msgstr ""
+"install ไม่สำเร็จ, ไฟล์บางไฟล์อยู่ไท่ครบ\n"
+"คุณอาจจะต้องอัพเดท�านข้อมูล source ของคุณ"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"The following packages have bad signatures:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"เ�ิดปั�หาขณะ install:\n"
+"เพ�เ�จเหล่านี้ต้องถู�ลบออ�เพื่อให้เพจเ�จอื่นๆอัพเ�รดได้:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"คุณต้อง�ารทำต่อหรือไม่?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Size: "
-msgstr "ขนาด:"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Security updates"
-msgstr "อัพเดทระบบรั�ษาความปลอดภัย"
+msgid "Verifying packages signatures..."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "ข้อมูล�บบละเอียด"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Proxy..."
-msgstr "Proxy..."
+msgid "Cancel"
+msgstr "ย�เลิ�"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "United Kingdom"
-msgstr "อัง�ฤษ"
+msgid "Ok"
+msgstr "ต�ลง"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure sources"
-msgstr "ปรับ�ต่ง source"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "�รุณาใส่สื่อข้อมูลชื่อ \"%s\" ลงในอุป�รณ์ชื่อ [%s]"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "ในชื่อ"
+msgid "Change medium"
+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."
+msgid "Initializing..."
 msgstr ""
-"ไม่สามารถพบ mirror ที่เหมาะสมได้\n"
-"\n"
-"ปั�หานี้เ�ิดได้จา�หลายสาเหตุ; ส่วนมา��ล้วจะมาจา��ารที่ architecture ของ\n"
-"หน่วยประมวลผลของคุณไม่ได้สนับสนุนโดย Mandrake Linux Offical Updates"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
-"\n"
-"\\Do you want to continue installation?"
-msgstr ""
-"เพ�เ�จเหล่านี้ต้องถู�ลบออ�เพื่อให้เพจเ�จอื่นๆอัพเ�รดได้:\n"
-"\n"
-"%s\n"
-"\n"
-"คุณต้อง�ารทำต่อหรือไม่?"
+msgid "Package installation..."
+msgstr "�าร install package"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr "ไม่สามารถหา source เพ�เ�จได้"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Remove .%s"
-msgstr "ลบ %s"
+msgid "Unable to get source packages."
+msgstr "ไม่สามารถหา source เพ�เ�จได้"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Source"
-msgstr "Source"
+msgid "Inspect..."
+msgstr "ตรวจสอบ..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "ฟิน�ลนด์"
+msgid "Installation finished"
+msgstr "install เสร็จเรียบร้อย"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
+msgid "Do nothing"
+msgstr "ไม่ต้องทำอะไร"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "France"
-msgstr "�รั่งเศส"
+msgid "Use .%s as main file"
+msgstr "ใช้ %s เป็นไฟล์หลั�Manager"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "More info"
-msgstr ""
+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
 #, c-format
+msgid "Please wait, adding medium..."
+msgstr "�ำลังเพิ่ม�ผ่นข้อมูล, �รุณารอสั�ครู่"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"%s\n"
+"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"
-"Is it ok to continue?"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"%s\n"
+"คุณสามารถเลือ� mirror ได้เอง\n"
+"โดยเปิด Software Sources Manager �ล้ว�็เพิ่ม Security updates' source\n"
 "\n"
-"คุณต้อง�ารจะทำต่อหรือไม่?"
+"จา�นั้น �็ปิด�ล้วเปิด Mandrake Update อี�ครั้ง"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "โหลดรายชื่อเพจเ�จใหม่"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Choose a mirror..."
-msgstr "เลือ� mirror..."
+msgid "How to choose manually your mirror"
+msgstr "วิธีเลือ� mirror ของคุณเอง"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Adding a source:"
-msgstr "เพิ่ม source: "
+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 ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages can't be installed"
-msgstr "ไม่สามารถ install บางเพ�เ�จได้"
+msgid "Already existing update sources"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
+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:1
 #, c-format
-msgid "All packages,"
-msgstr "ทุ�เพ�เ�จ,"
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "ในไฟล์"
+msgid "Fatal error"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "เพ�เ�จทุ�ตัวที่เลือ�ไว้ถู� install เรียบร้อย"
+msgid "Software Packages Installation"
+msgstr "�าร install package"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "ชื่อโฮส proxy: "
+msgid "Mandrake Update"
+msgstr "อัพเดทของ Mandrake"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Update source(s)"
-msgstr "อัพเดท source(s)"
+msgid "Software Packages Removal"
+msgstr "�ารลบเพ�เ�จ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Local files"
-msgstr "ไฟล์ในเครื่องนี้"
+msgid "Quit"
+msgstr "ออ�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "�ำลังตรวจสอบ %s"
+msgid "Install"
+msgstr "Install"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Israel"
-msgstr "อิสราเอล"
+msgid "Remove"
+msgstr "เอาออ�"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Help"
 msgstr "ความช่วยเหลือ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "เซอร์้เวอร์ HTTP"
+msgid "Search"
+msgstr "ค้นหา"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "ค้นหา:"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"Welcome to the packages source editor!\n"
+"The following packages have to be removed for others to be upgraded:\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."
+"%s\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
-"ยินดีต้อนรับสู่ package source editor!\n"
+"เพ�เ�จเหล่านี้ต้องถู�ลบออ�เพื่อให้เพจเ�จอื่นๆอัพเ�รดได้:\n"
 "\n"
-"เครื่องมือนี้จะช่วยคุณใน�ารปรับ�ต่ง package sources ที่คุณจะใช้ในเครื่องคอมพิวเตอร์\n"
-"ของคุณ เพื่อที่เพ�เ�จเหล่านี้จะได้พร้อมสำหรับ�าร install หรืออัพเดทต่อไป"
+"%s\n"
+"\n"
+"คุณต้อง�ารทำต่อหรือไม่?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation failed"
-msgstr "install ไม่สำเร็จ"
+msgid "Some packages need to be removed"
+msgstr "เพ�เ�จบางตัวต้องถู�ลบออ�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "ใช้ %s เป็นไฟล์หลั�Manager"
+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 "Search results"
-msgstr "ผล�ารค้นหา"
+msgid "Too many packages are selected"
+msgstr "มีเพ�เ�จที่ถู�เลือ�มา�เ�ินไป"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid " failed!"
-msgstr "ในไฟล์"
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
+msgstr "ข้อมูล�บบละเอียด"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Brazil"
-msgstr "บราซิล"
+msgid "Normal information"
+msgstr "ข้อมูล�บบป�ตื"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
-msgstr ""
-"มีสื่อข้อมูลชื่อดัง�ล่าวอยู่�ล้ว\n"
-"คุณต้อง�ารจะเขียนทับหรือไม่?"
+msgid "Update source(s)"
+msgstr "อัพเดท source(s)"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "ค้นหา:"
+msgid "Reload the packages list"
+msgstr "โหลดรายชื่อเพจเ�จใหม่"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "ทุ�เพ�เ�จ, เรียงตามตัวอั�ษร"
+msgid "Reset the selection"
+msgstr "reset รายชื่อที่ถู�เลือ�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "�ำลังค้นหา �รุณารอสั�ครู่..."
+msgid "in files"
+msgstr "ในไฟล์"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "�ำลังอ่านจา��านข้อมูลเพ�เ�จ, �รุณารอสั�ครู่..."
+msgid "in descriptions"
+msgstr "ตามคำอธิบาย"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "unknown package "
-msgstr "ไม่รู้จั�เพ�เ�จนี้"
+msgid "in names"
+msgstr "ในชื่อ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "reset รายชื่อที่ถู�เลือ�"
+msgid "by update availability"
+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 "by source repository"
+msgstr "ตาม source repository"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"เนื่องจา� dependencies จา�เพจเ�จเหล่านี้ ทำให้เพ�เ�จที่มีชื่อดังนี้\n"
-"ต้องถู�ลบออ�:\n"
-"\n"
+msgid "by selection state"
+msgstr "ตาม�ารถู�เลือ�"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "คอสตาริ�า"
+msgid "by size"
+msgstr "ตามขนาด"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"เ�ิดปั�หาขณะ install:\n"
-"\n"
-"%s"
+msgid "by group"
+msgstr "ตาม�ลุ่ม"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "�ำลังเอาสื่อข้อมูลออ�, �รุณารอสั�ครู่"
+msgid "All packages,"
+msgstr "ทุ�เพ�เ�จ,"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "พาสเวิร์ด:"
+msgid "All packages, alphabetical"
+msgstr "ทุ�เพ�เ�จ, เรียงตามตัวอั�ษร"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr ""
+msgid "Mandrake choices"
+msgstr "Mandrake choices"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "ไต้หวัน"
+msgid "Normal updates"
+msgstr "อัพเดททั่วไป"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "User:"
-msgstr "ผู้ใช้:"
+msgid "Bugfixes updates"
+msgstr "อัพเดท�บบ��้ไขบั�"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "�ำลังอัพเดท�ผ่นข้อมูล, �รุณารอสั�ครู่"
+msgid "Security updates"
+msgstr "อัพเดทระบบรั�ษาความปลอดภัย"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "�ำลังทำรายชื่อเพ�เ�จ, �รุณารอสั�ครู่"
+msgid "Description: "
+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 ""
+msgid "Reason for update: "
+msgstr "เหตุผลใน�ารอัพเดท:"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Information on packages"
-msgstr "ข้อมูลเพื่มเติมบน�พ�เ�จ..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Cancel"
-msgstr "ย�เลิ�"
+msgid "Summary: "
+msgstr "ข้อความสรุป:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "ทุ�อย่างถู� install เรียบร้อย"
+msgid "Importance: "
+msgstr "ความสำคั�:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "�ำลังอัพเดทสื่อข้อมูล, �รุณารอสั�ครู่"
+msgid "%s KB"
+msgstr "%s KB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Size: "
+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 "Version: "
+msgstr "เวอร์ชัน:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "ตามคำอธิบาย"
+msgid "Name: "
+msgstr "ชื่อ:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "ปรับ�ต่ง proxies"
+msgid "Currently installed version: "
+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 เพื่ออ่านรายชื่อ mirrors\n"
-"�รุณาตรวจสอบว่าระบบเนตเวิร์�ของคุณ�ำลังเปิดใช้งานอยู่\n"
-"\n"
-"คุณต้อง�ารจะทำต่อหรือไม่?"
+msgid "Source: "
+msgstr "Source:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "�รุณาเลือ�"
+msgid "(Not available)"
+msgstr "(ไม่พร้อมใช้งาน)"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "ขนาดรวมที่เลือ�: %d MB"
+msgid "Changelog:\n"
+msgstr "Changelog:\n"
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Add a source"
-msgstr "เพิ่ม source: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "�ฟ้ม:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr ""
+msgid "Selected size: %d MB"
+msgstr "ขนาดรวมที่เลือ�: %d MB"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "บันทึ��ารเปลี่ยน�ปลง"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "เลือ�ไป: %d MB / พื้นที่ดิส�์ที่เหลือ: %d MB"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
-msgstr "เ�ิดข้อผิดพลาดขณะดาวน์โหลด"
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
+msgstr ""
+"เนื่องจา� dependencies จา�เพจเ�จเหล่านี้ ทำให้ต้องเลือ�ออ�ตอนนี้:\n"
+"\n"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "�าร install package"
+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 "Importance: "
-msgstr "ความสำคั�:"
+msgid "%s conflicts with %s"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "ไม่สามารถ install บางเพ�เ�จได้"
 
 #: ../rpmdrake:1
 #, c-format
@@ -595,83 +645,74 @@ msgstr ""
 "เนื่องจา� dependencies, เพจเ�จเหล่านี้จะต้อง install ไปด้วย:\n"
 "\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "เพิ่ม..."
+msgid "Additional packages needed"
+msgstr "ต้อง�ารเพจเ�จเพิ่มเติม"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Unable to create medium."
-msgstr "ไม่สามารถสร้าง�ผ่นข้อมูลได้"
+msgid "Some packages can't be removed"
+msgstr "ไม่สามารถลบเพ�เ�จบางตัวออ�ได้"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Removing these packages would break your system, sorry:\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"
-"คุณอาจจะต้องตรวจสอบไฟล์เหล่านี้หา�ต้อง�ารทำอย่างอื่นต่อไป"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Browse..."
-msgstr "เลือ�..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages can't be removed"
-msgstr "ไม่สามารถลบเพ�เ�จบางตัวออ�ได้"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Info..."
-msgstr "ข้อมูล..."
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
+"เนื่องจา� dependencies จา�เพจเ�จเหล่านี้ ทำให้เพ�เ�จที่มีชื่อดังนี้\n"
+"ต้องถู�ลบออ�:\n"
+"\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "คุณต้องใส่สื่อข้อมูลเพื่อทำต่อ"
+msgid "Some additional packages need to be removed"
+msgstr "มีเพ�เ�จบางตัวยังต้องถู�เอาออ�"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "เอาออ�"
+msgid "More information on package..."
+msgstr "ข้อมูลเพื่มเติมบน�พ�เ�จ..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "�าร install package"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "No mirror"
-msgstr "ไม่พบ mirror"
+msgid "Information on packages"
+msgstr "ข้อมูลเพื่มเติมบน�พ�เ�จ..."
 
-#: ../edit-urpm-sources.pl:1
+#. -PO: Keep it short, this is gonna be on a button
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "คุณต้องใส่ข้อมูลอย่างน้อยในสองช่อง�ร�"
+msgid "More info"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Install"
+msgid "Addable"
+msgstr "เพิ่มได้"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "�ี่ปุ่น"
+msgid "Upgradable"
+msgstr "อัพเ�รดได้"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-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:1
 #, c-format
@@ -680,340 +721,372 @@ msgstr "ไม่มีตัวอัพเดท"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Description: "
-msgstr "คำอธิบาย:"
+msgid "(none)"
+msgstr "(ไม่มี)"
 
 #: ../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 "Please wait, listing packages..."
+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?"
-msgstr ""
-"คำเตือน: คุณ�ำลังเพิ่มเพ�เ�จเป็นจำนวนมา�ลงเครื่องของคุณ�ละอาจจะ\n"
-"ทำให้พื้นที่ว่างในระบบหมดไปขณะ หรือ หลัง�ารลงเพ�เ�จ�ล้ว\n"
-"�าร�ระทำนี้อาจเป็นอันตราย�ละควรจะพิจารณาให้ถี่ถ้วน\n"
-"\n"
-"คุณต้อง�ารจะลงเพ�เ�จที่เลือ�ไว้ทั้งหมดหรือไม่?"
+msgid "unknown package "
+msgstr "ไม่รู้จั�เพ�เ�จนี้"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "ชื่อ:"
+msgid "One of the following packages is needed:"
+msgstr "ต้อง�าร�พ�เ�จหนึ่งในรายชื่อนี้:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "ตรวจสอบ..."
+msgid "Please choose"
+msgstr "�รุณาเลือ�"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "�าร install package"
-
-#: ../rpmdrake.pm:1
 #, c-format
-msgid "Australia"
-msgstr "ออสเตรเลีย"
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation finished"
-msgstr "install เสร็จเรียบร้อย"
+msgid "Not selected"
+msgstr "ไม่ได้ถู�เลือ�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
-msgstr "ตามความพร้อมใน�ารอัพเดท"
+msgid "Selected"
+msgstr "ถู�เลือ�"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
-msgstr "โป�ลนด๋"
+msgid "Search results"
+msgstr "ผล�ารค้นหา"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Version: "
-msgstr "เวอร์ชัน:"
+msgid "Stop"
+msgstr "หยุด"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "คุณต้องใส่ล็อ�อิน�ละพาสเวิร์ดเพื่อใช้ proxy:"
+msgid "Please wait, searching..."
+msgstr "�ำลังค้นหา �รุณารอสั�ครู่..."
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Editing source \\\"%s\\\":"
-msgstr "�ำลัง��้ไข source \"%s\":"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
+msgstr "ผล�ารค้นหา (ไม่พบ)"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Upgradable"
-msgstr "อัพเ�รดได้"
+msgid "Other"
+msgstr "อื่นๆ"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid " done."
+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 หรืออัพเดทต่อไป"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Software Packages Installation"
-msgstr "�าร install package"
+msgid "Save and quit"
+msgstr "บันทึ��ล้วออ�"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr ""
+msgid "Proxy..."
+msgstr "Proxy..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "ต้อง�ารเพจเ�จเพิ่มเติม"
+msgid "Update..."
+msgstr "อัพเดท..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "อัพเดท�บบ��้ไขบั�"
+msgid "Add..."
+msgstr "เพิ่ม..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr ""
+msgid "Edit"
+msgstr "��้ไข"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Germany"
-msgstr "เยอรมนี"
+msgid "Source"
+msgstr "Source"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Russia"
-msgstr "รัสเซีย"
+msgid "Enabled?"
+msgstr "เปิดใช้?"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Norway"
-msgstr "นอร์เวย์"
+msgid "Configure sources"
+msgstr "ปรับ�ต่ง source"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Problem during installation"
-msgstr "เ�ิดปั�หาขณะ install"
+msgid "Password:"
+msgstr "พาสเวิร์ด:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search"
-msgstr "ค้นหา"
+msgid "User:"
+msgstr "ผู้ใช้:"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit a source"
-msgstr "��้ไข source"
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "คุณต้องใส่ล็อ�อิน�ละพาสเวิร์ดเพื่อใช้ proxy:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Czech Republic"
-msgstr "สาธารณรั�เช็ค"
+msgid "Proxy hostname:"
+msgstr "ชื่อโฮส proxy: "
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Stop"
-msgstr "หยุด"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr "ถ้าคุณต้อง�ารใช้ proxy �รุณาใส่ชื่อ host �ละ port (รูป�บบ: <proxyhost[:port]>):"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "อัพเดท"
+msgid "Configure proxies"
+msgstr "ปรับ�ต่ง proxies"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "�ำลังลบเพ�เ�จ, �รุณารอสั�ครู่..."
+msgid "Please wait, updating medium..."
+msgstr "�ำลังอัพเดท�ผ่นข้อมูล, �รุณารอสั�ครู่"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal information"
-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 "Downloading package `%s' (%s/%s)..."
-msgstr ""
+msgid "You need to insert the medium to continue"
+msgstr "คุณต้องใส่สื่อข้อมูลเพื่อทำต่อ"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "เลือ�ไป: %d MB / พื้นที่ดิส�์ที่เหลือ: %d MB"
+msgid "Save changes"
+msgstr "บันทึ��ารเปลี่ยน�ปลง"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Spain"
-msgstr "สเปน"
+msgid "Relative path to synthesis/hdlist:"
+msgstr "พาธ�บบ relative ไปยัง synthesis/hdlist:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
-msgstr "อัพเดททั่วไป"
+msgid "URL:"
+msgstr "๊URL:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing source \"%s\":"
+msgstr "�ำลัง��้ไข source \"%s\":"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by selection state"
-msgstr "ตาม�ารถู�เลือ�"
+msgid "Edit a source"
+msgstr "��้ไข source"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr "�รุณารอสั�ครุ่, �ำลังดาว์นโหลดรายชื่อ mirrors จา�เวป MandrakeSoft"
+msgid "Please wait, removing medium..."
+msgstr "�ำลังเอาสื่อข้อมูลออ�, �รุณารอสั�ครู่"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Login:"
-msgstr "ล็อ�อิน:"
+msgid "Type of source:"
+msgstr "ชนิดของ source:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Austria"
-msgstr "ออสเตรีย"
+msgid "Adding a source:"
+msgstr "เพิ่ม source: "
 
-#: ../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.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "เลือ� source(s) ที่คุณต้อง�ารจะอัพเดท"
+msgid "You need to fill up at least the two first entries."
+msgstr "คุณต้องใส่ข้อมูลอย่างน้อยในสองช่อง�ร�"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update..."
-msgstr "อัพเดท..."
+msgid "Name:"
+msgstr "ชื่อ:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Starting download of `%s'..."
-msgstr ""
+msgid "Login:"
+msgstr "ล็อ�อิน:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
-msgstr "(ไม่มี)"
+msgid "Choose a mirror..."
+msgstr "เลือ� mirror..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
+msgid "Browse..."
+msgstr "เลือ�..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr ""
+msgid "Path or mount point:"
+msgstr "ที่อยู่หรือจุดเมาท์:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "เวอร์ชันที่�ำลังใช้อยู่:"
+msgid "Removable device"
+msgstr "ไดร์ฟเคลื่อนย้ายได้"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Other"
-msgstr "อื่นๆ"
+msgid "HTTP server"
+msgstr "เซอร์้เวอร์ HTTP"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reason for update: "
-msgstr "เหตุผลใน�ารอัพเดท:"
+msgid "FTP server"
+msgstr "เซอร์เวอร์ FTP"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please choose the desired mirror."
-msgstr "�รุณาเลือ� mirror ที่ต้อง�าร"
+msgid "Path:"
+msgstr "พาธ:"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit"
-msgstr "��้ไข"
+msgid "Local files"
+msgstr "ไฟล์ในเครื่องนี้"
 
-#: ../rpmdrake:1
+#: ../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 "ไม่สามารถอัพเดท�ผ่นข้อมูลได้; �ผ่นข้อมูลนี้จะไม่ถู�ใช้โดยอัตโนมัติ"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, finding available packages..."
-msgstr "�ำลังหาเพ�เ�จที่มีอยู่, �รุณารอสั�ครู่..."
+msgid "Unable to create medium."
+msgstr "ไม่สามารถสร้าง�ผ่นข้อมูลได้"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "พาธ�บบ relative ไปยัง synthesis/hdlist:"
+msgid "Update"
+msgstr "อัพเดท"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results (none)"
-msgstr "ผล�ารค้นหา (ไม่พบ)"
+msgid "Select the source(s) you wish to update:"
+msgstr "เลือ� source(s) ที่คุณต้อง�ารจะอัพเดท"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Danmark"
-msgstr "เดนมาร์�"
+msgid "Please wait, updating media..."
+msgstr "�ำลังอัพเดทสื่อข้อมูล, �รุณารอสั�ครู่"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid " failed!"
+msgstr "ในไฟล์"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "จีน"
+msgid " done."
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United States"
-msgstr "สหรั�อเมริ�า"
+msgid "Download of `%s', speed:%s"
+msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "changes:"
-msgstr "บันทึ��ารเปลี่ยน�ปลง"
+#: ../rpmdrake.pm:1
+#, c-format
+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 "Starting download of `%s'..."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Examining distant file of source `%s'..."
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No"
-msgstr "ไม่ใช่"
+msgid "Examining file of source `%s'..."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Summary: "
-msgstr "ข้อความสรุป:"
+msgid "Copying file for source `%s'..."
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "�คนาดา"
+msgid "Please choose the desired mirror."
+msgstr "�รุณาเลือ� mirror ที่ต้อง�าร"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Greece"
-msgstr "�รืซ"
+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"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
+msgstr "ไม่พบ mirror"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1029,251 +1102,178 @@ msgstr ""
 "%s\n"
 "ระบบเนตเวิร์� หรือ เวป MandrakeSoft ในขณะนี้อาจจะไม่พร้อมให้บริ�าร �รุณาลองใหม่ภายหลัง"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Source: "
-msgstr "Source:"
-
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr ""
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "ไม่สามารถหา source เพ�เ�จได้"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Path:"
-msgstr "พาธ:"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during removal"
-msgstr "เ�ิดปั�หาขณะ install"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "by source repository"
-msgstr "ตาม source repository"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Selected"
-msgstr "ถู�เลือ�"
+msgid "Error during download"
+msgstr "เ�ิดข้อผิดพลาดขณะดาวน์โหลด"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Netherlands"
-msgstr "เนเธอร์�ลนด์"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Addable"
-msgstr "เพิ่มได้"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "�รุณารอสั�ครุ่, �ำลังดาว์นโหลดรายชื่อ mirrors จา�เวป MandrakeSoft"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
-msgstr "(ไม่พร้อมใช้งาน)"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
 "\n"
-"%s"
+"Is it ok to continue?"
 msgstr ""
-"เพ�เ�จเหล่านี้ไม่สามารถถู�เลือ�ได้:\n"
+"โปร��รมต้อง�ารติดต่อเวปไซต์ MandrakeSoft เพื่ออ่านรายชื่อ mirrors\n"
+"�รุณาตรวจสอบว่าระบบเนตเวิร์�ของคุณ�ำลังเปิดใช้งานอยู่\n"
 "\n"
+"คุณต้อง�ารจะทำต่อหรือไม่?"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Not selected"
-msgstr "ไม่ได้ถู�เลือ�"
+msgid "United States"
+msgstr "สหรั�อเมริ�า"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "�ารลบเพ�เ�จ"
+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:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
-msgstr ""
+msgid "Russia"
+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."
-msgstr ""
-"ไม่มีราย�ารที่ต้องอัพเดท หมายความว่าอาจจะยังไม่มีอัพเดทสำหรัับ\n"
-"เพ�เ�จที่อยู่ในเครื่องของคุณหรือไม่�็ถู� install หมด�ล้ว"
+msgid "Portugal"
+msgstr "โปรตุเ�ส"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr ""
+msgid "Poland"
+msgstr "โป�ลนด๋"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "ต้อง�าร�พ�เ�จหนึ่งในรายชื่อนี้:"
+msgid "Norway"
+msgstr "นอร์เวย์"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "ออ�"
+msgid "Netherlands"
+msgstr "เนเธอร์�ลนด์"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Korea"
+msgstr "เ�าหลี"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "ต�ลง"
+msgid "Japan"
+msgstr "�ี่ปุ่น"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "�ำลังเพิ่ม�ผ่นข้อมูล, �รุณารอสั�ครู่"
+msgid "Italy"
+msgstr "อิตาลี"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "ชนิดของ source:"
+msgid "Israel"
+msgstr "อิสราเอล"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please insert the medium named \\\"%s\\\" on device [%s]"
-msgstr "�รุณาใส่สื่อข้อมูลชื่อ \"%s\" ลงในอุป�รณ์ชื่อ [%s]"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "�รืซ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to get source packages."
-msgstr "ไม่สามารถหา source เพ�เ�จได้"
+msgid "France"
+msgstr "�รั่งเศส"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "มีเพ�เ�จที่ถู�เลือ�มา�เ�ินไป"
+msgid "Finland"
+msgstr "ฟิน�ลนด์"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "%s conflicts with %s"
-msgstr ""
+msgid "Spain"
+msgstr "สเปน"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 Update!\n"
-"\n"
-"โปร��รมนี้จะช่วยคุณใน�ารเลือ�ตัวอัพเดทที่คุณต้อง�าร install ลงในเครื่อง"
+msgid "Danmark"
+msgstr "เดนมาร์�"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Mandrake choices"
+msgid "Germany"
+msgstr "เยอรมนี"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Czech Republic"
+msgstr "สาธารณรั�เช็ค"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Changelog:\n"
+msgid "Costa Rica"
+msgstr "คอสตาริ�า"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Korea"
-msgstr "เ�าหลี"
+msgid "Canada"
+msgstr "�คนาดา"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "ไดร์ฟเคลื่อนย้ายได้"
+msgid "Brazil"
+msgstr "บราซิล"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "เบลเยียม"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Change medium"
-msgstr "เปลื่ยนสื่อข้อมูล"
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "อัพเดทของ Mandrake"
+msgid "Australia"
+msgstr "ออสเตรเลีย"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by size"
-msgstr "ตามขนาด"
+msgid "Austria"
+msgstr "ออสเตรีย"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "เซอร์เวอร์ FTP"
+msgid "Info..."
+msgstr "ข้อมูล..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Files:\n"
-msgstr "�ฟ้ม:\n"
+msgid "No"
+msgstr "ไม่ใช่"
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr "ไม่สามารถอัพเดท�ผ่นข้อมูลได้; �ผ่นข้อมูลนี้จะไม่ถู�ใช้โดยอัตโนมัติ"
+#, c-format
+msgid "Yes"
+msgstr "ใช่"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
diff --git a/po/tr.po b/po/tr.po
index 4273ee4e..7011dfc1 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grpmi\n"
-"POT-Creation-Date: 2003-05-02 20:15+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+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,20 +16,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-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
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Portugal"
-msgstr "Portekiz"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Devam etmek için herşey tamam mı ?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -49,58 +45,104 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-msgstr "gruba göre"
+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."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Name:"
-msgstr "Adı:"
+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.pm:1
-#, c-format
-msgid "Italy"
-msgstr "Ä°talya"
+#: ../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"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "Yansınızı elle nasıl seçersiniz?"
+msgid "Problem during removal"
+msgstr "Kaldırım esnasında problem"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "Please wait, removing packages..."
+msgstr "Lütfen bekleyin, paketler kaldırılıyor..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Bazı paketlerin kaldırılması gerekiyor"
+msgid "Please wait, reading packages database..."
+msgstr "Lütfen bekleyin, paket veritabanı okunuyor..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Already existing update sources"
+#, 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
 #, c-format
-msgid "More information on package..."
-msgstr "Paket hakkında daha fazla bilgi..."
+msgid "Installation failed"
+msgstr "Kurulum başarısız"
 
-#: ../rpmdrake.pm:1
+#: ../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..."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "Evet"
+msgid "All requested packages were installed successfully."
+msgstr "İstenen paketler başarılı bir şekilde yüklendi."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr "Herşey başarılı bir şekilde yüklendi"
 
 #: ../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 ""
-"Bağımlılıkları nedeniyle şu paketlerin seçili olmaması gerekiyor:\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
 #, c-format
@@ -108,490 +150,500 @@ 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 "%s KB"
-msgstr "%s KB"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "'%s' paketi kuruluyor ( %s/%s)..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Kurulum için paketler hazırlanılıyor..."
 
 #: ../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."
+"\n"
+"Error(s) reported:\n"
+"%s"
 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."
+"\n"
+"Hata(lar) rapor edildi:\n"
+"%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 "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"
+"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."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"The following packages have bad signatures:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"Paketlerin kurulumu sırasında bir hata ile karşılaşıldı:\n"
+"Diğerlerinin güncellenmesi için şu paketlerin kaldırılması gerekiyor:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"Devam etmek için herşey tamam mı?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Size: "
-msgstr "Boyut: "
+msgid "Verifying packages signatures..."
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Security updates"
-msgstr "Güvenlik güncellemeleri"
+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"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "Tamam"
+
+#: ../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 "Maximum information"
-msgstr "En fazla bilgi"
+msgid "Change medium"
+msgstr "Ortam deÄŸiÅŸtir"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, c-format
+msgid "Initializing..."
+msgstr "Başlatılıyor..."
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Hata..."
+msgid "Package installation..."
+msgstr "Kurulum için paketler hazırlanılıyor..."
 
-#: ../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."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Birleşik Krallık"
+msgid "Unable to get source packages."
+msgstr "Kaynak paketleri alınamıyor."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure sources"
-msgstr "Kaynakları yapılandır"
+msgid "Inspect..."
+msgstr "Ä°ncele..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "isimlerde"
+msgid "Installation finished"
+msgstr "Kurulum tamamlandı"
 
-#: ../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 ""
-"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 "Do nothing"
+msgstr "BirÅŸey yapma"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
-"\n"
-"\\Do you want to continue installation?"
-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ı?"
+#, c-format
+msgid "Use .%s as main file"
+msgstr "Ana dosya olarak .%s kullan"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Remove .%s"
 msgstr "Kaldır .%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Source"
-msgstr "Kaynak"
+msgid "changes:"
+msgstr "deÄŸiÅŸiklikler:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "Finlandiya"
+msgid "Inspecting %s"
+msgstr "%s inceleniyor"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
+msgid "Please wait, finding available packages..."
+msgstr "Lütfen bekleyin, erişilebilir paketler aranıyor..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "France"
-msgstr "Fransa"
+msgid "Please wait, adding medium..."
+msgstr "Lütfen bekleyin, ortam ekleniyor..."
 
-#. -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 ""
-"%s\n"
+"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"
-"Is it ok to continue?"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"%s\n"
+"İ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"
-"Devam etmek için herşey tamam mı ?"
+"Daha sonra, MandrakeUpdate'i yeniden çalıştırın."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Paket listesini yeniden yükle"
+msgid "How to choose manually your mirror"
+msgstr "Yansınızı elle nasıl seçersiniz?"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr "Yansı adresini seçin..."
+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 ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Kaynak ekleniyor:"
+msgid "Already existing update sources"
+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?"
+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:1
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "'%s' paketi yüklenemedi\n"
+msgid "Fatal error"
+msgstr "Dosya hatası"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
+msgid "Software Packages Installation"
 msgstr "Kurulum için paketler hazırlanılıyor..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages,"
-msgstr "Tüm paketler,"
+msgid "Mandrake Update"
+msgstr "Mandrake Güncelleme"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "dosyalarda"
+msgid "Software Packages Removal"
+msgstr "Yazılım Paketleri Kaldırıcı"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "İstenen paketler başarılı bir şekilde yüklendi."
+msgid "Quit"
+msgstr "Çık"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "Vekil sunucu adı:"
+msgid "Install"
+msgstr "Kur"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update source(s)"
-msgstr "Kaynakları güncelle"
+msgid "Remove"
+msgstr "Kaldır"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "Yerel dosyalar"
+msgid "Help"
+msgstr "Yardım"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "%s inceleniyor"
+msgid "Search"
+msgstr "Ara"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Israel"
-msgstr "Ä°srail"
+msgid "Find:"
+msgstr "Bul:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Help"
-msgstr "Yardı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ı?"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "HTTP sunucu"
+msgid "Some packages need to be removed"
+msgstr "Bazı paketlerin kaldırılması gerekiyor"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"Welcome to the packages source editor!\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"
-"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."
+"Do you really want to install all the selected packages?"
 msgstr ""
-"Paket kaynağı düzenleyicisine hoşgeldiniz!\n"
+"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"
-"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."
+"Bütün seçili paketleri gerçekten yüklemek istiyor musunuz?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation failed"
-msgstr "Kurulum başarısız"
+msgid "Too many packages are selected"
+msgstr "Aşırı fazla paket seçildi"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Ana dosya olarak .%s kullan"
+msgid "Maximum information"
+msgstr "En fazla bilgi"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results"
-msgstr "Arama sonuçları"
+msgid "Normal information"
+msgstr "Normal bilgi"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, c-format
-msgid " failed!"
-msgstr " başarısız!"
+msgid "Update source(s)"
+msgstr "Kaynakları güncelle"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Brazil"
-msgstr "Brezilya"
+msgid "Reload the packages list"
+msgstr "Paket listesini yeniden yükle"
 
-#: ../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 ""
-"Aynı isme sahip bir başka ortam mevcut, onu\n"
-"deÄŸiÅŸtirmek ister misiniz?"
+msgid "Reset the selection"
+msgstr "Seçimi sıfırla"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Bul:"
+msgid "in files"
+msgstr "dosyalarda"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Tüm paketler, alfabetik"
+msgid "in descriptions"
+msgstr "tanımlarda"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Lütfen bekleyin, aranıyor..."
+msgid "in names"
+msgstr "isimlerde"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Lütfen bekleyin, paket veritabanı okunuyor..."
+msgid "by update availability"
+msgstr "güncellenebilirliğine göre"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "'%s' paketi açılamadı\n"
+#, c-format
+msgid "by source repository"
+msgstr "kaynak deposuna göre"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "Seçimi sıfırla"
+msgid "by selection state"
+msgstr "seçim durumuna göre"
 
-#: ../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 ""
-"Eğer vekil sunucuya ihtiyacınız varsa makina adı ve isteğe bağlı olarak "
-"portu girin (<vekilsunucu[:port]>):"
+msgid "by size"
+msgstr "boyuta göre"
 
 #: ../rpmdrake: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 "by group"
+msgstr "gruba göre"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Kosta Rika"
+msgid "All packages,"
+msgstr "Tüm paketler,"
 
 #: ../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"
-
-#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Lütfen bekleyin, ortam kaldırılıyor..."
+msgid "All packages, alphabetical"
+msgstr "Tüm paketler, alfabetik"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "Parola:"
+msgid "Mandrake choices"
+msgstr "Mandrake seçimleri"
 
-#: ../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 "Normal updates"
+msgstr "Normal güncellemeler"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Tayvan"
+msgid "Bugfixes updates"
+msgstr "Hata düzeltme güncellemeleri"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "User:"
-msgstr "Kullanıcı:"
+msgid "Security updates"
+msgstr "Güvenlik güncellemeleri"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Lütfen bekleyin, ortam güncelleniyor..."
+msgid "Description: "
+msgstr "Tanım: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Lütfen bekleyin, paketler listeleniyor..."
+msgid "Reason for update: "
+msgstr "Güncelleme nedeni: "
 
 #: ../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 "Summary: "
+msgstr "Özet: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Information on packages"
-msgstr "Paket hakkında daha fazla bilgi"
+msgid "Importance: "
+msgstr "Önem: "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "Ä°ptal"
+msgid "%s KB"
+msgstr "%s KB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Herşey başarılı bir şekilde yüklendi"
+msgid "Size: "
+msgstr "Boyut: "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Lütfen bekleyin, ortam güncelleniyor..."
+msgid "Version: "
+msgstr "Sürümü: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Name: "
+msgstr "Adı: "
 
 #: ../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 "Currently installed version: "
+msgstr "Kurulu olan sürüm: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "tanımlarda"
+msgid "Source: "
+msgstr "Kaynak: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Vekil sunucuları yapılandır"
+msgid "(Not available)"
+msgstr "(EriÅŸilemez)"
 
-#: ../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 "Changelog:\n"
+msgstr "Günlük:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Lütfen seçin"
+msgid "Files:\n"
+msgstr "Dosyalar:\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Seçili boyut: %d MB"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add a source"
-msgstr "Bir kaynak ekle"
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "Başlatılıyor..."
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Seçili: %d MB / Diskteki boş alan: %d MB"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "DeÄŸiÅŸiklikleri kaydet"
+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"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Error during download"
-msgstr "İndirme sırasında hata"
+#: ../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 "Package installation..."
-msgstr "Kurulum için paketler hazırlanılıyor..."
+msgid "%s conflicts with %s"
+msgstr "şununla çakışıyor:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Importance: "
-msgstr "Önem: "
+#, fuzzy, c-format
+msgid "Some packages can't be installed"
+msgstr "'%s' paketi yüklenemedi\n"
 
 #: ../rpmdrake:1
 #, c-format
@@ -604,83 +656,76 @@ msgstr ""
 "gerekiyor:\n"
 "\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "Ekle..."
+msgid "Additional packages needed"
+msgstr "Ek paketlere ihtiyaç var"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Unable to create medium."
-msgstr "Ortam oluşturulamıyor."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "'%s' paketi yüklenemedi\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Removing these packages would break your system, sorry:\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"
+"Bu paketleri kaldırmak sisteminizin göçmesine sebeb olabilir, üzgünüm:\n"
 "\n"
-"'.rpmnew' veya '.rpmsave' olak bazı yapılandırma dosyaları oluşturuldu.\n"
-"Harekete geçmek için artık birkaçını inceleyebilirsiniz:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
-msgstr "Gözat..."
+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
-#, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "'%s' paketi yüklenemedi\n"
-
-#: ../rpmdrake.pm:1
 #, c-format
-msgid "Info..."
-msgstr "Hakkında..."
+msgid "Some additional packages need to be removed"
+msgstr "Bazı ek paketlerin kaldırılması gerekiyor"
 
-#: ../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 "More information on package..."
+msgstr "Paket hakkında daha fazla bilgi..."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "Kaldır"
+msgid "Information on packages"
+msgstr "Paket hakkında daha fazla bilgi"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Kurulum için paketler hazırlanılıyor..."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "No mirror"
-msgstr "Yansı yok"
-
-#: ../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."
+msgid "More info"
+msgstr "Daha Bilgi"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Kur"
+msgid "Addable"
+msgstr "Eklenebilir"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "Japonya"
+msgid "Upgradable"
+msgstr "Güncellenebilinir"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "BirÅŸey yapma"
+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:1
 #, c-format
@@ -689,344 +734,378 @@ msgstr "Güncelleme yok"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Description: "
-msgstr "Tanım: "
+msgid "(none)"
+msgstr "(hiçbiri)"
 
 #: ../rpmdrake: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."
+msgid "Please wait, listing packages..."
+msgstr "Lütfen bekleyin, paketler listeleniyor..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "'%s' paketi açılamadı\n"
 
 #: ../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 "One of the following packages is needed:"
+msgstr "Şu paketler birinin yüklenmesi gerekiyor:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "Adı: "
+msgid "Please choose"
+msgstr "Lütfen seçin"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "Ä°ncele..."
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Kurulum için paketler hazırlanılıyor..."
+msgid "Not selected"
+msgstr "Çakışmalar bulundu"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Avusturalya"
+msgid "Selected"
+msgstr "Seçili"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation finished"
-msgstr "Kurulum tamamlandı"
+msgid "Search results"
+msgstr "Arama sonuçları"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
-msgstr "güncellenebilirliğine göre"
+msgid "Stop"
+msgstr "Dur"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
-msgstr "Polonya"
+msgid "Please wait, searching..."
+msgstr "Lütfen bekleyin, aranıyor..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Version: "
-msgstr "Sürümü: "
+msgid "Search results (none)"
+msgstr "Arama sonuçları (hiçbiri)"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "DiÄŸer"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
+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 ""
-"Vekil sunucu kimlik denetimi için kullanıcıadı/parola belirtebilirsiniz:"
+"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."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Kaydet ve çık"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Editing source \\\"%s\\\":"
-msgstr "\"%s\" kaynağı düzenleniyor:"
+msgid "Proxy..."
+msgstr "Hata..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Upgradable"
-msgstr "Güncellenebilinir"
+msgid "Update..."
+msgstr "Güncelle..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid " done."
-msgstr " tamamlandı."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Kurulum için paketler hazırlanılıyor..."
+msgid "Add..."
+msgstr "Ekle..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "'%s' dosyasının kaynağı sınanıyor..."
+msgid "Edit"
+msgstr "Düzenle"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "Ek paketlere ihtiyaç var"
+msgid "Source"
+msgstr "Kaynak"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Hata düzeltme güncellemeleri"
+msgid "Enabled?"
+msgstr "Etkin?"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "'%s' indirmesi , kalan zaman:%s , hız:%s"
+msgid "Configure sources"
+msgstr "Kaynakları yapılandır"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Germany"
-msgstr "Almanya"
+msgid "Password:"
+msgstr "Parola:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Russia"
-msgstr "Rusya"
+msgid "User:"
+msgstr "Kullanıcı:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Norway"
-msgstr "Norveç"
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+"Vekil sunucu kimlik denetimi için kullanıcıadı/parola belirtebilirsiniz:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Kurulum sırasında sorunlar oluştu"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "Vekil sunucu adı:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search"
-msgstr "Ara"
+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]>):"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit a source"
-msgstr "Kaynağı Düzenle"
+msgid "Configure proxies"
+msgstr "Vekil sunucuları yapılandır"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Çek Cumhuriyeti"
+msgid "Please wait, updating medium..."
+msgstr "Lütfen bekleyin, ortam güncelleniyor..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Stop"
-msgstr "Dur"
+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."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "Güncelle"
+msgid "You need to insert the medium to continue"
+msgstr "Devam etmek için ortamı takmanız gerekli"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "Lütfen bekleyin, paketler kaldırılıyor..."
+msgid "Save changes"
+msgstr "DeÄŸiÅŸiklikleri kaydet"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal information"
-msgstr "Normal bilgi"
+msgid "Relative path to synthesis/hdlist:"
+msgstr "synthesis/hdlist'e göreli yol:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "`%s' paketi indiriliyor (%s/%s)..."
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing source \"%s\":"
+msgstr "\"%s\" kaynağı düzenleniyor:"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Seçili: %d MB / Diskteki boş alan: %d MB"
+msgid "Edit a source"
+msgstr "Kaynağı Düzenle"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Spain"
-msgstr "Ä°spanya"
+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 "Type of source:"
+msgstr "Kaynağın türü"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by selection state"
-msgstr "seçim durumuna göre"
+msgid "Adding a source:"
+msgstr "Kaynak ekleniyor:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 msgstr ""
-"Lütfen bekleyin, yansı adresleri MandrakeSoft'un web sitesinden indiriliyor."
+"Aynı isme sahip bir başka ortam mevcut, onu\n"
+"deÄŸiÅŸtirmek ister misiniz?"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Login:"
-msgstr "Kullanıcı adı:"
+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.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Austria"
-msgstr "Avusturya"
+msgid "Name:"
+msgstr "Adı:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Dosya hatası"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
+msgstr "Kullanıcı adı:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Lütfen güncellemek istediğiniz kaynakları seçiniz:"
+msgid "Choose a mirror..."
+msgstr "Yansı adresini seçin..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update..."
-msgstr "Güncelle..."
+msgid "Browse..."
+msgstr "Gözat..."
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "'%s' paketinin imzası doğrulanıyor..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Yol veya bağlama noktası:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
-msgstr "(hiçbiri)"
+msgid "Removable device"
+msgstr "Kaldırılabilinir aygıt"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-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"
+msgid "HTTP server"
+msgstr "HTTP sunucu"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "'%s' paketi kuruluyor ( %s/%s)..."
+msgid "FTP server"
+msgstr "FTP sunucu"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Kurulu olan sürüm: "
+msgid "Path:"
+msgstr "Yol:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Other"
-msgstr "DiÄŸer"
+msgid "Local files"
+msgstr "Yerel dosyalar"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Güncelleme nedeni: "
+msgid "Add a source"
+msgstr "Bir kaynak ekle"
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Please choose the desired mirror."
-msgstr "Lütfen istediğiniz yansıyı seçin."
+#, 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."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "Düzenle"
+msgid "Unable to create medium."
+msgstr "Ortam oluşturulamıyor."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Lütfen bekleyin, erişilebilir paketler aranıyor..."
+msgid "Update"
+msgstr "Güncelle"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "synthesis/hdlist'e göreli yol:"
+msgid "Select the source(s) you wish to update:"
+msgstr "Lütfen güncellemek istediğiniz kaynakları seçiniz:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Arama sonuçları (hiçbiri)"
+msgid "Please wait, updating media..."
+msgstr "Lütfen bekleyin, ortam güncelleniyor..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Danmark"
-msgstr "Danimarka"
+msgid " failed!"
+msgstr " başarısız!"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "Çin"
+msgid " done."
+msgstr " tamamlandı."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United States"
-msgstr "BirleÅŸik Devletler"
+msgid "Download of `%s', speed:%s"
+msgstr "'%s' indirmesi , hız:%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "changes:"
-msgstr "deÄŸiÅŸiklikler:"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "'%s' indirmesi , kalan zaman:%s , hız:%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "'%s' paketinin imzası doğrulanıyor..."
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Bazı ek paketlerin kaldırılması gerekiyor"
+msgid "Examining distant file of source `%s'..."
+msgstr "'%s' uzak dosyasının kaynağı sınanıyor..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Examining file of source `%s'..."
+msgstr "'%s' dosyasının kaynağı sınanıyor..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No"
-msgstr "Hayır"
+msgid "Copying file for source `%s'..."
+msgstr "'%s' dosyasının kaynağı kopyalanıyor..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Summary: "
-msgstr "Özet: "
+msgid "Please choose the desired mirror."
+msgstr "Lütfen istediğiniz yansıyı seçin."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "Kanada"
+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.pm:1
 #, c-format
-msgid "Greece"
-msgstr "Yunanistan"
+msgid "No mirror"
+msgstr "Yansı yok"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1043,258 +1122,179 @@ msgstr ""
 "Ağ veya MandrakeSoft'un web sayfasını erişilemez durumda\n"
 "olabilir. Lütfen daha sonra tekrar deneyin."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Source: "
-msgstr "Kaynak: "
-
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "'%s' dosyasının kaynağı kopyalanıyor..."
-
-#: ../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 "Path:"
-msgstr "Yol:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Problem during removal"
-msgstr "Kaldırım esnasında problem"
+msgid "Error during download"
+msgstr "İndirme sırasında hata"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by source repository"
-msgstr "kaynak deposuna göre"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
+"Lütfen bekleyin, yansı adresleri MandrakeSoft'un web sitesinden indiriliyor."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Selected"
-msgstr "Seçili"
+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.pm:1
 #, c-format
-msgid "Netherlands"
-msgstr "Hollanda"
+msgid "United States"
+msgstr "BirleÅŸik Devletler"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "Eklenebilir"
+msgid "China"
+msgstr "Çin"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
-msgstr "(EriÅŸilemez)"
-
-#: ../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"
+msgid "United Kingdom"
+msgstr "Birleşik Krallık"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Yazılım Paketleri Kaldırıcı"
+msgid "Taiwan"
+msgstr "Tayvan"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Sweden"
 msgstr "İsveç"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
-msgstr ""
-"\n"
-"\n"
-"Hata(lar) rapor edildi:\n"
-"%s"
+msgid "Russia"
+msgstr "Rusya"
 
-#: ../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."
-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 "Portugal"
+msgstr "Portekiz"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "'%s' indirmesi , hız:%s"
+msgid "Poland"
+msgstr "Polonya"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Şu paketler birinin yüklenmesi gerekiyor:"
+msgid "Norway"
+msgstr "Norveç"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "Çık"
+msgid "Netherlands"
+msgstr "Hollanda"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 ""
-"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ı?"
+msgid "Korea"
+msgstr "Kore"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "Tamam"
+msgid "Japan"
+msgstr "Japonya"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "Lütfen bekleyin, ortam ekleniyor..."
+msgid "Italy"
+msgstr "Ä°talya"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "Kaynağın türü"
+msgid "Israel"
+msgstr "Ä°srail"
 
-#: ../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.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Yunanistan"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to get source packages."
-msgstr "Kaynak paketleri alınamıyor."
+msgid "France"
+msgstr "Fransa"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Aşırı fazla paket seçildi"
+msgid "Finland"
+msgstr "Finlandiya"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "şununla çakışıyor:"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "Ä°spanya"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Danmark"
+msgstr "Danimarka"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Mandrake seçimleri"
+msgid "Germany"
+msgstr "Almanya"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 ""
-"İ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."
+msgid "Czech Republic"
+msgstr "Çek Cumhuriyeti"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Günlük:\n"
+msgid "Costa Rica"
+msgstr "Kosta Rika"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Korea"
-msgstr "Kore"
+msgid "Canada"
+msgstr "Kanada"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "Kaldırılabilinir aygıt"
+msgid "Brazil"
+msgstr "Brezilya"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Belçika"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Change medium"
-msgstr "Ortam deÄŸiÅŸtir"
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Mandrake Güncelleme"
+msgid "Australia"
+msgstr "Avusturalya"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by size"
-msgstr "boyuta göre"
+msgid "Austria"
+msgstr "Avusturya"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "FTP sunucu"
+msgid "Info..."
+msgstr "Hakkında..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Files:\n"
-msgstr "Dosyalar:\n"
+msgid "No"
+msgstr "Hayır"
 
 #: ../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."
+#, c-format
+msgid "Yes"
+msgstr "Evet"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
diff --git a/po/uk.po b/po/uk.po
index 6cb5acca..77e70101 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grpmi\n"
-"POT-Creation-Date: 2003-05-02 20:15+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+0200\n"
 "PO-Revision-Date: 2003-03-25 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,20 +15,16 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-u\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "äÏÓÔÕÐÎÉÊ?"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Path or mount point:"
-msgstr "ûÌÑÈ ÁÂÏ ÔÏÞËÁ ÍÏÎÔÕ×ÁÎÎÑ:"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Portugal"
-msgstr "ðÏÒÔ:"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"÷ÓÅ ÇÁÒÁÚÄ? ðÒÏÄÏ×ÖÕ×ÁÔÉ?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -47,69 +43,16 @@ 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 "Already existing update sources"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "More information on package..."
-msgstr "â¦ÌØÛÅ ¦ÎÆÏÒÍÁæ§ ÐÒÏ ÐÁËÕÎÏË..."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Yes"
-msgstr "ôÁË"
-
-#: ../rpmdrake:1
-#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"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"
 "\n"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "everything was installed correctly"
-msgstr "×ÓÅ ÂÕÌÏ ×ÓÔÁÎÏ×ÌÅÎÏ ËÏÒÅËÔÎÏ"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s KB"
-msgstr "%.1f ËÂ"
+"ãÑ ÐÒÏÇÒÁÍÁ ÄÏÐÏÍÏÖÅ ×ÁÍ ×ÉÂÒÁÔÉ ÐÏÎÏ×ÌÅÎÎÑ, Ñ˦ ×É ÈÏÞÅÔÅ ×ÓÔÁÎÏ×ÉÔÉ ÎÁ \n"
+"×ÁÛ ËÏÍÐ'ÀÔÅÒ."
 
 #: ../rpmdrake:1
 #, c-format
@@ -125,21 +68,40 @@ msgstr ""
 "×ÁÛÏÇÏ\n"
 "ËÏÍÐ'ÀÔÅÒÁ."
 
-#: ../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 "ýÏ ÚÂÅÒÅÇÔÉ ÚͦÎÉ, ×ÁÍ ÓÌ¦Ä ×ÓÔÁ×ÉÔÉ ÎÏÓ¦Ñ ÄÏ ÐÒÉÓÔÒÏÀ"
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"ôÒÁÐÉÌÁÓØ ÐÏÍÉÌËÁ Ð¦Ä ÞÁÓ ÕÓÔÁÎÏ×ËÉ ÐÁËÅÔÕ:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
-msgstr "úÂÅÒÅÇÔÉ ¦ ×ÉÊÔÉ"
+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"
+"óÏÒÔÕ×ÁÎÎÑ ÐÁËÅÔ¦×"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"There was a problem during the installation:\n"
 "\n"
 "%s"
 msgstr ""
@@ -149,53 +111,83 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Size: "
-msgstr "òÏÚͦÒ"
+msgid "Installation failed"
+msgstr "÷ÓÔÁÎÏ×ÉÔÉ ×ÓÅ"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Security updates"
-msgstr "ðÏËÁÚÁÔÉ ÓÐÉÓÏË ÐÏÎÏ×ÌÅÎØ Ú ÍÅÔÏÀ ЦÄ×ÉÝÅÎÎÑ ÂÅÚÐÅËÉ"
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "çÏÔÕÀÓØ ÐÁËÕÎËÉ ÄÏ ÕÓÔÁÎÏ×ËÉ..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "çÏÔÕÀÓØ ÐÁËÕÎËÉ ÄÏ ÕÓÔÁÎÏ×ËÉ..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "îÁʦÌØÛÅ ¦ÎÆÏÒÍÁæ§"
+msgid "All requested packages were installed successfully."
+msgstr "÷Ó¦ ×ÉÂÒÁΦ ÐÁËÕÎËÉ ÂÕÌÏ ÕÓЦÛÎÏ ×ÓÔÁÎÏ×ÌÅÎÏ."
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Proxy..."
-msgstr "ðÏÍÉÌËÁ..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr "÷ÓÅ ×ÓÔÁÎÏ×ÌÅÎÏ ÕÓЦÛÎÏ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-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"
+"×É ÍÏÖÅÔÅ ÒÅÔÅÌØÎÏ ÐÅÒÅÇÌÑÎÕÔÉ §È ÄÌÑ ÐÏÄÁÌØÛÉÈ Ä¦Ê:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure sources"
-msgstr "óËÏÎƦ­ÕÒÕ×ÁÔÉ ÄÖÅÒÅÌÁ"
+msgid "everything was installed correctly"
+msgstr "×ÓÅ ÂÕÌÏ ×ÓÔÁÎÏ×ÌÅÎÏ ËÏÒÅËÔÎÏ"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during installation"
+msgstr "ð¦Ä ÞÁÓ ÕÓÔÁÎÏ×ËÉ ÓÔÁÌÁÓÑ ÐÏÍÉÌËÁ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "× ÎÁÚ×ÁÈ"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "÷ÓÔÁÎÏ×ÌÀÀ ÐÁËÅÔ '%s' (%s/%s)..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "çÏÔÕÀÓØ ÐÁËÕÎËÉ ÄÏ ÕÓÔÁÎÏ×ËÉ..."
+
+#: ../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 ""
-"ñ ÎÅ ÍÏÖÕ ÚÎÁÊÔÉ ÐÒÉÄÁÔÎÏÇÏ ÄÚÅÒËÁÌÁ.\n"
 "\n"
-"íÏÖÅ ÂÕÌÉ ÂÁÇÁÔÏ ÐÒÉÞÉΠ椧 ÐÒÏÂÌÅÍÉ; ÎÁÊÞÁÓÔ¦ÛÅ ÃÅ\n"
-"ÓÔÁ¤ÔØÓÑ ÞÅÒÅÚ ÔÅ, ÝÏ ÁÒȦÔÅËÔÕÒÁ ×ÁÛÏÇÏ ÐÒÏÃÅÓÏÒÁ ΊЦÄÔÒÉÍÕ¤ÔØÓÑ\n"
-"Mandrake Linux Official Updates."
+"\n"
+"ðÏצÄÏÍÌÅÎÏ ÐÒÏ ÐÏÍÉÌËÉ:\n"
+"%s"
+
+#: ../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
@@ -204,7 +196,7 @@ msgid ""
 "\n"
 "%s\n"
 "\n"
-"\\Do you want to continue installation?"
+"Do you want to continue installation?"
 msgstr ""
 "îÁÓÔÕÐΦ ÐÁËÕÎËÉ ÐÏ×ÉÎΦ ÂÕÔÉ ×ÉÄÁÌÅΦ, ÝÏ ¦ÎÛ¦ ÍÏÖÎÁ ÂÕÌÏ ÐÏÎÏ×ÉÔÉ:\n"
 "\n"
@@ -214,480 +206,535 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Remove .%s"
-msgstr "÷ÉÌÕÞÉÔÉ .%s"
+msgid "Verifying packages signatures..."
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Source"
-msgstr "äÖÅÒÅÌÏ"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "úËÁÞÕÀ ÐÁËÅÔ '%s' (%s/%s)..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Finland"
-msgstr "æ¦ÎÌÑÎĦÑ"
+msgid "Cancel"
+msgstr "÷¦ÄͦÎÉÔÉ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "France"
-msgstr "ðÒÉÍÕÓÏ×Ï"
+msgid "Ok"
+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 ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"÷ÓÅ ÇÁÒÁÚÄ? ðÒÏÄÏ×ÖÕ×ÁÔÉ?"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "âÕÄØ ÌÁÓËÁ, ×ÓÔÁ×ÔÅ ÄÉÓË Ú ÎÁÚ×ÏÀ \"%s\" Õ ÐÒÉÓÔÒ¦Ê [%s]"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "ðÅÒÅ×ÁÎÔÁÖÉÔÉ ÐÅÒÅÌ¦Ë ÐÁËÕÎ˦×"
+msgid "Change medium"
+msgstr "úͦΦÔØ ÎÏÓ¦Ê"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr "÷ÉÂÅÒ¦ÔØ ÄÚÅÒËÁÌÏ..."
+msgid "Initializing..."
+msgstr "÷ÓÔÁÎÏ×ÌÀÀ..."
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Adding a source:"
-msgstr "äÏÂÁ×ÌÑÀÔØÓÑ ÄÖÅÒÅÌÁ:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Package installation..."
+msgstr "çÏÔÕÀÓØ ÐÁËÕÎËÉ ÄÏ ÕÓÔÁÎÏ×ËÉ..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "îÅ ÍÏÖÕ ×ÓÔÁÎÏ×ÉÔÉ ÐÁËÕÎÏË '%s'\n"
+msgid "Unable to get source packages, sorry. %s"
+msgstr "÷É ÐÏ×ÉÎΦ ÍÁÔÉ ÐÒÁ×Á ÁÄͦΦÓÔÒÁÔÏÒÁ, ×ÉÂÁÞÁÊÔÅ."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "çÏÔÕÀÓØ ÐÁËÕÎËÉ ÄÏ ÕÓÔÁÎÏ×ËÉ..."
+msgid "Unable to get source packages."
+msgstr "÷ÉÂÅÒ¦ÔØ Ó×ϧ ÐÁËÅÔÉ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages,"
-msgstr "÷Ó¦ ÐÁËÕÎËÉ,"
+msgid "Inspect..."
+msgstr "÷É×ÞÁÀ..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "in files"
-msgstr "Õ ÆÁÊÌÁÈ"
+#, fuzzy, c-format
+msgid "Installation finished"
+msgstr "÷ÓÔÁÎÏ×ÌÅÎÏ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "÷Ó¦ ×ÉÂÒÁΦ ÐÁËÕÎËÉ ÂÕÌÏ ÕÓЦÛÎÏ ×ÓÔÁÎÏ×ÌÅÎÏ."
+msgid "Do nothing"
+msgstr "î¦ÞÏÇÏ ÎÅ ÒÏÂÉÔÉ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "îÁÚ×Á ÐÒÏËÓ¦:"
+msgid "Use .%s as main file"
+msgstr "÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ .%s ÑË ÇÏÌÏ×ÎÉÊ ÆÁÊÌ"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Update source(s)"
-msgstr "ðÏÎÏ×ÉÔÉ ÄÖÅÒÅÌÏ(Á)"
+msgid "Remove .%s"
+msgstr "÷ÉÌÕÞÉÔÉ .%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "ìÏËÁÌØΦ ÆÁÊÌÉ"
+msgid "changes:"
+msgstr "ÚͦÎÉ:"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspecting %s"
 msgstr "÷É×ÞÅÎÎÑ %s"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Israel"
-msgstr "¶ÎÓÔÁÌÀ×ÁÔÉ"
-
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Help"
-msgstr "/_ð¦ÄËÁÚËÁ"
+msgid "Please wait, finding available packages..."
+msgstr ""
+"úÁÞÅËÁÊÔÅ\n"
+"óÏÒÔÕ×ÁÎÎÑ ÐÁËÅÔ¦×"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "HTTP server"
-msgstr "óÅÒ×ÅÒ HTTP"
+msgid "Please wait, adding medium..."
+msgstr "úÁÞÅËÁÊÔÅ, ÂÕÄØ-ÌÁÓËÁ, ÄÏÄÁÀ ÎÏÓ¦Ñ..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"Welcome to the packages source editor!\n"
+"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"
-"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 ""
-"ìÁÓËÁ×Ï ÐÒÏÓÉÍÏ ÄÏ ÒÅÄÁËÔÏÒÁ ÄÖÅÒÅÌ ÐÁËÕÎ˦×!\n"
+"÷É ÔÁËÏÖ ÍÏÖÅÔÅ ×ÉÂÒÁÔÉ ÂÁÖÁÎÅ ÄÚÅÒËÁÌÏ ÓÁÍÏÓÔ¦ÊÎÏ: ÝÏ ÃÅ ÚÒÏÂÉÔÉ,\n"
+"ÚÁ×ÁÎÔÁÖÔÅ íÅÎÅÄÖÅÒ äÖÅÒÅÌ ðÁËÕÎ˦×, Á ÐÏÔ¦Í ÄÏÄÁÊÔÅ ÄÖÅÒÅÌÏ 'âÅÚÐÅÞΦ\n"
+"ÐÏÎÏ×ÌÅÎÎÑ'.\n"
 "\n"
-"ãÅÊ ¦ÎÓÔÒÕÍÅÎÔ ÄÏÐÏÍÏÖÅ ×ÁÍ ÎÁÌÁÛÔÕ×ÁÔÉ ÄÖÅÒÅÌÁ ÐÁËÕÎ˦×, Ñ˦ ×É ÈÏÞÅÔÅ "
-"×ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ÎÁ\n"
-" ×ÁÛÏÍÕ ËÏÍÐ'ÀÔÅÒ¦. ÷ÏÎÉ ÓÔÁÎÕÔØ ÄÏÓÔÕÐÎÉÍÉ ÄÌÑ ×ÓÔÁÎÏ×ÌÅÎÎÑ ÎÏ×ÉÈ ÐÁËÕÎË¦× "
-"Ú ÐÒÏÇÒÁÍÁÍÉ\n"
-"ÁÂÏ ÄÌÑ ÚĦÊÓÎÅÎÎÑ ÐÏÎÏ×ÌÅÎØ."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "÷ÓÔÁÎÏ×ÉÔÉ ×ÓÅ"
+"ðÏÔ¦Í ÐÅÒÅÚÁÐÕÓÔ¦ÔØ ðÏÎÏ×ÌÅÎÎÑ íÁÎÄÒÅÊË."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ .%s ÑË ÇÏÌÏ×ÎÉÊ ÆÁÊÌ"
+msgid "How to choose manually your mirror"
+msgstr "ñË ×ÉÂÒÁÔÉ ÄÚÅÒËÁÌÏ ×ÒÕÞÎÕ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results"
-msgstr "òÅÚÕÌØÔÁÔÉ ÐÏÛÕËÕ"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid " failed!"
-msgstr " ÎÅÕÓЦÛÎÏ!"
+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 ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Brazil"
-msgstr "âÒÁÚÉ̦Ñ"
+msgid "Already existing update sources"
+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?"
+"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"
+"\n"
+"ðÒÏÄÏ×ÖÉÔÉ?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "úÎÁÊÔÉ:"
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "All packages, alphabetical"
-msgstr "÷Ó¦ ÐÁËÕÎËÉ ÚÁ ÁÂÅÔËÏÀ"
+#, fuzzy, c-format
+msgid "Fatal error"
+msgstr "ðÏÍÉÌËÁ ÆÁÊÌÕ"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Please wait, searching..."
-msgstr "úÁÞÅËÁÊÔÅ, ÂÕÄØ ÌÁÓËÁ, ÛÕËÁÀ..."
+#, fuzzy, c-format
+msgid "Software Packages Installation"
+msgstr "çÏÔÕÀÓØ ÐÁËÕÎËÉ ÄÏ ÕÓÔÁÎÏ×ËÉ..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, reading packages database..."
-msgstr ""
-"úÁÞÅËÁÊÔÅ\n"
-"óÏÒÔÕ×ÁÎÎÑ ÐÁËÅÔ¦×"
+msgid "Mandrake Update"
+msgstr "÷ÉËÏÎÁÔÉ ÐÏÎÏ×ÌÅÎÎÑ"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
+msgstr "÷ÉÌÕÞÅÎÎÑ ÐÁËÕÎË¦× Ú ÐÒÏÇÒÁÍÁÍÉ"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "÷ÉȦÄ"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "¶ÎÓÔÁÌÀ×ÁÔÉ"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "÷ÉÌÕÞÉÔÉ"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "unknown package "
-msgstr "ÎÅצÄÏÍÏ"
+msgid "Help"
+msgstr "/_ð¦ÄËÁÚËÁ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "óËÁÓÕ×ÁÔÉ ×ɦÒ"
+msgid "Search"
+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 ""
-"ñËÝÏ ×ÁÍ ÐÏÔÒ¦ÂÎÅÎ ÐÒÏËÓ¦, ××ÅĦÔØ ÊÏÇÏ ÎÁÚ×Õ ¦ ÐÏÒÔ (ÎÅÏÂÏ×'ÑÚËÏ×Ï) "
-"(ÓÉÎÔÁËÓÉÓ: <ÎÁÚ×Á[:ÐÏÒÔ]>):"
+msgid "Find:"
+msgstr "úÎÁÊÔÉ:"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"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"
+"îÁÓÔÕÐΦ ÐÁËÕÎËÉ ÐÏ×ÉÎΦ ÂÕÔÉ ×ÉÄÁÌÅΦ, ÝÏ ¦ÎÛ¦ ÍÏÖÎÁ ÂÕÌÏ ÐÏÎÏ×ÉÔÉ:\n"
 "\n"
+"%s\n"
+"\n"
+"ðÒÏÄÏ×ÖÉÔÉ?"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "ëÏÓÔÁ-ò¦ËÁ"
+msgid "Some packages need to be removed"
+msgstr "äÅÑ˦ ÐÁËÕÎËÉ ÐÏ×ÉÎΦ ÂÕÔÉ ×ÉÄÁÌÅΦ"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"There was a problem during the installation:\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"
-"%s"
+"Do you really want to install all the selected packages?"
 msgstr ""
-"ôÒÁÐÉÌÁÓØ ÐÏÍÉÌËÁ Ð¦Ä ÞÁÓ ÕÓÔÁÎÏ×ËÉ ÐÁËÅÔÕ:\n"
+"ðÏÐÅÒÅÄÖÅÎÎÑ: ÓÈÏÖÅ, ÝÏ ×É ÈÏÞÅÔÅ ÄÏÄÁÔÉ ÚÁÎÁÄÔÏ ÂÁÇÁÔÏ ÐÁËÕÎ˦×,\n"
+"ÞÅÒÅÚ ÝÏ ×ÁÛ¦Ê ÆÁÊÌÏ×¦Ê ÓÉÓÔÅͦ ÎÅ ×ÉÓÔÁÞÉÔØ ×¦ÌØÎÏÇÏ Í¦ÓÃÑ\n"
+"Ð¦Ä ÞÁÓ ÁÂÏ Ð¦ÓÌÑ ×ÓÔÁÎÏ×ÌÅÎÎÑ ÐÁËÕÎ˦×; ÃÅ ÄÕÖÅ ÎÅÂÅÚÐÅÞÎÏ,\n"
+"¦ ×É ÐÏ×ÉÎΦ ÃÅ ×ÒÁÈÕ×ÁÔÉ.\n"
 "\n"
-"%s"
+"÷É Ä¦ÊÓÎÏ ÈÏÞÅÔÅ ×ÓÔÁÎÏ×ÉÔÉ ×Ó¦ ×ÉÂÒÁΦ ÐÁËÕÎËÉ?"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "úÁÞÅËÁÊÔÅ, ÂÕÄØ-ÌÁÓËÁ, ×ÉÄÁÌÑÀ ÎÏÓ¦Ñ..."
+msgid "Too many packages are selected"
+msgstr "÷ÉÂÒÁÎÏ ÚÁÎÁÄÔÏ ÂÁÇÁÔÏ ÐÁËÕÎ˦×"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "ðÁÒÏÌØ:"
+msgid "Maximum information"
+msgstr "îÁʦÌØÛÅ ¦ÎÆÏÒÍÁæ§"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "ðÅÒÅצÒËÁ צÄÄÁÌÅÎÏÇÏ ÆÁÊÌÕ ÄÖÅÒÅÌÁ `%s'..."
+msgid "Normal information"
+msgstr "óÔÁÎÄÁÒÔÎÁ ¦ÎÆÏÒÍÁæÑ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Taiwan"
-msgstr "ôÁÊ×ÁÎØ"
+msgid "Update source(s)"
+msgstr "ðÏÎÏ×ÉÔÉ ÄÖÅÒÅÌÏ(Á)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "User:"
-msgstr "ëÏÒÉÓÔÕ×ÁÞ:"
+msgid "Reload the packages list"
+msgstr "ðÅÒÅ×ÁÎÔÁÖÉÔÉ ÐÅÒÅÌ¦Ë ÐÁËÕÎ˦×"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "úÁÞÅËÁÊÔÅ, ÂÕÄØ-ÌÁÓËÁ, ÐÏÎÏ×ÌÀÀ ÎÏÓ¦Ñ..."
+msgid "Reset the selection"
+msgstr "óËÁÓÕ×ÁÔÉ ×ɦÒ"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "in files"
+msgstr "Õ ÆÁÊÌÁÈ"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, listing packages..."
-msgstr ""
-"úÁÞÅËÁÊÔÅ\n"
-"óÏÒÔÕ×ÁÎÎÑ ÐÁËÅÔ¦×"
+msgid "in descriptions"
+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 ""
+msgid "in names"
+msgstr "× ÎÁÚ×ÁÈ"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Information on packages"
-msgstr "÷ÉÂÅÒ¦ÔØ Ó×ϧ ÐÁËÅÔÉ"
+#, c-format
+msgid "by update availability"
+msgstr "ÚÁ ÐÒÉÄÁÔΦÓÔÀ ÄÏ ÐÏÎÏ×ÌÅÎÎÑ"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "÷¦ÄͦÎÉÔÉ"
+msgid "by source repository"
+msgstr "ÚÁ ÄÖÅÒÅÌÏÍ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "÷ÓÅ ×ÓÔÁÎÏ×ÌÅÎÏ ÕÓЦÛÎÏ"
+msgid "by selection state"
+msgstr "ÚÁ ÓÔÁÎÏÍ ×ÉÂÏÒÕ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "úÁÞÅËÁÊÔÅ, ÂÕÄØ-ÌÁÓËÁ, ÐÏÎÏ×ÌÀÀÔØÓÑ ÎÏÓ¦§..."
+msgid "by size"
+msgstr "ÚÁ ÒÏÚͦÒÏÍ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "by group"
+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 "All packages,"
+msgstr "÷Ó¦ ÐÁËÕÎËÉ,"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
+msgstr "÷Ó¦ ÐÁËÕÎËÉ ÚÁ ÁÂÅÔËÏÀ"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
+msgstr "÷ÉÂ¦Ò íÁÎÄÒÅÊËÁ"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "in descriptions"
+msgid "Normal updates"
+msgstr "÷ÉËÏÎÁÔÉ ÐÏÎÏ×ÌÅÎÎÑ"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Bugfixes updates"
+msgstr "ðÏËÁÚÁÔÉ ÓÐÉÓÏË ÐÏÎÏ×ÌÅÎÎØ ÄÌÑ ×ÉÐÒÁ×ÌÅÎÎÑ ÐÏÍÉÌÏË"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Security updates"
+msgstr "ðÏËÁÚÁÔÉ ÓÐÉÓÏË ÐÏÎÏ×ÌÅÎØ Ú ÍÅÔÏÀ ЦÄ×ÉÝÅÎÎÑ ÂÅÚÐÅËÉ"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Description: "
 msgstr "ïÐÉÓÉ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "îÁÌÁÛÔÕ×ÁÔÉ ÐÒÏËÓ¦"
+msgid "Reason for update: "
+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, ÝÏ ÏÔÒÉÍÁÔÉ ÐÅÒÅÌ¦Ë "
-"ÄÚÅÒËÁÌ.\n"
-"âÕÄØ ÌÁÓËÁ, ÐÅÒÅצÒÔÅ, ÞÅ Ú'¤ÄÎÁΦ ×É Ú ¦ÎÔÅÒÎÅÔÏÍ.\n"
-"\n"
-"ðÒÏÄÏ×ÖÉÔÉ?"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Summary: "
+msgstr "ð¦ÄÓÕÍÏË"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "âÕÄØ ÌÁÓËÁ, ×ÉÂÅÒ¦ÔØ"
+msgid "Importance: "
+msgstr "÷ÁÖÌÉצÓÔØ: "
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Selected size: %d MB"
-msgstr "%d ×ÉÂÒÁÎÉÈ ÐÁËÅÔ¦×: %.1f íÂ"
+msgid "%s KB"
+msgstr "%.1f ËÂ"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add a source"
-msgstr "äÏÄÁÔÉ ÄÖÅÒÅÌÏ"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Size: "
+msgstr "òÏÚͦÒ"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Version: "
+msgstr "÷ÅÒÓ¦Ñ:"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Name: "
+msgstr "îÁÚ×Á: %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "÷ÓÔÁÎÏ×ÌÀÀ..."
+msgid "Currently installed version: "
+msgstr "÷ÓÔÁÎÏ×ÌÅÎÁ ×ÅÒÓ¦Ñ: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Source: "
+msgstr "äÖÅÒÅÌÏ"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "úÂÅÒÅÇÔÉ ÚͦÎÉ"
+msgid "(Not available)"
+msgstr "(îÅÄÏÓÔÕÐÎÅ)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
-msgstr "ðÏÍÉÌËÁ Ð¦Ä ÞÁÓ ÚËÁÞÕ×ÁÎÎÑ"
+msgid "Changelog:\n"
+msgstr "ðÅÒÅÌ¦Ë ÚͦÎ:\n"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "çÏÔÕÀÓØ ÐÁËÕÎËÉ ÄÏ ÕÓÔÁÎÏ×ËÉ..."
+msgid "Files:\n"
+msgstr "/_æÁÊÌ"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Selected size: %d MB"
+msgstr "%d ×ÉÂÒÁÎÉÈ ÐÁËÅÔ¦×: %.1f íÂ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Importance: "
-msgstr "÷ÁÖÌÉצÓÔØ: "
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "÷ÉÂÒÁÎÏ: %d í / ÷¦ÌØÎÏ ÎÁ ÄÉÓËÕ: %d í"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
 msgstr ""
-"äÌÑ ÚÁÂÅÚÐÅÎÎÑ ÚÁÌÅÖÎÏÓÔÅÊ ×É ÔÁËÏÖ ÐÏ×ÉÎΦ ×ÓÔÁÎÏ×ÉÔÉ\n"
-"ÎÁÓÔÕÐΦ ÐÁËÕÎËÉ:\n"
+"þÅÒÅÚ ×ÉÍÏÇÉ ÚÁÌÅÖÎÏÓÔ¦ ×ÉÂ¦Ò ÎÁÓÔÕÐÎÉÈ ÐÁËÕÎË¦× ÐÏÎÅÎ ÂÕÔÉ\n"
+"ÓËÁÓÏ×ÁÎÉÊ:\n"
 "\n"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add..."
-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 "Unable to create medium."
-msgstr "îÅÍÏÖÌÉ×Ï ÓÔ×ÏÒÉÔÉ ÎÏÓ¦Ñ."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
+msgstr "ËÏÎÆ̦ËÔÕ¤ Ú"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be installed"
+msgstr "îÅ ÍÏÖÕ ×ÓÔÁÎÏ×ÉÔÉ ÐÁËÕÎÏË '%s'\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\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' ÁÂÏ '.rmpsave',\n"
-"×É ÍÏÖÅÔÅ ÒÅÔÅÌØÎÏ ÐÅÒÅÇÌÑÎÕÔÉ §È ÄÌÑ ÐÏÄÁÌØÛÉÈ Ä¦Ê:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
-msgstr "ðÅÒÅÇÌÑÎÕÔÉ..."
+msgid "Additional packages needed"
+msgstr "ðÏÔÒ¦ÂΦ ÄÏÄÁÔËÏצ ÐÁËÕÎËÉ"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Some packages can't be removed"
 msgstr "îÅ ÍÏÖÕ ×ÓÔÁÎÏ×ÉÔÉ ÐÁËÕÎÏË '%s'\n"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
-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 "You need to insert the medium to continue"
-msgstr "÷ÁÍ ÐÏÔÒ¦ÂÎÏ ×ÓÔÁ×ÉÔÉ ÎÏÓ¦Ñ ÄÌÑ ÐÒÏÄÏ×ÖÅÎÎÑ"
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
+"÷ Ú×'ÑÚËÕ Ú ÎÅÏÂȦÄΦÓÔÀ ÚÁÄÏ×ÏÌÅÎÎÑ ×Ó¦È ÚÁÌÅÖÎÏÓÔÅÊ\n"
+"ÎÁÓÔÕÐΦ ÐÁËÕÎËÉ ÂÕÄÕÔØ ×ÉÌÕÞÅΦ:\n"
+"\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "÷ÉÌÕÞÉÔÉ"
+msgid "Some additional packages need to be removed"
+msgstr "ðÏÔÒ¦ÂÎÏ ÄÏÄÁÔËÏ×Ï ×ÉÌÕÞÉÔÉ ÄÅÑ˦ ÐÁËÕÎËÉ"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "çÏÔÕÀÓØ ÐÁËÕÎËÉ ÄÏ ÕÓÔÁÎÏ×ËÉ..."
+#, c-format
+msgid "More information on package..."
+msgstr "â¦ÌØÛÅ ¦ÎÆÏÒÍÁæ§ ÐÒÏ ÐÁËÕÎÏË..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No mirror"
-msgstr "ÄÚÅÒËÁÌÏ:"
+msgid "Information on packages"
+msgstr "÷ÉÂÅÒ¦ÔØ Ó×ϧ ÐÁËÅÔÉ"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "÷ÁÍ ÐÏÔÒ¦ÂÎÏ ÚÁÐÏ×ÎÉÔÉ ÈÏÞÁ  Ä×Á ÐÅÒÛ¦ ÐÏÌÑ."
+#. -PO: Keep it short, this is gonna be on a button
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "More info"
+msgstr "â¦ÌØÛÅ ¦ÎÆÏÒÍÁæ§"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "¶ÎÓÔÁÌÀ×ÁÔÉ"
+msgid "Addable"
+msgstr "íÏÖÌÉ×Ï ÄÏÄÁÔÉ"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Japan"
-msgstr "ñÐÏΦÑ"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Upgradable"
+msgstr "ðÏÎÏ×ÌÅÎÎÑ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-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:1
 #, fuzzy, c-format
@@ -695,352 +742,385 @@ msgid "No update"
 msgstr "÷ÉËÏÎÁÔÉ ÐÏÎÏ×ÌÅÎÎÑ"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Description: "
-msgstr "ïÐÉÓÉ"
+#, c-format
+msgid "(none)"
+msgstr "(ΦÞÏÇÏ)"
 
 #: ../rpmdrake:1
-#, c-format
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+#, fuzzy, c-format
+msgid "Please wait, listing packages..."
 msgstr ""
-"÷ÓÔÁÎÏ×ÌÅÎÎÑ ÐÅÒÅÒ×ÁÎÏ, צÄÓÕÔΦ ÄÅÑ˦ ÆÁÊÌÉ.\n"
-"íÏÖÌÉ×Ï, ×ÁÍ ÐÏÔÒ¦ÂÎÏ ÐÏÎÏ×ÉÔÉ ÂÁÚÕ ÄÁÎÉÈ ÄÖÅÒÅÌ."
+"úÁÞÅËÁÊÔÅ\n"
+"óÏÒÔÕ×ÁÎÎÑ ÐÁËÅÔ¦×"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "unknown package "
+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?"
-msgstr ""
-"ðÏÐÅÒÅÄÖÅÎÎÑ: ÓÈÏÖÅ, ÝÏ ×É ÈÏÞÅÔÅ ÄÏÄÁÔÉ ÚÁÎÁÄÔÏ ÂÁÇÁÔÏ ÐÁËÕÎ˦×,\n"
-"ÞÅÒÅÚ ÝÏ ×ÁÛ¦Ê ÆÁÊÌÏ×¦Ê ÓÉÓÔÅͦ ÎÅ ×ÉÓÔÁÞÉÔØ ×¦ÌØÎÏÇÏ Í¦ÓÃÑ\n"
-"Ð¦Ä ÞÁÓ ÁÂÏ Ð¦ÓÌÑ ×ÓÔÁÎÏ×ÌÅÎÎÑ ÐÁËÕÎ˦×; ÃÅ ÄÕÖÅ ÎÅÂÅÚÐÅÞÎÏ,\n"
-"¦ ×É ÐÏ×ÉÎΦ ÃÅ ×ÒÁÈÕ×ÁÔÉ.\n"
-"\n"
-"÷É Ä¦ÊÓÎÏ ÈÏÞÅÔÅ ×ÓÔÁÎÏ×ÉÔÉ ×Ó¦ ×ÉÂÒÁΦ ÐÁËÕÎËÉ?"
+msgid "One of the following packages is needed:"
+msgstr "ðÏÔÒ¦ÂÎÉÊ ÏÄÉÎ Ú ÎÁÓÔÕÐÎÉÈ ÐÁËÕÎ˦×:"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Name: "
-msgstr "îÁÚ×Á: %s"
+#, c-format
+msgid "Please choose"
+msgstr "âÕÄØ ÌÁÓËÁ, ×ÉÂÅÒ¦ÔØ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "÷É×ÞÁÀ..."
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "çÏÔÕÀÓØ ÐÁËÕÎËÉ ÄÏ ÕÓÔÁÎÏ×ËÉ..."
+msgid "Not selected"
+msgstr "ðÏͦÞÅΦ ËÏÎÆ̦ËÔÉ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Selected"
+msgstr ""
+"÷ÉÂÒÁÔÉ \n"
+"×ÓÅ"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "á×ÓÔÒÁ̦Ñ"
+msgid "Search results"
+msgstr "òÅÚÕÌØÔÁÔÉ ÐÏÛÕËÕ"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation finished"
-msgstr "÷ÓÔÁÎÏ×ÌÅÎÏ"
+#, c-format
+msgid "Stop"
+msgstr "úÕÐÉÎÉÔÉ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
-msgstr "ÚÁ ÐÒÉÄÁÔΦÓÔÀ ÄÏ ÐÏÎÏ×ÌÅÎÎÑ"
+msgid "Please wait, searching..."
+msgstr "úÁÞÅËÁÊÔÅ, ÂÕÄØ ÌÁÓËÁ, ÛÕËÁÀ..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
-msgstr "ðÏÌØÝÁ"
+msgid "Search results (none)"
+msgstr "òÅÚÕÌØÔÁÔ ÐÏÛÕËÕ (ÎÅÍÁ¤)"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Version: "
-msgstr "÷ÅÒÓ¦Ñ:"
+#, c-format
+msgid "Other"
+msgstr "¶ÎÛÅ"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "÷É ÍÏÖÅÔÅ ×ÓÔÁÎÏ×ÉÔÉ ËÏÒÉÓÔÕ×ÁÞÁ/ÐÁÒÏÌØ ÄÌÑ ÁÕÔÅÎÔÉƦËÁæ§ ÐÒÏËÓ¦:"
+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 "Editing source \\\"%s\\\":"
-msgstr "òÅÄÁÇÕ×ÁÎÎÑ ÄÖÅÒÅÌÁ \"%s\":"
+msgid "Proxy..."
+msgstr "ðÏÍÉÌËÁ..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Upgradable"
+msgid "Update..."
 msgstr "ðÏÎÏ×ÌÅÎÎÑ"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid " done."
-msgstr " ×ÉËÏÎÁÎÏ."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "çÏÔÕÀÓØ ÐÁËÕÎËÉ ÄÏ ÕÓÔÁÎÏ×ËÉ..."
+msgid "Add..."
+msgstr "äÏÄÁÔÉ..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "ðÅÒÅצÒËÁ ÆÁÊÌÕ ÄÖÅÒÅÌÁ `%s'..."
+msgid "Edit"
+msgstr "òÅÄÁÇÕ×ÁÔÉ"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "ðÏÔÒ¦ÂΦ ÄÏÄÁÔËÏצ ÐÁËÕÎËÉ"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Bugfixes updates"
-msgstr "ðÏËÁÚÁÔÉ ÓÐÉÓÏË ÐÏÎÏ×ÌÅÎÎØ ÄÌÑ ×ÉÐÒÁ×ÌÅÎÎÑ ÐÏÍÉÌÏË"
+msgid "Source"
+msgstr "äÖÅÒÅÌÏ"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "úÁ×ÁÎÔÁÖÅÎÏ `%s', ÚÁÌÉÛÉÌÏÓØ ÞÁÓÕ:%s, Û×ÉÄ˦ÓÔØ:%s"
+msgid "Enabled?"
+msgstr "äÏÓÔÕÐÎÉÊ?"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Germany"
-msgstr "î¦ÍÅÞÞÉÎÁ"
+msgid "Configure sources"
+msgstr "óËÏÎƦ­ÕÒÕ×ÁÔÉ ÄÖÅÒÅÌÁ"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Russia"
-msgstr "òÏÓ¦Ñ"
+msgid "Password:"
+msgstr "ðÁÒÏÌØ:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Norway"
-msgstr "îÏÒ×ÅǦÑ"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "ð¦Ä ÞÁÓ ÕÓÔÁÎÏ×ËÉ ÓÔÁÌÁÓÑ ÐÏÍÉÌËÁ"
+msgid "User:"
+msgstr "ëÏÒÉÓÔÕ×ÁÞ:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search"
-msgstr "ðÏÛÕË"
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "÷É ÍÏÖÅÔÅ ×ÓÔÁÎÏ×ÉÔÉ ËÏÒÉÓÔÕ×ÁÞÁ/ÐÁÒÏÌØ ÄÌÑ ÁÕÔÅÎÔÉƦËÁæ§ ÐÒÏËÓ¦:"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit a source"
-msgstr "òÅÄÁÇÕ×ÁÔÉ ÄÖÅÒÅÌÏ "
+msgid "Proxy hostname:"
+msgstr "îÁÚ×Á ÐÒÏËÓ¦:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Czech Republic"
-msgstr "þÅȦÑ"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"ñËÝÏ ×ÁÍ ÐÏÔÒ¦ÂÎÅÎ ÐÒÏËÓ¦, ××ÅĦÔØ ÊÏÇÏ ÎÁÚ×Õ ¦ ÐÏÒÔ (ÎÅÏÂÏ×'ÑÚËÏ×Ï) "
+"(ÓÉÎÔÁËÓÉÓ: <ÎÁÚ×Á[:ÐÏÒÔ]>):"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Stop"
-msgstr "úÕÐÉÎÉÔÉ"
+msgid "Configure proxies"
+msgstr "îÁÌÁÛÔÕ×ÁÔÉ ÐÒÏËÓ¦"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "ðÏÎÏ×ÌÅÎÎÑ"
+msgid "Please wait, updating medium..."
+msgstr "úÁÞÅËÁÊÔÅ, ÂÕÄØ-ÌÁÓËÁ, ÐÏÎÏ×ÌÀÀ ÎÏÓ¦Ñ..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, removing packages..."
-msgstr ""
-"úÁÞÅËÁÊÔÅ\n"
-"óÏÒÔÕ×ÁÎÎÑ ÐÁËÅÔ¦×"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+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 "Normal information"
-msgstr "óÔÁÎÄÁÒÔÎÁ ¦ÎÆÏÒÍÁæÑ"
+msgid "You need to insert the medium to continue"
+msgstr "÷ÁÍ ÐÏÔÒ¦ÂÎÏ ×ÓÔÁ×ÉÔÉ ÎÏÓ¦Ñ ÄÌÑ ÐÒÏÄÏ×ÖÅÎÎÑ"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "úËÁÞÕÀ ÐÁËÅÔ '%s' (%s/%s)..."
+msgid "Save changes"
+msgstr "úÂÅÒÅÇÔÉ ÚͦÎÉ"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "÷ÉÂÒÁÎÏ: %d í / ÷¦ÌØÎÏ ÎÁ ÄÉÓËÕ: %d í"
+msgid "Relative path to synthesis/hdlist:"
+msgstr "÷¦ÄÎÏÓÎÉÊ ÛÌÑÈ ÄÏ synthesis/hdlist:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Spain"
-msgstr "¶ÓÐÁΦÑ"
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Normal updates"
-msgstr "÷ÉËÏÎÁÔÉ ÐÏÎÏ×ÌÅÎÎÑ"
+msgid "Editing source \"%s\":"
+msgstr "òÅÄÁÇÕ×ÁÎÎÑ ÄÖÅÒÅÌÁ \"%s\":"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by selection state"
-msgstr "ÚÁ ÓÔÁÎÏÍ ×ÉÂÏÒÕ"
+msgid "Edit a source"
+msgstr "òÅÄÁÇÕ×ÁÔÉ ÄÖÅÒÅÌÏ "
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
-"úÁÞÅËÁÊÔÅ, ÂÕÄØ ÌÁÓËÁ, ÊÄÅ ÚÁ×ÁÎÔÁÖÅÎÎÑ ÁÄÒÅÓ ÄÚÅÒËÁÌ Ú ×ÅÂ-ÓÁÊÔÕ "
-"MandrakeSoft."
+msgid "Please wait, removing medium..."
+msgstr "úÁÞÅËÁÊÔÅ, ÂÕÄØ-ÌÁÓËÁ, ×ÉÄÁÌÑÀ ÎÏÓ¦Ñ..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Login:"
-msgstr "¶Í'Ñ:"
+msgid "Type of source:"
+msgstr "ôÉÐ ÄÖÅÒÅÌÁ:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Austria"
-msgstr "á×ÓÔÒ¦Ñ"
+msgid "Adding a source:"
+msgstr "äÏÂÁ×ÌÑÀÔØÓÑ ÄÖÅÒÅÌÁ:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Fatal error"
-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.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "÷ÉÂÅÒ¦ÔØ ÄÖÅÒÅÌÏÁ, Ñ˦ ×É ÈÏÞÅÔÅ ÐÏÎÏ×ÉÔÉ:"
+msgid "You need to fill up at least the two first entries."
+msgstr "÷ÁÍ ÐÏÔÒ¦ÂÎÏ ÚÁÐÏ×ÎÉÔÉ ÈÏÞÁ  Ä×Á ÐÅÒÛ¦ ÐÏÌÑ."
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Update..."
-msgstr "ðÏÎÏ×ÌÅÎÎÑ"
+msgid "Name:"
+msgstr "îÁÚ×Á"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "ðÅÒÅצÒÑÀ ЦÄÐÉÓ '%s'..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
+msgstr "¶Í'Ñ:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
-msgstr "(ΦÞÏÇÏ)"
+msgid "Choose a mirror..."
+msgstr "÷ÉÂÅÒ¦ÔØ ÄÚÅÒËÁÌÏ..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
-"÷ÉÂÁÞÔÅ, ÁÌÅ ×ÉÌÕÞÅÎÎÑ ÃÉÈ ÐÁËÕÎË¦× ÐÏÒÕÛÉÔØ ÒÏÂÏÔÕ ×ÁÛϧ ÓÉÓÔÅÍÉ:\n"
-"\n"
+msgid "Browse..."
+msgstr "ðÅÒÅÇÌÑÎÕÔÉ..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "÷ÓÔÁÎÏ×ÌÀÀ ÐÁËÅÔ '%s' (%s/%s)..."
+msgid "Path or mount point:"
+msgstr "ûÌÑÈ ÁÂÏ ÔÏÞËÁ ÍÏÎÔÕ×ÁÎÎÑ:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "÷ÓÔÁÎÏ×ÌÅÎÁ ×ÅÒÓ¦Ñ: "
+msgid "Removable device"
+msgstr "úͦÎÎÉÊ ÐÒÉÓÔÒ¦Ê"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Other"
-msgstr "¶ÎÛÅ"
+msgid "HTTP server"
+msgstr "óÅÒ×ÅÒ HTTP"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reason for update: "
-msgstr "ðÒÉÞÉÎÁ ÐÏÎÏ×ÌÅÎÎÑ: "
+msgid "FTP server"
+msgstr "óÅÒ×ÅÒ FTP"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Please choose the desired mirror."
-msgstr ""
-"úÁÞÅËÁÊÔÅ \n"
-"þÉÔÁÀ ÓÐÉÓÏË ÄÚÅÒËÁÌ"
+msgid "Path:"
+msgstr "ðÏÒÔ:"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit"
-msgstr "òÅÄÁÇÕ×ÁÔÉ"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, finding available packages..."
-msgstr ""
-"úÁÞÅËÁÊÔÅ\n"
-"óÏÒÔÕ×ÁÎÎÑ ÐÁËÅÔ¦×"
+msgid "Local files"
+msgstr "ìÏËÁÌØΦ ÆÁÊÌÉ"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "÷¦ÄÎÏÓÎÉÊ ÛÌÑÈ ÄÏ synthesis/hdlist:"
+msgid "Add a source"
+msgstr "äÏÄÁÔÉ ÄÖÅÒÅÌÏ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Search results (none)"
-msgstr "òÅÚÕÌØÔÁÔ ÐÏÛÕËÕ (ÎÅÍÁ¤)"
+msgid "Unable to create medium."
+msgstr "îÅÍÏÖÌÉ×Ï ÓÔ×ÏÒÉÔÉ ÎÏÓ¦Ñ."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Danmark"
-msgstr "äÁΦÑ"
+msgid "Update"
+msgstr "ðÏÎÏ×ÌÅÎÎÑ"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "ëÉÔÁÊ"
+msgid "Select the source(s) you wish to update:"
+msgstr "÷ÉÂÅÒ¦ÔØ ÄÖÅÒÅÌÏÁ, Ñ˦ ×É ÈÏÞÅÔÅ ÐÏÎÏ×ÉÔÉ:"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United States"
-msgstr "óÐÏÌÕÞÅΦ ûÔÁÔÉ"
+msgid "Please wait, updating media..."
+msgstr "úÁÞÅËÁÊÔÅ, ÂÕÄØ-ÌÁÓËÁ, ÐÏÎÏ×ÌÀÀÔØÓÑ ÎÏÓ¦§..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "changes:"
-msgstr "ÚͦÎÉ:"
+msgid " failed!"
+msgstr " ÎÅÕÓЦÛÎÏ!"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "ðÏÔÒ¦ÂÎÏ ÄÏÄÁÔËÏ×Ï ×ÉÌÕÞÉÔÉ ÄÅÑ˦ ÐÁËÕÎËÉ"
+msgid " done."
+msgstr " ×ÉËÏÎÁÎÏ."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Download of `%s', speed:%s"
+msgstr "úÁ×ÁÎÔÁÖÅÎÏ `%s', Û×ÉÄ˦ÓÔØ:%s"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No"
-msgstr "î¦"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "úÁ×ÁÎÔÁÖÅÎÏ `%s', ÚÁÌÉÛÉÌÏÓØ ÞÁÓÕ:%s, Û×ÉÄ˦ÓÔØ:%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Summary: "
-msgstr "ð¦ÄÓÕÍÏË"
+msgid "Starting download of `%s'..."
+msgstr "ðÅÒÅצÒÑÀ ЦÄÐÉÓ '%s'..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "ëÁÎÁÄÁ"
+msgid "Examining distant file of source `%s'..."
+msgstr "ðÅÒÅצÒËÁ צÄÄÁÌÅÎÏÇÏ ÆÁÊÌÕ ÄÖÅÒÅÌÁ `%s'..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Greece"
-msgstr "çÒÅæÑ"
+msgid "Examining file of source `%s'..."
+msgstr "ðÅÒÅצÒËÁ ÆÁÊÌÕ ÄÖÅÒÅÌÁ `%s'..."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Copying file for source `%s'..."
+msgstr "ëÏЦÀ×ÁÎÎÑ ÆÁÊÌÕ Ú ÄÖÅÒÅÌÁ `%s'..."
+
+#: ../rpmdrake.pm: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"
+"\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.pm:1
+#, fuzzy, c-format
+msgid "No mirror"
+msgstr "ÄÚÅÒËÁÌÏ:"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1057,261 +1137,181 @@ msgstr ""
 "íÏÖÌÉ×Ï, ÍÅÒÅÖÁ ÁÂÏ ×ÅÂ-ÓÁÊÔ MandrakeSoft ÎÅÄÏÓÔÕÐΦ.\n"
 "âÕÄØ ÌÁÓËÁ, ÓÐÒÏÂÕÊÔÅ ÝÅ ÒÁÚ Ð¦ÚΦÛÅ."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Source: "
-msgstr "äÖÅÒÅÌÏ"
-
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "ëÏЦÀ×ÁÎÎÑ ÆÁÊÌÕ Ú ÄÖÅÒÅÌÁ `%s'..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "÷É ÐÏ×ÉÎΦ ÍÁÔÉ ÐÒÁ×Á ÁÄͦΦÓÔÒÁÔÏÒÁ, ×ÉÂÁÞÁÊÔÅ."
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Path:"
-msgstr "ðÏÒÔ:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Problem during removal"
-msgstr "ðÒÏÂÌÅÍÁ Ð¦Ä ÞÁÓ ×ÉÌÕÞÅÎÎÑ"
+msgid "Error during download"
+msgstr "ðÏÍÉÌËÁ Ð¦Ä ÞÁÓ ÚËÁÞÕ×ÁÎÎÑ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by source repository"
-msgstr "ÚÁ ÄÖÅÒÅÌÏÍ"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Selected"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
-"÷ÉÂÒÁÔÉ \n"
-"×ÓÅ"
+"úÁÞÅËÁÊÔÅ, ÂÕÄØ ÌÁÓËÁ, ÊÄÅ ÚÁ×ÁÎÔÁÖÅÎÎÑ ÁÄÒÅÓ ÄÚÅÒËÁÌ Ú ×ÅÂ-ÓÁÊÔÕ "
+"MandrakeSoft."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Netherlands"
-msgstr "çÏÌÁÎĦÑ"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Addable"
-msgstr "íÏÖÌÉ×Ï ÄÏÄÁÔÉ"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "(Not available)"
-msgstr "(îÅÄÏÓÔÕÐÎÅ)"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
 "\n"
-"%s"
+"Is it ok to continue?"
 msgstr ""
-"÷ÉÂÁÞÔÅ, ÎÁÓÔÕÐΦ ÐÁËÕÎËÉ ÎÅ ÍÏÖÕÔØ ÂÕÔÉ ×ÉÂÒÁΦ:\n"
+"íÅΦ ÐÏÔÒ¦ÂÎÏ Ú'¤ÄÎÁÔÉÓÑ Ú ×ÅÂ-ÓÁÊÔÏÍ MandrakeSoft, ÝÏ ÏÔÒÉÍÁÔÉ ÐÅÒÅÌ¦Ë "
+"ÄÚÅÒËÁÌ.\n"
+"âÕÄØ ÌÁÓËÁ, ÐÅÒÅצÒÔÅ, ÞÅ Ú'¤ÄÎÁΦ ×É Ú ¦ÎÔÅÒÎÅÔÏÍ.\n"
 "\n"
+"ðÒÏÄÏ×ÖÉÔÉ?"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr "ðÏͦÞÅΦ ËÏÎÆ̦ËÔÉ"
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "÷ÉÌÕÞÅÎÎÑ ÐÁËÕÎË¦× Ú ÐÒÏÇÒÁÍÁÍÉ"
+msgid "United States"
+msgstr "óÐÏÌÕÞÅΦ ûÔÁÔÉ"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Sweden"
-msgstr "û×ÅæÑ"
+msgid "China"
+msgstr "ëÉÔÁÊ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
-msgstr ""
-"\n"
-"\n"
-"ðÏצÄÏÍÌÅÎÏ ÐÒÏ ÐÏÍÉÌËÉ:\n"
-"%s"
+msgid "United Kingdom"
+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."
-msgstr ""
-"ðÅÒÅÌ¦Ë ÐÏÎÏ×ÌÅÎØ ÐÏÒÏÖΦÊ. ãÅ ÏÚÎÁÞÁ¤, ÝÏ ÁÂÏ ÎÅÍÁ¤\n"
-"ÐÏÎÏ×ÌÅÎØ ÄÌÑ ÐÁËÕÎ˦×, Ñ˦ ×ÓÔÁÎÏ×ÌÅΦ ÎÁ ×ÁÛÏÍÕ ËÏÍÐ'ÀÔÅÒ¦,\n"
-"ÁÂÏ ×ÏÎÉ ×Ó¦ ×ÖÅ ×ÓÔÁÎÏ×ÌÅΦ."
+msgid "Taiwan"
+msgstr "ôÁÊ×ÁÎØ"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "úÁ×ÁÎÔÁÖÅÎÏ `%s', Û×ÉÄ˦ÓÔØ:%s"
+msgid "Sweden"
+msgstr "û×ÅæÑ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "ðÏÔÒ¦ÂÎÉÊ ÏÄÉÎ Ú ÎÁÓÔÕÐÎÉÈ ÐÁËÕÎ˦×:"
+msgid "Russia"
+msgstr "òÏÓ¦Ñ"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Quit"
-msgstr "÷ÉȦÄ"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Portugal"
+msgstr "ðÏÒÔ:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 ""
-"íÅΦ ÎÅÏÂȦÄÎÏ Ú'¤ÄÎÁÔÉÓÑ Ú ÄÚÅÒËÁÌÏÍ, ÝÏ ÏÔÒÉÍÁÔÉ ÏÓÔÁÎΦ ÐÏÎÏ×ÌÅÎÎÑ "
-"ÐÁËÕÎ˦×.\n"
-"âÕÄØ ÌÁÓËÁ, ÐÅÒÅצÒÔÅ, ÞÉ ×ÁÛÁ ÍÅÒÅÖÁ × ÄÁÎÉÊ ÞÁÓ ÐÒÁÃÀ¤.\n"
-"\n"
-"ðÒÏÄÏ×ÖÉÔÉ?"
+msgid "Poland"
+msgstr "ðÏÌØÝÁ"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "çÁÒÁÚÄ"
+msgid "Norway"
+msgstr "îÏÒ×ÅǦÑ"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "úÁÞÅËÁÊÔÅ, ÂÕÄØ-ÌÁÓËÁ, ÄÏÄÁÀ ÎÏÓ¦Ñ..."
+msgid "Netherlands"
+msgstr "çÏÌÁÎĦÑ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Korea"
+msgstr "ðÒÉÍÕÓÏ×Ï"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "ôÉÐ ÄÖÅÒÅÌÁ:"
+msgid "Japan"
+msgstr "ñÐÏΦÑ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Please insert the medium named \\\"%s\\\" on device [%s]"
-msgstr "âÕÄØ ÌÁÓËÁ, ×ÓÔÁ×ÔÅ ÄÉÓË Ú ÎÁÚ×ÏÀ \"%s\" Õ ÐÒÉÓÔÒ¦Ê [%s]"
+msgid "Italy"
+msgstr "¶ÎÓÔÁÌÀ×ÁÔÉ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Unable to get source packages."
-msgstr "÷ÉÂÅÒ¦ÔØ Ó×ϧ ÐÁËÅÔÉ"
+msgid "Israel"
+msgstr "¶ÎÓÔÁÌÀ×ÁÔÉ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "÷ÉÂÒÁÎÏ ÚÁÎÁÄÔÏ ÂÁÇÁÔÏ ÐÁËÕÎ˦×"
+msgid "Greece"
+msgstr "çÒÅæÑ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "ËÏÎÆ̦ËÔÕ¤ Ú"
+msgid "France"
+msgstr "ðÒÉÍÕÓÏ×Ï"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Finland"
+msgstr "æ¦ÎÌÑÎĦÑ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "÷ÉÂ¦Ò íÁÎÄÒÅÊËÁ"
+msgid "Spain"
+msgstr "¶ÓÐÁΦÑ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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"
-"ðÏÔ¦Í ÐÅÒÅÚÁÐÕÓÔ¦ÔØ ðÏÎÏ×ÌÅÎÎÑ íÁÎÄÒÅÊË."
+msgid "Danmark"
+msgstr "äÁΦÑ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "ðÅÒÅÌ¦Ë ÚͦÎ:\n"
+msgid "Germany"
+msgstr "î¦ÍÅÞÞÉÎÁ"
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Korea"
-msgstr "ðÒÉÍÕÓÏ×Ï"
+#, c-format
+msgid "Czech Republic"
+msgstr "þÅȦÑ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "úͦÎÎÉÊ ÐÒÉÓÔÒ¦Ê"
+msgid "Costa Rica"
+msgstr "ëÏÓÔÁ-ò¦ËÁ"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Canada"
+msgstr "ëÁÎÁÄÁ"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
+msgstr "âÒÁÚÉ̦Ñ"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "âÅÌØǦÑ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Change medium"
-msgstr "úͦΦÔØ ÎÏÓ¦Ê"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Mandrake Update"
-msgstr "÷ÉËÏÎÁÔÉ ÐÏÎÏ×ÌÅÎÎÑ"
+msgid "Australia"
+msgstr "á×ÓÔÒÁ̦Ñ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by size"
-msgstr "ÚÁ ÒÏÚͦÒÏÍ"
+msgid "Austria"
+msgstr "á×ÓÔÒ¦Ñ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "óÅÒ×ÅÒ FTP"
+msgid "Info..."
+msgstr "¶ÎÆÏÒÍÁæÑ..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Files:\n"
-msgstr "/_æÁÊÌ"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
+msgstr "î¦"
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr "îÅÍÏÖÌÉ×Ï ÐÏÎÏ×ÉÔÉ ÎÏÓ¦Ñ; ÊÏÇÏ ÂÕÄÅ Á×ÔÏÍÁÔÉÞÎÏ ×ÉÍËÎÅÎÏ."
+#, c-format
+msgid "Yes"
+msgstr "ôÁË"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
diff --git a/po/uz.po b/po/uz.po
index 70a71352..5c796fa6 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grpmi\n"
-"POT-Creation-Date: 2003-05-02 20:15+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+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,20 +15,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Enabled?"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
-
-#: ../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:"
+"%s\n"
+"\n"
+"Davom etsa bo'ladimi?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -42,141 +38,131 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-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"
+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 "How to choose manually your mirror"
+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 "URL:"
-msgstr "URL:"
-
 #: ../rpmdrake:1
-#, c-format
-msgid "Some packages need to be removed"
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
 msgstr ""
+"Paketlarni o'rnatish paytida xato yuzaga keldi:\n"
+"\n"
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Already existing update sources"
+msgid "Problem during removal"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "More information on package..."
+#, fuzzy, c-format
+msgid "Please wait, removing packages..."
 msgstr ""
+"Iltimos Kuting\n"
+"Paketlar saralanmoqda"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Yes"
-msgstr "Ha"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, reading packages database..."
+msgstr ""
+"Iltimos Kuting\n"
+"Paketlar saralanmoqda"
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"There was a problem during the installation:\n"
 "\n"
+"%s"
 msgstr ""
+"Paketlarni o'rnatish paytida xato yuzaga keldi:\n"
+"\n"
+"%s"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "everything was installed correctly"
-msgstr "hamma narsa to'g'ri o'rnatildi"
+#, fuzzy, c-format
+msgid "Installation failed"
+msgstr "Hammasini o'rnat"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "%s KB"
-msgstr "%.1f KB"
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "O'rnatishga paketlar tayyorlanmoqda..."
 
 #: ../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 ""
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "O'rnatishga paketlar tayyorlanmoqda..."
 
-#: ../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 "All requested packages were installed successfully."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
-msgstr "Saqlash va chiqish"
+msgid "Everything installed successfully"
+msgstr "Hamma narsa muvaffaqiyatli o'rnatildi"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"The installation is finished; %s.\n"
 "\n"
-"%s"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
 msgstr ""
-"Paketlarni o'rnatish paytida xato yuzaga keldi:\n"
-"\n"
-"%s"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Size: "
-msgstr "Hajm"
+#, c-format
+msgid "everything was installed correctly"
+msgstr "hamma narsa to'g'ri o'rnatildi"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Security updates"
-msgstr "Xavfsizlik apdeytlarini ko'rsat"
+msgid "Problem during installation"
+msgstr "O'rnatish paytida xatolar yuzaga keldi"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "Eng ko'p ma'lumot"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "`%s' (%s/%s) paketi o'rnatilmoqda..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Xato..."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "United Kingdom"
-msgstr "Buyuk Britaniya"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure sources"
-msgstr "Manbalarni moslash"
+msgid "Preparing packages installation..."
+msgstr "O'rnatishga paketlar tayyorlanmoqda..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "nomlarda"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
+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."
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
 msgstr ""
 
 #: ../rpmdrake:1
@@ -186,7 +172,7 @@ msgid ""
 "\n"
 "%s\n"
 "\n"
-"\\Do you want to continue installation?"
+"Do you want to continue installation?"
 msgstr ""
 "Ushbu fayl haqiqiy emas:\n"
 "\n"
@@ -196,362 +182,336 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Remove .%s"
+msgid "Verifying packages signatures..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Source"
-msgstr "Manba'"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "`%s' (%s/%s) paketi olinmoqda..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Finland"
-msgstr "Finlyandiya"
+msgid "Cancel"
+msgstr "Bekor"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "France"
-msgstr "Majburla"
+msgid "Ok"
+msgstr "Ok"
 
-#. -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 ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
-"%s\n"
-"\n"
-"Davom etsa bo'ladimi?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reload the packages list"
+msgid "Change medium"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr ""
+msgid "Initializing..."
+msgstr "Boshlanish..."
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Adding a source:"
-msgstr "Manbani qo'shayapman:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Package installation..."
+msgstr "O'rnatishga paketlar tayyorlanmoqda..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Paketni o'rnatish mumkin emas"
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Paketlarni o'rnatish uchun root bo'lish shart, uzr"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "O'rnatishga paketlar tayyorlanmoqda..."
+msgid "Unable to get source packages."
+msgstr "Paketlaringizni tanlang"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages,"
-msgstr ""
+msgid "Inspect..."
+msgstr "Tekshirish..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "in files"
-msgstr "fayllarda"
+#, fuzzy, c-format
+msgid "Installation finished"
+msgstr "O'rnatilgan"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr ""
+msgid "Do nothing"
+msgstr "Hech narsa qilmash"
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Proxy hostname:"
-msgstr "Proksi yuzer nomi:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
+msgstr "Faylni (.%s) asosiy fayl safatida islatish"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Update source(s)"
-msgstr "Manba(lar)ni yangilash"
+msgid "Remove .%s"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "Lokal fayllar"
+msgid "changes:"
+msgstr "o'zgarishlar:"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspecting %s"
 msgstr "%s tekshirilmoqda"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Israel"
-msgstr "O'rnat"
-
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Help"
-msgstr "/_Yordam"
+msgid "Please wait, finding available packages..."
+msgstr ""
+"Iltimos Kuting\n"
+"Paketlar saralanmoqda"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "HTTP server"
-msgstr "HTTP server"
+msgid "Please wait, adding medium..."
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"Welcome to the packages source editor!\n"
+"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"
-"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 ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Hammasini o'rnat"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Faylni (.%s) asosiy fayl safatida islatish"
+msgid "How to choose manually your mirror"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results"
-msgstr "Qidirish natijalari"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid " failed!"
-msgstr "fayllarda"
+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 ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Brazil"
-msgstr "Braziliya"
+msgid "Already existing update sources"
+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?"
+"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
 #, c-format
-msgid "Find:"
-msgstr "Qidirish:"
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "All packages, alphabetical"
-msgstr ""
+#, fuzzy, c-format
+msgid "Fatal error"
+msgstr "Fayl xatosi"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Please wait, searching..."
-msgstr "Qidirayapman, iltimos kutib turing..."
+#, fuzzy, c-format
+msgid "Software Packages Installation"
+msgstr "O'rnatishga paketlar tayyorlanmoqda..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, reading packages database..."
+msgid "Mandrake Update"
+msgstr "MandrakeUpdate Tanlovlari"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
 msgstr ""
-"Iltimos Kuting\n"
-"Paketlar saralanmoqda"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Chiqish"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "O'rnat"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "Olibtashlash"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "unknown package "
-msgstr "Paketni ocholmadim"
+msgid "Help"
+msgstr "/_Yordam"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "Tanlashni tiklash"
+msgid "Search"
+msgstr "Qidirish"
 
-#: ../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 ""
+msgid "Find:"
+msgstr "Qidirish:"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
 "\n"
+"Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Kosta Rika"
+msgid "Some packages need to be removed"
+msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"There was a problem during the installation:\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"
-"%s"
+"Do you really want to install all the selected packages?"
 msgstr ""
-"Paketlarni o'rnatish paytida xato yuzaga keldi:\n"
-"\n"
-"%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing medium..."
+msgid "Too many packages are selected"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "Parol:"
+msgid "Maximum information"
+msgstr "Eng ko'p ma'lumot"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr ""
+msgid "Normal information"
+msgstr "Oddiy ma'lumot"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Taiwan"
-msgstr "Tayvan"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "User:"
-msgstr "Yuzer nomi:"
+msgid "Update source(s)"
+msgstr "Manba(lar)ni yangilash"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating medium..."
+msgid "Reload the packages list"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, listing packages..."
-msgstr ""
-"Iltimos Kuting\n"
-"Paketlar saralanmoqda"
+#, c-format
+msgid "Reset the selection"
+msgstr "Tanlashni tiklash"
 
 #: ../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 "in files"
+msgstr "fayllarda"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Information on packages"
-msgstr "Paketni ocholmadim"
+msgid "in descriptions"
+msgstr "Tavsiflar"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "Bekor"
+msgid "in names"
+msgstr "nomlarda"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Hamma narsa muvaffaqiyatli o'rnatildi"
+msgid "by update availability"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr ""
+msgid "by source repository"
+msgstr "manba bo'yicha"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "by selection state"
+msgstr "tanlash holati bo'yicha"
 
 #: ../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 ""
+msgid "by size"
+msgstr "hajmi bo'yicha"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "in descriptions"
-msgstr "Tavsiflar"
+#, c-format
+msgid "by group"
+msgstr "guruh bo'yicha"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
+msgid "All packages,"
 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 "All packages, alphabetical"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Iltimos tanlang"
+msgid "Mandrake choices"
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Selected size: %d MB"
-msgstr "%dta tanlangan paket: %.1f MB"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add a source"
-msgstr "Manbani qo'shish"
+msgid "Normal updates"
+msgstr "Oddiy Apdeytlar"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Initializing..."
-msgstr "Boshlanish..."
+#, fuzzy, c-format
+msgid "Bugfixes updates"
+msgstr "Xato tuzatish apdeytlarini ko'rsat"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Save changes"
-msgstr "O'zgarishlarni saqlash"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Security updates"
+msgstr "Xavfsizlik apdeytlarini ko'rsat"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Description: "
+msgstr "Tavsiflar"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
-msgstr "Download paytida xato"
+msgid "Reason for update: "
+msgstr "Yangilash uchun sabab: "
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "O'rnatishga paketlar tayyorlanmoqda..."
+msgid "Summary: "
+msgstr "Xulosa"
 
 #: ../rpmdrake:1
 #, c-format
@@ -559,670 +519,710 @@ msgid "Importance: "
 msgstr "Muhimligi: "
 
 #: ../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 "%s KB"
+msgstr "%.1f KB"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add..."
-msgstr "Qo'shish"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Size: "
+msgstr "Hajm"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Unable to create medium."
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Version: "
+msgstr "Versiya:"
 
 #: ../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 ""
+#, fuzzy, c-format
+msgid "Name: "
+msgstr "Nom: %s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
-msgstr "Tanlash..."
+msgid "Currently installed version: "
+msgstr "O'rnatilgan versiyasi: "
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "Paketni o'rnatish mumkin emas"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Info..."
-msgstr "Ma'lumot"
+msgid "Source: "
+msgstr "Manba'"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
+msgid "(Not available)"
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "Olibtashlash"
+msgid "Changelog:\n"
+msgstr "Changelog:\n"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "O'rnatishga paketlar tayyorlanmoqda..."
+msgid "Files:\n"
+msgstr "/_Fayl"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No mirror"
-msgstr "ko'zgu:"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr ""
+msgid "Selected size: %d MB"
+msgstr "%dta tanlangan paket: %.1f MB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "O'rnat"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Tanlangan: %d Mb / Diskdagi bo'sh joy: %d Mb"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "Yaponiya"
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Hech narsa qilmash"
+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 "No update"
-msgstr "Yangila"
+msgid "%s conflicts with %s"
+msgstr "bu bilan ziddiyat"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Description: "
-msgstr "Tavsiflar"
+msgid "Some packages can't be installed"
+msgstr "Paketni o'rnatish mumkin emas"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
 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 "Additional packages needed"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Name: "
-msgstr "Nom: %s"
+msgid "Some packages can't be removed"
+msgstr "Paketni o'rnatish mumkin emas"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "Tekshirish..."
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "O'rnatishga paketlar tayyorlanmoqda..."
-
-#: ../rpmdrake.pm:1
 #, c-format
-msgid "Australia"
-msgstr "Avstraliya"
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation finished"
-msgstr "O'rnatilgan"
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
+msgid "More information on package..."
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Poland"
-msgstr "Polsha"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Information on packages"
+msgstr "Paketni ocholmadim"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Version: "
-msgstr "Versiya:"
+msgid "More info"
+msgstr "Qo'shimcha ma'lumot"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr ""
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Editing source \\\"%s\\\":"
-msgstr "Manbani (\"%s\") tuzatayapman:"
+msgid "Addable"
+msgstr "Qo'shsa bo'ladi"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Upgradable"
 msgstr "Apdeyt"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " done."
+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:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "O'rnatishga paketlar tayyorlanmoqda..."
+msgid "No update"
+msgstr "Yangila"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr ""
+msgid "(none)"
+msgstr "(hech qanaqa)"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Additional packages needed"
+#, fuzzy, c-format
+msgid "Please wait, listing packages..."
 msgstr ""
+"Iltimos Kuting\n"
+"Paketlar saralanmoqda"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Bugfixes updates"
-msgstr "Xato tuzatish apdeytlarini ko'rsat"
+msgid "unknown package "
+msgstr "Paketni ocholmadim"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
+msgid "One of the following packages is needed:"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Germany"
-msgstr "Olmoniya"
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Russia"
-msgstr "Rossiya"
+msgid "Please choose"
+msgstr "Iltimos tanlang"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Norway"
-msgstr "Norvegiya"
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "O'rnatish paytida xatolar yuzaga keldi"
+msgid "Not selected"
+msgstr "Ziddiyatlar aniqlandi"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Search"
-msgstr "Qidirish"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Edit a source"
-msgstr "Manbani tuzatish"
+#, fuzzy, c-format
+msgid "Selected"
+msgstr ""
+"Hammasini\n"
+"tanla"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Chex Respublikasi"
+msgid "Search results"
+msgstr "Qidirish natijalari"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Stop"
 msgstr "To'xtatish"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Update"
-msgstr "Apdeyt"
-
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, removing packages..."
-msgstr ""
-"Iltimos Kuting\n"
-"Paketlar saralanmoqda"
+#, c-format
+msgid "Please wait, searching..."
+msgstr "Qidirayapman, iltimos kutib turing..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Normal information"
-msgstr "Oddiy ma'lumot"
+msgid "Search results (none)"
+msgstr "Qidirish natijalari (hech qanaqa)"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "`%s' (%s/%s) paketi olinmoqda..."
+msgid "Other"
+msgstr "Boshqa"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Tanlangan: %d Mb / Diskdagi bo'sh joy: %d Mb"
+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 ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Spain"
-msgstr "Ispaniya"
+msgid "Save and quit"
+msgstr "Saqlash va chiqish"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Normal updates"
-msgstr "Oddiy Apdeytlar"
+msgid "Proxy..."
+msgstr "Xato..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Update..."
+msgstr "Apdeyt"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by selection state"
-msgstr "tanlash holati bo'yicha"
+msgid "Add..."
+msgstr "Qo'shish"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgid "Edit"
+msgstr "Tuzatish"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Source"
+msgstr "Manba'"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Login:"
-msgstr "Foydalanuvchi:"
+msgid "Configure sources"
+msgstr "Manbalarni moslash"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Austria"
-msgstr "Avstriya"
+msgid "Password:"
+msgstr "Parol:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Fayl xatosi"
+msgid "User:"
+msgstr "Yuzer nomi:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
+msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Update..."
-msgstr "Apdeyt"
+msgid "Proxy hostname:"
+msgstr "Proksi yuzer nomi:"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "`%s' imzosi tekshirilmoqda..."
+#: ../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
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
-msgstr "(hech qanaqa)"
+msgid "Configure proxies"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr ""
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
+"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 "Installing package `%s' (%s/%s)..."
-msgstr "`%s' (%s/%s) paketi o'rnatilmoqda..."
+msgid "You need to insert the medium to continue"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "O'rnatilgan versiyasi: "
+msgid "Save changes"
+msgstr "O'zgarishlarni saqlash"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Other"
-msgstr "Boshqa"
+msgid "Relative path to synthesis/hdlist:"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Yangilash uchun sabab: "
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Please choose the desired mirror."
-msgstr ""
-"Iltimos Kuting\n"
-"Ko'zgular ro'yxati yuklanmoqda"
+msgid "Editing source \"%s\":"
+msgstr "Manbani (\"%s\") tuzatayapman:"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit"
-msgstr "Tuzatish"
+msgid "Edit a source"
+msgstr "Manbani tuzatish"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, finding available packages..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
 msgstr ""
-"Iltimos Kuting\n"
-"Paketlar saralanmoqda"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
+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
+#, c-format
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Qidirish natijalari (hech qanaqa)"
+msgid "You need to fill up at least the two first entries."
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Name:"
+msgstr "Nom"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Danmark"
-msgstr "Daniya"
+msgid "Login:"
+msgstr "Foydalanuvchi:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "China"
-msgstr "Xitoy"
+msgid "Choose a mirror..."
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "United States"
-msgstr "Qo'shma Shtatlar"
+msgid "Browse..."
+msgstr "Tanlash..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "changes:"
-msgstr "o'zgarishlar:"
+msgid "Path or mount point:"
+msgstr "Yo'l yoki ulash nuqtasi:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Some additional packages need to be removed"
+msgid "Removable device"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "HTTP server"
+msgstr "HTTP server"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "Jo'q"
+msgid "FTP server"
+msgstr "FTP server"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Summary: "
-msgstr "Xulosa"
+msgid "Path:"
+msgstr "Port:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Canada"
-msgstr "Kanada"
+msgid "Local files"
+msgstr "Lokal fayllar"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Greece"
-msgstr "Gretsiya"
+msgid "Add a source"
+msgstr "Manbani qo'shish"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"There was an error downloading the mirrors list:\n"
+"Unable to update medium; it will be automatically disabled.\n"
 "\n"
-"%s\n"
-"The network, or MandrakeSoft website, are maybe unavailable.\n"
-"Please try again later."
+"Errors:\n"
+"%s"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Source: "
-msgstr "Manba'"
-
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
+msgid "Unable to create medium."
 msgstr ""
 
-#: ../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:"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
+msgstr "Apdeyt"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Problem during removal"
+msgid "Select the source(s) you wish to update:"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by source repository"
-msgstr "manba bo'yicha"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Selected"
+msgid "Please wait, updating media..."
 msgstr ""
-"Hammasini\n"
-"tanla"
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Netherlands"
-msgstr "Gollandiya"
+#, fuzzy, c-format
+msgid " failed!"
+msgstr "fayllarda"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "Qo'shsa bo'ladi"
+msgid " done."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
+msgid "Download of `%s', speed:%s"
 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 "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Not selected"
-msgstr "Ziddiyatlar aniqlandi"
+msgid "Starting download of `%s'..."
+msgstr "`%s' imzosi tekshirilmoqda..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
+msgid "Examining distant file of source `%s'..."
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Sweden"
-msgstr "Shvetsiya"
+msgid "Examining file of source `%s'..."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+msgid "Copying file for source `%s'..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Please choose the desired mirror."
+msgstr ""
+"Iltimos Kuting\n"
+"Ko'zgular ro'yxati yuklanmoqda"
+
+#: ../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."
+"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 "ko'zgu:"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%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:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr ""
+msgid "Error during download"
+msgstr "Download paytida xato"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "Chiqish"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"I need to contact the mirror to get latest update packages.\n"
+"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 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid "United States"
+msgstr "Qo'shma Shtatlar"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr ""
+msgid "China"
+msgstr "Xitoy"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "Manbaning turi:"
+msgid "United Kingdom"
+msgstr "Buyuk Britaniya"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \\\"%s\\\" on device [%s]"
-msgstr ""
+msgid "Taiwan"
+msgstr "Tayvan"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unable to get source packages."
-msgstr "Paketlaringizni tanlang"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "Shvetsiya"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr ""
+msgid "Russia"
+msgstr "Rossiya"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "bu bilan ziddiyat"
+msgid "Portugal"
+msgstr "Port:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 ""
+msgid "Poland"
+msgstr "Polsha"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
-msgstr ""
+msgid "Norway"
+msgstr "Norvegiya"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Netherlands"
+msgstr "Gollandiya"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Korea"
+msgstr "Majburla"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Changelog:\n"
+msgid "Japan"
+msgstr "Yaponiya"
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Korea"
+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"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr ""
+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
+#, c-format
+msgid "Brazil"
+msgstr "Braziliya"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Belgiya"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Change medium"
-msgstr ""
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Mandrake Update"
-msgstr "MandrakeUpdate Tanlovlari"
+msgid "Australia"
+msgstr "Avstraliya"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by size"
-msgstr "hajmi bo'yicha"
+msgid "Austria"
+msgstr "Avstriya"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "FTP server"
+msgid "Info..."
+msgstr "Ma'lumot"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Files:\n"
-msgstr "/_Fayl"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
+msgstr "Jo'q"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr ""
+msgid "Yes"
+msgstr "Ha"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
diff --git a/po/vi.po b/po/vi.po
index dc9ae0c6..839f83a1 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grpmi-vi\n"
-"POT-Creation-Date: 2003-05-02 20:15+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+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,20 +13,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-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
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Portugal"
-msgstr "Portugal"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Có đồng ý tiếp tục không?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -45,59 +41,104 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-msgstr "theo nhóm"
+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."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Name:"
-msgstr "Tên:"
+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.pm:1
-#, c-format
-msgid "Italy"
-msgstr "�"
+#: ../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"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "Cách ch�n thủ công mirror của bạn"
+msgid "Problem during removal"
+msgstr "Có trục trặc khi gỡ b�"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "Please wait, removing packages..."
+msgstr "Hãy đợi, đang gỡ b� các gói..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Một số gói cần được gỡ b�"
+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 "Already existing update sources"
-msgstr "Nguồn cập nhật đang tồn tại rồ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
+#, 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..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "Chuẩn bị các gói tin để cài đặt..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "More information on package..."
-msgstr "Thêm các thông tin v� gói..."
+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.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "Có"
+msgid "Everything installed successfully"
+msgstr "M�i thứ đã được cài đặt thành công"
 
 #: ../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 ""
-"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"
+"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
 #, c-format
@@ -105,496 +146,513 @@ 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 "%s KB"
-msgstr "%s KB"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "�ang cài đặt gói tin `%s' (%s/%s)..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Chuẩn bị các gói tin để cài đặt..."
 
 #: ../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."
+"\n"
+"Error(s) reported:\n"
+"%s"
 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."
+"\n"
+"Báo cáo lỗi:\n"
+"%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 "�ể 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"
+"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."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"The following packages have bad signatures:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"Có lỗi khi đang cài đặt các gói tin:\n"
+"Các gói sau phải được gỡ b� để nâng cấp các gói khác:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"�ã sẵn sàng tiếp tục?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Size: "
-msgstr "Kích thước: "
+msgid "Verifying packages signatures..."
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Security updates"
-msgstr "Cập nhật bảo mật"
+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"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "OK"
+
+#: ../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 "Maximum information"
-msgstr "Thông tin tối đa"
+msgid "Change medium"
+msgstr "Thay phương tiện"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, c-format
+msgid "Initializing..."
+msgstr "�ang khởi tạo..."
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Lá»—i..."
+msgid "Package installation..."
+msgstr "Chuẩn bị các gói tin để cài đặt..."
 
-#: ../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."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Liên Hiệp Anh"
+msgid "Unable to get source packages."
+msgstr "Không thể lấy các gói nguồn."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure sources"
-msgstr "Cấu hình các nguồn"
+msgid "Inspect..."
+msgstr "Thẩm tra..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "trong các tên"
+msgid "Installation finished"
+msgstr "Kết thúc cài đặt"
 
-#: ../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 ""
-"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 "Do nothing"
+msgstr "Không làm gì"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
-"\n"
-"\\Do you want to continue installation?"
-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?"
+#, c-format
+msgid "Use .%s as main file"
+msgstr "Dùng .%s là tập tin chính"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Remove .%s"
 msgstr "Gỡ B� .%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Source"
-msgstr "Nguồn"
+msgid "changes:"
+msgstr "các thay đổi:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "Phần Lan"
+msgid "Inspecting %s"
+msgstr "Thẩm tra %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
+msgid "Please wait, finding available packages..."
+msgstr "Hãy đợi, đang tìm các gói sẵn có..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "France"
-msgstr "Pháp"
+msgid "Please wait, adding medium..."
+msgstr "Hãy đợi, đang thêm phương tiện..."
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "More info"
-msgstr "Thêm thông tin"
+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 ""
+"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 ../edit-urpm-sources.pl:1
+#: ../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:1
 #, c-format
 msgid ""
-"%s\n"
+"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"
-"Is it ok to continue?"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"%s\n"
+"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"
-"Có đồng ý tiếp tục không?"
+"\n"
+"Sau đó chạy lại MandrakeUpdate."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Nạp lại danh sách các gói"
+msgid "Already existing update sources"
+msgstr "Nguồn cập nhật đang tồn tại rồi"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr "Ch�n một mirror..."
+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?"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Thêm một nguồn:"
+msgid "A fatal error occurred: %s."
+msgstr "Xả ra lỗi trầm tr�ng: %s."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Không thể cài đặt gói tin `%s'\n"
+msgid "Fatal error"
+msgstr "Lỗi tập tin"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
+msgid "Software Packages Installation"
 msgstr "Chuẩn bị các gói tin để cài đặt..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages,"
-msgstr "Toàn bộ các gói,"
+msgid "Mandrake Update"
+msgstr "Cập Nhật Mandrake"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "trong các tập tin"
+msgid "Software Packages Removal"
+msgstr "Gỡ B� Các Gói Phần M�m"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl: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 "Quit"
+msgstr "Thoát"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "Proxy hostname:"
+msgid "Install"
+msgstr "Cài đặt"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update source(s)"
-msgstr "Cập nhật các nguồn"
+msgid "Remove"
+msgstr "Gỡ B�"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "Tập tin cục bộ"
+msgid "Help"
+msgstr "Trợ giúp"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Thẩm tra %s"
+msgid "Search"
+msgstr "Tìm kiếm"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Israel"
-msgstr "Israel"
+msgid "Find:"
+msgstr "Tìm:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Help"
-msgstr "Trợ giúp"
+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?"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "Máy chủ HTTP"
+msgid "Some packages need to be removed"
+msgstr "Một số gói cần được gỡ b�"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"Welcome to the packages source editor!\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"
-"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."
+"Do you really want to install all the selected packages?"
 msgstr ""
-"Chào mừng trình biên soạn nguồn các gói tin!\n"
+"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"
-"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."
+"Bạn có thật sự muốn cài đặt tất cả các gói đã ch�n không?"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Lỗi hoạt động giao diện http\n"
+#, c-format
+msgid "Too many packages are selected"
+msgstr "Có quá nhi�u gói tin được ch�n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Dùng .%s là tập tin chính"
+msgid "Maximum information"
+msgstr "Thông tin tối đa"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results"
-msgstr "Kết quả tìm kiếm"
+msgid "Normal information"
+msgstr "Thông tin thông thư�ng"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, c-format
-msgid " failed!"
-msgstr " không được!"
+msgid "Update source(s)"
+msgstr "Cập nhật các nguồn"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Brazil"
-msgstr "Brazil"
+msgid "Reload the packages list"
+msgstr "Nạp lại danh sách các gói"
 
-#: ../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 ""
-"�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ó?"
+msgid "Reset the selection"
+msgstr "Lập lại việc ch�n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Tìm:"
+msgid "in files"
+msgstr "trong các tập tin"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "M�i gói tin, theo bảng chữ cái"
+msgid "in descriptions"
+msgstr "trong các mô tả"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Hãy đợi, đang tìm kiếm..."
+msgid "in names"
+msgstr "trong các tên"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Hãy đợi, đang đ�c cơ sở dữ liệu các gói..."
+msgid "by update availability"
+msgstr "theo sự sẵn 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 "by source repository"
+msgstr "theo nơi chứa nguồn"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "Lập lại việc ch�n"
+msgid "by selection state"
+msgstr "theo tình trạng ch�n"
 
-#: ../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 ""
-"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]>):"
+msgid "by size"
+msgstr "Theo kích thước"
 
 #: ../rpmdrake: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 "by group"
+msgstr "theo nhóm"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Costa Rica"
+msgid "All packages,"
+msgstr "Toàn bộ 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"
-
-#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Hãy đợi, đang gỡ b� phương tiện..."
+msgid "All packages, alphabetical"
+msgstr "M�i gói tin, theo bảng chữ cái"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "Mật khẩu:"
+msgid "Mandrake choices"
+msgstr "Các lựa ch�n của Mandrake"
 
-#: ../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 "Normal updates"
+msgstr "Cập nhật thông thư�ng"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "�ài Loan"
+msgid "Bugfixes updates"
+msgstr "Cập nhật sửa lỗi"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "User:"
-msgstr "Ngư�i dùng:"
+msgid "Security updates"
+msgstr "Cập nhật bảo mật"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Hãy đợi, đang cập nhật phương tiện..."
+msgid "Description: "
+msgstr "Mô tả: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Hãy đợi, đang liệt kê các gói..."
+msgid "Reason for update: "
+msgstr "Lý do cập nhật:"
 
 #: ../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 ""
-"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."
+msgid "Summary: "
+msgstr "Tóm tắt: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Information on packages"
-msgstr "Thông tin v� các gói"
+msgid "Importance: "
+msgstr "Mức độ quan tr�ng: "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "B� qua"
+msgid "%s KB"
+msgstr "%s KB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "M�i thứ đã được cài đặt thành công"
+msgid "Size: "
+msgstr "Kích thước: "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Hãy đợi, đang cập nhật phương tiện..."
+msgid "Version: "
+msgstr "Phiên bản: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr "Xả ra lỗi trầm tr�ng: %s."
+msgid "Name: "
+msgstr "Tên: "
 
 #: ../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 "Currently installed version: "
+msgstr "Phiên bản đã cài đặt hiện th�i:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "trong các mô tả"
+msgid "Source: "
+msgstr "Nguồn: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Cấu hình các proxy"
+msgid "(Not available)"
+msgstr "(Không có sẵ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 ""
-"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 "Changelog:\n"
+msgstr "Bản ghi thay đổi (Changelog):\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Hãy ch�n"
+msgid "Files:\n"
+msgstr "Tập tin:\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Kích thước được ch�n: %d MB"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add a source"
-msgstr "Thêm nguồn:"
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "�ang khởi tạo..."
+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
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "Lưu lại các thay đổi"
+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"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
-msgstr "Lỗi khi đang tải xuống"
+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 "Package installation..."
-msgstr "Chuẩn bị các gói tin để cài đặt..."
+msgid "%s conflicts with %s"
+msgstr "xung Ä‘á»™t vá»›i"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Importance: "
-msgstr "Mức độ quan tr�ng: "
+#, fuzzy, c-format
+msgid "Some packages can't be installed"
+msgstr "Không thể cài đặt gói tin `%s'\n"
 
 #: ../rpmdrake:1
 #, c-format
@@ -607,83 +665,77 @@ msgstr ""
 "cài đặt:\n"
 "\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "Thêm..."
+msgid "Additional packages needed"
+msgstr "Cần thêm các gói bổ sung"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Unable to create medium."
-msgstr "Không thể tạo phương tiện."
+#: ../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:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Removing these packages would break your system, sorry:\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"
+"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"
-"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:"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-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 "Info..."
-msgstr "Thông tin..."
+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"
 
-#: ../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 "Some additional packages need to be removed"
+msgstr "Cần gỡ b� một số gói bổ sung"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "Gỡ B�"
+msgid "More information on package..."
+msgstr "Thêm các thông tin v� gói..."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Chuẩn bị các gói tin để cài đặt..."
-
-#: ../rpmdrake.pm:1
 #, c-format
-msgid "No mirror"
-msgstr "Không có mirror"
+msgid "Information on packages"
+msgstr "Thông tin v� các gói"
 
-#: ../edit-urpm-sources.pl:1
+#. -PO: Keep it short, this is gonna be on a button
+#: ../rpmdrake: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."
+msgid "More info"
+msgstr "Thêm thông tin"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Cài đặt"
+msgid "Addable"
+msgstr "Có thể thêm vào"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "Nhật"
+msgid "Upgradable"
+msgstr "Có thể nâng cấp"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Không làm gì"
+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:1
 #, c-format
@@ -692,344 +744,380 @@ msgstr "Không có cập nhật"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Description: "
-msgstr "Mô tả: "
+msgid "(none)"
+msgstr "(không có)"
 
 #: ../rpmdrake: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."
+msgid "Please wait, listing packages..."
+msgstr "Hãy đợi, đang liệt kê các gói..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "Không thể mở gói tin `%s'\n"
 
 #: ../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?"
+msgid "One of the following packages is needed:"
+msgstr "Cần đến một trong các gói tin sau:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "Tên: "
+msgid "Please choose"
+msgstr "Hãy ch�n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "Thẩm tra..."
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Chuẩn bị các gói tin để cài đặt..."
+msgid "Not selected"
+msgstr "Phát hiện xung đột"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Châu úc"
+msgid "Selected"
+msgstr "�ược ch�n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation finished"
-msgstr "Kết thúc cài đặt"
+msgid "Search results"
+msgstr "Kết quả tìm kiếm"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
-msgstr "theo sự sẵn có để cập nhật"
+msgid "Stop"
+msgstr "Dừng"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
-msgstr "Ba Lan"
+msgid "Please wait, searching..."
+msgstr "Hãy đợi, đang tìm kiếm..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Version: "
-msgstr "Phiên bản: "
+msgid "Search results (none)"
+msgstr "Kết quả tìm kiếm (không)"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Khác"
 
 #: ../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:"
+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."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Lưu và Thoát"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Editing source \\\"%s\\\":"
-msgstr "Hiệu chỉnh nguồn \"%s\":"
+msgid "Proxy..."
+msgstr "Lá»—i..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Upgradable"
-msgstr "Có thể nâng cấp"
+msgid "Update..."
+msgstr "Cập nhật..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid " done."
-msgstr " hoàn thành."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Chuẩn bị các gói tin để cài đặt..."
+msgid "Add..."
+msgstr "Thêm..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "�ang kiểm tra tập tin của nguồn `%s'..."
+msgid "Edit"
+msgstr "Hiệu chỉnh"
 
-#: ../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 "Source"
+msgstr "Nguồn"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Cập nhật sửa lỗi"
+msgid "Enabled?"
+msgstr "Bật ?"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl: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 "Configure sources"
+msgstr "Cấu hình các nguồn"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Germany"
-msgstr "Germany"
+msgid "Password:"
+msgstr "Mật khẩu:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Russia"
-msgstr "Nga"
+msgid "User:"
+msgstr "Ngư�i dùng:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Norway"
-msgstr "Na Uy"
+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:"
 
-#: ../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
+#, c-format
+msgid "Proxy hostname:"
+msgstr "Proxy hostname:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search"
-msgstr "Tìm kiếm"
+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]>):"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit a source"
-msgstr "Hiệu chỉnh nguồn"
+msgid "Configure proxies"
+msgstr "Cấu hình các proxy"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Czech Republic"
+msgid "Please wait, updating medium..."
+msgstr "Hãy đợi, đang cập nhật phương tiện..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Stop"
-msgstr "Dừng"
+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 ổ."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "Cập nhật"
+msgid "You need to insert the medium to continue"
+msgstr "Cần nạp phương tiện để tiếp tục"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "Hãy đợi, đang gỡ b� các gói..."
+msgid "Save changes"
+msgstr "Lưu lại các thay đổi"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal information"
-msgstr "Thông tin thông thư�ng"
+msgid "Relative path to synthesis/hdlist:"
+msgstr "�ư�ng dẫn liên quan tới synthesis/hdlist:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "�ang tải xuống gói tin `%s' (%s/%s)..."
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing source \"%s\":"
+msgstr "Hiệu chỉnh nguồn \"%s\":"
+
+#: ../edit-urpm-sources.pl: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 "Edit a source"
+msgstr "Hiệu chỉnh nguồn"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Spain"
-msgstr "Tây ban nha"
+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 "Type of source:"
+msgstr "Loại nguồn:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by selection state"
-msgstr "theo tình trạng ch�n"
+msgid "Adding a source:"
+msgstr "Thêm một nguồn:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 msgstr ""
-"Hãy đợi, đang tải xuống các địa chỉ mirror từ website của MandrakeSoft."
+"�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 "Login:"
-msgstr "�ăng nhậ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.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Austria"
-msgstr "�o"
+msgid "Name:"
+msgstr "Tên:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Lỗi tập tin"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
+msgstr "�ăng nhập:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl: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 "Choose a mirror..."
+msgstr "Ch�n một mirror..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update..."
-msgstr "Cập nhật..."
+msgid "Browse..."
+msgstr "Duyệt..."
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "�ang thẩm tra chữ ký của `%s'..."
+#: ../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
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
-msgstr "(không có)"
+msgid "Removable device"
+msgstr "Thiết bị có thể gỡ b�"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-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"
+msgid "HTTP server"
+msgstr "Máy chủ HTTP"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "�ang cài đặt gói tin `%s' (%s/%s)..."
+msgid "FTP server"
+msgstr "Máy chủ FTP"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Phiên bản đã cài đặt hiện th�i:"
+msgid "Path:"
+msgstr "�ư�ng dẫn: "
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Other"
-msgstr "Khác"
+msgid "Local files"
+msgstr "Tập tin cục bộ"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Lý do cập nhật:"
+msgid "Add a source"
+msgstr "Thêm nguồn:"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Please choose the desired mirror."
-msgstr "Hãy ch�n mirror mong muốn."
+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"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "Hiệu chỉnh"
+msgid "Unable to create medium."
+msgstr "Không thể tạo phương tiện."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Hãy đợi, đang tìm các gói sẵn có..."
+msgid "Update"
+msgstr "Cập nhật"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "�ư�ng dẫn liên quan tới synthesis/hdlist:"
+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:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Kết quả tìm kiếm (không)"
+msgid "Please wait, updating media..."
+msgstr "Hãy đợi, đang cập nhật phương tiện..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Danmark"
-msgstr "Danmark"
+msgid " failed!"
+msgstr " không được!"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "Trung Quốc"
+msgid " done."
+msgstr " hoàn thành."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United States"
-msgstr "Hoa Kỳ"
+msgid "Download of `%s', speed:%s"
+msgstr "Tải xuống của `%s', tốc độ:%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "changes:"
-msgstr "các thay đổi:"
+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"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "�ang thẩm tra chữ ký của `%s'..."
+
+#: ../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 "Examining distant file of source `%s'..."
+msgstr "�ang kiểm tra tập tin ở xa của nguồn `%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Examining file of source `%s'..."
+msgstr "�ang kiểm tra tập tin của nguồn `%s'..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No"
-msgstr "Không"
+msgid "Copying file for source `%s'..."
+msgstr "�ang sao chép tập tin cho nguồn `%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Summary: "
-msgstr "Tóm tắt: "
+msgid "Please choose the desired mirror."
+msgstr "Hãy ch�n mirror mong muốn."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "Canada"
+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.pm:1
 #, c-format
-msgid "Greece"
-msgstr "Hy lạp"
+msgid "No mirror"
+msgstr "Không có mirror"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1046,267 +1134,179 @@ 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:1
-#, c-format
-msgid "Source: "
-msgstr "Nguồn: "
-
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "�ang sao chép tập tin cho nguồn `%s'..."
-
-#: ../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 "Path:"
-msgstr "�ư�ng dẫn: "
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Problem during removal"
-msgstr "Có trục trặc khi gỡ b�"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "by source repository"
-msgstr "theo nơi chứa nguồn"
+msgid "Error during download"
+msgstr "Lỗi khi đang tải xuống"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Selected"
-msgstr "�ược ch�n"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
+"Hãy đợi, đang tải xuống các địa chỉ mirror từ website của MandrakeSoft."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Netherlands"
-msgstr "Netherlands"
+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
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "Có thể thêm vào"
+msgid "United States"
+msgstr "Hoa Kỳ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
-msgstr "(Không có sẵn)"
+msgid "China"
+msgstr "Trung Quốc"
 
-#: ../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"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr "Phát hiện xung đột"
+msgid "United Kingdom"
+msgstr "Liên Hiệp Anh"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Gỡ B� Các Gói Phần M�m"
+msgid "Taiwan"
+msgstr "�ài Loan"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Sweden"
 msgstr "Thụy �iển"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
-msgstr ""
-"\n"
-"\n"
-"Báo cáo lỗi:\n"
-"%s"
+msgid "Russia"
+msgstr "Nga"
 
-#: ../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."
-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 "Portugal"
+msgstr "Portugal"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "Tải xuống của `%s', tốc độ:%s"
+msgid "Poland"
+msgstr "Ba Lan"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Norway"
+msgstr "Na Uy"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "Thoát"
+msgid "Netherlands"
+msgstr "Netherlands"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 ""
-"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?"
+msgid "Korea"
+msgstr "Nam Tri�u Tiên"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "OK"
+msgid "Japan"
+msgstr "Nhật"
 
-#: ../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 "Italy"
+msgstr "�"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "Loại nguồn:"
+msgid "Israel"
+msgstr "Israel"
 
-#: ../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.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Hy lạp"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to get source packages."
-msgstr "Không thể lấy các gói nguồn."
+msgid "France"
+msgstr "Pháp"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Có quá nhi�u gói tin được ch�n"
+msgid "Finland"
+msgstr "Phần Lan"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "xung Ä‘á»™t vá»›i"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "Tây ban nha"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Danmark"
+msgstr "Danmark"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Các lựa ch�n của Mandrake"
+msgid "Germany"
+msgstr "Germany"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 ""
-"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."
+msgid "Czech Republic"
+msgstr "Czech Republic"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Bản ghi thay đổi (Changelog):\n"
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Korea"
-msgstr "Nam Tri�u Tiên"
+msgid "Canada"
+msgstr "Canada"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "Thiết bị có thể gỡ b�"
+msgid "Brazil"
+msgstr "Brazil"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Bỉ"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Change medium"
-msgstr "Thay phương tiện"
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Cập Nhật Mandrake"
+msgid "Australia"
+msgstr "Châu úc"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by size"
-msgstr "Theo kích thước"
+msgid "Austria"
+msgstr "�o"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "Máy chủ FTP"
+msgid "Info..."
+msgstr "Thông tin..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Files:\n"
-msgstr "Tập tin:\n"
+msgid "No"
+msgstr "Không"
 
 #: ../rpmdrake.pm: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 "Yes"
+msgstr "Có"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
diff --git a/po/wa.po b/po/wa.po
index ad75e9b6..98297e03 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -1,34 +1,32 @@
-# SOME DESCRIPTIVE TITLE.
+# translation of rpmdrake-wa.po to Walon
 # Copyright (C) 1999 Free Software Foundation, Inc.
 # Copyright (C) 1999 MandrakeSoft
 # Pablo Saratxaga <pablo@mandrakesoft.com>, 1999-2000,2002
 # Lorint Hendschel <LorintHendschel@skynet.be>, 2002
+# Pablo Saratxaga <pablo@walon.org>, 2003
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: grpmi\n"
-"POT-Creation-Date: 2003-05-02 20:15+0200\n"
-"PO-Revision-Date: 2003-01-29 15:08+0100\n"
+"Project-Id-Version: rpmdrake\n"
+"POT-Creation-Date: 2003-05-13 13:06+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"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.0beta2\n"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "En alaedje?"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Path or mount point:"
-msgstr "Tchimin ou pont di montaedje:"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Portugal"
-msgstr "Pôrt:"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"C' est bon di continuwer?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -47,166 +45,158 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-msgstr "pa groupe"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Name:"
-msgstr "No"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Italy"
-msgstr "Astaler"
+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 "How to choose manually your mirror"
-msgstr "Kimint tchoezi manuwelmint vosse muroe"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "URL:"
-msgstr "Hårdêye:"
+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 "Some packages need to be removed"
-msgstr "Des pacaedjes k' i gn a dvèt esse dizastalé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 "Already existing update sources"
-msgstr ""
+msgid "Problem during removal"
+msgstr "Åk n' a nén stî tins do oistaedje"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "More information on package..."
-msgstr "Pus d' informåcions sol pacaedje..."
+msgid "Please wait, removing packages..."
+msgstr "Tårdjîz on pô s' i vs plait, rpm oistêye les pacaedjes..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "Oyi"
+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 ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"There was a problem during the installation:\n"
 "\n"
+"%s"
 msgstr ""
-"Cåze di leu-z aloyances, les pacaedjes ki shuvèt dvèt esse\n"
-"dizastalés asteure:\n"
+"Åk n' a nén stî tins d' l' astalaedje:\n"
 "\n"
+"%s"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "everything was installed correctly"
-msgstr "Totafwait a stî astalé comufåt"
+#, c-format
+msgid "Installation failed"
+msgstr "L' astalaedje a fwait berwete"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s KB"
-msgstr "%.1f Ko"
+#, c-format
+msgid "Unrecoverable error: no package found for installation, sorry."
+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 ""
-"Bénvnow 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."
+msgid "No package found for installation."
+msgstr "Nou pacaedje n' a stî trové po l' astalaedje."
 
-#: ../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' lijheu."
+msgid "All requested packages were installed successfully."
+msgstr "Totes les pacaedjes dimandés ont stî astalés comufåt."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
-msgstr "Schaper et cwiter"
+msgid "Everything installed successfully"
+msgstr "Totafwait a stî astalé comufåt"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"The installation is finished; %s.\n"
 "\n"
-"%s"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
 msgstr ""
-"Åk n' a nén stî tot-z astalant les pacaedjes:\n"
+"L' astalaedje a fini; %s.\n"
 "\n"
-"%s"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Size: "
-msgstr "Grandeu"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Security updates"
-msgstr "Mostrer metaedjes a djoû di såvrité"
+"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
-msgid "Maximum information"
-msgstr "Li pus d' informåcions"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Aroke..."
+msgid "everything was installed correctly"
+msgstr "totafwait a stî astalé comufåt"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Rweyåme-Uni"
+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 "Configure sources"
-msgstr "Apontyî les sourdants"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Dj' astale li pacaedje «%s» (%s/%s)..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "ezès Nos"
+msgid "Preparing packages installation..."
+msgstr "Dj' aprestêye les pacaedjes po l' astalaedje..."
 
-#: ../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 ""
-"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."
+"\n"
+"Aroke(s) di rapoirté(s):\n"
+"%s"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, 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."
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
 "%s\n"
 "\n"
-"\\Do you want to continue installation?"
+"Do you want to continue installation?"
 msgstr ""
-"Les pacaedjes ki shuvèt dvèt esse oistés po ds ôtes poleur esse metous a "
-"djoû:\n"
+"Les pacaedjes ki shuvèt ont des mwaijhès sinateures:\n"
 "\n"
 "%s\n"
 "\n"
@@ -214,385 +204,356 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Oister les *.%s"
+msgid "Verifying packages signatures..."
+msgstr "Verifiaedje des sinateures des pacaedjes..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Source"
-msgstr "Sourdant"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "Aberwetant l' pacaedje «%s» (%s/%s)..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Finland"
-msgstr "Finlande"
+msgid "Cancel"
+msgstr "Rinoncî"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "France"
-msgstr "Foirci"
+msgid "Ok"
+msgstr "'l est bon"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "More info"
-msgstr "Pus d' info"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Metoz l' sopoirt lomé «%s» dins l' léjheu [%s]"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"C' est bon di continuwer?"
+msgid "Change medium"
+msgstr "Candjî di sopoirt"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Ritcherdjî li djivêye des pacaedjes"
+msgid "Initializing..."
+msgstr "Inicialijhaedje..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr "Tchoezixhoz on muroe..."
+msgid "Package installation..."
+msgstr "Astalaedje do pacaedje..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Radjoutant on sourdant:"
+msgid "Unable to get source packages, sorry. %s"
+msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Li pacaedje ni pout esse astalé"
+#, c-format
+msgid "Unable to get source packages."
+msgstr "Dji n' a nén savou prinde les pacaedjes sourdants."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Dj' apresteye les pacaedjes po l' astalaedje..."
+#, c-format
+msgid "Inspect..."
+msgstr "Analijhant..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages,"
-msgstr "Tos les pacaedjes,"
+msgid "Installation finished"
+msgstr "L' astalaedje a fini"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "ezès fitchîs"
+msgid "Do nothing"
+msgstr "Èn rén fé"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Totes les pacaedjes dimandés ont stî astalés comufåt."
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Proxy hostname:"
-msgstr "No d' uzeu sol proxy:"
+msgid "Use .%s as main file"
+msgstr "Eployî les *.%s come mwaisses fitchîs"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Update source(s)"
-msgstr "Mete a djoû sourdant(s)"
+msgid "Remove .%s"
+msgstr "Oister les *.%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "Fitchîs locås"
+msgid "changes:"
+msgstr "candjmints:"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspecting %s"
 msgstr "Analijhant %s"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Israel"
-msgstr "Astaler"
-
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Help"
-msgstr "/_Aidance"
+#, 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..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "HTTP server"
-msgstr "Sierveu HTTP"
+msgid "Please wait, adding medium..."
+msgstr "Tårdjîz on pô s' i vs plait, dji radjoute on sopoirt..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"Welcome to the packages source editor!\n"
+"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"
-"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 ""
-"Bénvnowe a l' aspougneu des sourdants des pacaedjes!\n"
+"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"
-"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û."
+"Poy, renondez MandrakeUpdate."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Astaler tot"
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Kimint tchoezi manuwelmint vosse muroe"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Eployî les *.%s come mwaisses fitchîs"
+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 ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results"
-msgstr "Rizultats do cweraedje"
+msgid "Already existing update sources"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " failed!"
-msgstr " a fwait berwete!"
+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
 #, c-format
-msgid "Brazil"
-msgstr "Braezi"
+msgid "A fatal error occurred: %s."
+msgstr "I gn a-st avou èn aroke moirt: %s."
 
-#: ../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 "Fatal error"
+msgstr "Aroke moirt"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Trover:"
+msgid "Software Packages Installation"
+msgstr "Astalaedje des pacaedjes di programes"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Tos les pacaedjes, relîs alfabeticmint"
+msgid "Mandrake Update"
+msgstr "Metaedjes a djoû di Mandrake"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Tårdjîz on pô s' i vs plait, dji cwir..."
+msgid "Software Packages Removal"
+msgstr "Oistaedje des pacaedjes di programes"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Moussî foû"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, reading packages database..."
-msgstr ""
-"Tårdjîz on pô s' i vs plait\n"
-"Dji fwai li relijhaedje des pacaedjes"
+#, c-format
+msgid "Install"
+msgstr "Astaler"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "Oister"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "Dji n' pout drovi l' pacaedje"
+#, c-format
+msgid "Help"
+msgstr "Aidance"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "Rifé l' tchuze"
+msgid "Search"
+msgstr "Cweri"
 
-#: ../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 "Find:"
+msgstr "Trover:"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
 "\n"
+"Is it ok to continue?"
 msgstr ""
-"Cåze di leu-z aloyances, les pacaedjes ki shuvèt dvèt esse\n"
-"oistés eto:\n"
+"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.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Costa Rica"
+msgid "Some packages need to be removed"
+msgstr "Des pacaedjes k' i gn a dvèt esse dizastalés"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"There was a problem during the installation:\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"
-"%s"
+"Do you really want to install all the selected packages?"
 msgstr ""
-"Åk n' a nén stî tot-z astalant les pacaedjes:\n"
+"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"
-"%s"
+"Voloz vs vormint astaler tos les pacaedjes tchoezis?"
 
-#: ../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 oisteye on sopoirt..."
+msgid "Too many packages are selected"
+msgstr "Pår trop di pacaedjes ont stî tchoezis"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "Sicret:"
+msgid "Maximum information"
+msgstr "Li pus d' informåcions"
 
-#: ../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 "Normal information"
+msgstr "Informåcions normåles"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Taiwan"
-msgstr "Taiwan"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "User:"
-msgstr "No d' uzeu:"
+msgid "Update source(s)"
+msgstr "Mete a djoû sourdant(s)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Tårdjîz on pô s' i vs plait, metaedje a djoû do sopoirt..."
+msgid "Reload the packages list"
+msgstr "Ritcherdjî li djivêye des pacaedjes"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, listing packages..."
-msgstr ""
-"Tårdjîz on pô s' i vs plait\n"
-"Dji fwai li relijhaedje des pacaedjes"
+#, c-format
+msgid "Reset the selection"
+msgstr "Rifé l' tchuze"
 
 #: ../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 "in files"
+msgstr "ezès fitchîs"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Information on packages"
-msgstr "Dji n' pout drovi l' pacaedje"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Cancel"
-msgstr "Rinoncî"
+msgid "in descriptions"
+msgstr "ezès discrijhaedjes"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Totafwait a stî astalé comufåt"
+msgid "in names"
+msgstr "ezès Nos"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Tårdjîz on pô s' i vs plait, metaedje a djoû do sopoirt..."
+msgid "by update availability"
+msgstr "pa disponibilité di metaedjes a djoû"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr "I gn a-st avou èn aroke moirt: %s."
+msgid "by source repository"
+msgstr "pa sourdant d' astalaedje"
 
 #: ../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 ""
-"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 "by selection state"
+msgstr "pa l' estat di tchoezixhaedje"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "in descriptions"
-msgstr "Discrijhaedjes"
+#, c-format
+msgid "by size"
+msgstr "pa grandeu"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Apontyî les proxies"
+msgid "by group"
+msgstr "pa groupe"
 
-#: ../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 "All packages,"
+msgstr "Tos les pacaedjes,"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Tchoezixhoz s' i vs plait"
+msgid "All packages, alphabetical"
+msgstr "Tos les pacaedjes, relîs alfabeticmint"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Selected size: %d MB"
-msgstr "%d pacaedjes tchoezis: %.1f Mo"
+#, c-format
+msgid "Mandrake choices"
+msgstr "Tchuzes di Mandrake"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add a source"
-msgstr "Radjoutant on sourdant"
+msgid "Normal updates"
+msgstr "Metaedjes a djoû normås"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "Inicialijaedje..."
+msgid "Bugfixes updates"
+msgstr "Metaedjes a djoû di coridjaedje"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Save changes"
-msgstr "Schaper les candjmints"
+msgid "Security updates"
+msgstr "Metaedjes a djoû di såvrité"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
-msgstr "Åk n' a nén stî tot-z aberwetant"
+msgid "Description: "
+msgstr "Discrijhaedje: "
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Dj' apresteye les pacaedjes po l' astalaedje..."
+#, c-format
+msgid "Reason for update: "
+msgstr "Råjhon do metaedje a djoû: "
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Summary: "
+msgstr "Rascourti: "
 
 #: ../rpmdrake:1
 #, c-format
@@ -601,446 +562,563 @@ msgstr "Impôrtance: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
-msgstr ""
-"Po verifyî les aloyances, les pacaedjes ki shuvèt dvèt esse\n"
-"astalés eto:\n"
-"\n"
+msgid "%s KB"
+msgstr "%s Ko"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "Radjouter..."
+msgid "Size: "
+msgstr "Grandeu: "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Unable to create medium."
-msgstr "Dji n' sai askepyî l' sopoirt."
+msgid "Version: "
+msgstr "Modêye: "
 
 #: ../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 ""
-"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:"
+msgid "Name: "
+msgstr "No: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
-msgstr "Foyter..."
+msgid "Currently installed version: "
+msgstr "Modêye d' astalêye: "
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "Li pacaedje ni pout esse astalé"
+#, c-format
+msgid "Source: "
+msgstr "Sourdant: "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
-msgstr "Informåcions..."
+msgid "(Not available)"
+msgstr "(Nén disponibe)"
 
-#: ../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' lijheu po continuwer"
+msgid "Changelog:\n"
+msgstr "Djournå des candjmints:\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "Oister"
+msgid "Files:\n"
+msgstr "Fitchîs:\n"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Dj' apresteye les pacaedjes po l' astalaedje..."
+#, c-format
+msgid "Selected size: %d MB"
+msgstr "Grandeu tchoezeye: %d Mo"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "No mirror"
-msgstr "miroe:"
+#: ../rpmdrake:1
+#, c-format
+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
+#: ../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 ""
+"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"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Astaler"
+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 "Japan"
-msgstr "Djapon"
+msgid "%s conflicts with %s"
+msgstr "%s fwait des conflits avou %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Èn rén fé"
+msgid "Some packages can't be installed"
+msgstr "Des pacaedjes k' i gn a n' polèt nén esse astalés"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "No update"
-msgstr "Fé les metaedjes a djoû"
+#, c-format
+msgid ""
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
+msgstr ""
+"Po verifyî les aloyances, les pacaedjes ki shuvèt dvèt esse\n"
+"astalés eto:\n"
+"\n"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Description: "
-msgstr "Discrijhaedjes"
+#, c-format
+msgid "Additional packages needed"
+msgstr "Ôtes pacaedjes k' end a mezåjhe"
+
+#: ../rpmdrake: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"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"Removing these packages would break your system, sorry:\n"
+"\n"
 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."
+"Dji rgrete, mins oister ces pacaedjes la va spiyî l' sistinme da vosse:\n"
+"\n"
 
 #: ../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"
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
 "\n"
-"Do you really want to install all the selected packages?"
 msgstr ""
-"Adviertixhmint: i shonne ki vos sayîz d' astaler telmint\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 cossideré avou atincion.\n"
+"Cåze di leu-z aloyances, les pacaedjes ki shuvèt dvèt esse\n"
+"oistés eto:\n"
 "\n"
-"Voloz vs vormint astaler tos les pacaedjes tchoezis?"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Name: "
-msgstr "No: %s"
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr "Kékès ôtes pacaedjes divèt esse oistés"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "Analijhant..."
+msgid "More information on package..."
+msgstr "Pus d' informåcions sol pacaedje..."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Dj' apresteye les pacaedjes po l' astalaedje..."
-
-#: ../rpmdrake.pm:1
 #, c-format
-msgid "Australia"
-msgstr "Ostraleye"
+msgid "Information on packages"
+msgstr "Informåcion so les pacaedjes"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation finished"
-msgstr "Astalé"
+#, c-format
+msgid "More info"
+msgstr "Pus d' info"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
-msgstr "pa disponibilité di metaedjes a djoû"
+msgid "Addable"
+msgstr "Pout esse radjouté"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
-msgstr "Pologne"
+msgid "Upgradable"
+msgstr "Pout esse metou a djoû"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Version: "
-msgstr "Modêye:"
+#, 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."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake: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 "No update"
+msgstr "Nou metaedjes a djoû"
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Editing source \\\"%s\\\":"
-msgstr "Dji candje li sourdants «%s»:"
+#: ../rpmdrake:1
+#, c-format
+msgid "(none)"
+msgstr "(nole)"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Upgradable"
-msgstr "Mete a djoû"
+#, c-format
+msgid "Please wait, listing packages..."
+msgstr "Tårdjîz on pô s' i vs plait, dji fwait l' djivêye des pacaedjes..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " done."
-msgstr " fwait."
+msgid "unknown package "
+msgstr "pacaedje nén cnoxhou"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "Dj' apresteye les pacaedjes po l' astalaedje..."
+#, c-format
+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
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "Dji corwaite li fitchî pol sourdant «%s»..."
+msgid "Please choose"
+msgstr "Tchoezixhoz s' i vs plait"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "Ôtes pacaedjes k' end a mezåjhe"
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Bugfixes updates"
-msgstr "Mostrer metaedjes a djoû ki coridjèt des bugs"
+#, c-format
+msgid "Not selected"
+msgstr "Nén tchoezi"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "Aberwetaedje di «%s», tins ki dmeure:%s, roedeu:%s"
+msgid "Selected"
+msgstr "Tchoezi"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "Almagne"
+msgid "Search results"
+msgstr "Rizultats do cweraedje"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Russia"
-msgstr "Rûsseye"
+msgid "Stop"
+msgstr "Arester"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Norway"
-msgstr "Norvedje"
+msgid "Please wait, searching..."
+msgstr "Tårdjîz on pô s' i vs plait, dji cwir..."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Åk n' a nén stî cwand dj' astaléve"
+#, c-format
+msgid "Search results (none)"
+msgstr "Rizultats do cweraedje (nouk)"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search"
-msgstr "Cweri"
+msgid "Other"
+msgstr "Ôte"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit a source"
-msgstr "Candjî on sourdant"
+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û."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Tchekeye"
+msgid "Save and quit"
+msgstr "Schaper et cwiter"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Stop"
-msgstr "Arester"
+msgid "Proxy..."
+msgstr "Proxy..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "Mete a djoû"
+msgid "Update..."
+msgstr "Mete a djoû..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, removing packages..."
-msgstr ""
-"Tårdjîz on pô s' i vs plait\n"
-"Dji fwai li relijhaedje des pacaedjes"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "Radjouter..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal information"
-msgstr "Informåcions normåles"
+msgid "Edit"
+msgstr "Candjî"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Aberwetant l' pacaedje «%s» (%s/%s)..."
+msgid "Source"
+msgstr "Sourdant"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Tchoezi: %d Mo / Plaece libe sol deure plake: %d Mo"
+msgid "Enabled?"
+msgstr "En alaedje?"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Spain"
-msgstr "Espagne"
+msgid "Configure sources"
+msgstr "Apontyî les sourdants"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Normal updates"
-msgstr "Metaedjes a djoû normås"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "Sicret:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by selection state"
-msgstr "pa l' etat di tchoezixhadje"
+msgid "User:"
+msgstr "Uzeu:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+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
+#, c-format
+msgid "Proxy hostname:"
+msgstr "No d' lodjoe do proxy:"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
 msgstr ""
-"Tårdjîz on pô s' i vs plait, dj' aberweteye do waibe da MandrakeSoft les "
-"adresses des muroes."
+"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]>):"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Login:"
-msgstr "No d' elodjaedje:"
+msgid "Configure proxies"
+msgstr "Apontyî les proxies"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Austria"
-msgstr "Ôtriche"
+msgid "Please wait, updating medium..."
+msgstr "Tårdjîz on pô s' i vs plait, metaedje a djoû do sopoirt..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Aroke avou l' fitchî"
+#: ../edit-urpm-sources.pl: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."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Tchoezixhoz les sourdant(s) ki vos vloz mete a djoû:"
+msgid "You need to insert the medium to continue"
+msgstr "Vos dvoz mete li sopoirt dins l' léjheu po continuwer"
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Update..."
-msgstr "Mete a djoû"
+#, c-format
+msgid "Save changes"
+msgstr "Schaper les candjmints"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "Verifiaedje del sinateure di «%s»..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Tchimin relatif pol fitchî di sinteze ou hdlist:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
-msgstr "(nole)"
+msgid "URL:"
+msgstr "Hårdêye:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Editing source \"%s\":"
+msgstr "Dji candje li sourdants «%s»:"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit a source"
+msgstr "Candjî on sourdant"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr "Tårdjîz on pô s' i vs plait, dji oistêye on sopoirt..."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of source:"
+msgstr "Sôre di sourdant:"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Adding a source:"
+msgstr "Radjoutant on sourdant:"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 msgstr ""
-"Dji rgrete, mins oister ces pacaedjes la va spiyî l' sistinme da vosse:\n"
-"\n"
+"I gn a ddja on sopoirt avou ç' no la,\n"
+"el voloz vs vormint replaecî?"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Dj' astale li pacaedje «%s» (%s/%s)..."
+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
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Modêye d' astalêye: "
+msgid "Name:"
+msgstr "No:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Other"
-msgstr "Ôte"
+msgid "Login:"
+msgstr "No d' elodjaedje:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Råjhon do metaedje a djoû: "
+msgid "Choose a mirror..."
+msgstr "Tchoezixhoz on muroe..."
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Please choose the desired mirror."
-msgstr ""
-"Tårdjîz on pô s' i vs plait\n"
-"Dji cweri li djîvêye des miroes"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Browse..."
+msgstr "Foyter..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit"
-msgstr "Candjî"
+msgid "Path or mount point:"
+msgstr "Tchimin ou pont di montaedje:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, finding available packages..."
-msgstr ""
-"Tårdjîz on pô s' i vs plait\n"
-"Dji fwai li relijhaedje des pacaedjes"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Removable device"
+msgstr "Bodjåve sopoirt"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Tchimin relatif pol fitchî di sinteze ou hdlist:"
+msgid "HTTP server"
+msgstr "Sierveu HTTP"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Rizultats do cweraedje (nouk)"
+msgid "FTP server"
+msgstr "Sierveu FTP"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path:"
+msgstr "Tchimin:"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "Fitchîs locås"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add a source"
+msgstr "Radjoutant on sourdant"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Danmark"
-msgstr "Daenmåtche"
+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"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "Chine"
+msgid "Unable to create medium."
+msgstr "Dji n' sai askepyî l' sopoirt."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United States"
-msgstr "Etats Unis"
+msgid "Update"
+msgstr "Mete a djoû"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "changes:"
-msgstr "candjmints:"
+msgid "Select the source(s) you wish to update:"
+msgstr "Tchoezixhoz les sourdant(s) ki vos vloz mete a djoû:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Kékès ôtes pacaedjes divèt esse oistés"
+msgid "Please wait, updating media..."
+msgstr "Tårdjîz on pô s' i vs plait, metaedje a djoû do sopoirt..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid " failed!"
+msgstr " a fwait berwete!"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No"
-msgstr "Neni"
+msgid " done."
+msgstr " fwait."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Summary: "
-msgstr "Rascourti"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Download of `%s', speed:%s"
+msgstr "Aberwetaedje di «%s», roedeu:%s"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "Canada"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "Aberwetaedje di «%s», tins ki dmeure:%s, roedeu:%s"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Greece"
-msgstr "Grece"
+msgid "Starting download of `%s'..."
+msgstr "Dj' atake l' aberwetaedje di «%s»..."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Examining distant file of source `%s'..."
+msgstr "Dji corwaite li fitchî då lon do sourdant «%s»..."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Examining file of source `%s'..."
+msgstr "Dji corwaite li fitchî pol sourdant «%s»..."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Copying file for source `%s'..."
+msgstr "Dji copeye li fitchî pol sourdant «%s»..."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please choose the desired mirror."
+msgstr "Tchoezixhoz li muroe ki vos vloz, s' i vs plait."
+
+#: ../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."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
+msgstr "Nou muroe"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1058,270 +1136,181 @@ msgstr ""
 "disponibes pol moumint.\n"
 "Risayîz ene miete pus tård."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Source: "
-msgstr "Sourdant"
-
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "Dji copeye li fitchî pol sourdant «%s»..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Vos dvoz esse root po-z astalaer des pacaedjes."
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Path:"
-msgstr "Pôrt:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Problem during removal"
-msgstr "Åk n' a nén stî tins do oistaedje"
+msgid "Error during download"
+msgstr "Åk n' a nén stî tot-z aberwetant"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by source repository"
-msgstr "pa sourdant d' astalaedje"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Selected"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
-"Tchoezi\n"
-"totafwait"
+"Tårdjîz on pô s' i vs plait, dj' aberwetêye do waibe da MandrakeSoft les "
+"adresses des muroes."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Netherlands"
-msgstr "Olande"
+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
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "Pout esse radjouté"
+msgid "United States"
+msgstr "Estats Unis"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
-msgstr "(Nén disponibe)"
+msgid "China"
+msgstr "Chine"
 
-#: ../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"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr "I gn a des conflits"
+msgid "United Kingdom"
+msgstr "Rweyôme-Uni"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Oistaedje des pacaedjes di programes"
+msgid "Taiwan"
+msgstr "Taiwan"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Sweden"
 msgstr "Suwede"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
-msgstr ""
-"\n"
-"\n"
-"Aroke(s) di rpoirté(s):\n"
-"%s"
+msgid "Russia"
+msgstr "Rûsseye"
 
-#: ../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."
-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."
+msgid "Portugal"
+msgstr "Portugal"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "Aberwetaedje di «%s», roedeu:%s"
+msgid "Poland"
+msgstr "Pologne"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Norway"
+msgstr "Norvedje"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "Moussî foû"
+msgid "Netherlands"
+msgstr "Olande"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 ""
-"Dj' a mezåjhe di m' raloyî sol muroe po prinde les dierins pacaejes\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?"
+msgid "Korea"
+msgstr "Coreye"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "'l est bon"
+msgid "Japan"
+msgstr "Djapon"
 
-#: ../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 "Italy"
+msgstr "Itåleye"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "Sôre di sourdant:"
+msgid "Israel"
+msgstr "Israyel"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please insert the medium named \\\"%s\\\" on device [%s]"
-msgstr "Metoz l' sopoirt lomé «%s» dins l' lijheu [%s]"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Grece"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unable to get source packages."
-msgstr "Tchoezixhoz vos pacaedjes"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "France"
+msgstr "France"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Pår trop di pacaedjes ont stî tchoezis"
+msgid "Finland"
+msgstr "Finlande"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "fwait des conflits avou"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "Espagne"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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."
+msgid "Danmark"
+msgstr "Daenmåtche"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Tchuzes di Mandrake"
+msgid "Germany"
+msgstr "Almagne"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 ""
-"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"
-"Poy, renondez MandrakeUpdate."
+msgid "Czech Republic"
+msgstr "Tchekeye"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Djournå des candjmints:\n"
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Korea"
-msgstr "Foirci"
+#, c-format
+msgid "Canada"
+msgstr "Canada"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "Bodjåve sopoirt"
+msgid "Brazil"
+msgstr "Braezi"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Beljike"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Change medium"
-msgstr "Candjî di sopoirt"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Mandrake Update"
-msgstr "Preferinces po MandrakeUpdate"
+msgid "Australia"
+msgstr "Ostraleye"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by size"
-msgstr "pa grandeu"
+msgid "Austria"
+msgstr "Ôtriche"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "Sierveu FTP"
+msgid "Info..."
+msgstr "Informåcions..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Files:\n"
-msgstr "/_Fitchî"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
+msgstr "Neni"
 
 #: ../rpmdrake.pm: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 "Yes"
+msgstr "Oyi"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -1330,7 +1319,7 @@ msgstr "Li ridant wice aberweter doet egzister"
 #: ../grpmi/curl_download/curl_download.xs:89
 #: ../grpmi/curl_download/curl_download.xs:213
 msgid "Out of memory\n"
-msgstr "Li memwere est hoûte\n"
+msgstr "Li memwere est houte\n"
 
 #: ../grpmi/curl_download/curl_download.xs:102
 msgid "Could not open output file in append mode"
@@ -1442,7 +1431,7 @@ msgstr "Aroke tot lejhant\n"
 
 #: ../grpmi/curl_download/curl_download.xs:216
 msgid "Time out\n"
-msgstr "Li tins est hoûte\n"
+msgstr "Li tins est houte\n"
 
 #: ../grpmi/curl_download/curl_download.xs:219
 msgid "FTP couldn't set ASCII\n"
@@ -1490,11 +1479,11 @@ msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:252
 msgid "Library not found\n"
-msgstr "Lîvreye nén trovêye\n"
+msgstr "Livreye nén trovêye\n"
 
 #: ../grpmi/curl_download/curl_download.xs:255
 msgid "Function not found\n"
-msgstr "Foncsion nén trovêye\n"
+msgstr "Fonccion nén trovêye\n"
 
 #: ../grpmi/curl_download/curl_download.xs:258
 msgid "Aborted by callback\n"
@@ -1541,9 +1530,8 @@ msgid "when this is a specific error\n"
 msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:291
-#, fuzzy
 msgid "SSL crypto engine not found\n"
-msgstr "Foncsion nén trovêye\n"
+msgstr ""
 
 #: ../grpmi/curl_download/curl_download.xs:294
 msgid "can not set SSL crypto engine as default\n"
@@ -1583,9 +1571,8 @@ msgid "Unknown error code %d\n"
 msgstr "Côde d' aroke nén cnoxhou %d\n"
 
 #: data/rpmdrake.desktop.in.h:1
-#, fuzzy
 msgid "Install Software"
-msgstr "Astaler tot"
+msgstr "Astaler des programes"
 
 #: data/rpmdrake-remove.desktop.in.h:1
 msgid "Remove Software"
@@ -1641,18 +1628,6 @@ msgstr "Manaedjeu des sourdants d' astalaedje"
 #~ "Tårdjîz on pô s' i vs plait, dji m' raloye å muroe po vey les pacaedjes "
 #~ "di metaedje a djoû k' i gn a..."
 
-#, fuzzy
-#~ msgid ""
-#~ "There was an unrecoverable error while updating packages information."
-#~ msgstr ""
-#~ "Åk n' a nén stî tot-z astalant les pacaedjes:\n"
-#~ "\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid "Error updating medium"
-#~ msgstr "Åk n' a nén stî tot lejhant l' fitchî\n"
-
 #~ msgid "Please wait, contacting mirror to update packages information."
 #~ msgstr ""
 #~ "Tårdjîz on pô s' i vs plait, dji m' raloye å muroe po mete a djoû "
@@ -1661,14 +1636,6 @@ msgstr "Manaedjeu des sourdants d' astalaedje"
 #~ msgid "Everything already installed (is this supposed to happen at all?)."
 #~ msgstr "Tot a ddja stî astalé (est çki çoula n' divreut nén måy ariver?)."
 
-#, fuzzy
-#~ msgid "Everything already installed."
-#~ msgstr "Totafwait a stî astalé comufåt"
-
-#, fuzzy
-#~ msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#~ msgstr "-adobe-helvetica-bold-r-normal--*-120-*-*-*-*-iso8859-*,*"
-
 #~ msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
 #~ msgstr "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
 
@@ -1688,10 +1655,6 @@ msgstr "Manaedjeu des sourdants d' astalaedje"
 #~ "Djournå des candjmints:\n"
 #~ "%s"
 
-#, fuzzy
-#~ msgid "Source: %s\n"
-#~ msgstr "Sourdant"
-
 #~ msgid ""
 #~ "Name: %s\n"
 #~ "Version: %s\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index dadfa5fb..dbb58573 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-02 20:15+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+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,20 +16,16 @@ msgstr ""
 "Content-Type: text/plain; charset=GB2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "ÒÑÆôÓã¿"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Path or mount point:"
-msgstr "·¾¶»ò×°Ôص㣺"
-
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Portugal"
-msgstr "ÆÏÌÑÑÀ"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"È·¶¨¼ÌÐøÂð?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -47,58 +43,102 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by group"
-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"
+"±¾¹¤¾ß½«°ïÖúÄúΪÄúµÄµçÄÔÖа²×°¸üеÄÈí¼þ°ü¡£"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Name:"
-msgstr "Ãû³Æ£º"
+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.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Italy"
-msgstr "Òâ´óÀû"
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"ɾ³ý°ü¹ý³ÌÖз¢ÉúÒ»¸öÎÊÌ⣺\n"
+"\n"
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "ÈçºÎÊÖ¹¤Ñ¡ÔñÄúµÄ¾µÏñ"
+msgid "Problem during removal"
+msgstr "ÔÚɾ³ý¹ý³ÌÖз¢ÉúÎÊÌâ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "Please wait, removing packages..."
+msgstr "ÕýÔÚɾ³ýÈí¼þ°ü£¬ÇëÉÔºò..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "ÐèҪɾ³ýһЩÈí¼þ°ü"
+msgid "Please wait, reading packages database..."
+msgstr "ÕýÔÚ¶ÁÈ¡Èí¼þ°üÊý¾Ý¿â£¬ÇëÉÔºò..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Already existing update sources"
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
 msgstr ""
+"°²×°¹ý³ÌÖз¢ÉúÁËÎÊÌ⣺\n"
+"\n"
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "More information on package..."
-msgstr "¸ÃÈí¼þ°üµÄ¸ü¶àÐÅÏ¢..."
+msgid "Installation failed"
+msgstr "°²×°Ê§°Ü"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "ÊÇ"
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "²»¿É»Ö¸´µÄ´íÎ󣺶Բ»Æð£¬Ã»Óз¢ÏÖ¿É°²×°µÄÈí¼þ°ü¡£"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "No package found for installation."
+msgstr "ûÓпɰ²×°µÄÈí¼þ°ü¡£"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "ËùÓÐÒªÇóµÄÈí¼þ°ü¶¼Òѳɹ¦°²×°¡£"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+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 ""
-"ÓÉÓÚÈí¼þ°üÖ®¼äµÄÒÀÀµ¹Øϵ£¬Äú²»¿ÉÒÔÑ¡ÔñÏÂÁÐÈí¼þ°ü£º\n"
+"°²×°Íê³É£»%s¡£\n"
 "\n"
+"һЩÅäÖÃÎļþ±»±£´æΪ¡°.rpmnew¡±»ò¡°.rpmsave¡±£¬\n"
+"ÔÚÖ´ÐвÙ×÷ÒÔÇ°£¬ÄúÐèÒª¼ì²éһϣº"
 
 #: ../rpmdrake:1
 #, c-format
@@ -107,481 +147,497 @@ msgstr "ËùÓÐÈí¼þ°ü¶¼ÒÑÕýÈ·°²×°"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Problem during installation"
+msgstr "ÔÚ°²×°¹ý³ÌÖз¢ÉúÎÊÌâ"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr ""
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+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."
+"\n"
+"Error(s) reported:\n"
+"%s"
 msgstr ""
-"»¶Ó­Ê¹ÓÃÈí¼þ°üɾ³ý¹¤¾ß£¡\n"
 "\n"
-"±¾¹¤¾ß½«°ïÖúÄúÑ¡ÔñÏëÒª´ÓÄúµÄµçÄÔÖÐɾ³ýµÄÈí¼þ°ü¡£"
+"\n"
+"±¨¸æµÄ´íÎó£º\n"
+"%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 "Òª±£´æ¸Ä±ä£¬Äú±ØÐëÔÚÇý¶¯Æ÷ÖвåÈë½éÖÊ¡£"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Save and quit"
-msgstr "±£´æ²¢Í˳ö"
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
+msgstr ""
+"°²×°Ê§°Ü£¬È±ÉÙijЩÎļþ¡£\n"
+"Äú¿ÉÄÜÐèÒª¸üÐÂÄúµÄÈí¼þÔ´Êý¾Ý¿â¡£"
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"The following packages have bad signatures:\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"ɾ³ý°ü¹ý³ÌÖз¢ÉúÒ»¸öÎÊÌ⣺\n"
+"ÒªÉý¼¶ÆäËüÈí¼þ°ü£¬±ØÐëɾ³ýÏÂÁÐÈí¼þ°ü£º\n"
 "\n"
-"%s"
+"%s\n"
+"\n"
+"È·¶¨¼ÌÐøÂð£¿"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Size: "
-msgstr "´óС£º"
+msgid "Verifying packages signatures..."
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Security updates"
-msgstr "°²È«¸üÐÂ"
+msgid "Downloading package `%s' (%s/%s)..."
+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
+#, c-format
+msgid "Ok"
+msgstr "È·¶¨"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Çë°Ñ±ê¼ÇΪ¡°%s¡±µÄ½éÖʷŽøÉ豸 [%s]"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "×î¶àÐÅÏ¢"
+msgid "Change medium"
+msgstr "¸ü»»½éÖÊ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy..."
-msgstr "´úÀí·þÎñÆ÷..."
+msgid "Initializing..."
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Package installation..."
+msgstr "Èí¼þ°ü°²×°"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Ó¢¹ú"
+msgid "Unable to get source packages, sorry. %s"
+msgstr "¶Ô²»Æð£¬ÎÞ·¨µÃµ½Ô´Èí¼þ°ü¡£%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure sources"
-msgstr "ÅäÖÃÀ´Ô´"
+msgid "Unable to get source packages."
+msgstr "Ô´Èí¼þ°üδÕÒµ½¡£"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "ÔÚÃû³ÆÖÐ"
+msgid "Inspect..."
+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 ""
-"ÕÒ²»µ½ÈκÎÊʺϵľµÏñ¡£\n"
-"´ËÎÊÌâ¿ÉÄÜÓкܶàÔ­Òò£»×î³£¼ûµÄ¾ÍÊÇÄúµÄ´¦ÀíÆ÷¼Ü¹¹²»Îª Mandrake\n"
-"Linux ¹Ù·½¸üÐÂËùÖ§³Ö¡£"
+msgid "Installation finished"
+msgstr "°²×°Íê³É"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
-"\n"
-"\\Do you want to continue installation?"
-msgstr ""
-"ÒªÉý¼¶ÆäËüÈí¼þ°ü£¬±ØÐëɾ³ýÏÂÁÐÈí¼þ°ü£º\n"
-"\n"
-"%s\n"
-"\n"
-"È·¶¨¼ÌÐøÂð£¿"
+#, c-format
+msgid "Do nothing"
+msgstr "²»×öÈκÎÊÂ"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
+msgstr "ʹÓà .%s ×÷ΪÖ÷Îļþ"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Remove .%s"
 msgstr "ɾ³ý .%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Source"
-msgstr "À´Ô´"
+msgid "changes:"
+msgstr "¸ü¸Ä:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "·ÒÀ¼"
+msgid "Inspecting %s"
+msgstr "ÕýÔÚ¼ì²é %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
+msgid "Please wait, finding available packages..."
+msgstr "ÕýÔÚÑ°ÕÒ¿ÉÓõÄÈí¼þ°ü£¬ÇëÉÔºò..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "France"
-msgstr "·¨¹ú"
+msgid "Please wait, adding medium..."
+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 ""
-"%s\n"
+"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"
-"Is it ok to continue?"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"%s\n"
+"Äú»¹¿ÉÒÔÊÖ¶¯Ñ¡ÔñÄúÏ£ÍûʹÓõľµÏñ£º·½·¨ÊÇ£¬Ê¹ÓÃÈí¼þÔ´¹ÜÀíÆ÷£¬\n"
+"È»ºóÌí¼Ó¡°°²È«¸üС±Ô´¡£\n"
 "\n"
-"È·¶¨¼ÌÐøÂð?"
+"È»ºóÖØÐÂÆô¶¯ MandrakeUpdate¡£"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "ÖØÐÂ×°ÈëÈí¼þ°üÇåµ¥"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Choose a mirror..."
-msgstr "Ñ¡Ôñ¾µÏñ..."
+msgid "How to choose manually your mirror"
+msgstr "ÈçºÎÊÖ¹¤Ñ¡ÔñÄúµÄ¾µÏñ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Ìí¼ÓÒ»¸öÀ´Ô´£º"
+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 ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages can't be installed"
-msgstr "ÓÐЩÈí¼þ°üÎÞ·¨°²×°"
+msgid "Already existing update sources"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-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:1
 #, c-format
-msgid "All packages,"
-msgstr "È«²¿Èí¼þ°ü£¬"
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "ÔÚÎļþÖÐ"
+msgid "Fatal error"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "ËùÓÐÒªÇóµÄÈí¼þ°ü¶¼Òѳɹ¦°²×°¡£"
+msgid "Software Packages Installation"
+msgstr "Èí¼þ°ü°²×°"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "´úÀí·þÎñÆ÷Ö÷»úÃû£º"
+msgid "Mandrake Update"
+msgstr "Mandrake ¸üÐÂ"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Update source(s)"
-msgstr "¸üÐÂÈí¼þÔ´"
+msgid "Software Packages Removal"
+msgstr "Èí¼þ°üɾ³ý"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Local files"
-msgstr "±¾»úÎļþ"
+msgid "Quit"
+msgstr "Í˳ö"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "ÕýÔÚ¼ì²é %s"
+msgid "Install"
+msgstr "°²×°"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Israel"
-msgstr "ÒÔÉ«ÁÐ"
+msgid "Remove"
+msgstr "жÔØ"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Help"
 msgstr "°ïÖú"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "HTTP ·þÎñÆ÷"
+msgid "Search"
+msgstr "ËÑË÷"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "²éÕÒ£º"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"Welcome to the packages source editor!\n"
+"The following packages have to be removed for others to be upgraded:\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."
+"%s\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
-"»¶Ó­Ê¹ÓÃÈí¼þ°üÔ´±à¼­Æ÷£¡\n"
+"ÒªÉý¼¶ÆäËüÈí¼þ°ü£¬±ØÐëɾ³ýÏÂÁÐÈí¼þ°ü£º\n"
 "\n"
-"±¾¹¤¾ß½«°ïÖúÄúÅäÖÃÏëÒªÔÚÄúµÄµçÄÔÉÏËùʹÓõÄÈí¼þ°üÀ´Ô´¡£ÕâЩÀ´Ô´½«ÔÚ°²×°ÐÂ\n"
-"Èí¼þ°ü»òÖ´ÐиüÐÂʱʹÓá£"
+"%s\n"
+"\n"
+"È·¶¨¼ÌÐøÂð£¿"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation failed"
-msgstr "°²×°Ê§°Ü"
+msgid "Some packages need to be removed"
+msgstr "ÐèҪɾ³ýһЩÈí¼þ°ü"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "ʹÓà .%s ×÷ΪÖ÷Îļþ"
+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 "Search results"
-msgstr "ËÑË÷½á¹û"
+msgid "Too many packages are selected"
+msgstr "Ñ¡ÖеİüÌ«¶à"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " failed!"
-msgstr " ʧ°Ü£¡"
+msgid "Maximum information"
+msgstr "×î¶àÐÅÏ¢"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Brazil"
-msgstr "°ÍÎ÷"
+msgid "Normal information"
+msgstr "Õý³£ÐÅÏ¢"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake: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 "Update source(s)"
+msgstr "¸üÐÂÈí¼þÔ´"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "²éÕÒ£º"
+msgid "Reload the packages list"
+msgstr "ÖØÐÂ×°ÈëÈí¼þ°üÇåµ¥"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "È«²¿Èí¼þ°ü£¬°´×Öĸ´ÎÐòÅÅÁÐ"
+msgid "Reset the selection"
+msgstr "ÖØÖÃÑ¡ÖÐ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "ÕýÔÚËÑË÷£¬ÇëÉÔºò..."
+msgid "in files"
+msgstr "ÔÚÎļþÖÐ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "ÕýÔÚ¶ÁÈ¡Èí¼þ°üÊý¾Ý¿â£¬ÇëÉÔºò..."
+msgid "in descriptions"
+msgstr "ÔÚÃèÊöÖÐ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "unknown package "
-msgstr "δ֪Èí¼þ°ü"
+msgid "in names"
+msgstr "ÔÚÃû³ÆÖÐ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "ÖØÖÃÑ¡ÖÐ"
+msgid "by update availability"
+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 "by source repository"
+msgstr "°´ÕÕÀ´Ô´¿âÅÅÁÐ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"ΪÁËÂú×ãËùÓеÄÒÀÀµ¹Øϵ£¬ÐèҪɾ³ýÏÂÁÐÈí¼þ°ü£º\n"
-"\n"
+msgid "by selection state"
+msgstr "°´ÕÕÑ¡Ôñ״̬ÅÅÁÐ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "¸ç˹´ïÀè¼Ó"
+msgid "by size"
+msgstr "°´ÕÕ´óСÅÅÁÐ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"°²×°¹ý³ÌÖз¢ÉúÁËÎÊÌ⣺\n"
-"\n"
-"%s"
+msgid "by group"
+msgstr "°´ÕÕ×é±ðÅÅÁÐ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "ÕýÔÚɾ³ý½éÖÊ£¬ÇëÉÔºò..."
+msgid "All packages,"
+msgstr "È«²¿Èí¼þ°ü£¬"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "ÃÜÂ룺"
+msgid "All packages, alphabetical"
+msgstr "È«²¿Èí¼þ°ü£¬°´×Öĸ´ÎÐòÅÅÁÐ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "ÕýÔÚ¼ì²éÔ´¡°%s¡±µÄ¾àÀëÎļþ..."
+msgid "Mandrake choices"
+msgstr "Mandrake ¾«Ñ¡"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Öйų́Íå"
+msgid "Normal updates"
+msgstr "Õý³£¸üÐÂ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "User:"
-msgstr "Óû§Ãû£º"
+msgid "Bugfixes updates"
+msgstr "ȱÏÝÐÞÕý¸üÐÂ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "ÕýÔÚ¸üнéÖÊ£¬ÇëÉÔºò..."
+msgid "Security updates"
+msgstr "°²È«¸üÐÂ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "ÕýÔÚÁгöÈí¼þ°ü£¬ÇëÉÔºò..."
+msgid "Description: "
+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 ""
+msgid "Reason for update: "
+msgstr "¸üÐÂÔ­Òò£º"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Information on packages"
-msgstr "¸ÃÈí¼þ°üµÄÐÅÏ¢"
+msgid "Summary: "
+msgstr "ͻ񻣼"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "È¡Ïû"
+msgid "Importance: "
+msgstr "ÖØÒªÐÔ£º"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "ËùÓÐÈí¼þ°ü¶¼Òѳɹ¦°²×°"
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "ÕýÔÚ¸üнéÖÊ£¬ÇëÉÔºò..."
+msgid "Size: "
+msgstr "´óС£º"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Version: "
+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 "Name: "
+msgstr "Ãû³Æ£º"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "ÔÚÃèÊöÖÐ"
+msgid "Currently installed version: "
+msgstr "µ±Ç°°²×°µÄ°æ±¾£º"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "ÅäÖôúÀí·þÎñÆ÷"
+msgid "Source: "
+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 "(Not available)"
+msgstr "£¨²»¿ÉÓã©"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "ÇëÑ¡Ôñ"
+msgid "Changelog:\n"
+msgstr "¸üÐÂÈÕÖ¾£º\n"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "Îļþ£º\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Ñ¡ÖдóС£º%d MB"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add a source"
-msgstr "Ìí¼ÓÒ»¸öÀ´Ô´"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Ñ¡ÖÐÈí¼þ£º%d MB / Ê£Óà´ÅÅ̿ռ䣺%d MB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
 msgstr ""
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Save changes"
-msgstr "±£´æÐÞ¸Ä"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Error during download"
-msgstr "ÏÂÔسö´í"
+"ÓÉÓÚÈí¼þ°üÖ®¼äµÄÒÀÀµ¹Øϵ£¬Äú²»¿ÉÒÔÑ¡ÔñÏÂÁÐÈí¼þ°ü£º\n"
+"\n"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Èí¼þ°ü°²×°"
+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 "Importance: "
-msgstr "ÖØÒªÐÔ£º"
+msgid "%s conflicts with %s"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "ÓÐЩÈí¼þ°üÎÞ·¨°²×°"
 
 #: ../rpmdrake:1
 #, c-format
@@ -593,426 +649,447 @@ msgstr ""
 "ΪÂú×ãÒÀÀµ¹Øϵ£¬»¹ÐèÒª°²×°ÏÂÁÐÈí¼þ°ü£º\n"
 "\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "Ìí¼Ó..."
+msgid "Additional packages needed"
+msgstr "ÐèÒªÁíÍâµÄÈí¼þ°ü"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Unable to create medium."
-msgstr "ÎÞ·¨´´½¨½éÖÊ¡£"
+msgid "Some packages can't be removed"
+msgstr "ÓÐЩÈí¼þ°üÎÞ·¨É¾³ý"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Removing these packages would break your system, sorry:\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"
-"ÔÚÖ´ÐвÙ×÷ÒÔÇ°£¬ÄúÐèÒª¼ì²éһϣº"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Browse..."
-msgstr "ä¯ÀÀ..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages can't be removed"
-msgstr "ÓÐЩÈí¼þ°üÎÞ·¨É¾³ý"
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
+"ΪÁËÂú×ãËùÓеÄÒÀÀµ¹Øϵ£¬ÐèҪɾ³ýÏÂÁÐÈí¼þ°ü£º\n"
+"\n"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
-msgstr "ÐÅÏ¢..."
+msgid "Some additional packages need to be removed"
+msgstr "ÁíÍâһЩÈí¼þ°üÐèҪɾ³ý"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "Äú±ØÐë²åÈë½éÖʲÅÄܼÌÐø"
+msgid "More information on package..."
+msgstr "¸ÃÈí¼þ°üµÄ¸ü¶àÐÅÏ¢..."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "жÔØ"
+msgid "Information on packages"
+msgstr "¸ÃÈí¼þ°üµÄÐÅÏ¢"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Èí¼þ°ü°²×°"
+msgid "More info"
+msgstr "¸ü¶àÐÅÏ¢"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "No mirror"
-msgstr "ûÓоµÏñ"
+msgid "Addable"
+msgstr "¿ÉÌí¼Ó"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "ÄúÖÁÉÙÒªÌîдͷÁ½Ïî¡£"
+msgid "Upgradable"
+msgstr "¿ÉÉý¼¶"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-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
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "ÈÕ±¾"
+msgid "No update"
+msgstr "ûÓиüÐÂ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "²»×öÈκÎÊÂ"
+msgid "(none)"
+msgstr "£¨ÎÞ£©"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "No update"
-msgstr "ûÓиüÐÂ"
+msgid "Please wait, listing packages..."
+msgstr "ÕýÔÚÁгöÈí¼þ°ü£¬ÇëÉÔºò..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Description: "
-msgstr "ÃèÊö£º"
+msgid "unknown package "
+msgstr "δ֪Èí¼þ°ü"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"°²×°Ê§°Ü£¬È±ÉÙijЩÎļþ¡£\n"
-"Äú¿ÉÄÜÐèÒª¸üÐÂÄúµÄÈí¼þÔ´Êý¾Ý¿â¡£"
+msgid "One of the following packages is needed:"
+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?"
-msgstr ""
-"¾¯¸æ£ºÄúÊÔͼÌí¼ÓµÄÈí¼þ°üÌ«¶à£¬ÓпÉÄÜÔÚ°²×°µÄ¹ý³ÌÖе¼ÖÂÊ£Óà´Å\n"
-"ÅÌ¿Õ¼ä¸æóÀ£»ÕâÊǺÜΣÏյģ¬ÄúÓ¦µ±Ð¡ÐIJÙ×÷¡£\n"
-"\n"
-"ÄúÕæµÄÏëÒª°²×°ËùÓÐÑ¡ÖеÄÈí¼þ°üÂð£¿"
+msgid "Please choose"
+msgstr "ÇëÑ¡Ôñ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "Ãû³Æ£º"
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "¼ì²é..."
+msgid "Not selected"
+msgstr "δѡÖÐ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "No package found for installation."
-msgstr "ûÓпɰ²×°µÄÈí¼þ°ü¡£"
+msgid "Selected"
+msgstr "Ñ¡ÖÐ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "°Ä´óÀûÑÇ"
+msgid "Search results"
+msgstr "ËÑË÷½á¹û"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation finished"
-msgstr "°²×°Íê³É"
+msgid "Stop"
+msgstr "Í£Ö¹"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
-msgstr "°´ÕÕÊÇ·ñ¿ÉÓÃÅÅÁÐ"
+msgid "Please wait, searching..."
+msgstr "ÕýÔÚËÑË÷£¬ÇëÉÔºò..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
-msgstr "²¨À¼"
+msgid "Search results (none)"
+msgstr "ËÑË÷½á¹û£¨ÎÞ£©"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Version: "
-msgstr "°æ±¾£º"
+msgid "Other"
+msgstr "ÆäËû"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "ÔڵǼ´úÀí·þÎñÆ÷ʱ£¬Äú¿ÉÄÜÒªÖ¸¶¨Óû§ÃûºÍÃÜÂ룺"
+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"
+"Èí¼þ°ü»òÖ´ÐиüÐÂʱʹÓá£"
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Editing source \\\"%s\\\":"
-msgstr "±à¼­À´Ô´¡°%s¡±£º"
+#, c-format
+msgid "Save and quit"
+msgstr "±£´æ²¢Í˳ö"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Upgradable"
-msgstr "¿ÉÉý¼¶"
+msgid "Proxy..."
+msgstr "´úÀí·þÎñÆ÷..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid " done."
-msgstr " Íê³É¡£"
+msgid "Update..."
+msgstr "¸üÐÂ..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Software Packages Installation"
-msgstr "Èí¼þ°ü°²×°"
+msgid "Add..."
+msgstr "Ìí¼Ó..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "ÕýÔÚ¼ì²éÔ´¡°%s¡±µÄÎļþ..."
+msgid "Edit"
+msgstr "±à¼­"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "ÐèÒªÁíÍâµÄÈí¼þ°ü"
+msgid "Source"
+msgstr "À´Ô´"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "ȱÏÝÐÞÕý¸üÐÂ"
+msgid "Enabled?"
+msgstr "ÒÑÆôÓã¿"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "ÏÂÔØ¡°%s¡±£¬Ê£Óàʱ¼ä£º%s£¬Ëٶȣº%s"
+msgid "Configure sources"
+msgstr "ÅäÖÃÀ´Ô´"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Germany"
-msgstr "µÂ¹ú"
+msgid "Password:"
+msgstr "ÃÜÂ룺"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Russia"
-msgstr "¶íÂÞ˹"
+msgid "User:"
+msgstr "Óû§Ãû£º"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Norway"
-msgstr "ŲÍþ"
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "ÔڵǼ´úÀí·þÎñÆ÷ʱ£¬Äú¿ÉÄÜÒªÖ¸¶¨Óû§ÃûºÍÃÜÂ룺"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Problem during installation"
-msgstr "ÔÚ°²×°¹ý³ÌÖз¢ÉúÎÊÌâ"
+msgid "Proxy hostname:"
+msgstr "´úÀí·þÎñÆ÷Ö÷»úÃû£º"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search"
-msgstr "ËÑË÷"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"Èç¹ûÄúÐèÒªÓôúÀí·þÎñÆ÷£¬ÇëÊäÈëÖ÷»úÃûºÍ¶Ë¿Ú£¨Óï·¨£º<proxyhost[:port]>£©£º"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit a source"
-msgstr "±à¼­À´Ô´"
+msgid "Configure proxies"
+msgstr "ÅäÖôúÀí·þÎñÆ÷"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Czech Republic"
-msgstr "½Ý¿Ë¹²ºÍ¹ú"
+msgid "Please wait, updating medium..."
+msgstr "ÕýÔÚ¸üнéÖÊ£¬ÇëÉÔºò..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Stop"
-msgstr "Í£Ö¹"
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "Òª±£´æ¸Ä±ä£¬Äú±ØÐëÔÚÇý¶¯Æ÷ÖвåÈë½éÖÊ¡£"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "¸üÐÂ"
+msgid "You need to insert the medium to continue"
+msgstr "Äú±ØÐë²åÈë½éÖʲÅÄܼÌÐø"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "ÕýÔÚɾ³ýÈí¼þ°ü£¬ÇëÉÔºò..."
+msgid "Save changes"
+msgstr "±£´æÐÞ¸Ä"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal information"
-msgstr "Õý³£ÐÅÏ¢"
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Ïà¶Ô synthesis/hdlist µÄ·¾¶£º"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr ""
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing source \"%s\":"
+msgstr "±à¼­À´Ô´¡°%s¡±£º"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Ñ¡ÖÐÈí¼þ£º%d MB / Ê£Óà´ÅÅ̿ռ䣺%d MB"
+msgid "Edit a source"
+msgstr "±à¼­À´Ô´"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Spain"
-msgstr "Î÷°àÑÀ"
+msgid "Please wait, removing medium..."
+msgstr "ÕýÔÚɾ³ý½éÖÊ£¬ÇëÉÔºò..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
-msgstr "Õý³£¸üÐÂ"
+msgid "Type of source:"
+msgstr "À´Ô´ÀàÐÍ£º"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by selection state"
-msgstr "°´ÕÕÑ¡Ôñ״̬ÅÅÁÐ"
+msgid "Adding a source:"
+msgstr "Ìí¼ÓÒ»¸öÀ´Ô´£º"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr "ÕýÔÚ´Ó MandrakeSoft ÍøÕ¾ÏÂÔؾµÏñÕ¾µãµÄµØÖ·£¬ÇëÉÔºò¡£"
+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 "Login:"
-msgstr "µÇ¼Ãû£º"
+msgid "You need to fill up at least the two first entries."
+msgstr "ÄúÖÁÉÙÒªÌîдͷÁ½Ïî¡£"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Austria"
-msgstr "°ÂµØÀû"
+msgid "Name:"
+msgstr "Ãû³Æ£º"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Fatal error"
-msgstr ""
+msgid "Login:"
+msgstr "µÇ¼Ãû£º"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Ñ¡ÔñÒª¸üеÄÔ´½éÖÊ£º"
+msgid "Choose a mirror..."
+msgstr "Ñ¡Ôñ¾µÏñ..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update..."
-msgstr "¸üÐÂ..."
+msgid "Browse..."
+msgstr "ä¯ÀÀ..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Starting download of `%s'..."
-msgstr "¿ªÊ¼ÏÂÔØ¡°%s¡±..."
+msgid "Path or mount point:"
+msgstr "·¾¶»ò×°Ôص㣺"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(none)"
-msgstr "£¨ÎÞ£©"
+msgid "Removable device"
+msgstr "¿ÉÒƶ¯É豸"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
-"¶Ô²»Æð£¬É¾³ýÕâЩÈí¼þ°ü½«¿ÉÄܻٻµÄúµÄϵͳ£º\n"
-"\n"
+msgid "HTTP server"
+msgstr "HTTP ·þÎñÆ÷"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr ""
+msgid "FTP server"
+msgstr "FTP ·þÎñÆ÷"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "µ±Ç°°²×°µÄ°æ±¾£º"
+msgid "Path:"
+msgstr "·¾¶£º"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Other"
-msgstr "ÆäËû"
+msgid "Local files"
+msgstr "±¾»úÎļþ"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reason for update: "
-msgstr "¸üÐÂÔ­Òò£º"
+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 "ÎÞ·¨¸üнéÖÊ£»¸Ã½éÖʽ«±»×Ô¶¯Í£Óá£"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Please choose the desired mirror."
-msgstr "ÇëÑ¡Ôñϲ»¶µÄ¾µÏñÕ¾µã¡£"
+msgid "Unable to create medium."
+msgstr "ÎÞ·¨´´½¨½éÖÊ¡£"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "±à¼­"
+msgid "Update"
+msgstr "¸üÐÂ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, finding available packages..."
-msgstr "ÕýÔÚÑ°ÕÒ¿ÉÓõÄÈí¼þ°ü£¬ÇëÉÔºò..."
+msgid "Select the source(s) you wish to update:"
+msgstr "Ñ¡ÔñÒª¸üеÄÔ´½éÖÊ£º"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Ïà¶Ô synthesis/hdlist µÄ·¾¶£º"
+msgid "Please wait, updating media..."
+msgstr "ÕýÔÚ¸üнéÖÊ£¬ÇëÉÔºò..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results (none)"
-msgstr "ËÑË÷½á¹û£¨ÎÞ£©"
+msgid " failed!"
+msgstr " ʧ°Ü£¡"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Danmark"
-msgstr "µ¤Âó"
+msgid " done."
+msgstr " Íê³É¡£"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "Öйú"
+msgid "Download of `%s', speed:%s"
+msgstr "ÏÂÔØ¡°%s¡±£¬Ëٶȣº%s"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United States"
-msgstr "ÃÀ¹ú"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "ÏÂÔØ¡°%s¡±£¬Ê£Óàʱ¼ä£º%s£¬Ëٶȣº%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "changes:"
-msgstr "¸ü¸Ä:"
+msgid "Starting download of `%s'..."
+msgstr "¿ªÊ¼ÏÂÔØ¡°%s¡±..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "ÁíÍâһЩÈí¼þ°üÐèҪɾ³ý"
+msgid "Examining distant file of source `%s'..."
+msgstr "ÕýÔÚ¼ì²éÔ´¡°%s¡±µÄ¾àÀëÎļþ..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Examining file of source `%s'..."
+msgstr "ÕýÔÚ¼ì²éÔ´¡°%s¡±µÄÎļþ..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No"
-msgstr "·ñ"
+msgid "Copying file for source `%s'..."
+msgstr "ÕýÔÚ¸´ÖÆÔ´¡°%s¡±µÄÎļþ..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Summary: "
-msgstr "ͻ񻣼"
+msgid "Please choose the desired mirror."
+msgstr "ÇëÑ¡Ôñϲ»¶µÄ¾µÏñÕ¾µã¡£"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "¼ÓÄôó"
+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.pm:1
 #, c-format
-msgid "Greece"
-msgstr "Ï£À°"
+msgid "No mirror"
+msgstr "ûÓоµÏñ"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1029,255 +1106,178 @@ msgstr ""
 "ÄúµÄÍøÂç»ò MandrakeSoft ÍøÕ¾¿ÉÄܲ»¿ÉÓá£\n"
 "ÇëÉÔºóÔÙÊÔ¡£"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Source: "
-msgstr "À´Ô´£º"
-
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "ÕýÔÚ¸´ÖÆÔ´¡°%s¡±µÄÎļþ..."
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "¶Ô²»Æð£¬ÎÞ·¨µÃµ½Ô´Èí¼þ°ü¡£%s"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Path:"
-msgstr "·¾¶£º"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Problem during removal"
-msgstr "ÔÚɾ³ý¹ý³ÌÖз¢ÉúÎÊÌâ"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "by source repository"
-msgstr "°´ÕÕÀ´Ô´¿âÅÅÁÐ"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Selected"
-msgstr "Ñ¡ÖÐ"
+msgid "Error during download"
+msgstr "ÏÂÔسö´í"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Netherlands"
-msgstr "ºÉÀ¼"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Addable"
-msgstr "¿ÉÌí¼Ó"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "ÕýÔÚ´Ó MandrakeSoft ÍøÕ¾ÏÂÔؾµÏñÕ¾µãµÄµØÖ·£¬ÇëÉÔºò¡£"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
-msgstr "£¨²»¿ÉÓã©"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
 "\n"
-"%s"
+"Is it ok to continue?"
 msgstr ""
-"¶Ô²»Æ𣬲»ÄÜÑ¡ÔñÏÂÁÐÈí¼þ°ü£º\n"
+"ÐèÒªÁ¬½Ó MandrakeSoft ÍøÕ¾²ÅÄÜ»ñµÃ¾µÏñÁÐ±í¡£\n"
+"Çë¼ì²éÄúµÄÍøÂçÊÇ·ñÔËתÕý³£¡£\n"
 "\n"
+"È·¶¨¼ÌÐøÂð£¿"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Not selected"
-msgstr "δѡÖÐ"
+msgid "United States"
+msgstr "ÃÀ¹ú"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Èí¼þ°üɾ³ý"
+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:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
-msgstr ""
-"\n"
-"\n"
-"±¨¸æµÄ´íÎó£º\n"
-"%s"
+msgid "Russia"
+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."
-msgstr ""
-"¸üÐÂÁбíΪ¿Õ¡£ÕâÒâζ×Å¿ÉÄÜÄúËù°²×°µÄÈí¼þ°üûÓÐÏàÓ¦µÄ¸üУ¬\n"
-"»òÕßÄúÒѾ­°²×°ÁËÈ«²¿¸üС£"
+msgid "Portugal"
+msgstr "ÆÏÌÑÑÀ"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "ÏÂÔØ¡°%s¡±£¬Ëٶȣº%s"
+msgid "Poland"
+msgstr "²¨À¼"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "ÐèÒªÏÂÁÐÈí¼þ°üÖ®Ò»£º"
+msgid "Norway"
+msgstr "ŲÍþ"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Quit"
-msgstr "Í˳ö"
+msgid "Netherlands"
+msgstr "ºÉÀ¼"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 ""
-"ÎÒÐèÒªÁ¬½Ó¾µÏñ²ÅÄÜ»ñµÃ×îеĸüÐÂÈí¼þ°ü¡£\n"
-"Çë¼ì²éÄúµÄÍøÂçÊÇ·ñÔËתÕý³£¡£\n"
-"\n"
-"È·¶¨¼ÌÐøÂð£¿"
+msgid "Korea"
+msgstr "º«¹ú"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "È·¶¨"
+msgid "Japan"
+msgstr "ÈÕ±¾"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "ÕýÔÚÌí¼Ó½éÖÊ£¬ÇëÉÔºò..."
+msgid "Italy"
+msgstr "Òâ´óÀû"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "À´Ô´ÀàÐÍ£º"
+msgid "Israel"
+msgstr "ÒÔÉ«ÁÐ"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please insert the medium named \\\"%s\\\" on device [%s]"
-msgstr "Çë°Ñ±ê¼ÇΪ¡°%s¡±µÄ½éÖʷŽøÉ豸 [%s]"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Ï£À°"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to get source packages."
-msgstr "Ô´Èí¼þ°üδÕÒµ½¡£"
+msgid "France"
+msgstr "·¨¹ú"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Ñ¡ÖеİüÌ«¶à"
+msgid "Finland"
+msgstr "·ÒÀ¼"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "%s conflicts with %s"
-msgstr ""
+msgid "Spain"
+msgstr "Î÷°àÑÀ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Danmark"
+msgstr "µ¤Âó"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Mandrake ¾«Ñ¡"
+msgid "Germany"
+msgstr "µÂ¹ú"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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"
-"È»ºóÖØÐÂÆô¶¯ MandrakeUpdate¡£"
+msgid "Czech Republic"
+msgstr "½Ý¿Ë¹²ºÍ¹ú"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "¸üÐÂÈÕÖ¾£º\n"
+msgid "Costa Rica"
+msgstr "¸ç˹´ïÀè¼Ó"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Korea"
-msgstr "º«¹ú"
+msgid "Canada"
+msgstr "¼ÓÄôó"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "¿ÉÒƶ¯É豸"
+msgid "Brazil"
+msgstr "°ÍÎ÷"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "±ÈÀûʱ"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Change medium"
-msgstr "¸ü»»½éÖÊ"
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Mandrake ¸üÐÂ"
+msgid "Australia"
+msgstr "°Ä´óÀûÑÇ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by size"
-msgstr "°´ÕÕ´óСÅÅÁÐ"
+msgid "Austria"
+msgstr "°ÂµØÀû"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "FTP ·þÎñÆ÷"
+msgid "Info..."
+msgstr "ÐÅÏ¢..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Files:\n"
-msgstr "Îļþ£º\n"
+msgid "No"
+msgstr "·ñ"
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr "ÎÞ·¨¸üнéÖÊ£»¸Ã½éÖʽ«±»×Ô¶¯Í£Óá£"
+#, c-format
+msgid "Yes"
+msgstr "ÊÇ"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 2165312e..8e0476e9 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grpmi\n"
-"POT-Creation-Date: 2003-05-02 20:15+0200\n"
+"POT-Creation-Date: 2003-05-13 13:06+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,20 +15,16 @@ msgstr ""
 "Content-Type: text/plain; charset=big5\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "¶}±Ò"
-
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../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"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"±z­nÄ~Äò¶Ü¡H"
 
 #: ../rpmdrake:1
 #, c-format
@@ -45,151 +41,144 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-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¸Ë"
+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:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "¦p¦ó¤â°Ê¿ï¾Ü±z»Ý­nªº¬M®g¯¸¥x"
+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 ""
+"Åwªï¨Ó¨ì®M¥ó²¾°£µ{¦¡!\n"
+"\n"
+"±µ¤U¨Óµ{¦¡±N·|¤Þ¾É§A§¹¦¨²¾°£±z»{¬°¤£»Ý­nªº®M¥ó¶µ¥Ø¡C"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "URL:"
-msgstr "URL¡G"
+#: ../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"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Some packages need to be removed"
-msgstr "¬Y¨Ç®M¥ó»Ý­n¶¶«K²¾°£"
+#, fuzzy, c-format
+msgid "Problem during removal"
+msgstr "¦w¸Ë®Éµo¥Í°ÝÃD"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Already existing update sources"
+#, fuzzy, c-format
+msgid "Please wait, removing packages..."
 msgstr ""
+"½Ðµy­Ô\n"
+"±Æ§Ç®M¥ó"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "More information on package..."
-msgstr "§ó¦h¸Ó®M¥ó¸ê°T..."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Yes"
-msgstr "¬O"
+#, fuzzy, c-format
+msgid "Please wait, reading packages database..."
+msgstr ""
+"½Ðµy­Ô\n"
+"±Æ§Ç®M¥ó"
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"There was a problem during the installation:\n"
 "\n"
+"%s"
 msgstr ""
-"¥Ñ©ó¬Û¨Ì©Êªº­n¨D¡A¤U­±ªº®M¥ó±N·|¨ú®ø¿ï¨ú¥H«K©ó¯à°÷Ä~Äò¶i¦æ¤U¥h¡G\n"
+"¦w¸Ë®M¥ó®Éµo¥Í¤F¤U­±ªº¿ù»~¡G\n"
 "\n"
+"%s"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "everything was installed correctly"
-msgstr "©Ò¦³¶µ¥Ø¤w¸g³£¦w¸Ë¦¨¥\¤F¡C"
+msgid "Installation failed"
+msgstr "¥þ³¡¦w¸Ë"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "%s KB"
-msgstr "%.1f KB"
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "¥¿¦b·Ç³Æ¦w¸Ë"
 
 #: ../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 ""
-"Åwªï¨Ó¨ì®M¥ó²¾°£µ{¦¡!\n"
-"\n"
-"±µ¤U¨Óµ{¦¡±N·|¤Þ¾É§A§¹¦¨²¾°£±z»{¬°¤£»Ý­nªº®M¥ó¶µ¥Ø¡C"
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "¥¿¦b·Ç³Æ¦w¸Ë"
 
-#: ../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 "All requested packages were installed successfully."
+msgstr "¤w¸g¦¨¥\¦a¦w¸Ë±z»Ý­nªº®M¥ó¡C"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
-msgstr "Àx¦s¨ÃÂ÷¶}"
+msgid "Everything installed successfully"
+msgstr "©Ò¦³¶µ¥Ø¤w¸g³£¦w¸Ë¦¨¥\¤F¡C"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"The installation is finished; %s.\n"
 "\n"
-"%s"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
 msgstr ""
-"¦w¸Ë®M¥ó®Éµo¥Í¤F¤U­±ªº¿ù»~¡G\n"
+"¤w¸g§¹¦¨¦w¸Ë %s ®M¥ó¤F¡C\n"
 "\n"
-"%s"
+"½Ðª`·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
 #, fuzzy, c-format
-msgid "Size: "
-msgstr "¤j¤p"
+msgid "everything was installed correctly"
+msgstr "©Ò¦³¶µ¥Ø¤w¸g³£¦w¸Ë¦¨¥\¤F¡C"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Security updates"
-msgstr "Åã¥Ü¦w¥þ§ó·s®M¥ó"
+msgid "Problem during installation"
+msgstr "¦w¸Ë®Éµo¥Í°ÝÃD"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "§¹¾ã¸ê°T"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "¥¿¦b¦w¸Ë®M¥ó '%s (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "¿ù»~..."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "United Kingdom"
-msgstr "Áp¦X°ê"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure sources"
-msgstr "³]©w®M¥ó¨Ó·½¦ì¸m¡H"
+msgid "Preparing packages installation..."
+msgstr "¥¿¦b·Ç³Æ¦w¸Ë"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "¨Ì¦WºÙ"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
+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."
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
 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"
+"¦w¸Ë¥¢±Ñ¡C¦w¸Ëµ{¦¡§ä¤£¨ì¤@¨Ç­n¦w¸Ë¤Wªºµ{¦¡®M¥ó¡C\n"
+"¤]³\¬O¨t²Î¸ê®Æ®w¤Ó¤F¡A½Ð¥ý§ó·s¸ê®Æ®w«á¦AÄ~Äò¡C"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -198,7 +187,7 @@ msgid ""
 "\n"
 "%s\n"
 "\n"
-"\\Do you want to continue installation?"
+"Do you want to continue installation?"
 msgstr ""
 "¤U¦Cªº®M¥ó»Ý­n¶¶«K²¾°£¡A¥H«K©ó¯à°÷¶i¦æ¨ä¥L®M¥óªº¦w¸Ë§ó·s¡G\n"
 "\n"
@@ -208,475 +197,525 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Remove .%s"
-msgstr "²¾°£ .%s"
+msgid "Verifying packages signatures..."
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Source"
-msgstr "¨Ó·½"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "¥¿¦b¤U¸ü¡u%s¡v(%s/%s)..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Finland"
-msgstr "ªâÄõ"
+msgid "Cancel"
+msgstr "¨ú®ø"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
+msgid "Ok"
+msgstr "½T©w"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "France"
-msgstr "±j­¢"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "½Ð¸m¤J´C¤¶¦WºÙ¬° \"%s\" ªº¶µ¥Ø©ñ¸m©ó %s ¸Ë¸m"
 
-#. -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 ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"±z­nÄ~Äò¶Ü¡H"
+msgid "Change medium"
+msgstr "Åܧó´C¤¶"
 
 #: ../rpmdrake:1
 #, c-format
-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§}..."
+msgid "Initializing..."
+msgstr "ªì©l¤Æ¤¤..."
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Adding a source:"
-msgstr "·s¼W¨Ó·½¡G"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Package installation..."
+msgstr "¥¿¦b·Ç³Æ¦w¸Ë"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "®M¥ó '%s' µLªk³Q¦w¸Ë\n"
+msgid "Unable to get source packages, sorry. %s"
+msgstr "©êºp¡A±z»Ý­n¨ã³Æ root Åv­­¨­¥÷¤~¥i¥H¶i¦æ®M¥ó¦w¸Ë¡C"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "¥¿¦b·Ç³Æ¦w¸Ë"
+msgid "Unable to get source packages."
+msgstr "¿ï¾Ü®M¥ó"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages,"
-msgstr "©Ò¦³®M¥ó¡A"
+msgid "Inspect..."
+msgstr "Àˬd..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "in files"
-msgstr "¨ÌÀÉ®×"
+#, fuzzy, c-format
+msgid "Installation finished"
+msgstr "¤w¦w¸Ë"
 
 #: ../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 "Proxy hostname:"
-msgstr "¨Ï¥ÎªÌ¦WºÙ (¥N²z¦øªA¾¹)¡G"
+msgid "Do nothing"
+msgstr "¨S¦³¶i¦æ¥ô¦ó°Ê§@"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Update source(s)"
-msgstr "§ó·s¨Ó·½"
+msgid "Use .%s as main file"
+msgstr "¨Ï¥Î .%s ¬°¥D­nÀÉ®×"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "¥»¾÷ÀÉ®×"
+msgid "Remove .%s"
+msgstr "²¾°£ .%s"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "changes:"
+msgstr "Àx¦sÅܧó"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspecting %s"
 msgstr "¥¿¦bÀˬd %s"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Israel"
-msgstr "¦w¸Ë"
-
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Help"
-msgstr "/»¡©ú (_H)"
+msgid "Please wait, finding available packages..."
+msgstr ""
+"½Ðµy­Ô\n"
+"±Æ§Ç®M¥ó"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "HTTP server"
-msgstr "HTTP ¥D¾÷"
+msgid "Please wait, adding medium..."
+msgstr "½Ðµy«á¡A¥¿¦b¥[¤J´C¤¶¨Ó·½..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"Welcome to the packages source editor!\n"
+"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"
-"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 ""
-"Åwªï¨Ó¨ì®M¥ó¨Ó·½½s¿èµ{¦¡!\n"
+"±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"
-"±µ¤U¨Óµ{¦¡±N·|¤Þ¾É§A§¹¦¨½s¿è®M¥ó¨Ó·½ªº¶µ¥Ø¡A\n"
-"¥H«K©ó´£¨Ñ±z¯à°÷¨Ï¥Î±z©Ò³]©wªº¶µ¥Ø¶i¦æ³nÅ骺¦w¸Ë»P§ó·s¡C"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "¥þ³¡¦w¸Ë"
+"§¹¦¨«á¡A½Ð­«·s±Ò°Ê MandrakeUpdate µ{¦¡¡C"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "¨Ï¥Î .%s ¬°¥D­nÀÉ®×"
+msgid "How to choose manually your mirror"
+msgstr "¦p¦ó¤â°Ê¿ï¾Ü±z»Ý­nªº¬M®g¯¸¥x"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results"
-msgstr "·j´Mµ²ªG"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid " failed!"
-msgstr "¨ÌÀÉ®×"
+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 ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Brazil"
-msgstr "¤Ú¦è"
+msgid "Already existing update sources"
+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?"
+"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¤¶¸Ë¸m¶µ¥Ø¤w¸g¦s¦b¤F¡A\n"
-"±z½T©w­n¸m´«­ì¥»¶µ¥Ø¶Ü¡H"
+"¦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:1
 #, c-format
-msgid "Find:"
-msgstr "´M§ä¡G"
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "All packages, alphabetical"
-msgstr "©Ò¦³®M¥ó¡A¨Ì·Ó¦r¥À¶¶§Ç¤ÀÃþ"
+#, fuzzy, c-format
+msgid "Fatal error"
+msgstr "Àɮ׿ù»~"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Please wait, searching..."
-msgstr "½Ðµy­Ô¡A·j´M¤¤..."
+#, fuzzy, c-format
+msgid "Software Packages Installation"
+msgstr "¥¿¦b·Ç³Æ¦w¸Ë"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, reading packages database..."
-msgstr ""
-"½Ðµy­Ô\n"
-"±Æ§Ç®M¥ó"
+msgid "Mandrake Update"
+msgstr "MandrakeUpdate ½s¦n³]©w"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
+msgstr "²¾°£®M¥óµ{¦¡"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Â÷¶}"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "¦w¸Ë"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "²¾°£"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "unknown package "
-msgstr "¤£¸Ô"
+msgid "Help"
+msgstr "/»¡©ú (_H)"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "­«¸m¿ï¨ú¶µ¥Ø"
+msgid "Search"
+msgstr "´M§ä"
 
-#: ../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 ""
-"¦pªG±z»Ý­n³z¹L¥N²z¦øªA¾¹³s½u¡A½Ð¿é¤J¸Ó¥D¾÷¦WºÙ»P³sµ²°ð°ð¸¹(¤ñ¤è proxy.hinet."
-"net:80)¡G"
+msgid "Find:"
+msgstr "´M§ä¡G"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"The following packages have to be removed for others to be upgraded:\n"
 "\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
-"¬°¤F­nº¡¨¬¬Û¨Ì©Ê»Ý¨D¡A³o¨Ç®M¥ó»Ý­n³Q²¾°£¡G\n"
+"¤U¦Cªº®M¥ó»Ý­n¶¶«K²¾°£¡A¥H«K©ó¯à°÷¶i¦æ¨ä¥L®M¥óªº¦w¸Ë§ó·s¡G\n"
+"\n"
+"%s\n"
 "\n"
+"±z½T©w­nÄ~Äò¶Ü¡H"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "­ô´µ¤j¾¤¥["
+msgid "Some packages need to be removed"
+msgstr "¬Y¨Ç®M¥ó»Ý­n¶¶«K²¾°£"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"There was a problem during the installation:\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"
-"%s"
+"Do you really want to install all the selected packages?"
 msgstr ""
-"¦w¸Ë®M¥ó®Éµo¥Í¤F¤U­±ªº¿ù»~¡G\n"
-"\n"
-"%s"
+"ĵ§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"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "½Ðµy«á¡A¥¿¦b²¾°£´C¤¶¨Ó·½..."
+msgid "Too many packages are selected"
+msgstr "¿ï¨ú¤Ó¦h¤F®M¥ó¶µ¥Ø"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "±K½X¡G"
+msgid "Maximum information"
+msgstr "§¹¾ã¸ê°T"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr ""
+msgid "Normal information"
+msgstr "¤@¯ë¸ê°T"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Taiwan"
-msgstr "¥xÆW"
+msgid "Update source(s)"
+msgstr "§ó·s¨Ó·½"
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "User:"
-msgstr "¨Ï¥ÎªÌ¦WºÙ¡G"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reload the packages list"
+msgstr "­«·s¸ü¤J®M¥ó²M³æ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "½Ðµy«á¡A§ó·s´C¤¶¤¤..."
+msgid "Reset the selection"
+msgstr "­«¸m¿ï¨ú¶µ¥Ø"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "in files"
+msgstr "¨ÌÀÉ®×"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, listing packages..."
-msgstr ""
-"½Ðµy­Ô\n"
-"±Æ§Ç®M¥ó"
+msgid "in descriptions"
+msgstr "´y­z"
 
 #: ../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 "in names"
+msgstr "¨Ì¦WºÙ"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Information on packages"
-msgstr "¿ï¾Ü®M¥ó"
+#, c-format
+msgid "by update availability"
+msgstr "¨Ì¥i¨Ñ§ó·s¤ÀÃþ"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "¨ú®ø"
+msgid "by source repository"
+msgstr "¨Ì¨Ó·½­ÜÀx¤ÀÃþ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "©Ò¦³¶µ¥Ø¤w¸g³£¦w¸Ë¦¨¥\¤F¡C"
+msgid "by selection state"
+msgstr "¨Ì¿ï¾Üª¬ºA¤ÀÃþ"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "½Ðµy«á¡A§ó·s´C¤¶¤¤..."
+msgid "by size"
+msgstr "¨Ì¤j¤p¤ÀÃþ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "by group"
+msgstr "¨Ì¸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 ""
-"¤U¦Cªº®M¥ó»Ý­n¶¶«K²¾°£¡A¥H«K©ó¯à°÷¶i¦æ¨ä¥L®M¥óªº¦w¸Ë§ó·s¡G\n"
-"\n"
-"%s\n"
-"\n"
-"±z½T©w­nÄ~Äò¶Ü¡H"
+msgid "All packages,"
+msgstr "©Ò¦³®M¥ó¡A"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
+msgstr "©Ò¦³®M¥ó¡A¨Ì·Ó¦r¥À¶¶§Ç¤ÀÃþ"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
+msgstr "Mandrake ¤ÀÃþ"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "in descriptions"
+msgid "Normal updates"
+msgstr "¥¿±`§ó·s"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Bugfixes updates"
+msgstr "Åã¥Ü­×¥¿¿ù»~ªº§ó·s®M¥ó"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Security updates"
+msgstr "Åã¥Ü¦w¥þ§ó·s®M¥ó"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Description: "
 msgstr "´y­z"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "³]©w¥N²z¦øªA¾¹"
+msgid "Reason for update: "
+msgstr "§ó·sªº­ì¦]¡G "
 
-#: ../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 ""
-"¦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
+#, fuzzy, c-format
+msgid "Summary: "
+msgstr "ºK­n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "½Ð¿ï¾Ü"
+msgid "Importance: "
+msgstr "­«­n©Ê¡G "
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Selected size: %d MB"
-msgstr "¿ï¾Ü¤F %d ­Ó®M¥ó¡G%.1f MB"
+msgid "%s KB"
+msgstr "%.1f KB"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Add a source"
-msgstr "·s¼W¨Ó·½¡G"
+msgid "Size: "
+msgstr "¤j¤p"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Version: "
+msgstr "ª©¥»¡G"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Name: "
+msgstr "¦WºÙ¡G %s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "ªì©l¤Æ¤¤..."
+msgid "Currently installed version: "
+msgstr "¥Ø«e¤w¦w¸Ëªºª©¥»¡G"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Source: "
+msgstr "¨Ó·½"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "Àx¦sÅܧó"
+msgid "(Not available)"
+msgstr "(µLªk¨Ï¥Î)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
-msgstr "¤U¸üµo¥Í¿ù»~"
+msgid "Changelog:\n"
+msgstr "Åܧó¬ö¿ý¡G\n"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "¥¿¦b·Ç³Æ¦w¸Ë"
+msgid "Files:\n"
+msgstr "/ÀÉ®× (_F)"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Selected size: %d MB"
+msgstr "¿ï¾Ü¤F %d ­Ó®M¥ó¡G%.1f MB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Importance: "
-msgstr "­«­n©Ê¡G "
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "¤w¿ï¾Ü¡G%d MB / ¥i¥ÎºÏºÐªÅ¶¡¡G%d MB"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
 msgstr ""
-"¬°¤F¯à°÷º¡¨¬¬Û¨Ì©Êªº­n¨D¡A¤U­±ªº®M¥ó¤]¥²¶·¤@¦P¦w¸Ë¤W¡G\n"
+"¥Ñ©ó¬Û¨Ì©Êªº­n¨D¡A¤U­±ªº®M¥ó±N·|¨ú®ø¿ï¨ú¥H«K©ó¯à°÷Ä~Äò¶i¦æ¤U¥h¡G\n"
 "\n"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Add..."
-msgstr "·s¼W..."
+#: ../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"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Unable to create medium."
-msgstr "µLªk«Ø¥ß´C¤¶¶µ¥Ø¡C"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
+msgstr " »P %s-%s-%s ¨R¬ð"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be installed"
+msgstr "®M¥ó '%s' µLªk³Q¦w¸Ë\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\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"
+"¬°¤F¯à°÷º¡¨¬¬Û¨Ì©Êªº­n¨D¡A¤U­±ªº®M¥ó¤]¥²¶·¤@¦P¦w¸Ë¤W¡G\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"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Browse..."
-msgstr "ÂsÄý..."
+msgid "Additional packages needed"
+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.pm:1
-#, c-format
-msgid "Info..."
-msgstr "¸ê°T..."
+#: ../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"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "½Ð´¡¤J´C¤¶¸Ë¸m«áÄ~Äò"
+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 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Remove"
-msgstr "²¾°£"
+msgid "Some additional packages need to be removed"
+msgstr "¬°¤F¥i¥H¥þ­±¹B§@¥¿±`³o¨ÇÃB¥~ªº®M¥ó¥²¶·¤@¦P¦w¸Ë"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "¥¿¦b·Ç³Æ¦w¸Ë"
+#, c-format
+msgid "More information on package..."
+msgstr "§ó¦h¸Ó®M¥ó¸ê°T..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No mirror"
-msgstr "¬M®g¡G"
+msgid "Information on packages"
+msgstr "¿ï¾Ü®M¥ó"
 
-#: ../edit-urpm-sources.pl:1
+#. -PO: Keep it short, this is gonna be on a button
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "±z¦Ü¤Ö»Ý­n¿é¤J«e­±¨â­Ó¶µ¥Ø¡C"
+msgid "More info"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "¦w¸Ë"
+msgid "Addable"
+msgstr "¥i¨Ñ¥[¤J"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Japan"
-msgstr "¤é¥»"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Upgradable"
+msgstr "§ó·s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "¨S¦³¶i¦æ¥ô¦ó°Ê§@"
+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:1
 #, fuzzy, c-format
@@ -684,346 +723,381 @@ msgid "No update"
 msgstr "§ó·s"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Description: "
-msgstr "´y­z"
+#, c-format
+msgid "(none)"
+msgstr "(µL)"
 
 #: ../rpmdrake:1
-#, c-format
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+#, fuzzy, c-format
+msgid "Please wait, listing packages..."
 msgstr ""
-"¦w¸Ë¥¢±Ñ¡C¦w¸Ëµ{¦¡§ä¤£¨ì¤@¨Ç­n¦w¸Ë¤Wªºµ{¦¡®M¥ó¡C\n"
-"¤]³\¬O¨t²Î¸ê®Æ®w¤Ó¤F¡A½Ð¥ý§ó·s¸ê®Æ®w«á¦AÄ~Äò¡C"
+"½Ðµy­Ô\n"
+"±Æ§Ç®M¥ó"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "unknown package "
+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?"
-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"
+msgid "One of the following packages is needed:"
+msgstr "±N»Ý­n¤U¦Cªº¨ä¤¤¤§¤@®M¥ó¡G"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Name: "
-msgstr "¦WºÙ¡G %s"
+#, c-format
+msgid "Please choose"
+msgstr "½Ð¿ï¾Ü"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "Àˬd..."
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "¥¿¦b·Ç³Æ¦w¸Ë"
+msgid "Not selected"
+msgstr "°»´ú¨ì¬Û½Ä¬ðªº¸ê°T"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Selected"
+msgstr ""
+"¥þ\n"
+"¿ï "
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "¿D¬w"
+msgid "Search results"
+msgstr "·j´Mµ²ªG"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Installation finished"
-msgstr "¤w¦w¸Ë"
+#, c-format
+msgid "Stop"
+msgstr "°±¤î"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by update availability"
-msgstr "¨Ì¥i¨Ñ§ó·s¤ÀÃþ"
+msgid "Please wait, searching..."
+msgstr "½Ðµy­Ô¡A·j´M¤¤..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Poland"
-msgstr "ªiÄõ"
+msgid "Search results (none)"
+msgstr "·j´Mµ²ªG (µL¥ô¦ó²Å¦Xªº¶µ¥Ø)"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Version: "
-msgstr "ª©¥»¡G"
+#, c-format
+msgid "Other"
+msgstr "¨ä¥L"
 
 #: ../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"
+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"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Àx¦s¨ÃÂ÷¶}"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Editing source \\\"%s\\\":"
-msgstr "½s¿è¨Ó·½ \"%s\"¡G"
+msgid "Proxy..."
+msgstr "¿ù»~..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Upgradable"
+msgid "Update..."
 msgstr "§ó·s"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid " done."
-msgstr ""
+msgid "Add..."
+msgstr "·s¼W..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "¥¿¦b·Ç³Æ¦w¸Ë"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "½s¿è"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr ""
+msgid "Source"
+msgstr "¨Ó·½"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "»Ý­nÃB¥~ªº®M¥ó¶µ¥Ø"
+msgid "Enabled?"
+msgstr "¶}±Ò"
 
-#: ../rpmdrake:1
+#: ../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
 #, fuzzy, c-format
-msgid "Bugfixes updates"
-msgstr "Åã¥Ü­×¥¿¿ù»~ªº§ó·s®M¥ó"
+msgid "User:"
+msgstr "¨Ï¥ÎªÌ¦WºÙ¡G"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
+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"
+
+#: ../edit-urpm-sources.pl: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"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Germany"
-msgstr "¼w°ê"
+msgid "Configure proxies"
+msgstr "³]©w¥N²z¦øªA¾¹"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Russia"
-msgstr "Ĭ«X"
+msgid "Please wait, updating medium..."
+msgstr "½Ðµy«á¡A§ó·s´C¤¶¤¤..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Norway"
-msgstr "®¿«Â"
+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"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "¦w¸Ë®Éµo¥Í°ÝÃD"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
+msgstr "½Ð´¡¤J´C¤¶¸Ë¸m«áÄ~Äò"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Search"
-msgstr "´M§ä"
+msgid "Save changes"
+msgstr "Àx¦sÅܧó"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "synthesis/hdlist Àɮתº¬Û¹ï¸ô®|¡G"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL¡G"
+
+#: ../edit-urpm-sources.pl: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¥ó¨Ó·½"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Czech Republic"
-msgstr "±¶§J¦@©M°ê"
+msgid "Please wait, removing medium..."
+msgstr "½Ðµy«á¡A¥¿¦b²¾°£´C¤¶¨Ó·½..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Stop"
-msgstr "°±¤î"
+msgid "Type of source:"
+msgstr "¨Ó·½Ãþ§O¡G"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "§ó·s"
+msgid "Adding a source:"
+msgstr "·s¼W¨Ó·½¡G"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, removing packages..."
+#: ../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 ""
-"½Ðµy­Ô\n"
-"±Æ§Ç®M¥ó"
+"¸Ó´C¤¶¸Ë¸m¶µ¥Ø¤w¸g¦s¦b¤F¡A\n"
+"±z½T©w­n¸m´«­ì¥»¶µ¥Ø¶Ü¡H"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal information"
-msgstr "¤@¯ë¸ê°T"
+msgid "You need to fill up at least the two first entries."
+msgstr "±z¦Ü¤Ö»Ý­n¿é¤J«e­±¨â­Ó¶µ¥Ø¡C"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "¥¿¦b¤U¸ü¡u%s¡v(%s/%s)..."
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Name:"
+msgstr "¦WºÙ"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "¤w¿ï¾Ü¡G%d MB / ¥i¥ÎºÏºÐªÅ¶¡¡G%d MB"
+msgid "Login:"
+msgstr "µn¤J¡G"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Spain"
-msgstr "¦è¯Z¤ú"
+msgid "Choose a mirror..."
+msgstr "¿ï¾Ü¬M®g¦a§}..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Normal updates"
-msgstr "¥¿±`§ó·s"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Browse..."
+msgstr "ÂsÄý..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by selection state"
-msgstr "¨Ì¿ï¾Üª¬ºA¤ÀÃþ"
+msgid "Path or mount point:"
+msgstr "¸ô®|©Î¬O±¾¸üÂI¡G"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr "½Ðµy«á¡A¥¿¦b¥Ñ MandrakeSoft Á`³¡¨ú¦^¬M®g¯¸¥x²M³æ¡C"
+msgid "Removable device"
+msgstr "¥i²¾°£¸Ë¸m"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Login:"
-msgstr "µn¤J¡G"
+msgid "HTTP server"
+msgstr "HTTP ¥D¾÷"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Austria"
-msgstr "¶ø¦a§Q"
+msgid "FTP server"
+msgstr "FTP ¥D¾÷"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Àɮ׿ù»~"
+msgid "Path:"
+msgstr "°ð¸¹¡G"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "½Ð¿ï¾Ü±z­n§ó·sªº¨Ó·½¡G"
+msgid "Local files"
+msgstr "¥»¾÷ÀÉ®×"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Update..."
-msgstr "§ó·s"
+msgid "Add a source"
+msgstr "·s¼W¨Ó·½¡G"
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "½T»{ '%s' ®M¥óªºÃ±¦W¸ê°T"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "(none)"
-msgstr "(µL)"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
 msgid ""
-"Removing these packages would break your system, sorry:\n"
+"Unable to update medium; it will be automatically disabled.\n"
 "\n"
-msgstr "©êºp¡A­Y¬O²¾°£¤U­±³o¨Ç®M¥ó¥i¯à·|Åý±zªº¨t²Î¥X¿ù¡G\n"
+"Errors:\n"
+"%s"
+msgstr "µLªk§ó·s´C¤¶¡A¸Ó¶µ¥Ø±N·|¼È®É¦Û°ÊÃö³¬¡C"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "¥¿¦b¦w¸Ë®M¥ó '%s (%s/%s)..."
+msgid "Unable to create medium."
+msgstr "µLªk«Ø¥ß´C¤¶¶µ¥Ø¡C"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "¥Ø«e¤w¦w¸Ëªºª©¥»¡G"
+msgid "Update"
+msgstr "§ó·s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Other"
-msgstr "¨ä¥L"
+msgid "Select the source(s) you wish to update:"
+msgstr "½Ð¿ï¾Ü±z­n§ó·sªº¨Ó·½¡G"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Reason for update: "
-msgstr "§ó·sªº­ì¦]¡G "
+msgid "Please wait, updating media..."
+msgstr "½Ðµy«á¡A§ó·s´C¤¶¤¤..."
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Please choose the desired mirror."
-msgstr ""
-"½Ðµy­Ô\n"
-"¥¿¦b¨ú¦^¬M®g¦a§}ªº²M³æ"
+msgid " failed!"
+msgstr "¨ÌÀÉ®×"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "½s¿è"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, finding available packages..."
+msgid " done."
 msgstr ""
-"½Ðµy­Ô\n"
-"±Æ§Ç®M¥ó"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "synthesis/hdlist Àɮתº¬Û¹ï¸ô®|¡G"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Search results (none)"
-msgstr "·j´Mµ²ªG (µL¥ô¦ó²Å¦Xªº¶µ¥Ø)"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Danmark"
-msgstr "¤¦³Á"
+msgid "Download of `%s', speed:%s"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "China"
-msgstr "¤¤°ê¤j³°"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr ""
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "United States"
-msgstr "¬ü°ê"
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "changes:"
-msgstr "Àx¦sÅܧó"
+msgid "Starting download of `%s'..."
+msgstr "½T»{ '%s' ®M¥óªºÃ±¦W¸ê°T"
 
-#: ../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 "Examining distant file of source `%s'..."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Examining file of source `%s'..."
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No"
-msgstr "§_"
+msgid "Copying file for source `%s'..."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Summary: "
-msgstr "ºK­n"
+msgid "Please choose the desired mirror."
+msgstr ""
+"½Ðµy­Ô\n"
+"¥¿¦b¨ú¦^¬M®g¦a§}ªº²M³æ"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "¥[®³¤j"
+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"
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Greece"
-msgstr "§Æþ"
+#, fuzzy, c-format
+msgid "No mirror"
+msgstr "¬M®g¡G"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1040,252 +1114,178 @@ msgstr ""
 "¤]³\¬Oºô¸ô³s½u¥¢±Ñ¡A©ÎªÌ¬O MandrakeSoft ¯¸¥x¼È®ÉµLªkÁpô¤W¡A\n"
 "½Ðµy«á¦A¸Õ¡C"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Source: "
-msgstr "¨Ó·½"
-
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%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"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Path:"
-msgstr "°ð¸¹¡G"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during removal"
-msgstr "¦w¸Ë®Éµo¥Í°ÝÃD"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "by source repository"
-msgstr "¨Ì¨Ó·½­ÜÀx¤ÀÃþ"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Selected"
-msgstr ""
-"¥þ\n"
-"¿ï "
+msgid "Error during download"
+msgstr "¤U¸üµo¥Í¿ù»~"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Netherlands"
-msgstr "²üÄõ"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Addable"
-msgstr "¥i¨Ñ¥[¤J"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "½Ðµy«á¡A¥¿¦b¥Ñ MandrakeSoft Á`³¡¨ú¦^¬M®g¯¸¥x²M³æ¡C"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "(Not available)"
-msgstr "(µLªk¨Ï¥Î)"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
 "\n"
-"%s"
+"Is it ok to continue?"
 msgstr ""
-"©êºp¡A¤U­±ªº®M¥ó¶µ¥Ø±N¤£¯à°÷³Q¿ï¨ú¡G\n"
+"¦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
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr "°»´ú¨ì¬Û½Ä¬ðªº¸ê°T"
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "²¾°£®M¥óµ{¦¡"
+msgid "United States"
+msgstr "¬ü°ê"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Sweden"
-msgstr "·ç¨å"
+msgid "China"
+msgstr "¤¤°ê¤j³°"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
-msgstr ""
+msgid "United Kingdom"
+msgstr "Áp¦X°ê"
 
-#: ../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."
-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"
+msgid "Taiwan"
+msgstr "¥xÆW"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr ""
+msgid "Sweden"
+msgstr "·ç¨å"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "±N»Ý­n¤U¦Cªº¨ä¤¤¤§¤@®M¥ó¡G"
+msgid "Russia"
+msgstr "Ĭ«X"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Quit"
-msgstr "Â÷¶}"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Portugal"
+msgstr "°ð¸¹¡G"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 ""
-"¦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"
+msgid "Poland"
+msgstr "ªiÄõ"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Ok"
-msgstr "½T©w"
+msgid "Norway"
+msgstr "®¿«Â"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "½Ðµy«á¡A¥¿¦b¥[¤J´C¤¶¨Ó·½..."
+msgid "Netherlands"
+msgstr "²üÄõ"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Korea"
+msgstr "±j­¢"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Type of source:"
-msgstr "¨Ó·½Ãþ§O¡G"
+msgid "Japan"
+msgstr "¤é¥»"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Please insert the medium named \\\"%s\\\" on device [%s]"
-msgstr "½Ð¸m¤J´C¤¶¦WºÙ¬° \"%s\" ªº¶µ¥Ø©ñ¸m©ó %s ¸Ë¸m"
+msgid "Italy"
+msgstr "¦w¸Ë"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Unable to get source packages."
-msgstr "¿ï¾Ü®M¥ó"
+msgid "Israel"
+msgstr "¦w¸Ë"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "¿ï¨ú¤Ó¦h¤F®M¥ó¶µ¥Ø"
+msgid "Greece"
+msgstr "§Æþ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr " »P %s-%s-%s ¨R¬ð"
+msgid "France"
+msgstr "±j­¢"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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 "Finland"
+msgstr "ªâÄõ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Mandrake ¤ÀÃþ"
+msgid "Spain"
+msgstr "¦è¯Z¤ú"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm: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"
+msgid "Danmark"
+msgstr "¤¦³Á"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Åܧó¬ö¿ý¡G\n"
+msgid "Germany"
+msgstr "¼w°ê"
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Korea"
-msgstr "±j­¢"
+#, c-format
+msgid "Czech Republic"
+msgstr "±¶§J¦@©M°ê"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Removable device"
-msgstr "¥i²¾°£¸Ë¸m"
+msgid "Costa Rica"
+msgstr "­ô´µ¤j¾¤¥["
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Canada"
+msgstr "¥[®³¤j"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
+msgstr "¤Ú¦è"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "¤ñ§Q®É"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Change medium"
-msgstr "Åܧó´C¤¶"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Mandrake Update"
-msgstr "MandrakeUpdate ½s¦n³]©w"
+msgid "Australia"
+msgstr "¿D¬w"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "by size"
-msgstr "¨Ì¤j¤p¤ÀÃþ"
+msgid "Austria"
+msgstr "¶ø¦a§Q"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "FTP server"
-msgstr "FTP ¥D¾÷"
+msgid "Info..."
+msgstr "¸ê°T..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Files:\n"
-msgstr "/ÀÉ®× (_F)"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
+msgstr "§_"
 
 #: ../rpmdrake.pm: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"
+#, c-format
+msgid "Yes"
+msgstr "¬O"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"