updated pot file

author: Pablo Saratxaga <pablo@mandriva.com> 2003-05-13 11:06:35 +0000
committer: Pablo Saratxaga <pablo@mandriva.com> 2003-05-13 11:06:35 +0000
commit: 44998a5b27c8932a0d5b5a5759bf193e2cf600c3 (patch)
tree: 3c62effb1bde959ed7dfea2f25f2409defb4b024
parent: e4c4b187dd9d69c422d4e7e1318104fc98034b4b (diff)
download: rpmdrake-44998a5b27c8932a0d5b5a5759bf193e2cf600c3.tar
rpmdrake-44998a5b27c8932a0d5b5a5759bf193e2cf600c3.tar.gz
rpmdrake-44998a5b27c8932a0d5b5a5759bf193e2cf600c3.tar.bz2
rpmdrake-44998a5b27c8932a0d5b5a5759bf193e2cf600c3.tar.xz
rpmdrake-44998a5b27c8932a0d5b5a5759bf193e2cf600c3.zip
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 "ĳ����"
+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 "ĳ����"
 
-#: ../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
	Commit message (Expand)	Author	Age	Files	Lines
*	[ticket/12610] Correctly handle empty cache	Tristan Darricau	2016-12-03	1	-0/+21
*	[ticket/13361] Rename exception to runtime_exception	Tristan Darricau	2015-01-21	2	-4/+4
*	[ticket/13361] Add tests	Tristan Darricau	2015-01-11	1	-2/+4
*	[ticket/13361] Improve the exception listener	Tristan Darricau	2014-11-23	3	-0/+149
author	Pablo Saratxaga <pablo@mandriva.com>	2003-05-13 11:06:35 +0000
committer	Pablo Saratxaga <pablo@mandriva.com>	2003-05-13 11:06:35 +0000
commit	44998a5b27c8932a0d5b5a5759bf193e2cf600c3 (patch)
tree	3c62effb1bde959ed7dfea2f25f2409defb4b024
parent	e4c4b187dd9d69c422d4e7e1318104fc98034b4b (diff)
download	rpmdrake-44998a5b27c8932a0d5b5a5759bf193e2cf600c3.tar rpmdrake-44998a5b27c8932a0d5b5a5759bf193e2cf600c3.tar.gz rpmdrake-44998a5b27c8932a0d5b5a5759bf193e2cf600c3.tar.bz2 rpmdrake-44998a5b27c8932a0d5b5a5759bf193e2cf600c3.tar.xz rpmdrake-44998a5b27c8932a0d5b5a5759bf193e2cf600c3.zip