110 files changed, 59638 insertions, 46863 deletions

diff --git a/po/Makefile b/po/Makefile
index bf265175..11cf9608 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -3,10 +3,7 @@ PGOAL = rpmdrake
 
 # perl files to search translatable strings in
 PL_FILES = ../rpmdrake ../edit-urpm-sources.pl ../rpmdrake.pm
-# C-like files to search translatable strings in
-#CFILES = 
 
-PL_CFILES = $(PL_FILES:%=%_.c)
 POFILES = $(shell ls *.po)
 MOFILES = $(POFILES:%.po=%.mo)
 LANGS = $(POFILES:%.po=%)
@@ -24,9 +21,6 @@ all: $(PGOAL).pot $(MOFILES)
 	@if [ -z "`echo $(IGNOREPOMS) | grep $<`" ]; then cat $< "$<"m >> "$<"f; else cp $< "$<"f; fi
 	msgfmt -o $@ "$<"f
 
-$(PL_CFILES): %_.c: %
-	../grpmi/po/fake_c.pl $< > $@
-
 merge: $(PGOAL).pot
 	@for n in $(POFILES); do \
 		echo "Merging $$n"; \
@@ -35,12 +29,10 @@ merge: $(PGOAL).pot
 		./get_from_compssusers.pl "$$n" > "$$n"m; \
 	done
 
-$(PGOAL).pot: $(PL_CFILES) $(CFILES)
-	INTLTOOL_EXTRACT=./intltool-extract ./intltool-update --gettext-package rpmdrake --pot
-	xgettext -j -F -n --add-comments='-PO' \
-	--keyword=_ --keyword=__ --keyword=N_ --keyword=N \
-	--language=C -o $@ $(PL_CFILES) $(CFILES)
-	@rm -rf $(PL_CFILES)
+$(PGOAL).pot: $(PL_FILES)
+	INTLTOOL_EXTRACT=./intltool-extract ./intltool-update --gettext-package desktopstuff --pot
+	perl_checker -q --generate-pot rpmdrake_tmp.pot $(PL_FILES)
+	msgcat rpmdrake_tmp.pot desktopstuff.pot > $@
 
 install:
 	for l in $(LANGS); do \
@@ -49,5 +41,5 @@ install:
 	done
 
 clean:
-	@rm -rf *.mo *.pof $(POFILES:%=%t) $(PL_CFILES) $(PGOAL).pot
+	@rm -rf *.mo *.pof $(POFILES:%=%t) $(PL_CFILES) $(PGOAL).pot desktopstuff.pot rpmdrake_tmp.pot
 
diff --git a/po/af.po b/po/af.po
index cfd977c0..00fa2f07 100644
--- a/po/af.po
+++ b/po/af.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2003-01-19 16:57+0100\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\n"
 "PO-Revision-Date: Wed Sep 27 2000 10:18:51+0200\n"
 "Last-Translator: Schalk W. Cronjé <schalkc@ntaba.co.za>\n"
 "Language-Team: Afrikaans <lia@af.org.za>\n"
@@ -16,931 +16,1162 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KTranslator v 0.6.0\n"
 
-#: ../edit-urpm-sources.pl_.c:39
-msgid "Unable to create medium."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:40
-msgid "Unable to update medium; it will be automatically disabled."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to the software installation tool!\n"
+"\n"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:51
-#, fuzzy
-msgid "Add a source"
-msgstr "Media"
+#: ../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 ""
 
-#
-#: ../edit-urpm-sources.pl_.c:52
-#, fuzzy
-msgid "Local files"
-msgstr "Plaaslik"
+#: ../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_.c:52
-#, fuzzy
-msgid "Path:"
-msgstr "Poort:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr "Daar was probleme tydens installasie"
 
-#: ../edit-urpm-sources.pl_.c:53
-msgid "FTP server"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during removal"
+msgstr "Daar was probleme tydens installasie"
 
-#: ../edit-urpm-sources.pl_.c:53 ../edit-urpm-sources.pl_.c:54
-#: ../edit-urpm-sources.pl_.c:56 ../edit-urpm-sources.pl_.c:175
-msgid "URL:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, removing packages..."
 msgstr ""
+"Wag asb.\n"
+"Pakkette word verwyder"
 
-#: ../edit-urpm-sources.pl_.c:54
-msgid "HTTP server"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, reading packages database..."
 msgstr ""
+"Wag asb.\n"
+"Pakkette word verwyder"
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Path or mount point:"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr "Daar was probleme tydens installasie"
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Removable device"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during installation"
+msgstr "Daar was probleme tydens installasie"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:56 ../rpmdrake_.c:548
-#, fuzzy
-msgid "Security updates"
-msgstr "Vertoon slegs sekuriteitsopgraderings"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:67
-msgid "Browse..."
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:69
-msgid "Choose a mirror..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:89
-msgid "Login:"
-msgstr "Inteken:"
+#: ../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 ""
 
-#: ../edit-urpm-sources.pl_.c:89 ../edit-urpm-sources.pl_.c:215
-msgid "Password:"
-msgstr "Wagwoord:"
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:94
-msgid "Name:"
-msgstr "Naam:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"some packages failed to install\n"
+"correctly"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:96 ../edit-urpm-sources.pl_.c:176
-msgid "Relative path to synthesis/hdlist:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, removing packages to allow others to be upgraded..."
 msgstr ""
+"Wag asb.\n"
+"Pakkette word verwyder"
 
-#: ../edit-urpm-sources.pl_.c:104
-msgid "You need to fill up at least the two first entries."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:116
-#, fuzzy
-msgid "Adding a source:"
-msgstr "Media"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Installation failed"
+msgstr "Besig met installasie "
 
-#: ../edit-urpm-sources.pl_.c:117
-#, fuzzy
-msgid "Type of source:"
-msgstr "Tipes media:"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
+msgstr "Kanselleer"
 
-#: ../edit-urpm-sources.pl_.c:121 ../edit-urpm-sources.pl_.c:187
-#: ../edit-urpm-sources.pl_.c:219 ../rpmdrake.pm_.c:97 ../rpmdrake.pm_.c:136
-#: ../rpmdrake.pm_.c:319 ../rpmdrake_.c:353 ../rpmdrake_.c:365
-#: ../rpmdrake_.c:369 ../rpmdrake_.c:916 ../rpmdrake_.c:950
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:180
-#: ../edit-urpm-sources.pl_.c:187 ../edit-urpm-sources.pl_.c:220
-#: ../rpmdrake.pm_.c:319 ../rpmdrake.pm_.c:352 ../rpmdrake_.c:353
-#: ../rpmdrake_.c:950
-msgid "Cancel"
-msgstr "Kanselleer"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr ""
 
-#
-#: ../edit-urpm-sources.pl_.c:140
-#, fuzzy
-msgid "Please wait, adding medium..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
 msgstr ""
-"Wag asb.\n"
-"Media word sorteer"
 
-#
-#: ../edit-urpm-sources.pl_.c:158
-#, fuzzy
-msgid "Please wait, removing medium..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
 msgstr ""
-"Wag asb.\n"
-"Media word sorteer"
 
-#: ../edit-urpm-sources.pl_.c:169
-#, fuzzy
-msgid "Edit a source"
-msgstr "Media"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages."
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:173
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "Media"
+msgid "Installation finished"
+msgstr "Besig met installasie "
 
-#: ../edit-urpm-sources.pl_.c:179
-#, fuzzy
-msgid "Save changes"
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
+msgstr ""
+
+#
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Remove .%s"
+msgstr "Verwyder media"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "changes:"
 msgstr "Pakkette:"
 
-#: ../edit-urpm-sources.pl_.c:185
-msgid "You need to insert the medium to continue"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr ""
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, finding available packages..."
 msgstr ""
+"Wag asb.\n"
+"Pakkette word verwyder"
 
-#: ../edit-urpm-sources.pl_.c:186
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
+"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 ""
 
-#
-#: ../edit-urpm-sources.pl_.c:191
-#, fuzzy
-msgid "Please wait, updating medium..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
 msgstr ""
-"Wag asb.\n"
-"Media word sorteer"
 
-#: ../edit-urpm-sources.pl_.c:202
-#, fuzzy
-msgid "Configure proxies"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
 msgstr ""
-"Dateer\n"
-"media op"
 
-#: ../edit-urpm-sources.pl_.c:207
+#: ../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 ""
 
-#: ../edit-urpm-sources.pl_.c:209
-msgid "Proxy hostname:"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:211
-msgid "You may specify a user/password for the proxy authentication:"
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:213
-msgid "User:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:235
-#, fuzzy
-msgid "Configure sources"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
 msgstr ""
-"Dateer\n"
-"media op"
 
-#: ../edit-urpm-sources.pl_.c:242
-msgid "Enabled?"
+#: ../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 ""
 
-#: ../edit-urpm-sources.pl_.c:243
-msgid "Source"
-msgstr "Bron"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Installation"
+msgstr ""
+
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, c-format
+msgid "Mandrake Update"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
+msgstr ""
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Verlaat"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Install"
+msgstr "Installering:"
 
 #
-#: ../edit-urpm-sources.pl_.c:264 ../rpmdrake_.c:730
-#, fuzzy
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
 msgid "Remove"
 msgstr "Verwyder media"
 
-#: ../edit-urpm-sources.pl_.c:266
-msgid "Edit"
-msgstr ""
+#: ../rpmdrake:1
+#, c-format
+msgid "Search"
+msgstr "Soek"
 
-#: ../edit-urpm-sources.pl_.c:268
-msgid "Add..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:270
-#, fuzzy
-msgid "Update..."
-msgstr "Opgradeer"
-
-#: ../edit-urpm-sources.pl_.c:271
-#, fuzzy
-msgid "Proxy..."
-msgstr "Fout..."
-
-#: ../edit-urpm-sources.pl_.c:274
-msgid "Save and quit"
+#: ../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 ""
 
-#: ../edit-urpm-sources.pl_.c:275 ../rpmdrake_.c:733
-msgid "Quit"
-msgstr "Verlaat"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr ""
 
-#: ../rpmdrake.pm_.c:93
-msgid "Yes"
+#: ../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 ""
 
-#: ../rpmdrake.pm_.c:95
-msgid "No"
+#: ../rpmdrake:1
+#, c-format
+msgid "Too many packages are selected"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:127
-msgid "Info..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:180
-#, fuzzy
-msgid "Austria"
-msgstr "Australia"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Normal information"
+msgstr "Normale opdaterings"
 
-#: ../rpmdrake.pm_.c:181
-msgid "Australia"
-msgstr "Australia"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update source(s)"
+msgstr "Dateer media op"
 
-#: ../rpmdrake.pm_.c:182
-msgid "Belgium"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reload the packages list"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:183
-msgid "Brazil"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:184
-msgid "Canada"
+#
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "in files"
+msgstr "Plaaslik"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "in descriptions"
+msgstr "Beskrywings"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:185
-msgid "Costa Rica"
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:186
-msgid "Czech Republic"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:187
-msgid "Germany"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:188
-msgid "Danmark"
+#: ../rpmdrake:1
+#, c-format
+msgid "by size"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:189 ../rpmdrake.pm_.c:193
-msgid "Greece"
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:190
-msgid "Spain"
+#
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "All packages,"
+msgstr "Verwydering"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:191
-msgid "Finland"
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:192
-#, fuzzy
-msgid "France"
-msgstr "Afdwing"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal updates"
+msgstr ""
 
-#: ../rpmdrake.pm_.c:194
-#, fuzzy
-msgid "Israel"
-msgstr "Installering:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Bugfixes updates"
+msgstr ""
 
-#: ../rpmdrake.pm_.c:195
-#, fuzzy
-msgid "Italy"
-msgstr "Installering:"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Security updates"
+msgstr "Vertoon slegs sekuriteitsopgraderings"
 
-#: ../rpmdrake.pm_.c:196
-msgid "Japan"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Description: "
+msgstr "Beskrywings"
 
-#: ../rpmdrake.pm_.c:197
-#, fuzzy
-msgid "Korea"
-msgstr "Afdwing"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Summary: "
+msgstr "Opsomming"
 
-#: ../rpmdrake.pm_.c:198
-msgid "Netherlands"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Importance: "
+msgstr "Belangrikhied: %s"
 
-#: ../rpmdrake.pm_.c:199
-msgid "Norway"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "%s KB"
+msgstr "%.1f KB"
 
-#: ../rpmdrake.pm_.c:200
-msgid "Poland"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Size: "
+msgstr "Grootte"
 
-#: ../rpmdrake.pm_.c:201
-#, fuzzy
-msgid "Portugal"
-msgstr "Poort:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Version: "
+msgstr "Weergawe:"
 
-#: ../rpmdrake.pm_.c:202
-#, fuzzy
-msgid "Russia"
-msgstr "Asie"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Name: "
+msgstr "Naam:"
 
-#: ../rpmdrake.pm_.c:203
-msgid "Sweden"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
 msgstr ""
 
-#: ../rpmdrake.pm_.c:204
-msgid "Taiwan"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
 msgstr ""
 
-#: ../rpmdrake.pm_.c:205
-msgid "United Kingdom"
-msgstr ""
+#: ../rpmdrake:1
+#, c-format
+msgid "Source: "
+msgstr "Bron: "
 
-#: ../rpmdrake.pm_.c:206
-msgid "China"
+#: ../rpmdrake:1
+#, c-format
+msgid "(Not available)"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:207 ../rpmdrake.pm_.c:208 ../rpmdrake.pm_.c:209
-#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:261
-msgid "United States"
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:274
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Files:\n"
+msgstr "/_Lęer"
 
-#: ../rpmdrake.pm_.c:280
-msgid "Error during download"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Selected size: %d MB"
+msgstr "%d geselekteerde pakkette: %.1f MB"
 
-#: ../rpmdrake.pm_.c:289
-#, fuzzy
-msgid "No mirror"
-msgstr "spieël"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "%d geselekteerde pakkette: %.1f MB"
 
-#: ../rpmdrake.pm_.c:307
-#, fuzzy
-msgid "Please choose the desired mirror."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
 msgstr ""
-"Wag asb.\n"
-"Die databasis vir die %s media word opgedateer"
-
-#: ../rpmdrake.pm_.c:339 ../rpmdrake_.c:627
-#, fuzzy
-msgid "Update source(s)"
-msgstr "Dateer media op"
 
-#: ../rpmdrake.pm_.c:343
-msgid "Select the source(s) you wish to update:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:347
-msgid "Update"
-msgstr "Opgradeer"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be installed"
+msgstr ""
 
-#: ../rpmdrake.pm_.c:358
-#, fuzzy
-msgid "Please wait, updating media..."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
 msgstr ""
-"Wag asb.\n"
-"Media word sorteer"
 
-#: ../rpmdrake_.c:99
-msgid "Other"
+#: ../rpmdrake:1
+#, c-format
+msgid "Additional packages needed"
 msgstr ""
 
-#: ../rpmdrake_.c:121 ../rpmdrake_.c:135 ../rpmdrake_.c:227 ../rpmdrake_.c:298
-msgid "(none)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be removed"
 msgstr ""
 
-#: ../rpmdrake_.c:141 ../rpmdrake_.c:482 ../rpmdrake_.c:483
-msgid "(Not available)"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
 msgstr ""
 
-#: ../rpmdrake_.c:151 ../rpmdrake_.c:208
-#, fuzzy
-msgid "Search results"
-msgstr "Soek"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
+"Om alle afhanklikhede te bevredig moet hierdie\n"
+"pakkette verwyder word:"
 
-#: ../rpmdrake_.c:151
-#, fuzzy
-msgid "Search results (none)"
-msgstr "Soek"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr ""
 
-#: ../rpmdrake_.c:161 ../rpmdrake_.c:172
-#, fuzzy
-msgid "Please wait, searching..."
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
 msgstr ""
-"Wag asb.\n"
-"Pakkette word verwyder"
 
-#: ../rpmdrake_.c:175
-msgid "Stop"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Information on packages"
+msgstr "Kan nie pakket oopmaak nie"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
 msgstr ""
 
 #
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-#, fuzzy
+#: ../rpmdrake:1
+#, fuzzy, c-format
 msgid "Addable"
 msgstr ""
 "Installeer\n"
 "geselekteer"
 
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
+#: ../rpmdrake:1
+#, c-format
 msgid "Upgradable"
 msgstr ""
 
-#
-#: ../rpmdrake_.c:211
-#, fuzzy
-msgid "Not selected"
+#: ../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 ""
-"Deselekteer\n"
-"almal"
 
-#: ../rpmdrake_.c:211
-#, fuzzy
-msgid "Selected"
-msgstr "Kies geen"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "No update"
+msgstr "Dateer media op"
 
-#: ../rpmdrake_.c:240
-msgid "rpmdrake"
-msgstr "rpmdrake"
+#: ../rpmdrake:1
+#, c-format
+msgid "(none)"
+msgstr ""
 
-#: ../rpmdrake_.c:258 ../rpmdrake_.c:360 ../rpmdrake_.c:362
-msgid "More information on package..."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, listing packages..."
 msgstr ""
+"Wag asb.\n"
+"Pakkette word verwyder"
 
-#: ../rpmdrake_.c:259
-#, fuzzy
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "Onbekend"
+
+#: ../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_.c:259
+#: ../rpmdrake:1
+#, c-format
 msgid "Please choose"
 msgstr ""
 
-#: ../rpmdrake_.c:275
-#, fuzzy
-msgid "unknown package "
-msgstr "Onbekend"
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:285
-#, fuzzy
-msgid "Please wait, listing packages..."
+#
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Not selected"
 msgstr ""
-"Wag asb.\n"
-"Pakkette word verwyder"
+"Deselekteer\n"
+"almal"
 
-#: ../rpmdrake_.c:300
-#, fuzzy
-msgid "No update"
-msgstr "Dateer media op"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Selected"
+msgstr "Kies geen"
 
-#: ../rpmdrake_.c:353 ../rpmdrake_.c:354
-msgid "More infos"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Search results"
+msgstr "Soek"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Stop"
 msgstr ""
 
-#: ../rpmdrake_.c:355
-#, fuzzy
-msgid "Information on packages"
-msgstr "Kan nie pakket oopmaak nie"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, searching..."
+msgstr ""
+"Wag asb.\n"
+"Pakkette word verwyder"
 
-#: ../rpmdrake_.c:376
-msgid "Some additional packages need to be removed"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Search results (none)"
+msgstr "Soek"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
 msgstr ""
 
-#: ../rpmdrake_.c:377
-#, fuzzy
+#: ../edit-urpm-sources.pl:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"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 ""
-"Om alle afhanklikhede te bevredig moet hierdie\n"
-"pakkette verwyder word:"
 
-#: ../rpmdrake_.c:383 ../rpmdrake_.c:391
-msgid "Some packages can't be removed"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
 msgstr ""
 
-#: ../rpmdrake_.c:384
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Proxy..."
+msgstr "Fout..."
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Update..."
+msgstr "Opgradeer"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
 msgstr ""
 
-#: ../rpmdrake_.c:392 ../rpmdrake_.c:451
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
 msgstr ""
 
-#: ../rpmdrake_.c:421
-msgid "Additional packages needed"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Source"
+msgstr "Bron"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
 msgstr ""
 
-#: ../rpmdrake_.c:422
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure sources"
 msgstr ""
+"Dateer\n"
+"media op"
 
-#: ../rpmdrake_.c:435
-msgid "Some packages can't be installed"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "Wagwoord:"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
 msgstr ""
 
-#: ../rpmdrake_.c:436
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 
-#: ../rpmdrake_.c:450 ../rpmdrake_.c:684
-msgid "Some packages need to be removed"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+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 ""
 
-#: ../rpmdrake_.c:472
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "%d geselekteerde pakkette: %.1f MB"
+msgid "Configure proxies"
+msgstr ""
+"Dateer\n"
+"media op"
 
-#: ../rpmdrake_.c:474
+#
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Selected size: %d MB"
-msgstr "%d geselekteerde pakkette: %.1f MB"
+msgid "Please wait, updating medium..."
+msgstr ""
+"Wag asb.\n"
+"Media word sorteer"
 
-#: ../rpmdrake_.c:482
-#, fuzzy
-msgid "Files:\n"
-msgstr "/_Lęer"
+#: ../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_.c:483
-msgid "Changelog:\n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
 msgstr ""
 
-#: ../rpmdrake_.c:486
-msgid "Source: "
-msgstr "Bron: "
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Save changes"
+msgstr "Pakkette:"
 
-#: ../rpmdrake_.c:487
-msgid "Currently installed version: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
 msgstr ""
 
-#: ../rpmdrake_.c:491
-msgid "Reason for update: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
 msgstr ""
 
-#: ../rpmdrake_.c:493
-#, fuzzy
-msgid "Name: "
-msgstr "Naam:"
-
-#: ../rpmdrake_.c:494
-#, fuzzy
-msgid "Version: "
-msgstr "Weergawe:"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing source \"%s\":"
+msgstr "Media"
 
-#: ../rpmdrake_.c:495
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "%s KB"
-msgstr "%.1f KB"
+msgid "Edit a source"
+msgstr "Media"
 
-#: ../rpmdrake_.c:495
-#, fuzzy
-msgid "Size: "
-msgstr "Grootte"
+#
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, removing medium..."
+msgstr ""
+"Wag asb.\n"
+"Media word sorteer"
 
-#: ../rpmdrake_.c:497
-#, fuzzy
-msgid "Importance: "
-msgstr "Belangrikhied: %s"
+#
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, adding medium..."
+msgstr ""
+"Wag asb.\n"
+"Media word sorteer"
 
-#: ../rpmdrake_.c:498
-#, fuzzy
-msgid "Summary: "
-msgstr "Opsomming"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Type of source:"
+msgstr "Tipes media:"
 
-#: ../rpmdrake_.c:499
-#, fuzzy
-msgid "Description: "
-msgstr "Beskrywings"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Adding a source:"
+msgstr "Media"
 
-#: ../rpmdrake_.c:548
-msgid "Bugfixes updates"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 msgstr ""
 
-#: ../rpmdrake_.c:548
-msgid "Normal updates"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to fill up at least the two first entries."
 msgstr ""
 
-#: ../rpmdrake_.c:567
-msgid "Mandrake choices"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "Naam:"
 
-#: ../rpmdrake_.c:568
-msgid "All packages, alphabetical"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
+msgstr "Inteken:"
 
-#
-#: ../rpmdrake_.c:569
-#, fuzzy
-msgid "All packages,"
-msgstr "Verwydering"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr ""
 
-#: ../rpmdrake_.c:592
-msgid "by group"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Browse..."
 msgstr ""
 
-#: ../rpmdrake_.c:592
-msgid "by size"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
 msgstr ""
 
-#: ../rpmdrake_.c:593
-msgid "by selection state"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Removable device"
 msgstr ""
 
-#: ../rpmdrake_.c:594
-msgid "by source repository"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "HTTP server"
 msgstr ""
 
-#: ../rpmdrake_.c:594
-msgid "by update availability"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
 msgstr ""
 
-#: ../rpmdrake_.c:615
-#, fuzzy
-msgid "in descriptions"
-msgstr "Beskrywings"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Path:"
+msgstr "Poort:"
 
 #
-#: ../rpmdrake_.c:615
-#, fuzzy
-msgid "in files"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Local files"
 msgstr "Plaaslik"
 
-#: ../rpmdrake_.c:615
-msgid "in names"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a source"
+msgstr "Media"
 
-#: ../rpmdrake_.c:626
-msgid "Reload the packages list"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
 msgstr ""
 
-#: ../rpmdrake_.c:626
-msgid "Reset the selection"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to create medium."
 msgstr ""
 
-#: ../rpmdrake_.c:652
-msgid "Maximum information"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Please wait, updating media..."
 msgstr ""
+"Wag asb.\n"
+"Media word sorteer"
 
-#: ../rpmdrake_.c:652
-#, fuzzy
-msgid "Normal information"
-msgstr "Normale opdaterings"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
+msgstr "Opgradeer"
 
-#: ../rpmdrake_.c:674
-msgid "Too many packages are selected"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Select the source(s) you wish to update:"
 msgstr ""
 
-#: ../rpmdrake_.c:720
-msgid "Find:"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Please choose the desired mirror."
 msgstr ""
+"Wag asb.\n"
+"Die databasis vir die %s media word opgedateer"
 
-#: ../rpmdrake_.c:725
-msgid "Search"
-msgstr "Soek"
-
-#: ../rpmdrake_.c:731
-#, fuzzy
-msgid "Install"
-msgstr "Installering:"
-
-#: ../rpmdrake_.c:738 data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrake Update"
+#: ../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_.c:738
-msgid "Software Packages Installation"
-msgstr ""
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "No mirror"
+msgstr "spieël"
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Removal"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid ""
+"There was an error downloading the mirrors list:\n"
+"\n"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
 
-#: ../rpmdrake_.c:779
-msgid "Please wait, contacting mirror to update packages information."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
 msgstr ""
 
-#: ../rpmdrake_.c:781
-msgid "Error updating medium"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
 
-#: ../rpmdrake_.c:782
-msgid "There was an unrecoverable error while updating packages information."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake_.c:787
-msgid "How to choose manually your mirror"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United States"
 msgstr ""
 
-#: ../rpmdrake_.c:795
-msgid "Please wait, contacting mirror to initialize updates packages."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
 msgstr ""
 
-#: ../rpmdrake_.c:798
-msgid "Error adding update medium"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
 msgstr ""
 
-#: ../rpmdrake_.c:829
-#, fuzzy
-msgid "Please wait, finding available packages..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
 msgstr ""
-"Wag asb.\n"
-"Pakkette word verwyder"
 
-#: ../rpmdrake_.c:861
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Inspecting %s"
+msgid "Sweden"
 msgstr ""
 
-#: ../rpmdrake_.c:880
-#, fuzzy
-msgid "changes:"
-msgstr "Pakkette:"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Russia"
+msgstr "Asie"
 
-#
-#: ../rpmdrake_.c:884
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Remove .%s"
-msgstr "Verwyder media"
+msgid "Portugal"
+msgstr "Poort:"
 
-#: ../rpmdrake_.c:886
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr ""
-
-#: ../rpmdrake_.c:888
-msgid "Do nothing"
+msgid "Poland"
 msgstr ""
 
-#: ../rpmdrake_.c:900
-#, fuzzy
-msgid "Installation finished"
-msgstr "Besig met installasie "
-
-#: ../rpmdrake_.c:910
-msgid "Inspect..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
 msgstr ""
 
-#: ../rpmdrake_.c:925
-msgid "Program missing"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
 msgstr ""
 
-#: ../rpmdrake_.c:926
-msgid "A required program is missing (grpmi). Check your installation."
-msgstr ""
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Korea"
+msgstr "Afdwing"
 
-#: ../rpmdrake_.c:940
-msgid "Unable to get source packages."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Japan"
 msgstr ""
 
-#: ../rpmdrake_.c:941
-msgid "Unable to get source packages, sorry."
-msgstr ""
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Italy"
+msgstr "Installering:"
 
-#: ../rpmdrake_.c:948
-msgid "Change medium"
-msgstr ""
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Israel"
+msgstr "Installering:"
 
-#: ../rpmdrake_.c:949
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+msgid "Greece"
 msgstr ""
 
-#: ../rpmdrake_.c:957
-#, fuzzy
-msgid "Installation failed"
-msgstr "Besig met installasie "
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "France"
+msgstr "Afdwing"
 
-#: ../rpmdrake_.c:958
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
 msgstr ""
 
-#: ../rpmdrake_.c:961
-#, fuzzy
-msgid "Please wait, removing packages to allow others to be upgraded..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
 msgstr ""
-"Wag asb.\n"
-"Pakkette word verwyder"
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm: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 "Danmark"
 msgstr ""
 
-#: ../rpmdrake_.c:982
-msgid ""
-"some packages failed to install\n"
-"correctly"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
 msgstr ""
 
-#: ../rpmdrake_.c:983
-msgid "everything was installed correctly"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
 msgstr ""
 
-#: ../rpmdrake_.c:985
-msgid "Everything installed successfully"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Costa Rica"
 msgstr ""
 
-#: ../rpmdrake_.c:986
-msgid "All requested packages were installed successfully."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Canada"
 msgstr ""
 
-#: ../rpmdrake_.c:989
-msgid "Everything already installed."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
 msgstr ""
 
-#: ../rpmdrake_.c:990
-msgid "Everything already installed (is this supposed to happen at all?)."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Belgium"
 msgstr ""
 
-#: ../rpmdrake_.c:997
-#, fuzzy
-msgid "Problem during installation"
-msgstr "Daar was probleme tydens installasie"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Australia"
+msgstr "Australia"
 
-#: ../rpmdrake_.c:998
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr "Daar was probleme tydens installasie"
-
-#: ../rpmdrake_.c:1012
-#, fuzzy
-msgid "Please wait, reading packages database..."
-msgstr ""
-"Wag asb.\n"
-"Pakkette word verwyder"
+msgid "Austria"
+msgstr "Australia"
 
-#: ../rpmdrake_.c:1053
-#, fuzzy
-msgid "Please wait, removing packages..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Info..."
 msgstr ""
-"Wag asb.\n"
-"Pakkette word verwyder"
-
-#: ../rpmdrake_.c:1056
-#, fuzzy
-msgid "Problem during removal"
-msgstr "Daar was probleme tydens installasie"
 
-#: ../rpmdrake_.c:1057
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr "Daar was probleme tydens installasie"
-
-#: ../rpmdrake_.c:1089
-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."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
 msgstr ""
 
-#: ../rpmdrake_.c:1094
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
 msgstr ""
 
-#: ../rpmdrake_.c:1099
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
-msgstr ""
+#: data/rpmdrake.desktop.in.h:1
+#, fuzzy
+msgid "Install Software"
+msgstr "Installering:"
 
 #: data/rpmdrake-remove.desktop.in.h:1
 msgid "Remove Software"
@@ -950,11 +1181,6 @@ msgstr ""
 msgid "Software Sources Manager"
 msgstr ""
 
-#: data/rpmdrake.desktop.in.h:1
-#, fuzzy
-msgid "Install Software"
-msgstr "Installering:"
-
 #, fuzzy
 #~ msgid "Update sources"
 #~ msgstr "Dateer media op"
diff --git a/po/af.pom b/po/af.pom
index 19e232e3..548fb286 100644
--- a/po/af.pom
+++ b/po/af.pom
@@ -4,167 +4,177 @@ msgstr "Bediener"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
+msgid "Office Workstation"
+msgstr "Kantoorwerkstasie"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Netwerkrekenaar (kliënt)"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Kantoorprogramme: Woordverwerkers( kword, abiword), spreistate (kspread, "
+"gnumeric), PDF-sigprogramme, ens."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS, SMB, Instaan- , SSH (Bedieners)"
+msgid "Workstation"
+msgstr "Werkstasie"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Kantoor"
+msgid "Game station"
+msgstr "Speletjiesrekenaar"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Gnome werkstasie"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Vermaak: Arkade, Bordspel, Strategie ens."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Nutsprogramme vir PalmPilot en/of Visor"
+msgid "Multimedia station"
+msgstr "Multimediastasie"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Werkstasie"
+msgid "Sound and video playing/editing programs"
+msgstr "Klank- en videospelers/redigeerders"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Vuurmuur/Netwerkroteerder"
+msgid "Internet station"
+msgstr "Internetstasie"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr "Domeinnaam en Netwerk Informasie Bediener (DNS/NIS)"
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
+"Stel hulpprogramme om e-pos en netnuus te lees en te stuur (pine, mutt, tin) "
+"en om ook die web deur te blaai."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
-msgstr ""
-"Kantoorprogramme: Woordverwerkers( kword, abiword), spreistate (kspread, "
-"gnumeric), PDF-sigprogramme, ens."
+msgid "Network Computer (client)"
+msgstr "Netwerkrekenaar (kliënt)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "Klankprogramme: MP3- of MIDI-spelers, mengers, ens."
+msgid "Clients for different protocols including ssh"
+msgstr "Kliëntprogramme vir 'n verkeidenheid protokolle insluitende SSH"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr ""
+msgid "Configuration"
+msgstr "Konfigurasie"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Boeke en HOWTO's oor Linux en Vrye Sagteware"
+msgid "Tools to ease the configuration of your computer"
+msgstr "Hulpprogramme vir u rekenaarkonfigurasie te vergemaklik"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "KDE werkstasie"
+msgid "Scientific Workstation"
+msgstr "Wetenskaplike werkstasie"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, ens."
+msgid "Scientific applications such as gnuplot"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Multimedia - Video"
+msgid "Console Tools"
+msgstr "Konsole hulpprogramme"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr "Hulpprogramme vir e-pos, netnuus, web, FTP en netpraat"
+msgid "Editors, shells, file tools, terminals"
+msgstr ""
+"Redigeerders. teksverwerkers, instruksiedoppe, lęernutsprogramme, "
+"terminaalprogramme"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Datbasis"
+msgid "KDE Workstation"
+msgstr "KDE werkstasie"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL of MySQL databasisbediener"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"Die K-werkskermomgewing (KDE), die basiese grafiese omgewing met 'n "
+"versameling bygaande hulpprogramme"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Hulpprogramme vir u rekenaarkonfigurasie te vergemaklik"
+msgid "Graphical Environment"
+msgstr "Grafiese omgewing"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "Multimedia - Klank"
+msgid "Gnome Workstation"
+msgstr "Gnome werkstasie"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "dokumentasie"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+"'n Grafiese omgewing met  gebruikersvriendelike stel applikasies en "
+"werkskermhulpprogramme"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Konsole hulpprogramme"
+msgid "Other Graphical Desktops"
+msgstr "Ander grafiese werkskerms"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr "Postfix e-posbediener, Inn netnuusbediener"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, ens."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Internetstasie"
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+msgid "Development"
+msgstr "Ontwikkeling"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Multimediastasie"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C en C++ ontwikkelingsprogrammateke, programme en insluitlęers"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Konfigurasie"
+msgid "Documentation"
+msgstr "dokumentasie"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Addisionele grafiese werkskerms (Gnome, IceWM)"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Boeke en HOWTO's oor Linux en Vrye Sagteware"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
+msgid "LSB"
 msgstr ""
-"Die K-werkskermomgewing (KDE), die basiese grafiese omgewing met 'n "
-"versameling bygaande hulpprogramme"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Grafiese omgewing"
+msgid "Linux Standard Base. Third party applications support"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-msgid "Development"
-msgstr "Ontwikkeling"
+msgid "Web/FTP"
+msgstr "Web/FTP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -173,23 +183,33 @@ msgstr "Apache, Pro-ftpd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "Hulpprogramme vir die skep en brand van CDs"
+msgid "Mail/Groupware/News"
+msgstr "E-pos/Groepware/Netnuus"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Kantoorwerkstasie"
+msgid "Postfix mail server, Inn news server"
+msgstr "Postfix e-posbediener, Inn netnuusbediener"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, ens."
+msgid "Database"
+msgstr "Datbasis"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Grafiese programme soos Die GIMP"
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL of MySQL databasisbediener"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Firewall/Router"
+msgstr "Vuurmuur/Netwerkroteerder"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Internet gateway"
+msgstr "Internetpoort"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -198,8 +218,8 @@ msgstr "DNS/NIS "
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C en C++ ontwikkelingsprogrammateke, programme en insluitlęers"
+msgid "Domain Name and Network Information Server"
+msgstr "Domeinnaam en Netwerk Informasie Bediener (DNS/NIS)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -208,18 +228,18 @@ msgstr "Netwerkrekenaarbediener"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "E-pos/Groepware/Netnuus"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS, SMB, Instaan- , SSH (Bedieners)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Speletjiesrekenaar"
+msgid "Office"
+msgstr "Kantoor"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Videospelers en -redigeerders"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr "Hulpprogramme vir e-pos, netnuus, web, FTP en netpraat"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -228,81 +248,66 @@ msgstr "Multimedia - Grafika"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Vermaak: Arkade, Bordspel, Strategie ens."
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
-"Stel hulpprogramme om e-pos en netnuus te lees en te stuur (pine, mutt, tin) "
-"en om ook die web deur te blaai."
+msgid "Graphics programs such as The Gimp"
+msgstr "Grafiese programme soos Die GIMP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "Persoonlike finansies"
+msgid "Multimedia - Sound"
+msgstr "Multimedia - Klank"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
-"'n Grafiese omgewing met  gebruikersvriendelike stel applikasies en "
-"werkskermhulpprogramme"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "Klankprogramme: MP3- of MIDI-spelers, mengers, ens."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Kliëntprogramme vir 'n verkeidenheid protokolle insluitende SSH"
+msgid "Multimedia - Video"
+msgstr "Multimedia - Video"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "LSB"
-msgstr ""
+msgid "Video players and editors"
+msgstr "Videospelers en -redigeerders"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Internetpoort"
+msgid "Multimedia - CD Burning"
+msgstr "Multimedia - CD Sny"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Klank- en videospelers/redigeerders"
+msgid "Tools to create and burn CD's"
+msgstr "Hulpprogramme vir die skep en brand van CDs"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Ander grafiese werkskerms"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Addisionele grafiese werkskerms (Gnome, IceWM)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr ""
-"Redigeerders. teksverwerkers, instruksiedoppe, lęernutsprogramme, "
-"terminaalprogramme"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, ens."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "Programme om u finansies te bestuur, soos GNUcash"
+msgid "Personal Information Management"
+msgstr "Persoonlike Inligtingbestuur."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "Persoonlike Inligtingbestuur."
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Nutsprogramme vir PalmPilot en/of Visor"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multimedia - CD Sny"
+msgid "Personal Finance"
+msgstr "Persoonlike finansies"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Wetenskaplike werkstasie"
+msgid "Programs to manage your finances, such as gnucash"
+msgstr "Programme om u finansies te bestuur, soos GNUcash"
 
diff --git a/po/ar.po b/po/ar.po
index 8f7922cf..ff1df5cc 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-01-21 17:48+0100\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\n"
 "PO-Revision-Date: 2001-11-28 17:26GMT+3\n"
 "Last-Translator: Mohammed Gamal <f2c2001@yahoo.com>\n"
 "Language-Team: Arabic\n"
@@ -15,451 +15,625 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.8\n"
 
-#: ../edit-urpm-sources.pl_.c:39
-msgid "Unable to create medium."
-msgstr "تعذر انشاء الوسيط"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"هل من الممكن المتابعة؟"
 
-#: ../edit-urpm-sources.pl_.c:40
-msgid "Unable to update medium; it will be automatically disabled."
-msgstr "تعذر تحديث الوسيط;  سيتم تعطيله آلياً"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to the software installation tool!\n"
+"\n"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
+msgstr ""
+"أهلا بك في أداة تثبيت البرامج!\n"
+"\n"
+"يأتي نظام Linux Mandrake ألخاص بك مع بضع آلاف من جزم\n"
+"البرمجيات على أقراص CDROM أو DVD. هذه الأداة تسمح لك باختيار البرمجيات\n"
+"التي تريد تثبيتها على جهازك."
 
-#: ../edit-urpm-sources.pl_.c:51
-msgid "Add a source"
-msgstr "أضف مصدر"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"أهلا بك في تحديث Mandrake!\n"
+"\n"
+"هذه الأداة ستساعدك في اختيار التحديثات التي تريد تثبيتها على\n"
+"جهازك."
 
-#: ../edit-urpm-sources.pl_.c:52
-msgid "Local files"
-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"
+"من جهازك."
 
-#: ../edit-urpm-sources.pl_.c:52
-msgid "Path:"
-msgstr "المسار:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"كانت هناك مشكلة أثناء حذف الحزم:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:53
-msgid "FTP server"
-msgstr "خادم FTP"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during removal"
+msgstr "ظهرت مشاكل أثناء الحذف"
 
-#: ../edit-urpm-sources.pl_.c:53 ../edit-urpm-sources.pl_.c:54
-#: ../edit-urpm-sources.pl_.c:56 ../edit-urpm-sources.pl_.c:175
-msgid "URL:"
-msgstr "العنوان:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages..."
+msgstr "انتظر من فضلك, جاري ازالة الحزم..."
 
-#: ../edit-urpm-sources.pl_.c:54
-msgid "HTTP server"
-msgstr "خادم HTTP"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
+msgstr "انتظر من فضلك, جاري قراءة قاعدة بيانات الحزم..."
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Path or mount point:"
-msgstr "المسار أو نقطة التحميل:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"كانت هناك مشكلة أثناء التثبيت:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Removable device"
-msgstr "الأجهزة القابلة للإزالة"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during installation"
+msgstr "ظهرت مشاكل أثناء التثبيت"
 
-#: ../edit-urpm-sources.pl_.c:56 ../rpmdrake_.c:548
-msgid "Security updates"
-msgstr "تحديثات أمنية"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
+msgstr "كل شئ مثبت مسبقا (أليس المفروض أن يحدث هذا؟)"
 
-#: ../edit-urpm-sources.pl_.c:67
-msgid "Browse..."
-msgstr "استؚع؜..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed."
+msgstr "كل شئ مثبت مسبقاً."
 
-#: ../edit-urpm-sources.pl_.c:69
-msgid "Choose a mirror..."
-msgstr "اختار المرآة..."
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "تم تثبيت كل الحزم المطلوبة بنجاح."
 
-#: ../edit-urpm-sources.pl_.c:89
-msgid "Login:"
-msgstr "اسم الدخول:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr "تم تثبيت كل شئ بنجاح"
 
-#: ../edit-urpm-sources.pl_.c:89 ../edit-urpm-sources.pl_.c:215
-msgid "Password:"
-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"
+"يمكنك الآن التحقق من بعضها لكي تقوم بالمطلوب منها:"
 
-#: ../edit-urpm-sources.pl_.c:94
-msgid "Name:"
-msgstr "الإسم:"
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "تم تثبيت كل شئ بشكل صحيح"
 
-#: ../edit-urpm-sources.pl_.c:96 ../edit-urpm-sources.pl_.c:176
-msgid "Relative path to synthesis/hdlist:"
-msgstr "المسار الى ملف التخليق أو hdlist:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"some packages failed to install\n"
+"correctly"
+msgstr ""
+"فشا تثبيت بعض الحزم\n"
+"بشكل صحيح"
 
-#: ../edit-urpm-sources.pl_.c:104
-msgid "You need to fill up at least the two first entries."
-msgstr "يجب عليك ملء الحقلين الأولين على الأقل."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages to allow others to be upgraded..."
+msgstr "انتظر من فضلك, جاري ازالة الحزم للسماح بترقية الحزم الأخرى..."
 
-#: ../edit-urpm-sources.pl_.c:116
-msgid "Adding a source:"
-msgstr "جاري اضافة مصدر"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
+msgstr ""
+"فشل التثبيت, بعض الملفات مفقودة.\n"
+"ربما تحتاج الى تحديث فاعدة بيانات المصادر."
 
-#: ../edit-urpm-sources.pl_.c:117
-msgid "Type of source:"
-msgstr "نوع المصدر:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation failed"
+msgstr "فشل التثبيت"
 
-#: ../edit-urpm-sources.pl_.c:121 ../edit-urpm-sources.pl_.c:187
-#: ../edit-urpm-sources.pl_.c:219 ../rpmdrake.pm_.c:97 ../rpmdrake.pm_.c:136
-#: ../rpmdrake.pm_.c:319 ../rpmdrake_.c:353 ../rpmdrake_.c:365
-#: ../rpmdrake_.c:369 ../rpmdrake_.c:916 ../rpmdrake_.c:950
+#: ../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 "موافق"
 
-#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:180
-#: ../edit-urpm-sources.pl_.c:187 ../edit-urpm-sources.pl_.c:220
-#: ../rpmdrake.pm_.c:319 ../rpmdrake.pm_.c:352 ../rpmdrake_.c:353
-#: ../rpmdrake_.c:950
-msgid "Cancel"
-msgstr "الغاء"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "فضلاً أدخل الوسيط المسمى \"%s\" الى الجهاز [%s]"
 
-#: ../edit-urpm-sources.pl_.c:140
-msgid "Please wait, adding medium..."
-msgstr "انتظر من فضلك, جاري اضافة الوسيط..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr "غير الوسيط"
 
-#: ../edit-urpm-sources.pl_.c:158
-msgid "Please wait, removing medium..."
-msgstr "انتظر من فضلك, جاري اضافة الوسيط...."
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
+msgstr "تعذر ايجاد الحزم المصدرية, عفواً"
 
-#: ../edit-urpm-sources.pl_.c:169
-msgid "Edit a source"
-msgstr "تحرير مصدر"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages."
+msgstr "تعذر الحصول على الحزم المصدرية"
 
-#: ../edit-urpm-sources.pl_.c:173
+#: ../rpmdrake:1
 #, c-format
-msgid "Editing source \"%s\":"
-msgstr "جاري تحرير المصدر \"%s\":"
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr "هناك برنامج ضروري (grpmi) مفقود. تأكد من التثبيت."
 
-#: ../edit-urpm-sources.pl_.c:179
-msgid "Save changes"
-msgstr "احفظ التغييرات"
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
+msgstr "البرنامج مفقود"
 
-#: ../edit-urpm-sources.pl_.c:185
-msgid "You need to insert the medium to continue"
-msgstr "تحتاج الى ادخال الوسيط للمتابعة"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
+msgstr "تحقَّق..."
 
-#: ../edit-urpm-sources.pl_.c:186
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "لكي يتم حفظ التغييرات, تحتاج الى ادخال الوسيط في السواقة."
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation finished"
+msgstr "انتهى التثبيت"
 
-#: ../edit-urpm-sources.pl_.c:191
-msgid "Please wait, updating medium..."
-msgstr "انتظر من فضلك, جاري تحديث الوسيط..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
+msgstr "لا تفعل شيئاً"
 
-#: ../edit-urpm-sources.pl_.c:202
-msgid "Configure proxies"
-msgstr "تهيئة البروكسي"
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
+msgstr "استخدم .%s كملف رئيسي"
 
-#: ../edit-urpm-sources.pl_.c:207
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
-msgstr ""
-"اذا كنت تحتاج الى بروكسي, أدخل اسم المستضيف و المنفذ (على الشكل التالي: <اسم "
-"المستضيف[:المنفذ[>):"
+#: ../rpmdrake:1
+#, c-format
+msgid "Remove .%s"
+msgstr "احذف .%s"
 
-#: ../edit-urpm-sources.pl_.c:209
-msgid "Proxy hostname:"
-msgstr "اسم مستضيف البروكسي"
+#: ../rpmdrake:1
+#, c-format
+msgid "changes:"
+msgstr "التغييرات:"
 
-#: ../edit-urpm-sources.pl_.c:211
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "يجب عليك تحديد امس مستخدم/كلمة مرور للمصادقة في البروكسي:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr "جاري التحقق من %s"
 
-#: ../edit-urpm-sources.pl_.c:213
-msgid "User:"
-msgstr "اسم المستخدم:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, finding available packages..."
+msgstr "اتنظر من فضلك, جاري ايجاد الحزم المتوفرة..."
 
-#: ../edit-urpm-sources.pl_.c:235
-msgid "Configure sources"
-msgstr "تهيئة المصادر"
+#: ../rpmdrake:1
+#, c-format
+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 ""
+"كان هناك خطأ أثناء تحديث الوسيط عن طريق urpmi.\n"
+"\n"
+"ربما يكون هذا بسبب مرآة مكسورة أو غير موجودة مؤقتاً, أو عندما\n"
+"يكون اصدار Mandrake Linux الخاص بك (%s) غير مدعوم الى الآن/ اطلاقاً من "
+"تحديثات Linux\n"
+"Mandrake الرسمية.\n"
+"\n"
+"هل تريد المحاولة مع مرآة أخرى؟"
 
-#: ../edit-urpm-sources.pl_.c:242
-msgid "Enabled?"
-msgstr "متاح؟"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
+msgstr "خطأ أثناء اضافة وسيط التحديث"
 
-#: ../edit-urpm-sources.pl_.c:243
-msgid "Source"
-msgstr "المصدر"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
+msgstr "انتظر من فضلك, جاري الإتصال بالمرآة لبدء تحديث الحزم."
 
-#: ../edit-urpm-sources.pl_.c:264 ../rpmdrake_.c:730
-msgid "Remove"
-msgstr "احذف"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Sources Manager, and then add a `Security\n"
+"updates' source.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"يمكنك أيضا اختيار المرآة يدويا: لعمل ذلك,\n"
+"قم بتشغيل مدير مصادر البرمجيات, ثم أضف مصدر 'تحديثات\n"
+"أمنية'.\n"
+"\n"
+"ثم أعد تشغيل أداة تحديث Mandrake."
 
-#: ../edit-urpm-sources.pl_.c:266
-msgid "Edit"
-msgstr "حرّر"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "كيفية اختيار المرآة يدوياً"
 
-#: ../edit-urpm-sources.pl_.c:268
-msgid "Add..."
-msgstr "أ؜ف..."
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
+msgstr "كان هناك خطأ غير قابل للإصلاح أثناء تحديث معلومات الحزم"
 
-#: ../edit-urpm-sources.pl_.c:270
-msgid "Update..."
-msgstr "حدّث..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
+msgstr "خطأ في تحديث الوسيط"
 
-#: ../edit-urpm-sources.pl_.c:271
-msgid "Proxy..."
-msgstr "بروكسي..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
+msgstr "انتظر من فضلك, جاري الإتصال بالمرآة لتحديث معلومات الحزم"
 
-#: ../edit-urpm-sources.pl_.c:274
-msgid "Save and quit"
-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"
+"هل من الممكن المتابعة؟"
 
-#: ../edit-urpm-sources.pl_.c:275 ../rpmdrake_.c:733
-msgid "Quit"
-msgstr "؎عو؏"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Installation"
+msgstr "تثبيت حزم البرامج"
 
-#: ../rpmdrake.pm_.c:93
-msgid "Yes"
-msgstr "نعم"
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, c-format
+msgid "Mandrake Update"
+msgstr "تحديث Mandrake"
 
-#: ../rpmdrake.pm_.c:95
-msgid "No"
-msgstr "لا"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
+msgstr "حذف حزم البرامج"
 
-#: ../rpmdrake.pm_.c:127
-msgid "Info..."
-msgstr "معلومات..."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "؎عو؏"
 
-#: ../rpmdrake.pm_.c:180
-msgid "Austria"
-msgstr "النمسا"
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "تثبيت"
 
-#: ../rpmdrake.pm_.c:181
-msgid "Australia"
-msgstr "أوستراليا"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "احذف"
 
-#: ../rpmdrake.pm_.c:182
-msgid "Belgium"
-msgstr "بلجيكا"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search"
+msgstr "ابح؍"
 
-#: ../rpmdrake.pm_.c:183
-msgid "Brazil"
-msgstr "البرازيل"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "ابحث عن:"
 
-#: ../rpmdrake.pm_.c:184
-msgid "Canada"
-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"
+"هل من الممكن المتابعة؟"
 
-#: ../rpmdrake.pm_.c:185
-msgid "Costa Rica"
-msgstr "كوستاريكا"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "بعض الحزم يجب ازالتها"
 
-#: ../rpmdrake.pm_.c:186
-msgid "Czech Republic"
-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"
+"هل تريد فعلا تثبيت الحزم؟"
 
-#: ../rpmdrake.pm_.c:187
-msgid "Germany"
-msgstr "ألمانيا"
+#: ../rpmdrake:1
+#, c-format
+msgid "Too many packages are selected"
+msgstr "تم اختيار حزم كثيرة"
 
-#: ../rpmdrake.pm_.c:188
-msgid "Danmark"
-msgstr "الدنمارك"
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
+msgstr "أقضى المعلومات"
 
-#: ../rpmdrake.pm_.c:189 ../rpmdrake.pm_.c:193
-msgid "Greece"
-msgstr "اليونان"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal information"
+msgstr "معلومات عادية"
 
-#: ../rpmdrake.pm_.c:190
-msgid "Spain"
-msgstr "أسبانيا"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update source(s)"
+msgstr "حدّث المصدر/المصادر"
 
-#: ../rpmdrake.pm_.c:191
-msgid "Finland"
-msgstr "فنلندا"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reload the packages list"
+msgstr "أعد تحميل قائمة الحزم"
 
-#: ../rpmdrake.pm_.c:192
-msgid "France"
-msgstr "فرنسا"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
+msgstr "أعد الإختيار من جديد"
 
-#: ../rpmdrake.pm_.c:194
-msgid "Israel"
-msgstr "اسرائيل"
+#: ../rpmdrake:1
+#, c-format
+msgid "in files"
+msgstr "في الملفات"
 
-#: ../rpmdrake.pm_.c:195
-msgid "Italy"
-msgstr "ايطاليا"
+#: ../rpmdrake:1
+#, c-format
+msgid "in descriptions"
+msgstr "في الوصف"
 
-#: ../rpmdrake.pm_.c:196
-msgid "Japan"
-msgstr "اليابان"
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
+msgstr "في الأسماء"
 
-#: ../rpmdrake.pm_.c:197
-msgid "Korea"
-msgstr "كوريا"
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
+msgstr "بتواجد التحديث"
 
-#: ../rpmdrake.pm_.c:198
-msgid "Netherlands"
-msgstr "هولندا"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
+msgstr "بمخزن المصدر"
 
-#: ../rpmdrake.pm_.c:199
-msgid "Norway"
-msgstr "النرويج"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
+msgstr "بحالة الإختيار"
 
-#: ../rpmdrake.pm_.c:200
-msgid "Poland"
-msgstr "بولندا"
+#: ../rpmdrake:1
+#, c-format
+msgid "by size"
+msgstr "بالحجم"
 
-#: ../rpmdrake.pm_.c:201
-msgid "Portugal"
-msgstr "البرتغال"
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
+msgstr "بالمجموعة"
 
-#: ../rpmdrake.pm_.c:202
-msgid "Russia"
-msgstr "روسيا"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages,"
+msgstr "كل الحزم,"
 
-#: ../rpmdrake.pm_.c:203
-msgid "Sweden"
-msgstr "السويد"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
+msgstr "كل الحزم, أبجدياً"
 
-#: ../rpmdrake.pm_.c:204
-msgid "Taiwan"
-msgstr "تايوان"
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
+msgstr "اختيارات Mandrake"
 
-#: ../rpmdrake.pm_.c:205
-msgid "United Kingdom"
-msgstr "المملكة المتحدة"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal updates"
+msgstr "تحديثات عادية"
 
-#: ../rpmdrake.pm_.c:206
-msgid "China"
-msgstr "الصين"
+#: ../rpmdrake:1
+#, c-format
+msgid "Bugfixes updates"
+msgstr "تحديثات ازالة العيوب"
 
-#: ../rpmdrake.pm_.c:207 ../rpmdrake.pm_.c:208 ../rpmdrake.pm_.c:209
-#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:261
-msgid "United States"
-msgstr "الولايات المتحدة"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
+msgstr "تحديثات أمنية"
 
-#: ../rpmdrake.pm_.c:274
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr "انتظر من فضلك, جاري تنزيل عناوين المرايا من موقع MandrakeSoft"
+#: ../rpmdrake:1
+#, c-format
+msgid "Description: "
+msgstr "وؾف:"
 
-#: ../rpmdrake.pm_.c:280
-msgid "Error during download"
-msgstr "خطأ أثناء التنزيل"
+#: ../rpmdrake:1
+#, c-format
+msgid "Summary: "
+msgstr "نبذة: "
 
-#: ../rpmdrake.pm_.c:289
-msgid "No mirror"
-msgstr "لا مرايا"
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "الأهمية: "
 
-#: ../rpmdrake.pm_.c:307
-msgid "Please choose the desired mirror."
-msgstr "فضلاً اختر المرآة المطلوبة."
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake.pm_.c:339 ../rpmdrake_.c:627
-msgid "Update source(s)"
-msgstr "حدّث المصدر/المصادر"
+#: ../rpmdrake:1
+#, c-format
+msgid "Size: "
+msgstr "الحجم: "
 
-#: ../rpmdrake.pm_.c:343
-msgid "Select the source(s) you wish to update:"
-msgstr "اختر المصدر/المصادر التي تريد تحديثها:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Version: "
+msgstr "الإصدار: "
 
-#: ../rpmdrake.pm_.c:347
-msgid "Update"
-msgstr "حدّث"
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "الإسم: "
 
-#: ../rpmdrake.pm_.c:357
-msgid "Please wait, updating media..."
-msgstr "انتظر من فضلك, جاري تحديث الوسائط..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "سبب التحديث:"
 
-#: ../rpmdrake_.c:99
-msgid "Other"
-msgstr "أخرى"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
+msgstr "الإصدار المثبت حالياً:"
 
-#: ../rpmdrake_.c:121 ../rpmdrake_.c:135 ../rpmdrake_.c:227 ../rpmdrake_.c:298
-msgid "(none)"
-msgstr "(لا شئ)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Source: "
+msgstr "المصدر:"
 
-#: ../rpmdrake_.c:141 ../rpmdrake_.c:482 ../rpmdrake_.c:483
+#: ../rpmdrake:1
+#, c-format
 msgid "(Not available)"
 msgstr "(غير موجود)"
 
-#: ../rpmdrake_.c:151 ../rpmdrake_.c:208
-msgid "Search results"
-msgstr "نتائج البحث"
-
-#: ../rpmdrake_.c:151
-msgid "Search results (none)"
-msgstr "نتائج البحث (لا شئ)"
-
-#: ../rpmdrake_.c:161 ../rpmdrake_.c:172
-msgid "Please wait, searching..."
-msgstr "انتظر من فضلك, جاري البحث..."
-
-#: ../rpmdrake_.c:175
-msgid "Stop"
-msgstr "قف"
-
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-msgid "Addable"
-msgstr "قابلة للإضافة"
-
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-msgid "Upgradable"
-msgstr "قابلة للترقية"
-
-#: ../rpmdrake_.c:211
-msgid "Not selected"
-msgstr "غير مختار"
-
-#: ../rpmdrake_.c:211
-msgid "Selected"
-msgstr "مختار"
-
-#: ../rpmdrake_.c:240
-msgid "rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake_.c:258 ../rpmdrake_.c:360 ../rpmdrake_.c:362
-msgid "More information on package..."
-msgstr "معلومات أكثر حول الحزمة..."
-
-#: ../rpmdrake_.c:259
-msgid "One of the following packages is needed:"
-msgstr "أحد هذه الحزم مطلوب:"
-
-#: ../rpmdrake_.c:259
-msgid "Please choose"
-msgstr "فضلاً اختر"
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
+msgstr "سحل التغييرات:\n"
 
-#: ../rpmdrake_.c:275
-msgid "unknown package "
-msgstr "حزمة غير معروفة"
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "الملفات:\n"
 
-#: ../rpmdrake_.c:285
-msgid "Please wait, listing packages..."
-msgstr "انتظر من فضلك, جاري سرد الحزم..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected size: %d MB"
+msgstr "الحجم المختار: %d ميغابايت"
 
-#: ../rpmdrake_.c:300
-msgid "No update"
-msgstr "لا تحديث"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "تم اختيار: %d ميغابايت / المساحة المتوفرة في القرص: %d ميغابايت"
 
-#: ../rpmdrake_.c:353 ../rpmdrake_.c:354
-msgid "More infos"
-msgstr "مزيد من المعلومات"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
+msgstr ""
+"نظرا للاعتمادات, فإن الحزمة/الحزم التالية يجب أن\n"
+"الرجوع عن اختيارها الآن:\n"
+"\n"
 
-#: ../rpmdrake_.c:355
-msgid "Information on packages"
-msgstr "معلومات حول الحزم"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+msgstr ""
+"عفواً, لا يمكن اختيار الحزمة/الحزم التالية:\n"
+"\n"
 
-#: ../rpmdrake_.c:376
-msgid "Some additional packages need to be removed"
-msgstr "هذه الحزم الاضافية يجب أن تحذف"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "لا يمكن تثبيت بعض الحزم"
 
-#: ../rpmdrake_.c:377
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
 "\n"
 msgstr ""
-"نظرا للاعتمادات, فإن الحزمة/الحزم التالية يجب أن\n"
-"تحذف:\n"
+"لإرضاء الإعتمادات يجب تثبيت الحزمة/الحزم\n"
+"التالية:\n"
 "\n"
 
-#: ../rpmdrake_.c:383 ../rpmdrake_.c:391
+#: ../rpmdrake:1
+#, c-format
+msgid "Additional packages needed"
+msgstr "هناك حزم اضافية مطلوبة"
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "بعض الحزم لا يمكن حذفها"
 
-#: ../rpmdrake_.c:384
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -467,579 +641,597 @@ msgstr ""
 "ازالة هذه الحزم قد تكسر نظامك, عذراً:\n"
 "\n"
 
-#: ../rpmdrake_.c:392 ../rpmdrake_.c:451
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
 "\n"
 msgstr ""
 "نظرا للاعتمادات, فإن الحزمة/الحزم التالية يجب أن\n"
-"الرجوع عن اختيارها الآن:\n"
+"تحذف:\n"
 "\n"
 
-#: ../rpmdrake_.c:421
-msgid "Additional packages needed"
-msgstr "هناك حزم اضافية مطلوبة"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr "هذه الحزم الاضافية يجب أن تحذف"
 
-#: ../rpmdrake_.c:422
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
-msgstr ""
-"لإرضاء الإعتمادات يجب تثبيت الحزمة/الحزم\n"
-"التالية:\n"
-"\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
+msgstr "معلومات أكثر حول الحزمة..."
 
-#: ../rpmdrake_.c:435
-msgid "Some packages can't be installed"
-msgstr "لا يمكن تثبيت بعض الحزم"
+#: ../rpmdrake:1
+#, c-format
+msgid "Information on packages"
+msgstr "معلومات حول الحزم"
 
-#: ../rpmdrake_.c:436
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
+msgstr "مزيد من المعلومات"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Addable"
+msgstr "قابلة للإضافة"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Upgradable"
+msgstr "قابلة للترقية"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
+"The list of updates is void. This means that either there is\n"
+"no available update for the packages installed on your computer,\n"
+"or you already installed all of them."
 msgstr ""
-"عفواً, لا يمكن اختيار الحزمة/الحزم التالية:\n"
-"\n"
+"قائمة التحديث فارغة. هذا إما يعني أنه\n"
+"لا توجد تحديثات للحزم الموجودة على جهازك,\n"
+"أو أنك قمت بتثبيت كل التحديثات مسبقا."
 
-#: ../rpmdrake_.c:450 ../rpmdrake_.c:684
-msgid "Some packages need to be removed"
-msgstr "بعض الحزم يجب ازالتها"
+#: ../rpmdrake:1
+#, c-format
+msgid "No update"
+msgstr "لا تحديث"
 
-#: ../rpmdrake_.c:472
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "تم اختيار: %d ميغابايت / المساحة المتوفرة في القرص: %d ميغابايت"
+msgid "(none)"
+msgstr "(لا شئ)"
 
-#: ../rpmdrake_.c:474
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "الحجم المختار: %d ميغابايت"
+msgid "Please wait, listing packages..."
+msgstr "انتظر من فضلك, جاري سرد الحزم..."
 
-#: ../rpmdrake_.c:482
-msgid "Files:\n"
-msgstr "الملفات:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "unknown package "
+msgstr "حزمة غير معروفة"
 
-#: ../rpmdrake_.c:483
-msgid "Changelog:\n"
-msgstr "سحل التغييرات:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "أحد هذه الحزم مطلوب:"
 
-#: ../rpmdrake_.c:486
-msgid "Source: "
-msgstr "المصدر:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please choose"
+msgstr "فضلاً اختر"
 
-#: ../rpmdrake_.c:487
-msgid "Currently installed version: "
-msgstr "الإصدار المثبت حالياً:"
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:491
-msgid "Reason for update: "
-msgstr "سبب التحديث:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Not selected"
+msgstr "غير مختار"
 
-#: ../rpmdrake_.c:493
-msgid "Name: "
-msgstr "الإسم: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected"
+msgstr "مختار"
 
-#: ../rpmdrake_.c:494
-msgid "Version: "
-msgstr "الإصدار: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results"
+msgstr "نتائج البحث"
 
-#: ../rpmdrake_.c:495
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Stop"
+msgstr "قف"
 
-#: ../rpmdrake_.c:495
-msgid "Size: "
-msgstr "الحجم: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, searching..."
+msgstr "انتظر من فضلك, جاري البحث..."
 
-#: ../rpmdrake_.c:497
-msgid "Importance: "
-msgstr "الأهمية: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
+msgstr "نتائج البحث (لا شئ)"
 
-#: ../rpmdrake_.c:498
-msgid "Summary: "
-msgstr "نبذة: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "أخرى"
 
-#: ../rpmdrake_.c:499
-msgid "Description: "
-msgstr "وؾف:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"Welcome to the packages source editor!\n"
+"\n"
+"This tool will help you configure the packages sources you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"أهلا بك في محرر مصادر الحزم!\n"
+"\n"
+"هذه الأداة ستساعدك على تهيئة مصادر الحزم التي قد تريد استخدامها على\n"
+"حاسوبك. عندها ستكون هذه المصادر موجودة لتثبيت حزم برمجية جديدة\n"
+"أو لعمل التحديثات."
 
-#: ../rpmdrake_.c:548
-msgid "Bugfixes updates"
-msgstr "تحديثات ازالة العيوب"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "احفظ و ا؎ع؏"
 
-#: ../rpmdrake_.c:548
-msgid "Normal updates"
-msgstr "تحديثات عادية"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy..."
+msgstr "بروكسي..."
 
-#: ../rpmdrake_.c:567
-msgid "Mandrake choices"
-msgstr "اختيارات Mandrake"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
+msgstr "حدّث..."
 
-#: ../rpmdrake_.c:568
-msgid "All packages, alphabetical"
-msgstr "كل الحزم, أبجدياً"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "أ؜ف..."
 
-#: ../rpmdrake_.c:569
-msgid "All packages,"
-msgstr "كل الحزم,"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "حرّر"
 
-#: ../rpmdrake_.c:592
-msgid "by group"
-msgstr "بالمجموعة"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Source"
+msgstr "المصدر"
 
-#: ../rpmdrake_.c:592
-msgid "by size"
-msgstr "بالحجم"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
+msgstr "متاح؟"
 
-#: ../rpmdrake_.c:593
-msgid "by selection state"
-msgstr "بحالة الإختيار"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure sources"
+msgstr "تهيئة المصادر"
 
-#: ../rpmdrake_.c:594
-msgid "by source repository"
-msgstr "بمخزن المصدر"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "كلمة المرور:"
 
-#: ../rpmdrake_.c:594
-msgid "by update availability"
-msgstr "بتواجد التحديث"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
+msgstr "اسم المستخدم:"
 
-#: ../rpmdrake_.c:615
-msgid "in descriptions"
-msgstr "في الوصف"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "يجب عليك تحديد امس مستخدم/كلمة مرور للمصادقة في البروكسي:"
 
-#: ../rpmdrake_.c:615
-msgid "in files"
-msgstr "في الملفات"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "اسم مستضيف البروكسي"
 
-#: ../rpmdrake_.c:615
-msgid "in names"
-msgstr "في الأسماء"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"اذا كنت تحتاج الى بروكسي, أدخل اسم المستضيف و المنفذ (على الشكل التالي: <اسم "
+"المستضيف[:المنفذ[>):"
 
-#: ../rpmdrake_.c:626
-msgid "Reload the packages list"
-msgstr "أعد تحميل قائمة الحزم"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "تهيئة البروكسي"
 
-#: ../rpmdrake_.c:626
-msgid "Reset the selection"
-msgstr "أعد الإختيار من جديد"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr "انتظر من فضلك, جاري تحديث الوسيط..."
 
-#: ../rpmdrake_.c:652
-msgid "Maximum information"
-msgstr "أقضى المعلومات"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "لكي يتم حفظ التغييرات, تحتاج الى ادخال الوسيط في السواقة."
 
-#: ../rpmdrake_.c:652
-msgid "Normal information"
-msgstr "معلومات عادية"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
+msgstr "تحتاج الى ادخال الوسيط للمتابعة"
 
-#: ../rpmdrake_.c:674
-msgid "Too many packages are selected"
-msgstr "تم اختيار حزم كثيرة"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save changes"
+msgstr "احفظ التغييرات"
 
-#: ../rpmdrake_.c:720
-msgid "Find:"
-msgstr "ابحث عن:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "المسار الى ملف التخليق أو hdlist:"
 
-#: ../rpmdrake_.c:725
-msgid "Search"
-msgstr "ابح؍"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "العنوان:"
 
-#: ../rpmdrake_.c:731
-msgid "Install"
-msgstr "تثبيت"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Editing source \"%s\":"
+msgstr "جاري تحرير المصدر \"%s\":"
 
-#: ../rpmdrake_.c:738 data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrake Update"
-msgstr "تحديث Mandrake"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit a source"
+msgstr "تحرير مصدر"
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Installation"
-msgstr "تثبيت حزم البرامج"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr "انتظر من فضلك, جاري اضافة الوسيط...."
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Removal"
-msgstr "حذف حزم البرامج"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, adding medium..."
+msgstr "انتظر من فضلك, جاري اضافة الوسيط..."
 
-#: ../rpmdrake_.c:779
-msgid "Please wait, contacting mirror to update packages information."
-msgstr "انتظر من فضلك, جاري الإتصال بالمرآة لتحديث معلومات الحزم"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of source:"
+msgstr "نوع المصدر:"
 
-#: ../rpmdrake_.c:781
-msgid "Error updating medium"
-msgstr "خطأ في تحديث الوسيط"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Adding a source:"
+msgstr "جاري اضافة مصدر"
 
-#: ../rpmdrake_.c:782
-msgid "There was an unrecoverable error while updating packages information."
-msgstr "كان هناك خطأ غير قابل للإصلاح أثناء تحديث معلومات الحزم"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr "هناك وسيط بهذا الإسم مسبقاً, هل تريد استبداله فعلاً؟"
 
-#: ../rpmdrake_.c:787
-msgid "How to choose manually your mirror"
-msgstr "كيفية اختيار المرآة يدوياً"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to fill up at least the two first entries."
+msgstr "يجب عليك ملء الحقلين الأولين على الأقل."
 
-#: ../rpmdrake_.c:795
-msgid "Please wait, contacting mirror to initialize updates packages."
-msgstr "انتظر من فضلك, جاري الإتصال بالمرآة لبدء تحديث الحزم."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "الإسم:"
 
-#: ../rpmdrake_.c:798
-msgid "Error adding update medium"
-msgstr "خطأ أثناء اضافة وسيط التحديث"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
+msgstr "اسم الدخول:"
 
-#: ../rpmdrake_.c:829
-msgid "Please wait, finding available packages..."
-msgstr "اتنظر من فضلك, جاري ايجاد الحزم المتوفرة..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "اختار المرآة..."
 
-#: ../rpmdrake_.c:861
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "جاري التحقق من %s"
+msgid "Browse..."
+msgstr "استؚع؜..."
 
-#: ../rpmdrake_.c:880
-msgid "changes:"
-msgstr "التغييرات:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "المسار أو نقطة التحميل:"
 
-#: ../rpmdrake_.c:884
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove .%s"
-msgstr "احذف .%s"
+msgid "Removable device"
+msgstr "الأجهزة القابلة للإزالة"
 
-#: ../rpmdrake_.c:886
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "استخدم .%s كملف رئيسي"
+msgid "HTTP server"
+msgstr "خادم HTTP"
 
-#: ../rpmdrake_.c:888
-msgid "Do nothing"
-msgstr "لا تفعل شيئاً"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "خادم FTP"
 
-#: ../rpmdrake_.c:900
-msgid "Installation finished"
-msgstr "انتهى التثبيت"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path:"
+msgstr "المسار:"
 
-#: ../rpmdrake_.c:910
-msgid "Inspect..."
-msgstr "تحقَّق..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "ملفات محلية"
 
-#: ../rpmdrake_.c:925
-msgid "Program missing"
-msgstr "البرنامج مفقود"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add a source"
+msgstr "أضف مصدر"
 
-#: ../rpmdrake_.c:926
-msgid "A required program is missing (grpmi). Check your installation."
-msgstr "هناك برنامج ضروري (grpmi) مفقود. تأكد من التثبيت."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
+msgstr "تعذر تحديث الوسيط;  سيتم تعطيله آلياً"
 
-#: ../rpmdrake_.c:940
-msgid "Unable to get source packages."
-msgstr "تعذر الحصول على الحزم المصدرية"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "تعذر انشاء الوسيط"
 
-#: ../rpmdrake_.c:941
-msgid "Unable to get source packages, sorry."
-msgstr "تعذر ايجاد الحزم المصدرية, عفواً"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, updating media..."
+msgstr "انتظر من فضلك, جاري تحديث الوسائط..."
 
-#: ../rpmdrake_.c:948
-msgid "Change medium"
-msgstr "غير الوسيط"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
+msgstr "حدّث"
 
-#: ../rpmdrake_.c:949
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "فضلاً أدخل الوسيط المسمى \"%s\" الى الجهاز [%s]"
+msgid "Select the source(s) you wish to update:"
+msgstr "اختر المصدر/المصادر التي تريد تحديثها:"
 
-#: ../rpmdrake_.c:957
-msgid "Installation failed"
-msgstr "فشل التثبيت"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please choose the desired mirror."
+msgstr "فضلاً اختر المرآة المطلوبة."
 
-#: ../rpmdrake_.c:958
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
-"فشل التثبيت, بعض الملفات مفقودة.\n"
-"ربما تحتاج الى تحديث فاعدة بيانات المصادر."
+"تعذر ايجاد أي مرآة مناسبة.\n"
+"\n"
+"قد تكون هناك أسباب عديدة لهذه المشكلة: السبب الأكثر حدوثاً هو\n"
+":أن يكون نوع المعالج الخاص بك غير مدعوم\n"
+"من تحديثات Mandrake Linux الرسمية."
 
-#: ../rpmdrake_.c:961
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr "انتظر من فضلك, جاري ازالة الحزم للسماح بترقية الحزم الأخرى..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
+msgstr "لا مرايا"
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"There was an error downloading the mirrors list:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
-"انتهى التثبيت; %s.\n"
+"كان هناك خطأ في تنزيل قائمة المرايا:\n"
 "\n"
-"تم انشاء بعض ملفات التهيئة مثل `.rpmnew' أو `.rpmsave',\n"
-"يمكنك الآن التحقق من بعضها لكي تقوم بالمطلوب منها:"
+"%s\n"
+"الشبكة, أو موقع MandrakeSoft قد يكون غير موجود.\n"
+"فضلا حاول مرة أخرى في وقت لاحق."
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "خطأ أثناء التنزيل"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "انتظر من فضلك, جاري تنزيل عناوين المرايا من موقع MandrakeSoft"
+
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"some packages failed to install\n"
-"correctly"
+"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"
-"بشكل صحيح"
+"أحتاج للإتصال بموقع MandrakeSoft للحصول على قائمة المرايا.\n"
+"فضلاً تأكد من أن الشبكة الخاصة بك تعمل حالياً.\n"
+"\n"
+"هل من الممكن المتابعة؟"
 
-#: ../rpmdrake_.c:983
-msgid "everything was installed correctly"
-msgstr "تم تثبيت كل شئ بشكل صحيح"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United States"
+msgstr "الولايات المتحدة"
 
-#: ../rpmdrake_.c:985
-msgid "Everything installed successfully"
-msgstr "تم تثبيت كل شئ بنجاح"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
+msgstr "الصين"
 
-#: ../rpmdrake_.c:986
-msgid "All requested packages were installed successfully."
-msgstr "تم تثبيت كل الحزم المطلوبة بنجاح."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr "المملكة المتحدة"
 
-#: ../rpmdrake_.c:989
-msgid "Everything already installed."
-msgstr "كل شئ مثبت مسبقاً."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "تايوان"
 
-#: ../rpmdrake_.c:990
-msgid "Everything already installed (is this supposed to happen at all?)."
-msgstr "كل شئ مثبت مسبقا (أليس المفروض أن يحدث هذا؟)"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "السويد"
 
-#: ../rpmdrake_.c:997
-msgid "Problem during installation"
-msgstr "ظهرت مشاكل أثناء التثبيت"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
+msgstr "روسيا"
 
-#: ../rpmdrake_.c:998
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"كانت هناك مشكلة أثناء التثبيت:\n"
-"\n"
-"%s"
+msgid "Portugal"
+msgstr "البرتغال"
 
-#: ../rpmdrake_.c:1012
-msgid "Please wait, reading packages database..."
-msgstr "انتظر من فضلك, جاري قراءة قاعدة بيانات الحزم..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
+msgstr "بولندا"
 
-#: ../rpmdrake_.c:1053
-msgid "Please wait, removing packages..."
-msgstr "انتظر من فضلك, جاري ازالة الحزم..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
+msgstr "النرويج"
 
-#: ../rpmdrake_.c:1056
-msgid "Problem during removal"
-msgstr "ظهرت مشاكل أثناء الحذف"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
+msgstr "هولندا"
 
-#: ../rpmdrake_.c:1057
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"كانت هناك مشكلة أثناء حذف الحزم:\n"
-"\n"
-"%s"
+msgid "Korea"
+msgstr "كوريا"
 
-#: ../rpmdrake_.c:1089
-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 "Japan"
+msgstr "اليابان"
 
-#: ../rpmdrake_.c:1094
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"أهلا بك في تحديث Mandrake!\n"
-"\n"
-"هذه الأداة ستساعدك في اختيار التحديثات التي تريد تثبيتها على\n"
-"جهازك."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Italy"
+msgstr "ايطاليا"
 
-#: ../rpmdrake_.c:1099
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
-msgstr ""
-"أهلا بك في أداة تثبيت البرامج!\n"
-"\n"
-"يأتي نظام Linux Mandrake ألخاص بك مع بضع آلاف من جزم\n"
-"البرمجيات على أقراص CDROM أو DVD. هذه الأداة تسمح لك باختيار البرمجيات\n"
-"التي تريد تثبيتها على جهازك."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Israel"
+msgstr "اسرائيل"
 
-#: data/rpmdrake-remove.desktop.in.h:1
-msgid "Remove Software"
-msgstr "احذف البرنامج"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "اليونان"
 
-#: data/rpmdrake-sources.desktop.in.h:1
-msgid "Software Sources Manager"
-msgstr "مدير مصادر البرمجيات"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "France"
+msgstr "فرنسا"
 
-#: data/rpmdrake.desktop.in.h:1
-msgid "Install Software"
-msgstr "ثبـت البرنامج"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "فنلندا"
 
-#~ msgid ""
-#~ "There is already a medium by that name, do you\n"
-#~ "really want to replace it?"
-#~ msgstr "هناك وسيط بهذا الإسم مسبقاً, هل تريد استبداله فعلاً؟"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "أسبانيا"
 
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-#~ "هل من الممكن المتابعة؟"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
+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
+#, c-format
+msgid "Germany"
+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 "Czech Republic"
+msgstr "جمهورية التشيك"
 
-#~ msgid ""
-#~ "There was an error downloading the mirrors list:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "The network, or MandrakeSoft website, are maybe unavailable.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "كان هناك خطأ في تنزيل قائمة المرايا:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "الشبكة, أو موقع MandrakeSoft قد يكون غير موجود.\n"
-#~ "فضلا حاول مرة أخرى في وقت لاحق."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Costa Rica"
+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 "Canada"
+msgstr "كندا"
 
-#~ msgid ""
-#~ "The list of updates is void. This means that either there is\n"
-#~ "no available update for the packages installed on your computer,\n"
-#~ "or you already installed all of them."
-#~ msgstr ""
-#~ "قائمة التحديث فارغة. هذا إما يعني أنه\n"
-#~ "لا توجد تحديثات للحزم الموجودة على جهازك,\n"
-#~ "أو أنك قمت بتثبيت كل التحديثات مسبقا."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
+msgstr "البرازيل"
 
-#~ msgid ""
-#~ "Warning: it seems that you are attempting to add so much\n"
-#~ "packages that your filesystem may run out of free diskspace,\n"
-#~ "during or after package installation ; this is particularly\n"
-#~ "dangerous and should be considered with care.\n"
-#~ "\n"
-#~ "Do you really want to install all the selected packages?"
-#~ msgstr ""
-#~ "تحذير: يبدو أنك تحاول تثبيت الكثير من الحزم\n"
-#~ "بحيث يمكن ألا تكون هناك مساحة فارغة على القرص\n"
-#~ "أثناء أو بعد تثبيت الحزم, هذا في منتهى الخطورة\n"
-#~ "و يجب أخذه في الإعتبار بحذر.\n"
-#~ "\n"
-#~ "هل تريد فعلا تثبيت الحزم؟"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Belgium"
+msgstr "بلجيكا"
 
-#~ msgid ""
-#~ "The following packages have to be removed for others to be upgraded:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "يجب ازالة الحزم التالية لكي تتم ترقية الحزم الأخرى:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "هل من الممكن المتابعة؟"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Australia"
+msgstr "أوستراليا"
 
-#~ msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#~ msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
+msgstr "النمسا"
 
-#~ msgid ""
-#~ "I need to contact the mirror to get latest update packages.\n"
-#~ "Please check that your network is currently running.\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "أحتاج للإتصال بالمرآة للحصول على أخر حزم التحديثات.\n"
-#~ "فضلاً تأكد من أن الشبكة الخاصة بك تعمل حالياً.\n"
-#~ "\n"
-#~ "هل من الممكن المتابعة؟"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "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"
-#~ "ثم أعد تشغيل أداة تحديث Mandrake."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
+msgstr "لا"
 
-#~ 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 ""
-#~ "كان هناك خطأ أثناء تحديث الوسيط عن طريق urpmi.\n"
-#~ "\n"
-#~ "ربما يكون هذا بسبب مرآة مكسورة أو غير موجودة مؤقتاً, أو عندما\n"
-#~ "يكون اصدار Mandrake Linux الخاص بك (%s) غير مدعوم الى الآن/ اطلاقاً من "
-#~ "تحديثات Linux\n"
-#~ "Mandrake الرسمية.\n"
-#~ "\n"
-#~ "هل تريد المحاولة مع مرآة أخرى؟"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "نعم"
+
+#: data/rpmdrake.desktop.in.h:1
+msgid "Install Software"
+msgstr "ثبـت البرنامج"
+
+#: data/rpmdrake-remove.desktop.in.h:1
+msgid "Remove Software"
+msgstr "احذف البرنامج"
+
+#: data/rpmdrake-sources.desktop.in.h:1
+msgid "Software Sources Manager"
+msgstr "مدير مصادر البرمجيات"
+
+#~ 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--*-*-*-*-*,*"
diff --git a/po/ar.pom b/po/ar.pom
index 7e207761..44334cf1 100644
--- a/po/ar.pom
+++ b/po/ar.pom
@@ -4,166 +4,174 @@ msgstr "خادم"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "ويب/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "جهاز شبكة (عميل)"
+msgid "Office Workstation"
+msgstr "محطة عمل مكتبية"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "خادم NFS, خادم SMB, خادم بروكسي, خادم ssh"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"برامج مكتبية: معالجة الكلمات (kword, abiword), الجداول الحسابية (kspread, "
+"gnumeric) , برامج عرض pdf, الخ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "أدوات المكتب"
+msgid "Workstation"
+msgstr "محطة عمل"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "محطة عمل غنوم"
+msgid "Game station"
+msgstr "محطة ألعاب"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "أدوات لجهاز بالم بايلوت أو فايزور ألخاص بك"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "برامج التسلية: ألعاب فيديو, ألعاب لوحات, ألعاب ستراتيجية, الخ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "محطة عمل"
+msgid "Multimedia station"
+msgstr "محطة وسائط متعددة"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "جدتر ناري/موجِّه"
+msgid "Sound and video playing/editing programs"
+msgstr "برامج تحرير/تشغيل الفيديو و الصوت"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr "خادم أسماء النطاثات و معلومات الشيكة"
+msgid "Internet station"
+msgstr "محطة انترنت"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
 msgstr ""
-"برامج مكتبية: معالجة الكلمات (kword, abiword), الجداول الحسابية (kspread, "
-"gnumeric) , برامج عرض pdf, الخ"
+"مجموعة من الأدوات لقراءة و ارسال البريد و الأخبار (pine, mutt, tin..) و "
+"لتصفح الإنترنت"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "أدوات صوتية: مشغلات mp3 أو midi, مازجات صوت, الخ"
+msgid "Network Computer (client)"
+msgstr "جهاز شبكة (عميل)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr ""
+msgid "Clients for different protocols including ssh"
+msgstr "عملاء لبروتوكولات مختلفة مثل ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "كتب و مذكرات 'كيف أعمل' حول لينكس و البرامج الحرة"
+msgid "Configuration"
+msgstr "أدوات الإعدادات"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "محطو عمل كيدي"
+msgid "Tools to ease the configuration of your computer"
+msgstr "أدوات لتسهيل إعداد جهازك"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, الخ"
+msgid "Scientific Workstation"
+msgstr "محطة عمل علمية"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "وسائط متعدددة - فيديو"
+msgid "Scientific applications such as gnuplot"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr "مجموعة من الأدوات للبريد , الأخبار, الإنترنت, نقل الملفات, و المحادثة"
+msgid "Console Tools"
+msgstr "أدوات سطر الأوامر"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "قواعد البيانات"
+msgid "Editors, shells, file tools, terminals"
+msgstr "محررات نصوص, أغلفة, أدوات ملفات, طرفيات"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "خادم قواعد البيانات PostgreSQL أو MySQL"
+msgid "KDE Workstation"
+msgstr "محطو عمل كيدي"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "أدوات لتسهيل إعداد جهازك"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"بيئة سطح مكتب كيدي, البيئة الرسومية الأساسية مع مجموعة من الأدوات المصاحبة"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "وسائط متعددة - صوت"
+msgid "Graphical Environment"
+msgstr "بيئات رسومية"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "وثائق المساعدة"
+msgid "Gnome Workstation"
+msgstr "محطة عمل جنوم"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "أدوات سطر الأوامر"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+"بيئة رسومية مع مجموعة من التطبيقات و أدوات سطح المكتب المناسبة للمستخدمين "
+"العاديين"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr "خادم البريد Postfix, خادم الأخبار Inn"
+msgid "Other Graphical Desktops"
+msgstr "أسطخ مكتب رسومية أخرى"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "محطة انترنت"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, الخ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "محطة وسائط متعددة"
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+msgid "Development"
+msgstr "تطوير"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "أدوات الإعدادات"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "برامج و مكتبات تطوير C و C++"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "أسطح مكتب رسومية أكثر (Gnome, IceWM)"
+msgid "Documentation"
+msgstr "وثائق المساعدة"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
-"بيئة سطح مكتب كيدي, البيئة الرسومية الأساسية مع مجموعة من الأدوات المصاحبة"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "كتب و مذكرات 'كيف أعمل' حول لينكس و البرامج الحرة"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "بيئات رسومية"
+msgid "LSB"
+msgstr "LSB"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Linux Standard Base. Third party applications support"
+
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-msgid "Development"
-msgstr ""
+#: ../../share/compssUsers:999
+msgid "Web/FTP"
+msgstr "ويب/FTP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -172,23 +180,33 @@ msgstr "Apache, Pro-ftpd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "أدوات لعمل و نسخ الأقراص"
+msgid "Mail/Groupware/News"
+msgstr "بريد/أدوات مجموعات/أخبار"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "محطة عمل مكتبية"
+msgid "Postfix mail server, Inn news server"
+msgstr "خادم البريد Postfix, خادم الأخبار Inn"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, الخ"
+msgid "Database"
+msgstr "قواعد البيانات"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "برامج رسوميات مثل The Gimp"
+msgid "PostgreSQL or MySQL database server"
+msgstr "خادم قواعد البيانات PostgreSQL أو MySQL"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Firewall/Router"
+msgstr "جدتر ناري/موجِّه"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Internet gateway"
+msgstr "بوابة انترنت"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -197,8 +215,8 @@ msgstr "DNS/NIS"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "برامج و مكتبات تطوير C و C++"
+msgid "Domain Name and Network Information Server"
+msgstr "خادم أسماء النطاثات و معلومات الشيكة"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -207,18 +225,18 @@ msgstr "خادم شبكات"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "بريد/أدوات مجموعات/أخبار"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "خادم NFS, خادم SMB, خادم بروكسي, خادم ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "محطة ألعاب"
+msgid "Office"
+msgstr "أدوات المكتب"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "برامج تشغيل و تحرير الفيديو"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr "مجموعة من الأدوات للبريد , الأخبار, الإنترنت, نقل الملفات, و المحادثة"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -227,78 +245,66 @@ msgstr "وسائط متعددة - رسوميات"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "برامج التسلية: ألعاب فيديو, ألعاب لوحات, ألعاب ستراتيجية, الخ"
+msgid "Graphics programs such as The Gimp"
+msgstr "برامج رسوميات مثل The Gimp"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
-"مجموعة من الأدوات لقراءة و ارسال البريد و الأخبار (pine, mutt, tin..) و "
-"لتصفح الإنترنت"
+msgid "Multimedia - Sound"
+msgstr "وسائط متعددة - صوت"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "الميزانية الشخصية"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "أدوات صوتية: مشغلات mp3 أو midi, مازجات صوت, الخ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
-"بيئة رسومية مع مجموعة من التطبيقات و أدوات سطح المكتب المناسبة للمستخدمين "
-"العاديين"
+msgid "Multimedia - Video"
+msgstr "وسائط متعدددة - فيديو"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "عملاء لبروتوكولات مختلفة مثل ssh"
+msgid "Video players and editors"
+msgstr "برامج تشغيل و تحرير الفيديو"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "LSB"
-msgstr ""
+msgid "Multimedia - CD Burning"
+msgstr "وسائط متعددة - نسخ أقراص"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "بوابة انترنت"
+msgid "Tools to create and burn CD's"
+msgstr "أدوات لعمل و نسخ الأقراص"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "برامج تحرير/تشغيل الفيدية و الصوت"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "أسطح مكتب رسومية أكثر (Gnome, IceWM)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "أسطخ مكتب رسومية أخرى"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, الخ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "محررات نصوص, أغلفة, أدوات ملفات, طرفيات"
+msgid "Personal Information Management"
+msgstr "ادارة المعلومات الشخصية"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "برامج لإدارة ميزانيتك مثل gnucash"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "أدوات لجهاز بالم بايلوت أو فايزور ألخاص بك"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "ادارة المعلومات الشخصية"
+msgid "Personal Finance"
+msgstr "الميزانية الشخصية"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "وسائط متعددة - نسخ أقراص"
+msgid "Programs to manage your finances, such as gnucash"
+msgstr "برامج لإدارة ميزانيتك مثل gnucash"
 
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "محطة عمل علمية"
diff --git a/po/az.po b/po/az.po
index 01bc732c..09cc433d 100644
--- a/po/az.po
+++ b/po/az.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2003-01-19 16:57+0100\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\n"
 "PO-Revision-Date: 2001-11-14 17:09GMT+0200\n"
 "Last-Translator: Vasif İsmayıloğlu MD <azerb_linux@hotmail.com>\n"
 "Language-Team: Azerbaijani Turkic <linuxaz@azerimail.net>\n"
@@ -14,919 +14,1135 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.5\n"
 
-#: ../edit-urpm-sources.pl_.c:39
-#, fuzzy
-msgid "Unable to create medium."
-msgstr "Raport faylĹ yaradĹla bilmir, çĹxĹlĹr.\n"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:40
-msgid "Unable to update medium; it will be automatically disabled."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to the software installation tool!\n"
+"\n"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:51
-#, fuzzy
-msgid "Add a source"
+#: ../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 ""
-"Lütfən Gözləyin\n"
-"Mənbə əlavə edilir"
 
-#: ../edit-urpm-sources.pl_.c:52
-#, fuzzy
-msgid "Local files"
-msgstr "Yerli"
+#: ../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_.c:52
-#, fuzzy
-msgid "Path:"
-msgstr "cığır:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr "Qurma əsnasında problemlər oldu"
 
-#: ../edit-urpm-sources.pl_.c:53
-msgid "FTP server"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during removal"
+msgstr "Qurma əsnasında problemlər oldu"
 
-#: ../edit-urpm-sources.pl_.c:53 ../edit-urpm-sources.pl_.c:54
-#: ../edit-urpm-sources.pl_.c:56 ../edit-urpm-sources.pl_.c:175
-msgid "URL:"
-msgstr "URL:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, removing packages..."
+msgstr "Xahiş edirik rpm paketləri çıxardana qədər gözləyin"
 
-#: ../edit-urpm-sources.pl_.c:54
-msgid "HTTP server"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:55
-#, fuzzy
-msgid "Path or mount point:"
-msgstr "bağlama nöqtəsi:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr "Qurma əsnasında problemlər oldu"
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Removable device"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during installation"
+msgstr "Qurma əsnasında problemlər oldu"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:56 ../rpmdrake_.c:548
-msgid "Security updates"
-msgstr "Təhlükəsizlik güncəlləmələri"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Everything already installed."
+msgstr "Paket onsuz da quruludur"
 
-#: ../edit-urpm-sources.pl_.c:67
-msgid "Browse..."
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:69
-#, fuzzy
-msgid "Choose a mirror..."
-msgstr "Əksi seçin:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:89
-#, fuzzy
-msgid "Login:"
-msgstr "giriş:"
+#: ../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 ""
 
-#: ../edit-urpm-sources.pl_.c:89 ../edit-urpm-sources.pl_.c:215
-msgid "Password:"
-msgstr "Parol:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "everything was installed correctly"
+msgstr "Paket onsuz da quruludur"
 
-#: ../edit-urpm-sources.pl_.c:94
-#, fuzzy
-msgid "Name:"
-msgstr "Ad"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"some packages failed to install\n"
+"correctly"
+msgstr "Paketlər onsuz da quruludur"
 
-#: ../edit-urpm-sources.pl_.c:96 ../edit-urpm-sources.pl_.c:176
-#, fuzzy
-msgid "Relative path to synthesis/hdlist:"
-msgstr "hdlist-in nisbi cığırı: "
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, removing packages to allow others to be upgraded..."
+msgstr "Xahiş edirik, güncəlləmək istədiyiniz paketi seçin"
 
-#: ../edit-urpm-sources.pl_.c:104
-msgid "You need to fill up at least the two first entries."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:116
-#, fuzzy
-msgid "Adding a source:"
-msgstr ""
-"Lütfən Gözləyin\n"
-"Mənbə əlavə edilir"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Installation failed"
+msgstr "Qurula Bilən"
 
-#: ../edit-urpm-sources.pl_.c:117
-msgid "Type of source:"
-msgstr "Mənbə növü:"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
+msgstr "Ləğv et"
 
-#: ../edit-urpm-sources.pl_.c:121 ../edit-urpm-sources.pl_.c:187
-#: ../edit-urpm-sources.pl_.c:219 ../rpmdrake.pm_.c:97 ../rpmdrake.pm_.c:136
-#: ../rpmdrake.pm_.c:319 ../rpmdrake_.c:353 ../rpmdrake_.c:365
-#: ../rpmdrake_.c:369 ../rpmdrake_.c:916 ../rpmdrake_.c:950
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
 msgid "Ok"
 msgstr "Oldu"
 
-#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:180
-#: ../edit-urpm-sources.pl_.c:187 ../edit-urpm-sources.pl_.c:220
-#: ../rpmdrake.pm_.c:319 ../rpmdrake.pm_.c:352 ../rpmdrake_.c:353
-#: ../rpmdrake_.c:950
-msgid "Cancel"
-msgstr "Ləğv et"
-
-#: ../edit-urpm-sources.pl_.c:140
-#, fuzzy
-msgid "Please wait, adding medium..."
-msgstr "AsÄąlÄąlÄąqlar yoxlanÄąlÄąr..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:158
-#, fuzzy
-msgid "Please wait, removing medium..."
-msgstr "AsÄąlÄąlÄąqlar yoxlanÄąlÄąr..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:169
-#, fuzzy
-msgid "Edit a source"
-msgstr "Mənbələri Düzəlt"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:173
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "Mənbələri Düzəlt"
+msgid "Unable to get source packages."
+msgstr "Çox pis, oxuna bilməyən və ya tapılmayan paketlər"
 
-#: ../edit-urpm-sources.pl_.c:179
-#, fuzzy
-msgid "Save changes"
-msgstr "Paketlər"
+#: ../rpmdrake:1
+#, c-format
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:185
-msgid "You need to insert the medium to continue"
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:186
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:191
-#, fuzzy
-msgid "Please wait, updating medium..."
-msgstr "AsÄąlÄąlÄąqlar yoxlanÄąlÄąr..."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Installation finished"
+msgstr "Qurula Bilən"
 
-#: ../edit-urpm-sources.pl_.c:202
-#, fuzzy
-msgid "Configure proxies"
-msgstr "Mənbəni quraq?"
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:207
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:209
-#, fuzzy
-msgid "Proxy hostname:"
-msgstr "Vəkil verici istifadəçi adı:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Remove .%s"
+msgstr "Çıxardıla Bilən"
 
-#: ../edit-urpm-sources.pl_.c:211
-msgid "You may specify a user/password for the proxy authentication:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "changes:"
+msgstr "Paketlər"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:213
-#, fuzzy
-msgid "User:"
-msgstr "İstifadəçi adı:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, finding available packages..."
+msgstr "mövcud paketlərin siyahısını yenidən yüklə"
 
-#: ../edit-urpm-sources.pl_.c:235
-#, fuzzy
-msgid "Configure sources"
-msgstr "Mənbəni quraq?"
+#: ../rpmdrake:1
+#, c-format
+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 ""
 
-#: ../edit-urpm-sources.pl_.c:242
-msgid "Enabled?"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:243
-msgid "Source"
-msgstr "Qaynaq"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:264 ../rpmdrake_.c:730
-#, fuzzy
-msgid "Remove"
-msgstr "Çıxardıla Bilən"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Sources Manager, and then add a `Security\n"
+"updates' source.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:266
-msgid "Edit"
-msgstr "Düzəlt"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:268
-msgid "Add..."
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:270
-msgid "Update..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:271
-#, fuzzy
-msgid "Proxy..."
-msgstr "Xəta..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:274
-msgid "Save and quit"
+#: ../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 ""
 
-#: ../edit-urpm-sources.pl_.c:275 ../rpmdrake_.c:733
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Software Packages Installation"
+msgstr "Paketlərin qurulumu"
+
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h: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 "Quit"
 msgstr "Çıx"
 
-#: ../rpmdrake.pm_.c:93
-msgid "Yes"
-msgstr ""
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "Qurulur"
 
-#: ../rpmdrake.pm_.c:95
-msgid "No"
-msgstr ""
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Remove"
+msgstr "Çıxardıla Bilən"
 
-#: ../rpmdrake.pm_.c:127
-msgid "Info..."
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Search"
+msgstr "axtar"
 
-#: ../rpmdrake.pm_.c:180
-msgid "Austria"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "Axtar:"
+
+#: ../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 ""
 
-#: ../rpmdrake.pm_.c:181
-msgid "Australia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:182
-msgid "Belgium"
+#: ../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 ""
 
-#: ../rpmdrake.pm_.c:183
-msgid "Brazil"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Too many packages are selected"
+msgstr "Paketlər onsuz da quruludur"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:184
-msgid "Canada"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Normal information"
+msgstr "normal güncəlləmələr"
+
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update source(s)"
+msgstr "Mənbələri Düzəlt"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Reload the packages list"
+msgstr "%s paketi imzalanmayÄąb"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:185
-msgid "Costa Rica"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "in files"
+msgstr "Yerli"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "in descriptions"
+msgstr "Ä°zahatlar"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:186
-msgid "Czech Republic"
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:187
-msgid "Germany"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:188
-msgid "Danmark"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:189 ../rpmdrake.pm_.c:193
-msgid "Greece"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "by size"
+msgstr "Dərinliklər"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:190
-msgid "Spain"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "All packages,"
+msgstr "o paket, o bayt"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:191
-#, fuzzy
-msgid "Finland"
-msgstr "Axtar:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mandrake choices"
+msgstr "MandrakeUpdate"
 
-#: ../rpmdrake.pm_.c:192
-#, fuzzy
-msgid "France"
-msgstr "Ləğv et"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Normal updates"
+msgstr "normal güncəlləmələr"
 
-#: ../rpmdrake.pm_.c:194
-#, fuzzy
-msgid "Israel"
-msgstr "Qurulmuşlar"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Bugfixes updates"
+msgstr "Təhlükəsizlik güncəlləmələri"
 
-#: ../rpmdrake.pm_.c:195
-#, fuzzy
-msgid "Italy"
-msgstr "Qurulmuşlar"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
+msgstr "Təhlükəsizlik güncəlləmələri"
 
-#: ../rpmdrake.pm_.c:196
-msgid "Japan"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Description: "
+msgstr "Ä°zahatlar"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Summary: "
+msgstr "QÄąsaca"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
 msgstr ""
 
-#: ../rpmdrake.pm_.c:197
-msgid "Korea"
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Size: "
+msgstr "BĂśyĂźklĂźk"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Version: "
+msgstr "Buraxılış:"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "Ad: "
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
 msgstr ""
 
-#: ../rpmdrake.pm_.c:198
-msgid "Netherlands"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
 msgstr ""
 
-#: ../rpmdrake.pm_.c:199
-msgid "Norway"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Source: "
+msgstr "Qaynaq"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "(Not available)"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:200
-msgid "Poland"
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:201
-#, fuzzy
-msgid "Portugal"
-msgstr "QapÄą:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Files:\n"
+msgstr "/_Fayl"
 
-#: ../rpmdrake.pm_.c:202
-msgid "Russia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected size: %d MB"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:203
-msgid "Sweden"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:204
-msgid "Taiwan"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:205
-msgid "United Kingdom"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:206
-msgid "China"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be installed"
+msgstr "Paketlər onsuz da quruludur"
 
-#: ../rpmdrake.pm_.c:207 ../rpmdrake.pm_.c:208 ../rpmdrake.pm_.c:209
-#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:261
-msgid "United States"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:274
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+#: ../rpmdrake:1
+#, c-format
+msgid "Additional packages needed"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:280
-msgid "Error during download"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be removed"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:289
-#, fuzzy
-msgid "No mirror"
-msgstr "Xətasz"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
 
-#: ../rpmdrake.pm_.c:307
-#, fuzzy
-msgid "Please choose the desired mirror."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
 msgstr ""
-"Lütfən Gözləyin\n"
-"Əks siyahısı alınır"
+"Bütün asılılıqlara cavab vermək üçün\n"
+"bu paketlər silinəcəklər:"
 
-#: ../rpmdrake.pm_.c:339 ../rpmdrake_.c:627
-#, fuzzy
-msgid "Update source(s)"
-msgstr "Mənbələri Düzəlt"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some additional packages need to be removed"
+msgstr ""
+"İşlərin düzgün getməyi üçün burdakı əlavə proqram tə'minatlarına ehtiyac "
+"vardÄąr:"
 
-#: ../rpmdrake.pm_.c:343
-#, fuzzy
-msgid "Select the source(s) you wish to update:"
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
 msgstr ""
-"Xahiş edirik, güncəlləmək\n"
-"istədiyiniz mənbəni seçin"
 
-#: ../rpmdrake.pm_.c:347
-msgid "Update"
-msgstr "Güncəllə"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Information on packages"
+msgstr "Paket açĹla bilmir"
 
-#: ../rpmdrake.pm_.c:358
-#, fuzzy
-msgid "Please wait, updating media..."
-msgstr "AsÄąlÄąlÄąqlar yoxlanÄąlÄąr..."
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
+msgstr ""
 
-#: ../rpmdrake_.c:99
-msgid "Other"
+#: ../rpmdrake:1
+#, c-format
+msgid "Addable"
 msgstr ""
 
-#: ../rpmdrake_.c:121 ../rpmdrake_.c:135 ../rpmdrake_.c:227 ../rpmdrake_.c:298
-msgid "(none)"
-msgstr "(heç biri)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Upgradable"
+msgstr ""
 
-#: ../rpmdrake_.c:141 ../rpmdrake_.c:482 ../rpmdrake_.c:483
-msgid "(Not available)"
+#: ../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_.c:151 ../rpmdrake_.c:208
-#, fuzzy
-msgid "Search results"
-msgstr "Axtarış Nəticələri"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "No update"
+msgstr "normal güncəlləmələr"
 
-#: ../rpmdrake_.c:151
-#, fuzzy
-msgid "Search results (none)"
-msgstr "Axtarış Nəticələri"
+#: ../rpmdrake:1
+#, c-format
+msgid "(none)"
+msgstr "(heç biri)"
 
-#: ../rpmdrake_.c:161 ../rpmdrake_.c:172
-#, fuzzy
-msgid "Please wait, searching..."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, listing packages..."
 msgstr "Xahiş edirik rpm paketləri çıxardana qədər gözləyin"
 
-#: ../rpmdrake_.c:175
-msgid "Stop"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "Namə'lum səhifə"
 
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-msgid "Addable"
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
 msgstr ""
 
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-msgid "Upgradable"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please choose"
 msgstr ""
 
-#: ../rpmdrake_.c:211
-#, fuzzy
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
 msgid "Not selected"
 msgstr ""
 "HamÄąsÄąnÄą\n"
 "  burax"
 
-#: ../rpmdrake_.c:211
-#, fuzzy
+#: ../rpmdrake:1
+#, fuzzy, c-format
 msgid "Selected"
 msgstr "HamĹsĹnĹ Seç"
 
-#: ../rpmdrake_.c:240
-msgid "rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake_.c:258 ../rpmdrake_.c:360 ../rpmdrake_.c:362
-msgid "More information on package..."
-msgstr ""
-
-#: ../rpmdrake_.c:259
-msgid "One of the following packages is needed:"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Search results"
+msgstr "Axtarış Nəticələri"
 
-#: ../rpmdrake_.c:259
-msgid "Please choose"
+#: ../rpmdrake:1
+#, c-format
+msgid "Stop"
 msgstr ""
 
-#: ../rpmdrake_.c:275
-#, fuzzy
-msgid "unknown package "
-msgstr "Namə'lum səhifə"
-
-#: ../rpmdrake_.c:285
-#, fuzzy
-msgid "Please wait, listing packages..."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, searching..."
 msgstr "Xahiş edirik rpm paketləri çıxardana qədər gözləyin"
 
-#: ../rpmdrake_.c:300
-#, fuzzy
-msgid "No update"
-msgstr "normal güncəlləmələr"
-
-#: ../rpmdrake_.c:353 ../rpmdrake_.c:354
-msgid "More infos"
-msgstr ""
-
-#: ../rpmdrake_.c:355
-#, fuzzy
-msgid "Information on packages"
-msgstr "Paket açĹla bilmir"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Search results (none)"
+msgstr "Axtarış Nəticələri"
 
-#: ../rpmdrake_.c:376
-#, fuzzy
-msgid "Some additional packages need to be removed"
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
 msgstr ""
-"İşlərin düzgün getməyi üçün burdakı əlavə proqram tə'minatlarına ehtiyac "
-"vardÄąr:"
 
-#: ../rpmdrake_.c:377
-#, fuzzy
+#: ../edit-urpm-sources.pl:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"Welcome to the packages source editor!\n"
 "\n"
+"This tool will help you configure the packages sources you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
 msgstr ""
-"Bütün asılılıqlara cavab vermək üçün\n"
-"bu paketlər silinəcəklər:"
 
-#: ../rpmdrake_.c:383 ../rpmdrake_.c:391
-msgid "Some packages can't be removed"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
 msgstr ""
 
-#: ../rpmdrake_.c:384
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Proxy..."
+msgstr "Xəta..."
 
-#: ../rpmdrake_.c:392 ../rpmdrake_.c:451
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
 msgstr ""
 
-#: ../rpmdrake_.c:421
-msgid "Additional packages needed"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
 msgstr ""
 
-#: ../rpmdrake_.c:422
-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 "Edit"
+msgstr "Düzəlt"
 
-#: ../rpmdrake_.c:435
-#, fuzzy
-msgid "Some packages can't be installed"
-msgstr "Paketlər onsuz da quruludur"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Source"
+msgstr "Qaynaq"
 
-#: ../rpmdrake_.c:436
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
 msgstr ""
 
-#: ../rpmdrake_.c:450 ../rpmdrake_.c:684
-msgid "Some packages need to be removed"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure sources"
+msgstr "Mənbəni quraq?"
 
-#: ../rpmdrake_.c:472
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr ""
+msgid "Password:"
+msgstr "Parol:"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "User:"
+msgstr "İstifadəçi adı:"
 
-#: ../rpmdrake_.c:474
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected size: %d MB"
+msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 
-#: ../rpmdrake_.c:482
-#, fuzzy
-msgid "Files:\n"
-msgstr "/_Fayl"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Proxy hostname:"
+msgstr "Vəkil verici istifadəçi adı:"
 
-#: ../rpmdrake_.c:483
-msgid "Changelog:\n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
 msgstr ""
 
-#: ../rpmdrake_.c:486
-#, fuzzy
-msgid "Source: "
-msgstr "Qaynaq"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure proxies"
+msgstr "Mənbəni quraq?"
 
-#: ../rpmdrake_.c:487
-msgid "Currently installed version: "
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, updating medium..."
+msgstr "AsÄąlÄąlÄąqlar yoxlanÄąlÄąr..."
+
+#: ../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_.c:491
-msgid "Reason for update: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
 msgstr ""
 
-#: ../rpmdrake_.c:493
-msgid "Name: "
-msgstr "Ad: "
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Save changes"
+msgstr "Paketlər"
 
-#: ../rpmdrake_.c:494
-#, fuzzy
-msgid "Version: "
-msgstr "Buraxılış:"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "hdlist-in nisbi cığırı: "
 
-#: ../rpmdrake_.c:495
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake_.c:495
-#, fuzzy
-msgid "Size: "
-msgstr "BĂśyĂźklĂźk"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing source \"%s\":"
+msgstr "Mənbələri Düzəlt"
 
-#: ../rpmdrake_.c:497
-msgid "Importance: "
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Edit a source"
+msgstr "Mənbələri Düzəlt"
 
-#: ../rpmdrake_.c:498
-#, fuzzy
-msgid "Summary: "
-msgstr "QÄąsaca"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, removing medium..."
+msgstr "AsÄąlÄąlÄąqlar yoxlanÄąlÄąr..."
 
-#: ../rpmdrake_.c:499
-#, fuzzy
-msgid "Description: "
-msgstr "Ä°zahatlar"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, adding medium..."
+msgstr "AsÄąlÄąlÄąqlar yoxlanÄąlÄąr..."
 
-#: ../rpmdrake_.c:548
-#, fuzzy
-msgid "Bugfixes updates"
-msgstr "Təhlükəsizlik güncəlləmələri"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of source:"
+msgstr "Mənbə növü:"
 
-#: ../rpmdrake_.c:548
-#, fuzzy
-msgid "Normal updates"
-msgstr "normal güncəlləmələr"
+#: ../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_.c:567
-#, fuzzy
-msgid "Mandrake choices"
-msgstr "MandrakeUpdate"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
 
-#: ../rpmdrake_.c:568
-msgid "All packages, alphabetical"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to fill up at least the two first entries."
 msgstr ""
 
-#: ../rpmdrake_.c:569
-#, fuzzy
-msgid "All packages,"
-msgstr "o paket, o bayt"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Name:"
+msgstr "Ad"
 
-#: ../rpmdrake_.c:592
-msgid "by group"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+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 ""
 
-#: ../rpmdrake_.c:592
-#, fuzzy
-msgid "by size"
-msgstr "Dərinliklər"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Path or mount point:"
+msgstr "bağlama nöqtəsi:"
 
-#: ../rpmdrake_.c:593
-msgid "by selection state"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Removable device"
 msgstr ""
 
-#: ../rpmdrake_.c:594
-msgid "by source repository"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "HTTP server"
 msgstr ""
 
-#: ../rpmdrake_.c:594
-msgid "by update availability"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
 msgstr ""
 
-#: ../rpmdrake_.c:615
-#, fuzzy
-msgid "in descriptions"
-msgstr "Ä°zahatlar"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Path:"
+msgstr "cığır:"
 
-#: ../rpmdrake_.c:615
-#, fuzzy
-msgid "in files"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Local files"
 msgstr "Yerli"
 
-#: ../rpmdrake_.c:615
-msgid "in names"
-msgstr ""
-
-#: ../rpmdrake_.c:626
-#, fuzzy
-msgid "Reload the packages list"
-msgstr "%s paketi imzalanmayÄąb"
-
-#: ../rpmdrake_.c:626
-msgid "Reset the selection"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a source"
 msgstr ""
+"Lütfən Gözləyin\n"
+"Mənbə əlavə edilir"
 
-#: ../rpmdrake_.c:652
-msgid "Maximum information"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
 msgstr ""
 
-#: ../rpmdrake_.c:652
-#, fuzzy
-msgid "Normal information"
-msgstr "normal güncəlləmələr"
-
-#: ../rpmdrake_.c:674
-#, fuzzy
-msgid "Too many packages are selected"
-msgstr "Paketlər onsuz da quruludur"
-
-#: ../rpmdrake_.c:720
-msgid "Find:"
-msgstr "Axtar:"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Unable to create medium."
+msgstr "Raport faylĹ yaradĹla bilmir, çĹxĹlĹr.\n"
 
-#: ../rpmdrake_.c:725
-#, fuzzy
-msgid "Search"
-msgstr "axtar"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Please wait, updating media..."
+msgstr "AsÄąlÄąlÄąqlar yoxlanÄąlÄąr..."
 
-#: ../rpmdrake_.c:731
-msgid "Install"
-msgstr "Qurulur"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
+msgstr "Güncəllə"
 
-#: ../rpmdrake_.c:738 data/mandrakeupdate.desktop.in.h:1
-#, fuzzy
-msgid "Mandrake Update"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Select the source(s) you wish to update:"
 msgstr ""
-"Mandrake\n"
-"Güncəlləmə"
-
-#: ../rpmdrake_.c:738
-#, fuzzy
-msgid "Software Packages Installation"
-msgstr "Paketlərin qurulumu"
-
-#: ../rpmdrake_.c:738
-#, fuzzy
-msgid "Software Packages Removal"
-msgstr " Proqram Tə'minatı İdarəçisi "
+"Xahiş edirik, güncəlləmək\n"
+"istədiyiniz mənbəni seçin"
 
-#: ../rpmdrake_.c:779
-msgid "Please wait, contacting mirror to update packages information."
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Please choose the desired mirror."
 msgstr ""
+"Lütfən Gözləyin\n"
+"Əks siyahısı alınır"
 
-#: ../rpmdrake_.c:781
-msgid "Error updating medium"
+#: ../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_.c:782
-msgid "There was an unrecoverable error while updating packages information."
-msgstr ""
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "No mirror"
+msgstr "Xətasz"
 
-#: ../rpmdrake_.c:787
-msgid "How to choose manually your mirror"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid ""
+"There was an error downloading the mirrors list:\n"
+"\n"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
 
-#: ../rpmdrake_.c:795
-msgid "Please wait, contacting mirror to initialize updates packages."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
 msgstr ""
 
-#: ../rpmdrake_.c:798
-msgid "Error adding update medium"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
 
-#: ../rpmdrake_.c:829
-#, fuzzy
-msgid "Please wait, finding available packages..."
-msgstr "mövcud paketlərin siyahısını yenidən yüklə"
-
-#: ../rpmdrake_.c:861
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Inspecting %s"
+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_.c:880
-#, fuzzy
-msgid "changes:"
-msgstr "Paketlər"
-
-#: ../rpmdrake_.c:884
-#, fuzzy, c-format
-msgid "Remove .%s"
-msgstr "Çıxardıla Bilən"
-
-#: ../rpmdrake_.c:886
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Use .%s as main file"
+msgid "United States"
 msgstr ""
 
-#: ../rpmdrake_.c:888
-msgid "Do nothing"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
 msgstr ""
 
-#: ../rpmdrake_.c:900
-#, fuzzy
-msgid "Installation finished"
-msgstr "Qurula Bilən"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr ""
 
-#: ../rpmdrake_.c:910
-msgid "Inspect..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
 msgstr ""
 
-#: ../rpmdrake_.c:925
-msgid "Program missing"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
 msgstr ""
 
-#: ../rpmdrake_.c:926
-msgid "A required program is missing (grpmi). Check your installation."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
 msgstr ""
 
-#: ../rpmdrake_.c:940
-#, fuzzy
-msgid "Unable to get source packages."
-msgstr "Çox pis, oxuna bilməyən və ya tapılmayan paketlər"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Portugal"
+msgstr "QapÄą:"
 
-#: ../rpmdrake_.c:941
-msgid "Unable to get source packages, sorry."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
 msgstr ""
 
-#: ../rpmdrake_.c:948
-msgid "Change medium"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
 msgstr ""
 
-#: ../rpmdrake_.c:949
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+msgid "Netherlands"
 msgstr ""
 
-#: ../rpmdrake_.c:957
-#, fuzzy
-msgid "Installation failed"
-msgstr "Qurula Bilən"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Korea"
+msgstr ""
 
-#: ../rpmdrake_.c:958
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Japan"
 msgstr ""
 
-#: ../rpmdrake_.c:961
-#, fuzzy
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr "Xahiş edirik, güncəlləmək istədiyiniz paketi seçin"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Italy"
+msgstr "Qurulmuşlar"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Israel"
+msgstr "Qurulmuşlar"
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm: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 "Greece"
 msgstr ""
 
-#: ../rpmdrake_.c:982
-#, fuzzy
-msgid ""
-"some packages failed to install\n"
-"correctly"
-msgstr "Paketlər onsuz da quruludur"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "France"
+msgstr "Ləğv et"
 
-#: ../rpmdrake_.c:983
-#, fuzzy
-msgid "everything was installed correctly"
-msgstr "Paket onsuz da quruludur"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Finland"
+msgstr "Axtar:"
 
-#: ../rpmdrake_.c:985
-msgid "Everything installed successfully"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
 msgstr ""
 
-#: ../rpmdrake_.c:986
-msgid "All requested packages were installed successfully."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
 msgstr ""
 
-#: ../rpmdrake_.c:989
-#, fuzzy
-msgid "Everything already installed."
-msgstr "Paket onsuz da quruludur"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr ""
 
-#: ../rpmdrake_.c:990
-msgid "Everything already installed (is this supposed to happen at all?)."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
 msgstr ""
 
-#: ../rpmdrake_.c:997
-#, fuzzy
-msgid "Problem during installation"
-msgstr "Qurma əsnasında problemlər oldu"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Costa Rica"
+msgstr ""
 
-#: ../rpmdrake_.c:998
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr "Qurma əsnasında problemlər oldu"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Canada"
+msgstr ""
 
-#: ../rpmdrake_.c:1012
-msgid "Please wait, reading packages database..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
 msgstr ""
 
-#: ../rpmdrake_.c:1053
-#, fuzzy
-msgid "Please wait, removing packages..."
-msgstr "Xahiş edirik rpm paketləri çıxardana qədər gözləyin"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Belgium"
+msgstr ""
 
-#: ../rpmdrake_.c:1056
-#, fuzzy
-msgid "Problem during removal"
-msgstr "Qurma əsnasında problemlər oldu"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Australia"
+msgstr ""
 
-#: ../rpmdrake_.c:1057
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr "Qurma əsnasında problemlər oldu"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
+msgstr ""
 
-#: ../rpmdrake_.c:1089
-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."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Info..."
 msgstr ""
 
-#: ../rpmdrake_.c:1094
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
 msgstr ""
 
-#: ../rpmdrake_.c:1099
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
 msgstr ""
 
+#: data/rpmdrake.desktop.in.h:1
+#, fuzzy
+msgid "Install Software"
+msgstr "HamÄąsÄąnÄą qur"
+
 #: data/rpmdrake-remove.desktop.in.h:1
 msgid "Remove Software"
 msgstr ""
@@ -935,11 +1151,6 @@ msgstr ""
 msgid "Software Sources Manager"
 msgstr ""
 
-#: data/rpmdrake.desktop.in.h:1
-#, fuzzy
-msgid "Install Software"
-msgstr "HamÄąsÄąnÄą qur"
-
 #, fuzzy
 #~ msgid "Update sources"
 #~ msgstr "Mənbələri Düzəlt"
diff --git a/po/az.pom b/po/az.pom
index 8a5cdaa6..0014cbc4 100644
--- a/po/az.pom
+++ b/po/az.pom
@@ -4,167 +4,172 @@ msgstr "Verici"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Verici, Veb/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Şəbəkə Kompüteri (alıcı)"
+msgid "Office Workstation"
+msgstr "İş Yeri Stansiyası"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS vericisi, SMB vericisi, SSH vericisi, Vəkil Verici"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"İdarə proqramları: kəlmə işləyənlər (kword, abiword), hesablayıcılar və pdf "
+"göstəriciləri, vs."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "İş Yeri"
+msgid "Workstation"
+msgstr "Masa ĂźstĂź"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Gnome iş stansiyası"
+msgid "Game station"
+msgstr "Oyun stansiyasÄą"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Palm Pilot və ya Visorunuz üçün vasitələr"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Məzəli proqramlar: arkad, lövhə oyunları, strategiya, vs"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Masa ĂźstĂź"
+msgid "Multimedia station"
+msgstr "Multimedya stansiyasÄą"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Verici, Firewall/Ruter"
+msgid "Sound and video playing/editing programs"
+msgstr "Səs və video çalınması/düzəliş proqramları"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr "Domeyn Ad bə Şəbəkə Mə'lumat Vericisi"
+msgid "Internet station"
+msgstr "Ä°nternet stansiyasÄą"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
 msgstr ""
-"İdarə proqramları: kəlmə işləyənlər (kword, abiword), hesablayıcılar və pdf "
-"göstəriciləri, vs."
+"Elektronik məktub və xəbər oxuyucusu (pine, mutt, tin..) və Web səyyahları"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr ""
-"Səs ilə əlaqədər vasitələr: mp3 və ya midi çalğıçılar, qarışdırıçılar, vs."
+msgid "Network Computer (client)"
+msgstr "Şəbəkə Kompüteri (alıcı)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr ""
+msgid "Clients for different protocols including ssh"
+msgstr "SSH daxil bir çox protokollarĹn alĹcĹlarĹ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Linuks və pulsuz proqram tə'minatıları Kitablar və Howtoları"
+#, fuzzy
+msgid "Configuration"
+msgstr "Yerli Şəbəkə Quraşdırılması"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "KDE iş stansiyası"
+msgid "Tools to ease the configuration of your computer"
+msgstr "Kompüter qurğularını asandlaşdıran vasitələr"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, vs."
+msgid "Scientific Workstation"
+msgstr "Elmi iş stansiyası"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Multimedya - Video"
+msgid "Scientific applications such as gnuplot"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr "Məktub, xəbərlər, fayl daşınması, chat vasitələri"
+msgid "Console Tools"
+msgstr "Konsol Vasitələri"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Databeyz"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Editorlar, rəflər, fayl vasitələri, terminallar"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL və ya MySQL databeyz vericisi"
+msgid "KDE Workstation"
+msgstr "KDE iş stansiyası"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Kompüter qurğularını asandlaşdıran vasitələr"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr "KDE, əsas qrafiki ara üz və yardımçi proqramlar kolleksiyası"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "Multimedya - Səs"
+msgid "Graphical Environment"
+msgstr "Qrafiki Ara Üz"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Sənədlər"
+msgid "Gnome Workstation"
+msgstr "Gnome iş stansiyası"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Konsol Vasitələri"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+"İstifadəçi dostu proqram və masa üstü ilə bərabər qrafiki ara üz vasitələri"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr "Postfix məktub vericisi, Inn xəbər vericisi"
+msgid "Other Graphical Desktops"
+msgstr "Başqa qrafiki ara üzlər"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Ä°nternet stansiyasÄą"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, vs."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Multimedya stansiyasÄą"
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+msgid "Development"
+msgstr "Təcrübi"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Configuration"
-msgstr "Yerli Şəbəkə Quraşdırılması"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C və C++ inkişaf kitabxanaları, proqramları və daxil ediləcək fayllar"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Başqa qrafiki ara üzlər (Gnome, IceWM)"
+msgid "Documentation"
+msgstr "Sənədlər"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr "KDE, əsas qrafiki ara üz və yardımçi proqramlar kolleksiyası"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Linuks və pulsuz proqram tə'minatıları Kitablar və Howtoları"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Qrafiki Ara Üz"
+msgid "LSB"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
+msgid "Linux Standard Base. Third party applications support"
+msgstr ""
+
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-msgid "Development"
-msgstr "Təcrübi"
+#: ../../share/compssUsers:999
+msgid "Web/FTP"
+msgstr "Verici, Veb/FTP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -173,23 +178,33 @@ msgstr "Apache və Pro-ftpd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "CD yazmaq və yandırmaq proqramları"
+msgid "Mail/Groupware/News"
+msgstr "Verici, ePoçt/Groupware/Xəbərlər"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "İş Yeri Stansiyası"
+msgid "Postfix mail server, Inn news server"
+msgstr "Postfix məktub vericisi, Inn xəbər vericisi"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, IceWM, Windows Maker, Enlightement, Fvwm, vs."
+msgid "Database"
+msgstr "Databeyz"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Qrafika proqramları, məsələn The Gimp"
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL və ya MySQL databeyz vericisi"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Firewall/Router"
+msgstr "Verici, Firewall/Ruter"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Internet gateway"
+msgstr "İnternet keçişı"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -198,8 +213,8 @@ msgstr "DNS/NIS "
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C və C++ inkişaf kitabxanaları, proqramları və daxil ediləcək fayllar"
+msgid "Domain Name and Network Information Server"
+msgstr "Domeyn Ad bə Şəbəkə Mə'lumat Vericisi"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -208,18 +223,18 @@ msgstr "Şəbəkə Kompüteri vericisi"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "Verici, ePoçt/Groupware/Xəbərlər"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS vericisi, SMB vericisi, SSH vericisi, Vəkil Verici"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Oyun stansiyasÄą"
+msgid "Office"
+msgstr "İş Yeri"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Video çalğıçıları və editorları"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr "Məktub, xəbərlər, fayl daşınması, chat vasitələri"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -228,77 +243,67 @@ msgstr "Multimedya - Qrafika"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Məzəli proqramlar: arkad, lövhə oyunları, strategiya, vs"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
-"Elektronik məktub və xəbər oxuyucusu (pine, mutt, tin..) və Web səyyahları"
+msgid "Graphics programs such as The Gimp"
+msgstr "Qrafika proqramları, məsələn The Gimp"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "Şəxsi Maliyyə"
+msgid "Multimedia - Sound"
+msgstr "Multimedya - Səs"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
 msgstr ""
-"İstifadəçi dostu proqram və masa üstü ilə bərabər qrafiki ara üz vasitələri"
+"Səs ilə əlaqədər vasitələr: mp3 və ya midi çalğıçılar, qarışdırıçılar, vs."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "SSH daxil bir çox protokollarĹn alĹcĹlarĹ"
+msgid "Multimedia - Video"
+msgstr "Multimedya - Video"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "LSB"
-msgstr ""
+msgid "Video players and editors"
+msgstr "Video çalğıçıları və editorları"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "İnternet keçişı"
+msgid "Multimedia - CD Burning"
+msgstr "Multimedya - CD YandÄąrma"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Səs və video çalınması/düzəliş proqramları"
+msgid "Tools to create and burn CD's"
+msgstr "CD yazmaq və yandırmaq proqramları"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Başqa qrafiki ara üzlər"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Başqa qrafiki ara üzlər (Gnome, IceWM)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Editorlar, rəflər, fayl vasitələri, terminallar"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, IceWM, Windows Maker, Enlightement, Fvwm, vs."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "Şəxsi maliyyə idarəçiləri, məsələn gnucash"
+msgid "Personal Information Management"
+msgstr "Şəxsi Mə'lumat İdarəçisi"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "Şəxsi Mə'lumat İdarəçisi"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Palm Pilot və ya Visorunuz üçün vasitələr"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multimedya - CD YandÄąrma"
+msgid "Personal Finance"
+msgstr "Şəxsi Maliyyə"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Elmi iş stansiyası"
+msgid "Programs to manage your finances, such as gnucash"
+msgstr "Şəxsi maliyyə idarəçiləri, məsələn gnucash"
 
diff --git a/po/bg.po b/po/bg.po
index d11e734a..0793634a 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-bg\n"
-"POT-Creation-Date: 2003-02-12 14:24+0100\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\n"
 "PO-Revision-Date: 2003-02-14 09:21+0200\n"
 "Last-Translator: Borislav Aleksandrov <B.Aleksandrov@cnsys.bg>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
@@ -17,885 +17,1175 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
 
-#: ../edit-urpm-sources.pl_.c:43
-msgid "Unable to create medium."
-msgstr "Íĺâúçěîćíîńň çŕ ńúçäŕâŕíĺ íŕ čçňî÷íčę."
-
-#: ../edit-urpm-sources.pl_.c:44
-msgid "Unable to update medium; it will be automatically disabled."
-msgstr "Íĺ ěîăŕ äŕ îáíîâ˙ čçňî÷íčę; ňîé ůĺ áúäĺ ŕâňîěŕč÷íî çŕáđŕíĺí."
-
-#: ../edit-urpm-sources.pl_.c:54
-msgid "Add a source"
-msgstr "Äîáŕâ˙ íŕ čçňî÷íčę"
-
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Local files"
-msgstr "Ëîęŕëíč ôŕéëîâĺ"
-
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Path:"
-msgstr "Ďúň:"
-
-#: ../edit-urpm-sources.pl_.c:56
-msgid "FTP server"
-msgstr "FTP ńúđâúđ"
-
-#: ../edit-urpm-sources.pl_.c:56 ../edit-urpm-sources.pl_.c:57
-#: ../edit-urpm-sources.pl_.c:59 ../edit-urpm-sources.pl_.c:187
-msgid "URL:"
-msgstr "URL:"
-
-#: ../edit-urpm-sources.pl_.c:57
-msgid "HTTP server"
-msgstr "HTTP ńĺđâĺđ"
-
-#: ../edit-urpm-sources.pl_.c:58
-msgid "Path or mount point:"
-msgstr "Ďúň čëč ňî÷ęŕ íŕ ěîíňčđŕíĺ:"
-
-#: ../edit-urpm-sources.pl_.c:58
-msgid "Removable device"
-msgstr "Ďđĺěĺńňâŕĺěî óńňđîéńňâî"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:550
-msgid "Security updates"
-msgstr "Îáíîâ˙âŕíč˙ çŕ ńčăóđíîńň"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to the software installation tool!\n"
+"\n"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
+msgstr ""
+"Äîáđĺ äîřëč â číńňđóěĺíňŕ çŕ číńňŕëčđŕíĺ!\n"
+"\n"
+"Âŕřŕňŕ Ěŕíäđĺéę Ëčíóęń ńčńňĺěŕ čäâŕ ń í˙ęîëęî őčë˙äč ńîôňóĺđíč\n"
+"ďŕęĺňŕ íŕ CDROM čëč DVD. Ňîçč číńňđóěĺíň ůĺ âč ďîěîăíĺ äŕ čçáĺđĺňĺ ęîč "
+"ďŕęĺňč\n"
+"âčĺ čńęŕňĺ äŕ číńňŕëčđŕňĺ íŕ ńčńňĺěŕňŕ."
 
-#: ../edit-urpm-sources.pl_.c:70
-msgid "Browse..."
-msgstr "Ňúđńč..."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Äîáđĺ äîřëč â MandrakeÎáíîâ˙âŕíĺ!\n"
+"\n"
+"Ňîçč číńňđóěĺíň ůĺ âč ďîěîăíĺ äŕ čçáĺđĺňĺ îáíîâ˙âŕíĺ íŕ âŕřč˙ň ńîôňóĺđr\n"
+"âúđőó ńčńňĺěŕňŕ."
 
-#: ../edit-urpm-sources.pl_.c:72
-msgid "Choose a mirror..."
-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"
+"čçňđčĺňĺ îň ńčńňĺěŕňŕ."
 
-#: ../edit-urpm-sources.pl_.c:92
-msgid "Login:"
-msgstr "Ďîňđĺáčňĺëńęî čěĺ:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"Ďî˙âčőŕ ńĺ ďđîáëĺěč ďî âđĺěĺ íŕ ďđĺěŕőâŕíĺ íŕ ďŕęĺňč:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:231
-msgid "Password:"
-msgstr "Ďŕđîëŕ:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during removal"
+msgstr "Ďî˙âčőŕ ńĺ ďđîáëĺěč ďî âđĺěĺ íŕ ďđĺěŕőâŕíĺňî"
 
-#: ../edit-urpm-sources.pl_.c:97
-msgid "Name:"
-msgstr "Čěĺ:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages..."
+msgstr "Ěîë˙ čç÷ŕęŕéňĺ, ďđĺěŕőâŕň ńĺ ďŕęĺňčňĺ..."
 
-#: ../edit-urpm-sources.pl_.c:99 ../edit-urpm-sources.pl_.c:188
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Đĺëŕňčâĺí ďúň äî äčđĺęňîđč˙ čëč hdlist: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
+msgstr "Ěîë˙ čç÷ŕęŕéňĺ, ÷ĺňŕ áŕçŕňŕ äŕííč ń ďŕęĺňč..."
 
-#: ../edit-urpm-sources.pl_.c:107
-msgid "You need to fill up at least the two first entries."
-msgstr "Ňđ˙áâŕ äŕ ďîďúëíčňĺ ďîíĺ ďúđâčňĺ 2 ňî÷ęč."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Čěŕ ďđîáëĺěč ďî âđĺěĺ íŕ číńňŕëŕöč˙ňŕ:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:120
-msgid "Adding a source:"
-msgstr "Äîáŕâ˙íĺ íŕ čçňî÷íčę:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during installation"
+msgstr "Ďđîáëĺěč ďî âđĺěĺ íŕ číńňŕëŕöč˙ňŕ"
 
-#: ../edit-urpm-sources.pl_.c:121
-msgid "Type of source:"
-msgstr "Ňčď íŕ čçňî÷íčęŕ:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
+msgstr "Âńč÷ęî âĺ÷ĺ ĺ číńňŕëčđŕíî."
 
-#: ../edit-urpm-sources.pl_.c:125 ../edit-urpm-sources.pl_.c:202
-#: ../edit-urpm-sources.pl_.c:235 ../rpmdrake.pm_.c:100 ../rpmdrake.pm_.c:139
-#: ../rpmdrake.pm_.c:322 ../rpmdrake_.c:355 ../rpmdrake_.c:367
-#: ../rpmdrake_.c:371 ../rpmdrake_.c:918 ../rpmdrake_.c:953
-msgid "Ok"
-msgstr "Äîáđĺ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed."
+msgstr "Âńč÷ęî âĺ÷ĺ ĺ číńňŕëčđŕíî."
 
-#: ../edit-urpm-sources.pl_.c:140 ../edit-urpm-sources.pl_.c:196
-#: ../edit-urpm-sources.pl_.c:202 ../edit-urpm-sources.pl_.c:242
-#: ../rpmdrake.pm_.c:322 ../rpmdrake.pm_.c:355 ../rpmdrake_.c:355
-#: ../rpmdrake_.c:953
-msgid "Cancel"
-msgstr "Îňęŕç"
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "Âńč÷ęč çŕ˙âĺíč ďŕęĺňč á˙őŕ číńňŕëčđŕíč ęîđĺęňíî."
 
-#: ../edit-urpm-sources.pl_.c:147
-msgid "Please wait, adding medium..."
-msgstr ""
-"Ěîë˙ Čç÷ŕęŕéňĺ\n"
-"Äîáŕâ˙ ńĺ čçňî÷íčę..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr "Âńč÷ęč á˙őŕ číńňŕëčđŕíč ęîđĺęňíî"
 
-#: ../edit-urpm-sources.pl_.c:168
-msgid "Please wait, removing medium..."
+#: ../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 ""
-"Ěîë˙ Čç÷ŕęŕéňĺ\n"
-"Ďđĺěŕőâŕ ńĺ čçňî÷íčę"
-
-#: ../edit-urpm-sources.pl_.c:181
-msgid "Edit a source"
-msgstr "Đĺäŕęňčđŕíĺ íŕ čçňî÷íčöč"
+"Číńňŕëčđŕíĺňî çŕâúđřč; %s.\n"
+"\n"
+"Í˙ęîé ęîíôčăóđŕöčîííč ôŕéëîâĺ á˙őŕ ńúçäŕäĺíč ęŕňî .rpmnew' čëč `.rpmsave'.\n"
+"Âčĺ ňđ˙áâŕ äŕ ďđĺăëĺäŕňĺ í˙ęîé îň ň˙ő çŕ äŕ ďđĺäďđčĺěĺňĺ äĺéńňâčĺ:"
 
-#: ../edit-urpm-sources.pl_.c:185
+#: ../rpmdrake:1
 #, c-format
-msgid "Editing source \"%s\":"
-msgstr "Đĺäŕęňčđŕíĺ íŕ čçňî÷íčę \"%s\":"
-
-#: ../edit-urpm-sources.pl_.c:191
-msgid "Save changes"
-msgstr "Çŕďŕçâŕ ďđîěĺíčňĺ"
-
-#: ../edit-urpm-sources.pl_.c:200
-msgid "You need to insert the medium to continue"
-msgstr "Âčĺ ňđ˙áâŕ äŕ ďîńňŕâčňĺ čçňî÷íčęŕ çŕ äŕ ďđîäúëćčňĺ"
+msgid "everything was installed correctly"
+msgstr "âńč÷ęč á˙őŕ číńňŕëčđŕíč ęîđĺęňíî"
 
-#: ../edit-urpm-sources.pl_.c:201
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
+"some packages failed to install\n"
+"correctly"
 msgstr ""
-"Çŕ äŕ çŕďŕçčňĺ ďđîěĺíčňĺ, âčĺ ňđ˙áâŕ ďúđâî äŕ ďîńňŕâčňĺ čçňî÷íčęŕ â "
-"óńňđîéńňâîňî."
+"í˙ęîč ďŕęĺňč íĺ ěîăŕň äŕ áúäŕň číńňŕëčđŕíč\n"
+"ęîđĺęňíî"
 
-#: ../edit-urpm-sources.pl_.c:206
-msgid "Please wait, updating medium..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages to allow others to be upgraded..."
 msgstr ""
-"Ěîë˙ Čç÷ŕęŕéňĺ\n"
-"Îáíîâ˙âŕ ńĺ číôîđěŕöč˙ňŕ çŕ ňîçč čçňî÷íčę..."
-
-#: ../edit-urpm-sources.pl_.c:217
-msgid "Configure proxies"
-msgstr "Ęîíôčăóđčđŕíĺ íŕ ďđîęńčňŕ"
+"Ěîë˙ čç÷ŕęŕéňĺ, ďđĺěŕőâŕň ńĺ ďŕęĺňčňĺ çŕ äŕ ďîçâîë˙ň äđóăč äŕ áúäŕň "
+"îáíîâĺíč..."
 
-#: ../edit-urpm-sources.pl_.c:223
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
 msgstr ""
-"Ŕęî ńĺ íóćäŕĺňĺ îň ďđîęńč, âúâĺäĺňĺ čěĺ íŕ őîńň č îďöčîíŕëíî ďîđň (ńčíňŕęńčń:"
-"<proxyhost[:port]>):"
+"Číńňŕëčđŕíĺňî ďđîďŕäíŕ, í˙ęîé îň ôŕéëîâĺňĺ ëčďńâŕň.\n"
+"Âčĺ ňđ˙áâŕ äŕ îáíîâčňĺ čçňî÷íčęŕ íŕ âŕřŕňŕ áŕçŕ äŕííč."
 
-#: ../edit-urpm-sources.pl_.c:225
-msgid "Proxy hostname:"
-msgstr "Čěĺ íŕ ďđîęńč:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation failed"
+msgstr "Číńňŕëčđŕíĺňî ďđîďŕäíŕ"
 
-#: ../edit-urpm-sources.pl_.c:227
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "Âčĺ ňđ˙áâŕ äŕ çŕäŕäĺňĺ čěĺ/ďŕđîëŕ çŕ čäĺíňčôčęŕöč˙ ďđĺä ďđîęńčňî:"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
+msgstr "Îňęŕç"
 
-#: ../edit-urpm-sources.pl_.c:229
-msgid "User:"
-msgstr "Ďîňđĺáčňĺë:"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "Äîáđĺ"
 
-#: ../edit-urpm-sources.pl_.c:255
-msgid "Configure sources"
-msgstr "Ęîíôčăóđčđŕíĺ íŕ čçňî÷íčę"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Ěîë˙, ďîńňŕâĺňĺ čçňî÷íčę ń čěĺ \"%s\" íŕ óńňđîéńňâî [%s]"
 
-#: ../edit-urpm-sources.pl_.c:262
-msgid "Enabled?"
-msgstr "Äŕ đŕçđĺřŕ?"
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr "Ńěĺí˙ čçňî÷íčę"
 
-#: ../edit-urpm-sources.pl_.c:263
-msgid "Source"
-msgstr "Čçňî÷íčę"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
+msgstr "Íĺ ěîăŕ äŕ âçĺěŕ čçőîäíčňĺ ďŕęĺňč, ńúćŕë˙âŕě."
 
-#: ../edit-urpm-sources.pl_.c:286 ../rpmdrake_.c:732
-msgid "Remove"
-msgstr "Čçňđčâŕ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages."
+msgstr "Íĺ ěîăŕ äŕ âçĺěŕ čçőîäíčňĺ ďŕęĺňč."
 
-#: ../edit-urpm-sources.pl_.c:288
-msgid "Edit"
-msgstr "Đĺäŕęňčđŕ"
+#: ../rpmdrake:1
+#, c-format
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr "çŕ˙âĺíŕňŕ ďđîăđŕěŕ ëčďńâŕ (grpmi). Ďđîâĺđĺňĺ ńč číńňŕëŕöč˙ňŕ."
 
-#: ../edit-urpm-sources.pl_.c:290
-msgid "Add..."
-msgstr "Äîáŕâ˙..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
+msgstr "Ďđîăđŕěŕ ëčďńâŕ"
 
-#: ../edit-urpm-sources.pl_.c:292
-msgid "Update..."
-msgstr "Îáíîâ˙âŕ..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
+msgstr "Ďđĺăëĺćäŕ..."
 
-#: ../edit-urpm-sources.pl_.c:293
-msgid "Proxy..."
-msgstr "Ďđîęńč..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation finished"
+msgstr "Číńňŕëčđŕíĺňî ďđčęëţ÷č"
 
-#: ../edit-urpm-sources.pl_.c:296
-msgid "Save and quit"
-msgstr "Çŕďčńâŕ č čçëčçŕ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
+msgstr "Íĺ ďđŕâč íčůî"
 
-#: ../edit-urpm-sources.pl_.c:297 ../rpmdrake_.c:735
-msgid "Quit"
-msgstr "Čçőîä"
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
+msgstr "Čçďîëçâŕ .%s ęŕňî ăëŕâĺí ôŕéë"
 
-#: ../rpmdrake.pm_.c:96
-msgid "Yes"
-msgstr "Äŕ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Remove .%s"
+msgstr "Ďđĺěŕőâŕ .%s"
 
-#: ../rpmdrake.pm_.c:98
-msgid "No"
-msgstr "Íĺ"
+#: ../rpmdrake:1
+#, c-format
+msgid "changes:"
+msgstr "ďđîěĺíč:"
 
-#: ../rpmdrake.pm_.c:130
-msgid "Info..."
-msgstr "Číôîđěŕöč˙..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr "Ďđĺăëĺćäŕě %s"
 
-#: ../rpmdrake.pm_.c:183
-msgid "Austria"
-msgstr "Ŕâńňđč˙"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, finding available packages..."
+msgstr "Ěîë˙ čç÷ŕęŕéňĺ, ňúđń˙ íŕëč÷íčňĺ ďŕęĺňč..."
 
-#: ../rpmdrake.pm_.c:184
-msgid "Australia"
-msgstr "Ŕâńňđŕëč˙"
+#: ../rpmdrake:1
+#, c-format
+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 ""
 
-#: ../rpmdrake.pm_.c:185
-msgid "Belgium"
-msgstr "Áĺëăč˙"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
+msgstr "Ăđĺřęŕ ďđč äîáŕâ˙íĺ íŕ čçňî÷íčę çŕ îáíîâ˙âŕíĺ"
 
-#: ../rpmdrake.pm_.c:186
-msgid "Brazil"
-msgstr "Áđŕçčëč˙"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
+msgstr ""
+"Ěîë˙ ďî÷ŕęŕéňĺ, ęîíňŕęňóâŕě ń îăëĺäŕëĺí ńúđâúđ çŕ číčöčŕëčçčđŕíĺ îáíîâ˙âŕíĺ "
+"íŕ ďŕęĺňč."
 
-#: ../rpmdrake.pm_.c:187
-msgid "Canada"
-msgstr "Ęŕíŕäŕ"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Sources Manager, and then add a `Security\n"
+"updates' source.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
 
-#: ../rpmdrake.pm_.c:188
-msgid "Costa Rica"
-msgstr "Ęîńňŕ Đčęŕ"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Ęŕę äŕ čçáĺđĺňĺ đú÷íî âŕřč˙ň îăëĺäŕëĺí ńúđâúđ"
 
-#: ../rpmdrake.pm_.c:189
-msgid "Czech Republic"
-msgstr "×ĺőč˙"
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
+msgstr "Čěŕ íĺďîďđŕâčěŕ ăđĺřęŕ ďđč îáíîâ˙âŕíĺ číôîđěŕöč˙ çŕ ďŕęĺňč."
 
-#: ../rpmdrake.pm_.c:190
-msgid "Germany"
-msgstr "Ăĺđěŕíč˙"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
+msgstr "Ăđĺřęŕ ďđč îáíîâ˙âŕíĺ íŕ čçňî÷íčę"
 
-#: ../rpmdrake.pm_.c:191
-msgid "Danmark"
-msgstr "Äŕíč˙"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
+msgstr ""
+"Ěîë˙, ďî÷ŕęŕéňĺ. Ęîíňŕęňóâŕě ń îăëĺäŕëĺí ńúđâúđ çŕ îáíîâ˙âŕíĺ číîđěŕöč˙ çŕ "
+"ďŕęĺňč."
 
-#: ../rpmdrake.pm_.c:192 ../rpmdrake.pm_.c:196
-msgid "Greece"
-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 ""
 
-#: ../rpmdrake.pm_.c:193
-msgid "Spain"
-msgstr "Čńďŕíč˙"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Installation"
+msgstr "Číńňŕëčđŕíĺ íŕ ďŕęĺňč"
 
-#: ../rpmdrake.pm_.c:194
-msgid "Finland"
-msgstr "Ôčíëŕíäč˙"
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, c-format
+msgid "Mandrake Update"
+msgstr "Ěŕíäđĺéę Ďîäíîâ˙âŕíĺ"
 
-#: ../rpmdrake.pm_.c:195
-msgid "France"
-msgstr "Ôđŕíöč˙"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
+msgstr "Čçňđčâŕíĺ íŕ ďŕęĺňč"
 
-#: ../rpmdrake.pm_.c:197
-msgid "Israel"
-msgstr "Čçđŕĺë"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Čçőîä"
 
-#: ../rpmdrake.pm_.c:198
-msgid "Italy"
-msgstr "Čňŕëč˙"
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "Číńňŕëčđŕ"
 
-#: ../rpmdrake.pm_.c:199
-msgid "Japan"
-msgstr "ßďîíč˙"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "Čçňđčâŕ"
 
-#: ../rpmdrake.pm_.c:200
-msgid "Korea"
-msgstr "Ęîđĺ˙"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search"
+msgstr "Ňúđńč"
 
-#: ../rpmdrake.pm_.c:201
-msgid "Netherlands"
-msgstr "Őîëŕíäč˙"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "Ňúđńč:"
 
-#: ../rpmdrake.pm_.c:202
-msgid "Norway"
-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 ""
 
-#: ../rpmdrake.pm_.c:203
-msgid "Poland"
-msgstr "Ďîëřŕ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "Í˙ęîč ďŕęĺňč ňđ˙áâŕ äŕ áúäŕň ďđĺěŕőíŕňč"
 
-#: ../rpmdrake.pm_.c:204
-msgid "Portugal"
-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 ""
 
-#: ../rpmdrake.pm_.c:205
-msgid "Russia"
-msgstr "Đóńč˙"
+#: ../rpmdrake:1
+#, c-format
+msgid "Too many packages are selected"
+msgstr "Ňâúđäĺ ěíîăî ďŕęĺňč ńŕ čçáđŕíč"
 
-#: ../rpmdrake.pm_.c:206
-msgid "Sweden"
-msgstr "Řâĺöč˙"
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
+msgstr "Ěŕęńčěóě číôîđěŕöč˙"
 
-#: ../rpmdrake.pm_.c:207
-msgid "Taiwan"
-msgstr "Ňŕéâŕí"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal information"
+msgstr "Íîđěŕëíŕ číôîđěŕöč˙"
 
-#: ../rpmdrake.pm_.c:208
-msgid "United Kingdom"
-msgstr "Îáĺäčíĺíîňî ęđŕëńňâî"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update source(s)"
+msgstr "Îáíîâč čçňî÷íčöčňĺ"
 
-#: ../rpmdrake.pm_.c:209
-msgid "China"
-msgstr "Ęčňŕé"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reload the packages list"
+msgstr "Ďđĺçŕđĺćäŕ ńďčńúę ń ďŕęĺňčňĺ"
 
-#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:211 ../rpmdrake.pm_.c:212
-#: ../rpmdrake.pm_.c:213 ../rpmdrake.pm_.c:264
-msgid "United States"
-msgstr "ŃŔŮ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
+msgstr "Íóëčđŕ čçáđŕíîňî"
 
-#: ../rpmdrake.pm_.c:277
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
-"Ěîë˙, ďî÷ŕęŕéňĺ. Čçňĺăë˙ě îăëĺäŕëíčňĺ ŕäđĺńč îň web ńŕéňŕ íŕ MandrakeSoft."
+#: ../rpmdrake:1
+#, c-format
+msgid "in files"
+msgstr "ďî ôŕéëîâĺ"
 
-#: ../rpmdrake.pm_.c:283
-msgid "Error during download"
-msgstr "Ăđĺřęŕ ďî âđĺěĺ íŕ čçňĺăë˙íĺ"
+#: ../rpmdrake:1
+#, c-format
+msgid "in descriptions"
+msgstr "ďî îďčńŕíčĺ"
 
-#: ../rpmdrake.pm_.c:292
-msgid "No mirror"
-msgstr "Í˙ěŕ îăëĺäŕëĺí"
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
+msgstr "ďî čěĺíŕ"
 
-#: ../rpmdrake.pm_.c:310
-msgid "Please choose the desired mirror."
-msgstr "Ěîë˙, čçáĺđĺňĺ ćĺëŕíč˙ň îăëĺäŕëĺí ńúđâúđ."
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
+msgstr "ďî âúçěîćíîńň çŕ îáíîâ˙âŕíĺ"
 
-#: ../rpmdrake.pm_.c:342 ../rpmdrake_.c:629
-msgid "Update source(s)"
-msgstr "Îáíîâč čçňî÷íčöčňĺ"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
+msgstr "ďî čçňî÷íčę íŕ ńúőđŕíĺíčĺ"
 
-#: ../rpmdrake.pm_.c:346
-msgid "Select the source(s) you wish to update:"
-msgstr "Ěîë˙ čçáĺđĺňĺ čçňî÷íčöč ęîčňî čńęŕňĺ äŕ ńĺ ďîäíîâ˙ň:"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
+msgstr "ďî ńúńňî˙íčĺ"
 
-#: ../rpmdrake.pm_.c:350
-msgid "Update"
-msgstr "Îáíîâ˙âŕ"
+#: ../rpmdrake:1
+#, c-format
+msgid "by size"
+msgstr "ďî ăîëĺěčíŕ"
 
-#: ../rpmdrake.pm_.c:360
-msgid "Please wait, updating media..."
-msgstr "Ěîë˙, čç÷ŕęŕéňĺ. Îáíîâ˙âŕ ńĺ čçňî÷íčę..."
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
+msgstr "ďî ăđóďŕ"
 
-#: ../rpmdrake_.c:101
-msgid "Other"
-msgstr "Äđóă"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages,"
+msgstr "Âńč÷ęč ďŕęĺňč,"
 
-#: ../rpmdrake_.c:123 ../rpmdrake_.c:137 ../rpmdrake_.c:229 ../rpmdrake_.c:300
-msgid "(none)"
-msgstr "(í˙ěŕ)"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
+msgstr "Âńč÷ęč ďŕęĺňč ďî ŕçáó÷ĺí đĺä"
 
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:484 ../rpmdrake_.c:485
-msgid "(Not available)"
-msgstr "(Íĺ ĺ íŕëč÷ĺí)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
+msgstr "Ěŕíäđĺéę čçáđŕíč"
 
-#: ../rpmdrake_.c:153 ../rpmdrake_.c:210
-msgid "Search results"
-msgstr "Đĺçóëňŕň îň ňúđńĺíĺ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal updates"
+msgstr "Íîđěŕëíč îáíîâ˙âŕíč˙"
 
-#: ../rpmdrake_.c:153
-msgid "Search results (none)"
-msgstr "Đĺçóëňŕň îň ňúđńĺíĺňî (í˙ěŕ)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Bugfixes updates"
+msgstr "Îáíîâ˙âŕíĺ çŕ îňęđčňč ăđĺřęč"
 
-#: ../rpmdrake_.c:163 ../rpmdrake_.c:174
-msgid "Please wait, searching..."
-msgstr "Ěîë˙ čç÷ŕęŕéňĺ, ňúđń˙..."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
+msgstr "Îáíîâ˙âŕíč˙ çŕ ńčăóđíîńň"
 
-#: ../rpmdrake_.c:177
-msgid "Stop"
-msgstr "Ńňîď"
+#: ../rpmdrake:1
+#, c-format
+msgid "Description: "
+msgstr "Îďčńŕíčĺ: "
 
-#: ../rpmdrake_.c:211 ../rpmdrake_.c:321
-msgid "Addable"
-msgstr "Âúçěîćíč çŕ äîáŕâ˙íĺ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Summary: "
+msgstr "Đĺçţěĺ: "
 
-#: ../rpmdrake_.c:211 ../rpmdrake_.c:321
-msgid "Upgradable"
-msgstr "Âúçěîćíč çŕ îáíîâ˙âŕíĺ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "Âŕćíîńň: "
 
-#: ../rpmdrake_.c:213
-msgid "Not selected"
-msgstr "Íĺ ńŕ čçáđŕíč"
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s ĘÁ"
 
-#: ../rpmdrake_.c:213
-msgid "Selected"
-msgstr "Čçáđŕíč"
+#: ../rpmdrake:1
+#, c-format
+msgid "Size: "
+msgstr "Đŕçěĺđ: "
 
-#: ../rpmdrake_.c:242
-msgid "rpmdrake"
-msgstr "rpmdrake"
+#: ../rpmdrake:1
+#, c-format
+msgid "Version: "
+msgstr "Âĺđńč˙: "
 
-#: ../rpmdrake_.c:260 ../rpmdrake_.c:362 ../rpmdrake_.c:364
-msgid "More information on package..."
-msgstr "Ďîâĺ÷ĺ číôîđěŕöč˙ îň ďŕęĺň..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "Čěĺ: "
 
-#: ../rpmdrake_.c:261
-msgid "One of the following packages is needed:"
-msgstr "Ĺäčí îň ńëĺäíčňĺ ďŕęĺňč ĺ íĺîáőîäčě:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "Ďđč÷číŕ çŕ îáíîâ˙âŕíĺ: "
 
-#: ../rpmdrake_.c:261
-msgid "Please choose"
-msgstr "Ěîë˙ čçáĺđĺňĺ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
+msgstr "Ňĺęóůî číńňŕëčđŕíŕ âĺđńč˙: "
 
-#: ../rpmdrake_.c:277
-msgid "unknown package "
-msgstr "íĺđŕçďîçíŕň ďŕęĺň"
+#: ../rpmdrake:1
+#, c-format
+msgid "Source: "
+msgstr "Čçňî÷íčę: "
 
-#: ../rpmdrake_.c:287
-msgid "Please wait, listing packages..."
-msgstr "Ěîë˙ čç÷ŕęŕéňĺ, ďđŕâč ńĺ ńďčńúę íŕ ďŕęĺňčňĺ"
+#: ../rpmdrake:1
+#, c-format
+msgid "(Not available)"
+msgstr "(Íĺ ĺ íŕëč÷ĺí)"
 
-#: ../rpmdrake_.c:302
-msgid "No update"
-msgstr "Í˙ěŕ îáíîâ˙âŕíč˙"
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
+msgstr ""
 
-#: ../rpmdrake_.c:355 ../rpmdrake_.c:356
-msgid "More infos"
-msgstr "Ďîâĺ÷ĺ číôîđěŕöč˙"
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "Ôŕéëîâĺ:\n"
 
-#: ../rpmdrake_.c:357
-msgid "Information on packages"
-msgstr "Číôîđěŕöč˙ íŕ ďŕęĺňč"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected size: %d MB"
+msgstr "Đŕçěĺđ íŕ čçáđŕíč: %d ĚÁ"
 
-#: ../rpmdrake_.c:378
-msgid "Some additional packages need to be removed"
-msgstr "Í˙ęîé äîďúëíčňĺëíč ďŕęĺňč ňđ˙áâŕ äŕ ńĺ čçňđč˙ň"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Čçáđŕíč: %d ĚÁ / Ńâîáîäíî äčńęîâî ďđîńňđŕíńňâî: %d ĚÁ"
 
-#: ../rpmdrake_.c:379
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
 msgstr ""
-"Çŕ äŕ ńĺ óäîâîëĺňâîđ˙ň çŕâčńčěîńňčňĺ,\n"
-"ńëĺäíčňĺ ďŕęĺňč ňđ˙áâŕ áúäŕň ďđĺěŕőíŕňč:\n"
+"Ďîđŕäč çŕâčńčěîńň, ńëĺäíčňĺ ďŕęĺňč ňđ˙áâŕ äŕ áúäŕň îňęŕçŕíč\n"
+"îň čçáîđŕ ńĺăŕ:\n"
 "\n"
 
-#: ../rpmdrake_.c:385 ../rpmdrake_.c:393
-msgid "Some packages can't be removed"
-msgstr "Í˙ęîč ďŕęĺňč íĺ ěîăŕň äŕ áúäŕň ďđĺěŕőíŕňč"
-
-#: ../rpmdrake_.c:386
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Removing these packages would break your system, sorry:\n"
+"Sorry, the following package(s) can't be selected:\n"
 "\n"
 msgstr ""
-"Ďđĺěŕőâŕíĺňî íŕ ňĺçč ďŕęĺňč áč đŕçáčëî ńčńňĺěŕňŕ âč, ńúćŕë˙âŕě:\n"
+"Ńúćŕë˙âŕě, ńëĺäíčňĺ ďŕęĺňč íĺ ěîăŕň äŕ áúäŕň čçáđŕíč:\n"
 "\n"
 
-#: ../rpmdrake_.c:394 ../rpmdrake_.c:453
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "Í˙ęîč ďŕęĺňč íĺ ěîăŕň äŕ áúäŕň číńňŕëčđŕíč"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
 "\n"
 msgstr ""
-"Ďîđŕäč çŕâčńčěîńň, ńëĺäíčňĺ ďŕęĺňč ňđ˙áâŕ äŕ áúäŕň îňęŕçŕíč\n"
-"îň čçáîđŕ ńĺăŕ:\n"
+"Çŕ äŕ ńĺ çŕäîâîë˙ň çŕâčńčěîńňčňĺ, ńëĺäíčňĺ ďŕęĺňč ňđ˙áâŕ ńúůî\n"
+"äŕ áúäŕň číńňŕëčđŕíč:\n"
 "\n"
 
-#: ../rpmdrake_.c:423
+#: ../rpmdrake:1
+#, c-format
 msgid "Additional packages needed"
 msgstr "Ňđ˙áâŕ äîďúëíčňĺëíč ďŕęĺňč"
 
-#: ../rpmdrake_.c:424
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be removed"
+msgstr "Í˙ęîč ďŕęĺňč íĺ ěîăŕň äŕ áúäŕň ďđĺěŕőíŕňč"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
+"Removing these packages would break your system, sorry:\n"
 "\n"
 msgstr ""
-"Çŕ äŕ ńĺ çŕäîâîë˙ň çŕâčńčěîńňčňĺ, ńëĺäíčňĺ ďŕęĺňč ňđ˙áâŕ ńúůî\n"
-"äŕ áúäŕň číńňŕëčđŕíč:\n"
+"Ďđĺěŕőâŕíĺňî íŕ ňĺçč ďŕęĺňč áč đŕçáčëî ńčńňĺěŕňŕ âč, ńúćŕë˙âŕě:\n"
 "\n"
 
-#: ../rpmdrake_.c:437
-msgid "Some packages can't be installed"
-msgstr "Í˙ęîč ďŕęĺňč íĺ ěîăŕň äŕ áúäŕň číńňŕëčđŕíč"
-
-#: ../rpmdrake_.c:438
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
 "\n"
 msgstr ""
-"Ńúćŕë˙âŕě, ńëĺäíčňĺ ďŕęĺňč íĺ ěîăŕň äŕ áúäŕň čçáđŕíč:\n"
+"Çŕ äŕ ńĺ óäîâîëĺňâîđ˙ň çŕâčńčěîńňčňĺ,\n"
+"ńëĺäíčňĺ ďŕęĺňč ňđ˙áâŕ áúäŕň ďđĺěŕőíŕňč:\n"
 "\n"
 
-#: ../rpmdrake_.c:452 ../rpmdrake_.c:686
-msgid "Some packages need to be removed"
-msgstr "Í˙ęîč ďŕęĺňč ňđ˙áâŕ äŕ áúäŕň ďđĺěŕőíŕňč"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr "Í˙ęîé äîďúëíčňĺëíč ďŕęĺňč ňđ˙áâŕ äŕ ńĺ čçňđč˙ň"
 
-#: ../rpmdrake_.c:474
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Čçáđŕíč: %d ĚÁ / Ńâîáîäíî äčńęîâî ďđîńňđŕíńňâî: %d ĚÁ"
+msgid "More information on package..."
+msgstr "Ďîâĺ÷ĺ číôîđěŕöč˙ îň ďŕęĺň..."
 
-#: ../rpmdrake_.c:476
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "Đŕçěĺđ íŕ čçáđŕíč: %d ĚÁ"
+msgid "Information on packages"
+msgstr "Číôîđěŕöč˙ íŕ ďŕęĺňč"
 
-#: ../rpmdrake_.c:484
-msgid "Files:\n"
-msgstr "Ôŕéëîâĺ:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
+msgstr "Ďîâĺ÷ĺ číôîđěŕöč˙"
 
-#: ../rpmdrake_.c:485
-msgid "Changelog:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "Addable"
+msgstr "Âúçěîćíč çŕ äîáŕâ˙íĺ"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Upgradable"
+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_.c:488
-msgid "Source: "
-msgstr "Čçňî÷íčę: "
+#: ../rpmdrake:1
+#, c-format
+msgid "No update"
+msgstr "Í˙ěŕ îáíîâ˙âŕíč˙"
 
-#: ../rpmdrake_.c:489
-msgid "Currently installed version: "
-msgstr "Ňĺęóůî číńňŕëčđŕíŕ âĺđńč˙: "
+#: ../rpmdrake:1
+#, c-format
+msgid "(none)"
+msgstr "(í˙ěŕ)"
 
-#: ../rpmdrake_.c:493
-msgid "Reason for update: "
-msgstr "Ďđč÷číŕ çŕ îáíîâ˙âŕíĺ: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, listing packages..."
+msgstr "Ěîë˙ čç÷ŕęŕéňĺ, ďđŕâč ńĺ ńďčńúę íŕ ďŕęĺňčňĺ"
 
-#: ../rpmdrake_.c:495
-msgid "Name: "
-msgstr "Čěĺ: "
+#: ../rpmdrake:1
+#, c-format
+msgid "unknown package "
+msgstr "íĺđŕçďîçíŕň ďŕęĺň"
 
-#: ../rpmdrake_.c:496
-msgid "Version: "
-msgstr "Âĺđńč˙: "
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Ĺäčí îň ńëĺäíčňĺ ďŕęĺňč ĺ íĺîáőîäčě:"
 
-#: ../rpmdrake_.c:497
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s ĘÁ"
+msgid "Please choose"
+msgstr "Ěîë˙ čçáĺđĺňĺ"
 
-#: ../rpmdrake_.c:497
-msgid "Size: "
-msgstr "Đŕçěĺđ: "
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:499
-msgid "Importance: "
-msgstr "Âŕćíîńň: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Not selected"
+msgstr "Íĺ ńŕ čçáđŕíč"
 
-#: ../rpmdrake_.c:500
-msgid "Summary: "
-msgstr "Đĺçţěĺ: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected"
+msgstr "Čçáđŕíč"
 
-#: ../rpmdrake_.c:501
-msgid "Description: "
-msgstr "Îďčńŕíčĺ: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results"
+msgstr "Đĺçóëňŕň îň ňúđńĺíĺ"
 
-#: ../rpmdrake_.c:550
-msgid "Bugfixes updates"
-msgstr "Îáíîâ˙âŕíĺ çŕ îňęđčňč ăđĺřęč"
+#: ../rpmdrake:1
+#, c-format
+msgid "Stop"
+msgstr "Ńňîď"
 
-#: ../rpmdrake_.c:550
-msgid "Normal updates"
-msgstr "Íîđěŕëíč îáíîâ˙âŕíč˙"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, searching..."
+msgstr "Ěîë˙ čç÷ŕęŕéňĺ, ňúđń˙..."
 
-#: ../rpmdrake_.c:569
-msgid "Mandrake choices"
-msgstr "Ěŕíäđĺéę čçáđŕíč"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
+msgstr "Đĺçóëňŕň îň ňúđńĺíĺňî (í˙ěŕ)"
 
-#: ../rpmdrake_.c:570
-msgid "All packages, alphabetical"
-msgstr "Âńč÷ęč ďŕęĺňč ďî ŕçáó÷ĺí đĺä"
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Äđóă"
 
-#: ../rpmdrake_.c:571
-msgid "All packages,"
-msgstr "Âńč÷ęč ďŕęĺňč,"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"Welcome to the packages source editor!\n"
+"\n"
+"This tool will help you configure the packages sources you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
 
-#: ../rpmdrake_.c:594
-msgid "by group"
-msgstr "ďî ăđóďŕ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Çŕďčńâŕ č čçëčçŕ"
 
-#: ../rpmdrake_.c:594
-msgid "by size"
-msgstr "ďî ăîëĺěčíŕ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy..."
+msgstr "Ďđîęńč..."
 
-#: ../rpmdrake_.c:595
-msgid "by selection state"
-msgstr "ďî ńúńňî˙íčĺ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
+msgstr "Îáíîâ˙âŕ..."
 
-#: ../rpmdrake_.c:596
-msgid "by source repository"
-msgstr "ďî čçňî÷íčę íŕ ńúőđŕíĺíčĺ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "Äîáŕâ˙..."
 
-#: ../rpmdrake_.c:596
-msgid "by update availability"
-msgstr "ďî âúçěîćíîńň çŕ îáíîâ˙âŕíĺ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "Đĺäŕęňčđŕ"
 
-#: ../rpmdrake_.c:617
-msgid "in descriptions"
-msgstr "ďî îďčńŕíčĺ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Source"
+msgstr "Čçňî÷íčę"
 
-#: ../rpmdrake_.c:617
-msgid "in files"
-msgstr "ďî ôŕéëîâĺ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
+msgstr "Äŕ đŕçđĺřŕ?"
 
-#: ../rpmdrake_.c:617
-msgid "in names"
-msgstr "ďî čěĺíŕ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure sources"
+msgstr "Ęîíôčăóđčđŕíĺ íŕ čçňî÷íčę"
 
-#: ../rpmdrake_.c:628
-msgid "Reload the packages list"
-msgstr "Ďđĺçŕđĺćäŕ ńďčńúę ń ďŕęĺňčňĺ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "Ďŕđîëŕ:"
 
-#: ../rpmdrake_.c:628
-msgid "Reset the selection"
-msgstr "Íóëčđŕ čçáđŕíîňî"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
+msgstr "Ďîňđĺáčňĺë:"
 
-#: ../rpmdrake_.c:654
-msgid "Maximum information"
-msgstr "Ěŕęńčěóě číôîđěŕöč˙"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Âčĺ ňđ˙áâŕ äŕ çŕäŕäĺňĺ čěĺ/ďŕđîëŕ çŕ čäĺíňčôčęŕöč˙ ďđĺä ďđîęńčňî:"
 
-#: ../rpmdrake_.c:654
-msgid "Normal information"
-msgstr "Íîđěŕëíŕ číôîđěŕöč˙"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "Čěĺ íŕ ďđîęńč:"
 
-#: ../rpmdrake_.c:676
-msgid "Too many packages are selected"
-msgstr "Ňâúđäĺ ěíîăî ďŕęĺňč ńŕ čçáđŕíč"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"Ŕęî ńĺ íóćäŕĺňĺ îň ďđîęńč, âúâĺäĺňĺ čěĺ íŕ őîńň č îďöčîíŕëíî ďîđň (ńčíňŕęńčń:"
+"<proxyhost[:port]>):"
 
-#: ../rpmdrake_.c:722
-msgid "Find:"
-msgstr "Ňúđńč:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "Ęîíôčăóđčđŕíĺ íŕ ďđîęńčňŕ"
 
-#: ../rpmdrake_.c:727
-msgid "Search"
-msgstr "Ňúđńč"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr ""
+"Ěîë˙ Čç÷ŕęŕéňĺ\n"
+"Îáíîâ˙âŕ ńĺ číôîđěŕöč˙ňŕ çŕ ňîçč čçňî÷íčę..."
 
-#: ../rpmdrake_.c:733
-msgid "Install"
-msgstr "Číńňŕëčđŕ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr ""
+"Çŕ äŕ çŕďŕçčňĺ ďđîěĺíčňĺ, âčĺ ňđ˙áâŕ ďúđâî äŕ ďîńňŕâčňĺ čçňî÷íčęŕ â "
+"óńňđîéńňâîňî."
 
-#: ../rpmdrake_.c:740 data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrake Update"
-msgstr "Ěŕíäđĺéę Ďîäíîâ˙âŕíĺ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
+msgstr "Âčĺ ňđ˙áâŕ äŕ ďîńňŕâčňĺ čçňî÷íčęŕ çŕ äŕ ďđîäúëćčňĺ"
 
-#: ../rpmdrake_.c:740
-msgid "Software Packages Installation"
-msgstr "Číńňŕëčđŕíĺ íŕ ďŕęĺňč"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save changes"
+msgstr "Çŕďŕçâŕ ďđîěĺíčňĺ"
 
-#: ../rpmdrake_.c:740
-msgid "Software Packages Removal"
-msgstr "Čçňđčâŕíĺ íŕ ďŕęĺňč"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Đĺëŕňčâĺí ďúň äî äčđĺęňîđč˙ čëč hdlist: "
 
-#: ../rpmdrake_.c:781
-msgid "Please wait, contacting mirror to update packages information."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Editing source \"%s\":"
+msgstr "Đĺäŕęňčđŕíĺ íŕ čçňî÷íčę \"%s\":"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit a source"
+msgstr "Đĺäŕęňčđŕíĺ íŕ čçňî÷íčöč"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
 msgstr ""
-"Ěîë˙, ďî÷ŕęŕéňĺ. Ęîíňŕęňóâŕě ń îăëĺäŕëĺí ńúđâúđ çŕ îáíîâ˙âŕíĺ číîđěŕöč˙ çŕ "
-"ďŕęĺňč."
+"Ěîë˙ Čç÷ŕęŕéňĺ\n"
+"Ďđĺěŕőâŕ ńĺ čçňî÷íčę"
 
-#: ../rpmdrake_.c:783
-msgid "Error updating medium"
-msgstr "Ăđĺřęŕ ďđč îáíîâ˙âŕíĺ íŕ čçňî÷íčę"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, adding medium..."
+msgstr ""
+"Ěîë˙ Čç÷ŕęŕéňĺ\n"
+"Äîáŕâ˙ ńĺ čçňî÷íčę..."
 
-#: ../rpmdrake_.c:784
-msgid "There was an unrecoverable error while updating packages information."
-msgstr "Čěŕ íĺďîďđŕâčěŕ ăđĺřęŕ ďđč îáíîâ˙âŕíĺ číôîđěŕöč˙ çŕ ďŕęĺňč."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of source:"
+msgstr "Ňčď íŕ čçňî÷íčęŕ:"
 
-#: ../rpmdrake_.c:789
-msgid "How to choose manually your mirror"
-msgstr "Ęŕę äŕ čçáĺđĺňĺ đú÷íî âŕřč˙ň îăëĺäŕëĺí ńúđâúđ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Adding a source:"
+msgstr "Äîáŕâ˙íĺ íŕ čçňî÷íčę:"
 
-#: ../rpmdrake_.c:797
-msgid "Please wait, contacting mirror to initialize updates packages."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 msgstr ""
-"Ěîë˙ ďî÷ŕęŕéňĺ, ęîíňŕęňóâŕě ń îăëĺäŕëĺí ńúđâúđ çŕ číčöčŕëčçčđŕíĺ îáíîâ˙âŕíĺ "
-"íŕ ďŕęĺňč."
 
-#: ../rpmdrake_.c:800
-msgid "Error adding update medium"
-msgstr "Ăđĺřęŕ ďđč äîáŕâ˙íĺ íŕ čçňî÷íčę çŕ îáíîâ˙âŕíĺ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to fill up at least the two first entries."
+msgstr "Ňđ˙áâŕ äŕ ďîďúëíčňĺ ďîíĺ ďúđâčňĺ 2 ňî÷ęč."
 
-#: ../rpmdrake_.c:831
-msgid "Please wait, finding available packages..."
-msgstr "Ěîë˙ čç÷ŕęŕéňĺ, ňúđń˙ íŕëč÷íčňĺ ďŕęĺňč..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "Čěĺ:"
 
-#: ../rpmdrake_.c:863
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Ďđĺăëĺćäŕě %s"
+msgid "Login:"
+msgstr "Ďîňđĺáčňĺëńęî čěĺ:"
 
-#: ../rpmdrake_.c:882
-msgid "changes:"
-msgstr "ďđîěĺíč:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Čçáĺđĺňĺ ńúđâúđ:..."
 
-#: ../rpmdrake_.c:886
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Ďđĺěŕőâŕ .%s"
+msgid "Browse..."
+msgstr "Ňúđńč..."
 
-#: ../rpmdrake_.c:888
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Čçďîëçâŕ .%s ęŕňî ăëŕâĺí ôŕéë"
+msgid "Path or mount point:"
+msgstr "Ďúň čëč ňî÷ęŕ íŕ ěîíňčđŕíĺ:"
 
-#: ../rpmdrake_.c:890
-msgid "Do nothing"
-msgstr "Íĺ ďđŕâč íčůî"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Removable device"
+msgstr "Ďđĺěĺńňâŕĺěî óńňđîéńňâî"
 
-#: ../rpmdrake_.c:902
-msgid "Installation finished"
-msgstr "Číńňŕëčđŕíĺňî ďđčęëţ÷č"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "HTTP server"
+msgstr "HTTP ńĺđâĺđ"
 
-#: ../rpmdrake_.c:912
-msgid "Inspect..."
-msgstr "Ďđĺăëĺćäŕ..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "FTP ńúđâúđ"
 
-#: ../rpmdrake_.c:927
-msgid "Program missing"
-msgstr "Ďđîăđŕěŕ ëčďńâŕ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path:"
+msgstr "Ďúň:"
 
-#: ../rpmdrake_.c:928
-msgid "A required program is missing (grpmi). Check your installation."
-msgstr "çŕ˙âĺíŕňŕ ďđîăđŕěŕ ëčďńâŕ (grpmi). Ďđîâĺđĺňĺ ńč číńňŕëŕöč˙ňŕ."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "Ëîęŕëíč ôŕéëîâĺ"
 
-#: ../rpmdrake_.c:942
-msgid "Unable to get source packages."
-msgstr "Íĺ ěîăŕ äŕ âçĺěŕ čçőîäíčňĺ ďŕęĺňč."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add a source"
+msgstr "Äîáŕâ˙ íŕ čçňî÷íčę"
 
-#: ../rpmdrake_.c:943
-msgid "Unable to get source packages, sorry."
-msgstr "Íĺ ěîăŕ äŕ âçĺěŕ čçőîäíčňĺ ďŕęĺňč, ńúćŕë˙âŕě."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
+msgstr "Íĺ ěîăŕ äŕ îáíîâ˙ čçňî÷íčę; ňîé ůĺ áúäĺ ŕâňîěŕč÷íî çŕáđŕíĺí."
 
-#: ../rpmdrake_.c:951
-msgid "Change medium"
-msgstr "Ńěĺí˙ čçňî÷íčę"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "Íĺâúçěîćíîńň çŕ ńúçäŕâŕíĺ íŕ čçňî÷íčę."
 
-#: ../rpmdrake_.c:952
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Ěîë˙, ďîńňŕâĺňĺ čçňî÷íčę ń čěĺ \"%s\" íŕ óńňđîéńňâî [%s]"
+msgid "Please wait, updating media..."
+msgstr "Ěîë˙, čç÷ŕęŕéňĺ. Îáíîâ˙âŕ ńĺ čçňî÷íčę..."
 
-#: ../rpmdrake_.c:960
-msgid "Installation failed"
-msgstr "Číńňŕëčđŕíĺňî ďđîďŕäíŕ"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
+msgstr "Îáíîâ˙âŕ"
 
-#: ../rpmdrake_.c:961
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Select the source(s) you wish to update:"
+msgstr "Ěîë˙ čçáĺđĺňĺ čçňî÷íčöč ęîčňî čńęŕňĺ äŕ ńĺ ďîäíîâ˙ň:"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please choose the desired mirror."
+msgstr "Ěîë˙, čçáĺđĺňĺ ćĺëŕíč˙ň îăëĺäŕëĺí ńúđâúđ."
+
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
-"Číńňŕëčđŕíĺňî ďđîďŕäíŕ, í˙ęîé îň ôŕéëîâĺňĺ ëčďńâŕň.\n"
-"Âčĺ ňđ˙áâŕ äŕ îáíîâčňĺ čçňî÷íčęŕ íŕ âŕřŕňŕ áŕçŕ äŕííč."
 
-#: ../rpmdrake_.c:964
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr ""
-"Ěîë˙ čç÷ŕęŕéňĺ, ďđĺěŕőâŕň ńĺ ďŕęĺňčňĺ çŕ äŕ ďîçâîë˙ň äđóăč äŕ áúäŕň "
-"îáíîâĺíč..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
+msgstr "Í˙ěŕ îăëĺäŕëĺí"
 
-#: ../rpmdrake_.c:985
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"There was an error downloading the mirrors list:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
-"Číńňŕëčđŕíĺňî çŕâúđřč; %s.\n"
-"\n"
-"Í˙ęîé ęîíôčăóđŕöčîííč ôŕéëîâĺ á˙őŕ ńúçäŕäĺíč ęŕňî .rpmnew' čëč `.rpmsave'.\n"
-"Âčĺ ňđ˙áâŕ äŕ ďđĺăëĺäŕňĺ í˙ęîé îň ň˙ő çŕ äŕ ďđĺäďđčĺěĺňĺ äĺéńňâčĺ:"
 
-#: ../rpmdrake_.c:985
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "Ăđĺřęŕ ďî âđĺěĺ íŕ čçňĺăë˙íĺ"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
+"Ěîë˙, ďî÷ŕęŕéňĺ. Čçňĺăë˙ě îăëĺäŕëíčňĺ ŕäđĺńč îň web ńŕéňŕ íŕ MandrakeSoft."
+
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"some packages failed to install\n"
-"correctly"
+"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"
-"ęîđĺęňíî"
 
-#: ../rpmdrake_.c:986
-msgid "everything was installed correctly"
-msgstr "âńč÷ęč á˙őŕ číńňŕëčđŕíč ęîđĺęňíî"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United States"
+msgstr "ŃŔŮ"
 
-#: ../rpmdrake_.c:988
-msgid "Everything installed successfully"
-msgstr "Âńč÷ęč á˙őŕ číńňŕëčđŕíč ęîđĺęňíî"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
+msgstr "Ęčňŕé"
 
-#: ../rpmdrake_.c:989
-msgid "All requested packages were installed successfully."
-msgstr "Âńč÷ęč çŕ˙âĺíč ďŕęĺňč á˙őŕ číńňŕëčđŕíč ęîđĺęňíî."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr "Îáĺäčíĺíîňî ęđŕëńňâî"
 
-#: ../rpmdrake_.c:992
-msgid "Everything already installed."
-msgstr "Âńč÷ęî âĺ÷ĺ ĺ číńňŕëčđŕíî."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "Ňŕéâŕí"
 
-#: ../rpmdrake_.c:993
-msgid "Everything already installed (is this supposed to happen at all?)."
-msgstr "Âńč÷ęî âĺ÷ĺ ĺ číńňŕëčđŕíî."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "Řâĺöč˙"
 
-#: ../rpmdrake_.c:1000
-msgid "Problem during installation"
-msgstr "Ďđîáëĺěč ďî âđĺěĺ íŕ číńňŕëŕöč˙ňŕ"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
+msgstr "Đóńč˙"
 
-#: ../rpmdrake_.c:1001
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Čěŕ ďđîáëĺěč ďî âđĺěĺ íŕ číńňŕëŕöč˙ňŕ:\n"
-"\n"
-"%s"
+msgid "Portugal"
+msgstr "Ďîđňóăŕëč˙"
 
-#: ../rpmdrake_.c:1015
-msgid "Please wait, reading packages database..."
-msgstr "Ěîë˙ čç÷ŕęŕéňĺ, ÷ĺňŕ áŕçŕňŕ äŕííč ń ďŕęĺňč..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
+msgstr "Ďîëřŕ"
 
-#: ../rpmdrake_.c:1056
-msgid "Please wait, removing packages..."
-msgstr "Ěîë˙ čç÷ŕęŕéňĺ, ďđĺěŕőâŕň ńĺ ďŕęĺňčňĺ..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
+msgstr "Íîđâĺăč˙"
 
-#: ../rpmdrake_.c:1059
-msgid "Problem during removal"
-msgstr "Ďî˙âčőŕ ńĺ ďđîáëĺěč ďî âđĺěĺ íŕ ďđĺěŕőâŕíĺňî"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
+msgstr "Őîëŕíäč˙"
 
-#: ../rpmdrake_.c:1060
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Ďî˙âčőŕ ńĺ ďđîáëĺěč ďî âđĺěĺ íŕ ďđĺěŕőâŕíĺ íŕ ďŕęĺňč:\n"
-"\n"
-"%s"
+msgid "Korea"
+msgstr "Ęîđĺ˙"
 
-#: ../rpmdrake_.c:1092
-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 "Japan"
+msgstr "ßďîíč˙"
 
-#: ../rpmdrake_.c:1097
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"Äîáđĺ äîřëč â MandrakeÎáíîâ˙âŕíĺ!\n"
-"\n"
-"Ňîçč číńňđóěĺíň ůĺ âč ďîěîăíĺ äŕ čçáĺđĺňĺ îáíîâ˙âŕíĺ íŕ âŕřč˙ň ńîôňóĺđr\n"
-"âúđőó ńčńňĺěŕňŕ."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Italy"
+msgstr "Čňŕëč˙"
 
-#: ../rpmdrake_.c:1102
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
-msgstr ""
-"Äîáđĺ äîřëč â číńňđóěĺíňŕ çŕ číńňŕëčđŕíĺ!\n"
-"\n"
-"Âŕřŕňŕ Ěŕíäđĺéę Ëčíóęń ńčńňĺěŕ čäâŕ ń í˙ęîëęî őčë˙äč ńîôňóĺđíč\n"
-"ďŕęĺňŕ íŕ CDROM čëč DVD. Ňîçč číńňđóěĺíň ůĺ âč ďîěîăíĺ äŕ čçáĺđĺňĺ ęîč "
-"ďŕęĺňč\n"
-"âčĺ čńęŕňĺ äŕ číńňŕëčđŕňĺ íŕ ńčńňĺěŕňŕ."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Israel"
+msgstr "Čçđŕĺë"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Ăúđöč˙"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "France"
+msgstr "Ôđŕíöč˙"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "Ôčíëŕíäč˙"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "Čńďŕíč˙"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
+msgstr "Äŕíč˙"
+
+#: ../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.pm:1
+#, c-format
+msgid "Australia"
+msgstr "Ŕâńňđŕëč˙"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
+msgstr "Ŕâńňđč˙"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Info..."
+msgstr "Číôîđěŕöč˙..."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
+msgstr "Íĺ"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Äŕ"
+
+#: data/rpmdrake.desktop.in.h:1
+msgid "Install Software"
+msgstr "Číńňŕëčđŕé ńîôňóĺđ"
 
 #: data/rpmdrake-remove.desktop.in.h:1
 msgid "Remove Software"
@@ -905,10 +1195,6 @@ msgstr "Čçňđčâŕ ńîôňóĺđ"
 msgid "Software Sources Manager"
 msgstr "Ěĺíčäćúđ çŕ ńîôňóĺđíč čçňî÷íčöč"
 
-#: data/rpmdrake.desktop.in.h:1
-msgid "Install Software"
-msgstr "Číńňŕëčđŕé ńîôňóĺđ"
-
 #, fuzzy
 #~ msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
 #~ msgstr "-adobe-helvetica-bold-r-*-*-*-100-*-*-*-*-*-*,*"
diff --git a/po/bg.pom b/po/bg.pom
index 6728e5b8..fb86feaf 100644
--- a/po/bg.pom
+++ b/po/bg.pom
@@ -4,167 +4,174 @@ msgstr "Ńúđâúđ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Ńúđâúđ, Web/FTP"
+msgid "Office Workstation"
+msgstr "Îôčńíŕ đŕáîňíŕ ńňŕíöč˙"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Ěđĺćîâ ęîěďţňúđ (ęëčĺíň)"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Îôčń ďđîăđŕěč: word-ďđîöĺńîđč (kword, abiword), ňŕáëčöč (kspread, gnumeric), "
+"ďđĺăëĺä íŕ PDF, č ň.í."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS ńúđâúđ, SMB ńúđâúđ, Proxy ńúđâúđ, SSH ńúđâúđ"
+msgid "Workstation"
+msgstr "Đŕáîňíŕ ńňŕíöč˙"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Îôčń"
+msgid "Game station"
+msgstr "Čăđŕëíŕ ńňŕíöč˙"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Gnome đŕáîňíŕ ńňŕíöč˙"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Çŕáŕâíč ďđîăđŕěč: ŕđęŕäíč čăđč, čăđč íŕ ěŕńŕ, ńňđŕňĺăčč č ň.í."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Číńňđóěĺíňč çŕ âŕřč˙ Palm Pilot čëč Visor-ŕ âč"
+msgid "Multimedia station"
+msgstr "Ěóňčěĺäčéíŕ ńňŕíöč˙"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Đŕáîňíŕ ńňŕíöč˙"
+msgid "Sound and video playing/editing programs"
+msgstr "Ďđîăđŕěč çŕ ďóńęŕíĺ/ďîďđŕâ˙íĺ íŕ çâóę č âčäĺî"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Ńúđâúđ, Firewall/Đóňĺđ"
+msgid "Internet station"
+msgstr "Číňĺđíĺň ńňŕíöč˙"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr "Čěĺ íŕ äîěĺéí č Ěđĺćîâ Číôîđěŕöčîíĺí Ńúđâúđ"
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
+"Íŕáîđ îň číńňđóěĺíňč çŕ ÷ĺňĺíĺ č čçďđŕůŕíĺ íŕ ďîůŕ č íîâčíč (pine, mutt, "
+"tin..) č çŕ îáčęŕë˙íĺ čç Ěđĺćŕňŕ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
-msgstr ""
-"Îôčń ďđîăđŕěč: word-ďđîöĺńîđč (kword, abiword), ňŕáëčöč (kspread, gnumeric), "
-"ďđĺăëĺä íŕ PDF, č ň.í."
+msgid "Network Computer (client)"
+msgstr "Ěđĺćîâ ęîěďţňúđ (ęëčĺíň)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "Číńňđóěĺíňč çŕ ŕóäčî: MP3 čëč MIDI ďëĺéúđč, ěčęńĺđč, č ň.í. "
+msgid "Clients for different protocols including ssh"
+msgstr "Ęëčĺíňč çŕ đŕçëč÷íč ďđîňîęîëč âęëţ÷čňĺëíî SSH"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr ""
+msgid "Configuration"
+msgstr "Íŕńňđîéęŕ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Ęíčăč č HOTWO-ňŕ çŕ Linux č ńâîáîäíč˙ ńîôňóĺđ"
+msgid "Tools to ease the configuration of your computer"
+msgstr "Číńňđóěĺíňč çŕ óëĺńí˙âŕíĺ íŕńňđîéęŕňŕ íŕ ęîěďţňúđŕ âč"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "KDE đŕáîňíŕ ńňŕíöč˙"
+msgid "Scientific Workstation"
+msgstr "Íŕó÷íŕ đŕáîňíŕ ńňŕíöč˙"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm č ň.í."
+msgid "Scientific applications such as gnuplot"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Ěóëňčěĺäč˙ - Âčäĺî"
+msgid "Console Tools"
+msgstr "Ęîíçîëíč číńňđóěĺíňč"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr "Íŕáîđ îň číńňđóěĺíňč çŕ ďîůŕ, íîâčíč, web, ôŕéëîâ ňđŕíńôĺđ, č ÷ŕň"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Đĺäŕęňîđč, řĺëîâĺ, ôŕéëîâč číńňđčěĺíňč, ňĺđěčíŕëč"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Ńúđâúđ, Áŕçč-äŕííč"
+msgid "KDE Workstation"
+msgstr "KDE đŕáîňíŕ ńňŕíöč˙"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL čëč MySQL ńúđâúđ çŕ áŕçč-äŕííč"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"The K Desktop Environment, ďđîńňŕ ńđĺäŕ ń ęîëĺęöč˙ îň ďđčäđóćŕâŕůč "
+"číńňđóěĺíňč"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Číńňđóěĺíňč çŕ óëĺńí˙âŕíĺ íŕńňđîéęŕňŕ íŕ ęîěďţňúđŕ âč"
+msgid "Graphical Environment"
+msgstr "Ăđŕôč÷íŕ ńđĺäŕ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "Ěóňčěĺäč˙ - Çâóę"
+msgid "Gnome Workstation"
+msgstr "Gnome đŕáîňíŕ ńňŕíöč˙"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Äîęóěĺíňŕöč˙"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+"Ăđŕôč÷íŕ ńđĺäŕ ń ďîňđĺáčňĺëńęč íŕáîđ îň ďđčëîćĺíč˙ č desktop číńňđóěĺíňč"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Ęîíçîëíč číńňđóěĺíňč"
+msgid "Other Graphical Desktops"
+msgstr "Äđóăč ăđŕôč÷íč desktop-č"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr "Postfix ďîůĺíńęč ńúđâúđ, Inn íîâčíŕđńęč ńúđâúđ"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm č ň.í."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Číňĺđíĺň ńňŕíöč˙"
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+msgid "Development"
+msgstr "Đŕçđŕáîňęŕ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Ěóňčěĺäčéíŕ ńňŕíöč˙"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "Áčáëčîňĺęč çŕ đŕçđŕáîňęŕ íŕ C č C++, ďđîăđŕěč č include ôŕéëîâĺ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Íŕńňđîéęŕ"
+msgid "Documentation"
+msgstr "Äîęóěĺíňŕöč˙"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Îůĺ ăđŕôč÷íč desktop-č (Gnome, IceWM)"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Ęíčăč č HOTWO-ňŕ çŕ Linux č ńâîáîäíč˙ ńîôňóĺđ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
+msgid "LSB"
 msgstr ""
-"The K Desktop Environment, ďđîńňŕ ńđĺäŕ ń ęîëĺęöč˙ îň ďđčäđóćŕâŕůč "
-"číńňđóěĺíňč"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Ăđŕôč÷íŕ ńđĺäŕ"
+msgid "Linux Standard Base. Third party applications support"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-msgid "Development"
-msgstr "Đŕçđŕáîňęŕ"
+msgid "Web/FTP"
+msgstr "Ńúđâúđ, Web/FTP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -173,23 +180,33 @@ msgstr "Apache č Pro-ftpd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "Číńňđóěĺíňč çŕ ńúçäŕâŕíĺ č îďč÷ŕíĺ íŕ CD-ňŕ"
+msgid "Mail/Groupware/News"
+msgstr "Ńúđâúđ, Ďîůŕ/Groupware/Íîâčíč"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Îôčńíŕ đŕáîňíŕ ńňŕíöč˙"
+msgid "Postfix mail server, Inn news server"
+msgstr "Postfix ďîůĺíńęč ńúđâúđ, Inn íîâčíŕđńęč ńúđâúđ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, č ň.í."
+msgid "Database"
+msgstr "Ńúđâúđ, Áŕçč-äŕííč"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Ăđŕôč÷íč ďđîăđŕěč ęŕňî The Gimp"
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL čëč MySQL ńúđâúđ çŕ áŕçč-äŕííč"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Firewall/Router"
+msgstr "Ńúđâúđ, Firewall/Đóňĺđ"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Internet gateway"
+msgstr "Číňĺđíĺň gateway"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -198,8 +215,8 @@ msgstr "FND/NIS"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "Áčáëčîňĺęč çŕ đŕçđŕáîňęŕ íŕ C č C++, ďđîăđŕěč č include ôŕéëîâĺ"
+msgid "Domain Name and Network Information Server"
+msgstr "Čěĺ íŕ äîěĺéí č Ěđĺćîâ Číôîđěŕöčîíĺí Ńúđâúđ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -208,18 +225,18 @@ msgstr "Ěđĺćîâ ęîěďţňúđ, ńúđâúđ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "Ńúđâúđ, Ďîůŕ/Groupware/Íîâčíč"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS ńúđâúđ, SMB ńúđâúđ, Proxy ńúđâúđ, SSH ńúđâúđ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Čăđŕëíŕ ńňŕíöč˙"
+msgid "Office"
+msgstr "Îôčń"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Âčäĺî ďëĺéúđč č đĺäŕęňîđč"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr "Íŕáîđ îň číńňđóěĺíňč çŕ ďîůŕ, íîâčíč, web, ôŕéëîâ ňđŕíńôĺđ, č ÷ŕň"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -228,78 +245,66 @@ msgstr "Ěóëňčěĺäč˙ - Ăđŕôčęŕ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Çŕáŕâíč ďđîăđŕěč: ŕđęŕäíč čăđč, čăđč íŕ ěŕńŕ, ńňđŕňĺăčč č ň.í."
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
-"Íŕáîđ îň číńňđóěĺíňč çŕ ÷ĺňĺíĺ č čçďđŕůŕíĺ íŕ ďîůŕ č íîâčíč (pine, mutt, "
-"tin..) č çŕ îáčęŕë˙íĺ čç Ěđĺćŕňŕ"
+msgid "Graphics programs such as The Gimp"
+msgstr "Ăđŕôč÷íč ďđîăđŕěč ęŕňî The Gimp"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "Ëč÷íč ôčíŕíńč"
+msgid "Multimedia - Sound"
+msgstr "Ěóňčěĺäč˙ - Çâóę"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
-"Ăđŕôč÷íŕ ńđĺäŕ ń ďîňđĺáčňĺëńęč íŕáîđ îň ďđčëîćĺíč˙ č desktop číńňđóěĺíňč"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "Číńňđóěĺíňč çŕ ŕóäčî: MP3 čëč MIDI ďëĺéúđč, ěčęńĺđč, č ň.í. "
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Ęëčĺíňč çŕ đŕçëč÷íč ďđîňîęîëč âęëţ÷čňĺëíî SSH"
+msgid "Multimedia - Video"
+msgstr "Ěóëňčěĺäč˙ - Âčäĺî"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "LSB"
-msgstr ""
+msgid "Video players and editors"
+msgstr "Âčäĺî ďëĺéúđč č đĺäŕęňîđč"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Číňĺđíĺň gateway"
+msgid "Multimedia - CD Burning"
+msgstr "Ěóëňčěĺäč˙ - îďč÷ŕíĺ íŕ CD"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Ďđîăđŕěč çŕ ďóńęŕíĺ/ďîďđŕâ˙íĺ íŕ çâóę č âčäĺî"
+msgid "Tools to create and burn CD's"
+msgstr "Číńňđóěĺíňč çŕ ńúçäŕâŕíĺ č îďč÷ŕíĺ íŕ CD-ňŕ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Äđóăč ăđŕôč÷íč desktop-č"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Îůĺ ăđŕôč÷íč desktop-č (Gnome, IceWM)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Đĺäŕęňîđč, řĺëîâĺ, ôŕéëîâč číńňđčěĺíňč, ňĺđěčíŕëč"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, č ň.í."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "Ďđîăđŕěč çŕ îáđŕáîňęŕ íŕ ôčíŕíńč, ęŕňî gnucash"
+msgid "Personal Information Management"
+msgstr "Îáđŕáîňęŕ íŕ ëč÷íŕ číôîđěŕöč˙"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "Îáđŕáîňęŕ íŕ ëč÷íŕ číôîđěŕöč˙"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Číńňđóěĺíňč çŕ âŕřč˙ Palm Pilot čëč Visor-ŕ âč"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Ěóëňčěĺäč˙ - îďč÷ŕíĺ íŕ CD"
+msgid "Personal Finance"
+msgstr "Ëč÷íč ôčíŕíńč"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Íŕó÷íŕ đŕáîňíŕ ńňŕíöč˙"
+msgid "Programs to manage your finances, such as gnucash"
+msgstr "Ďđîăđŕěč çŕ îáđŕáîňęŕ íŕ ôčíŕíńč, ęŕňî gnucash"
 
diff --git a/po/br.po b/po/br.po
index 635e4355..a07cbc10 100644
--- a/po/br.po
+++ b/po/br.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2003-01-19 16:57+0100\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\n"
 "PO-Revision-Date: 2002-10-17 12:17+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: Brezhoneg <ofisk@wanadoo.fr>\n"
@@ -13,928 +13,1118 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl_.c:39
-msgid "Unable to create medium."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:40
-msgid "Unable to update medium; it will be automatically disabled."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to the software installation tool!\n"
+"\n"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:51
-#, fuzzy
-msgid "Add a source"
-msgstr "OuzhpennaĂą un arveriad"
-
-#: ../edit-urpm-sources.pl_.c:52
-msgid "Local files"
-msgstr "RestroÚ lec'hel"
+#: ../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 ""
 
-#: ../edit-urpm-sources.pl_.c:52
-msgid "Path:"
+#: ../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_.c:53
-msgid "FTP server"
-msgstr "Servijer FTP"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr "Gortozit mar plij, o prientiĂą ar staliadur"
 
-#: ../edit-urpm-sources.pl_.c:53 ../edit-urpm-sources.pl_.c:54
-#: ../edit-urpm-sources.pl_.c:56 ../edit-urpm-sources.pl_.c:175
-msgid "URL:"
-msgstr "URL:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during removal"
+msgstr "O prientiĂą ar staliadur"
 
-#: ../edit-urpm-sources.pl_.c:54
-msgid "HTTP server"
-msgstr "Servijer HTTP"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, removing packages..."
+msgstr "Gortozit mar plij, o prientiĂą ar staliadur"
 
-#: ../edit-urpm-sources.pl_.c:55
-#, fuzzy
-msgid "Path or mount point:"
-msgstr "Poent marc'hañ : "
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, reading packages database..."
+msgstr "Gortozit mar plij, o prientiĂą ar staliadur"
 
-#: ../edit-urpm-sources.pl_.c:55
-#, fuzzy
-msgid "Removable device"
-msgstr "Lemel ar steudad"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr "Gortozit mar plij, o prientiĂą ar staliadur"
 
-#: ../edit-urpm-sources.pl_.c:56 ../rpmdrake_.c:548
-#, fuzzy
-msgid "Security updates"
-msgstr "Live surentez"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during installation"
+msgstr "O prientiĂą ar staliadur"
 
-#: ../edit-urpm-sources.pl_.c:67
-msgid "Browse..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:69
-#, fuzzy
-msgid "Choose a mirror..."
-msgstr "Dibabit ur skramm"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Everything already installed."
+msgstr "N'hellit ket andiuz ar pakad-maĂą. Staliet eo endo"
 
-#: ../edit-urpm-sources.pl_.c:89
-msgid "Login:"
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:89 ../edit-urpm-sources.pl_.c:215
-#, fuzzy
-msgid "Password:"
-msgstr "Tremenger"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:94
-msgid "Name:"
-msgstr "Anv:"
+#: ../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 ""
 
-#: ../edit-urpm-sources.pl_.c:96 ../edit-urpm-sources.pl_.c:176
-msgid "Relative path to synthesis/hdlist:"
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:104
-msgid "You need to fill up at least the two first entries."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"some packages failed to install\n"
+"correctly"
+msgstr "Dibabit pakadoÚ da staliaù"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages to allow others to be upgraded..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:116
-#, fuzzy
-msgid "Adding a source:"
-msgstr "OuzhpennaĂą un arveriad"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:117
-#, fuzzy
-msgid "Type of source:"
-msgstr "Dibabit pakadoÚ da staliaù"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Installation failed"
+msgstr "Diuzit renkad ar staliadur"
 
-#: ../edit-urpm-sources.pl_.c:121 ../edit-urpm-sources.pl_.c:187
-#: ../edit-urpm-sources.pl_.c:219 ../rpmdrake.pm_.c:97 ../rpmdrake.pm_.c:136
-#: ../rpmdrake.pm_.c:319 ../rpmdrake_.c:353 ../rpmdrake_.c:365
-#: ../rpmdrake_.c:369 ../rpmdrake_.c:916 ../rpmdrake_.c:950
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
+msgstr "NullaĂą"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
 msgid "Ok"
 msgstr "Mat eo"
 
-#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:180
-#: ../edit-urpm-sources.pl_.c:187 ../edit-urpm-sources.pl_.c:220
-#: ../rpmdrake.pm_.c:319 ../rpmdrake.pm_.c:352 ../rpmdrake_.c:353
-#: ../rpmdrake_.c:950
-msgid "Cancel"
-msgstr "NullaĂą"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Lakait ur bladennig gwerc'h el lenner %s"
 
-#: ../edit-urpm-sources.pl_.c:140
-#, fuzzy
-msgid "Please wait, adding medium..."
-msgstr "Gortozit mar plij, o prientiĂą ar staliadur"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Change medium"
+msgstr "KemmaĂą ar spister"
 
-#: ../edit-urpm-sources.pl_.c:158
-#, fuzzy
-msgid "Please wait, removing medium..."
-msgstr "O termeniĂą al live surentez"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:169
-#, fuzzy
-msgid "Edit a source"
-msgstr "Etre"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages."
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:173
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "Etre"
+msgid "Program missing"
+msgstr "Stumm : %s\n"
 
-#: ../edit-urpm-sources.pl_.c:179
-#, fuzzy
-msgid "Save changes"
-msgstr "Meuziad LaĂąsaĂą"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:185
-msgid "You need to insert the medium to continue"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Installation finished"
+msgstr "Diuzit renkad ar staliadur"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Do nothing"
+msgstr "N'ev ket lodaĂą"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:186
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Remove .%s"
+msgstr "DibarzhoÚ ar voullerez lpd a-bell"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "changes:"
+msgstr "Meuziad LaĂąsaĂą"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Inspecting %s"
+msgstr "AdskrivaĂą %s"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, finding available packages..."
+msgstr "O klask ar pakadoÚ hegerz"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
+"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 ""
 
-#: ../edit-urpm-sources.pl_.c:191
-#, fuzzy
-msgid "Please wait, updating medium..."
-msgstr "O termeniĂą al live surentez"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:202
-#, fuzzy
-msgid "Configure proxies"
-msgstr "Kefluniaù servijoÚ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:207
+#: ../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 ""
 
-#: ../edit-urpm-sources.pl_.c:209
-#, fuzzy
-msgid "Proxy hostname:"
-msgstr "Anv an ostiz a-bell"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:211
-#, fuzzy
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "Ret eo deoc'h kaout ur parzhadur disloaĂą"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "There was an unrecoverable error while updating packages information."
+msgstr "Ur fazi a zo bet en ur staliañ ar pakadoù :"
 
-#: ../edit-urpm-sources.pl_.c:213
-#, fuzzy
-msgid "User:"
-msgstr "Anv arveriad"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Error updating medium"
+msgstr "Fazi en ur lenn ar restr %s"
 
-#: ../edit-urpm-sources.pl_.c:235
-#, fuzzy
-msgid "Configure sources"
-msgstr "Kefluniaù servijoÚ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:242
-msgid "Enabled?"
+#: ../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 ""
 
-#: ../edit-urpm-sources.pl_.c:243
-#, fuzzy
-msgid "Source"
-msgstr "Dilec'hiaĂą"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Software Packages Installation"
+msgstr "Diuz pakadoÚ unan hag unan"
 
-#: ../edit-urpm-sources.pl_.c:264 ../rpmdrake_.c:730
-#, fuzzy
-msgid "Remove"
-msgstr "DibarzhoÚ ar voullerez lpd a-bell"
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, fuzzy, c-format
+msgid "Mandrake Update"
+msgstr "MandrakeConsulting"
 
-#: ../edit-urpm-sources.pl_.c:266
-#, fuzzy
-msgid "Edit"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Software Packages Removal"
+msgstr "Anv rannet"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
 msgstr "Kuitaat"
 
-#: ../edit-urpm-sources.pl_.c:268
-#, fuzzy
-msgid "Add..."
-msgstr "OuzhpennaĂą"
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "StaliaĂą"
 
-#: ../edit-urpm-sources.pl_.c:270
-msgid "Update..."
+#: ../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 "Search"
+msgstr "Klask"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:271
-msgid "Proxy..."
+#: ../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 ""
 
-#: ../edit-urpm-sources.pl_.c:274
-msgid "Save and quit"
+#: ../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 ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may 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 ""
 
-#: ../edit-urpm-sources.pl_.c:275 ../rpmdrake_.c:733
-msgid "Quit"
-msgstr "Kuitaat"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Too many packages are selected"
+msgstr "HemaĂą a zo ur pakad ret, n'hell ket bezaĂą andiuzet"
 
-#: ../rpmdrake.pm_.c:93
-msgid "Yes"
-msgstr "Ya"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Maximum information"
+msgstr "Diskouez titouroÚ"
 
-#: ../rpmdrake.pm_.c:95
-msgid "No"
-msgstr "Ket"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Normal information"
+msgstr "Diskouez titouroÚ"
 
-#: ../rpmdrake.pm_.c:127
-#, fuzzy
-msgid "Info..."
-msgstr "TitouroÚ"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update source(s)"
+msgstr "Etre"
 
-#: ../rpmdrake.pm_.c:180
-msgid "Austria"
-msgstr "Aostria"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Reload the packages list"
+msgstr "Bremanaat pakadoÚ hep ken"
 
-#: ../rpmdrake.pm_.c:181
-#, fuzzy
-msgid "Australia"
-msgstr "a-steud"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Reset the selection"
+msgstr "Diuz pakadoÚ unan hag unan"
 
-#: ../rpmdrake.pm_.c:182
-msgid "Belgium"
-msgstr "Beljik"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "in files"
+msgstr "mkraid sac'het"
 
-#: ../rpmdrake.pm_.c:183
-msgid "Brazil"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "in descriptions"
+msgstr "Spisait dibarzhoÚ"
 
-#: ../rpmdrake.pm_.c:184
-#, fuzzy
-msgid "Canada"
-msgstr "Kanadian (Kebek)"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "in names"
+msgstr "Anv ar domani"
 
-#: ../rpmdrake.pm_.c:185
-msgid "Costa Rica"
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:186
-msgid "Czech Republic"
-msgstr "Tchek"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
+msgstr ""
 
-#: ../rpmdrake.pm_.c:187
-msgid "Germany"
-msgstr "Alaman"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "by selection state"
+msgstr "Diuz pakadoÚ unan hag unan"
 
-#: ../rpmdrake.pm_.c:188
-msgid "Danmark"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "by size"
+msgstr "AdventaĂą"
 
-#: ../rpmdrake.pm_.c:189 ../rpmdrake.pm_.c:193
-msgid "Greece"
-msgstr "Gres"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "by group"
+msgstr "Strollad labour"
 
-#: ../rpmdrake.pm_.c:190
-#, fuzzy
-msgid "Spain"
-msgstr "Spagnol"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "All packages,"
+msgstr "%d pakad"
 
-#: ../rpmdrake.pm_.c:191
-msgid "Finland"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:192
-msgid "France"
-msgstr "Gall"
-
-#: ../rpmdrake.pm_.c:194
-#, fuzzy
-msgid "Israel"
-msgstr "Israelian"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mandrake choices"
+msgstr "MandrakeConsulting"
 
-#: ../rpmdrake.pm_.c:195
-msgid "Italy"
-msgstr "Italian"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Normal updates"
+msgstr "Boas"
 
-#: ../rpmdrake.pm_.c:196
-msgid "Japan"
+#: ../rpmdrake:1
+#, c-format
+msgid "Bugfixes updates"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:197
-#, fuzzy
-msgid "Korea"
-msgstr "Dilec'hiaĂą"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Security updates"
+msgstr "Live surentez"
 
-#: ../rpmdrake.pm_.c:198
-msgid "Netherlands"
-msgstr "IzelvroioÚ"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Description: "
+msgstr "Spisait dibarzhoÚ"
 
-#: ../rpmdrake.pm_.c:199
-msgid "Norway"
-msgstr "Norvegek"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Summary: "
+msgstr "Evit diverriĂą"
 
-#: ../rpmdrake.pm_.c:200
-#, fuzzy
-msgid "Poland"
-msgstr "Islandek"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Importance: "
+msgstr "Talvoudegezh : %s\n"
 
-#: ../rpmdrake.pm_.c:201
-#, fuzzy
-msgid "Portugal"
-msgstr "Paour"
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr ""
 
-#: ../rpmdrake.pm_.c:202
-#, fuzzy
-msgid "Russia"
-msgstr "Rusiek"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Size: "
+msgstr "Ment: %s"
 
-#: ../rpmdrake.pm_.c:203
-msgid "Sweden"
-msgstr "Suis"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Version: "
+msgstr "Stumm : %s\n"
 
-#: ../rpmdrake.pm_.c:204
-#, fuzzy
-msgid "Taiwan"
-msgstr "Iraniek"
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "Anv: "
 
-#: ../rpmdrake.pm_.c:205
-msgid "United Kingdom"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
 msgstr ""
 
-#: ../rpmdrake.pm_.c:206
-msgid "China"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
 msgstr ""
 
-#: ../rpmdrake.pm_.c:207 ../rpmdrake.pm_.c:208 ../rpmdrake.pm_.c:209
-#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:261
-msgid "United States"
-msgstr "Amerika"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Source: "
+msgstr "Servijer"
 
-#: ../rpmdrake.pm_.c:274
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "(Not available)"
+msgstr "parzhadur hegerz ebet"
 
-#: ../rpmdrake.pm_.c:280
-#, fuzzy
-msgid "Error during download"
-msgstr "Fazi en ur lenn ar restr %s"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Changelog:\n"
+msgstr "NullaĂą"
 
-#: ../rpmdrake.pm_.c:289
-msgid "No mirror"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Files:\n"
+msgstr "/_Restr"
 
-#: ../rpmdrake.pm_.c:307
-#, fuzzy
-msgid "Please choose the desired mirror."
-msgstr "Dibabit al live surentez"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Selected size: %d MB"
+msgstr "Ment : %d Ko\n"
 
-#: ../rpmdrake.pm_.c:339 ../rpmdrake_.c:627
-#, fuzzy
-msgid "Update source(s)"
-msgstr "Etre"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr ""
 
-#: ../rpmdrake.pm_.c:343
-msgid "Select the source(s) you wish to update:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:347
-#, fuzzy
-msgid "Update"
-msgstr "Bremanaat"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+msgstr "Ar pakadoÚ a-heul a zo war-nes bezaù distaliet"
 
-#: ../rpmdrake.pm_.c:358
-#, fuzzy
-msgid "Please wait, updating media..."
-msgstr "Gortozit mar plij, o prientiĂą ar staliadur"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be installed"
+msgstr "Dibabit pakadoÚ da staliaù"
 
-#: ../rpmdrake_.c:99
-msgid "Other"
-msgstr "All"
+#: ../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"
 
-#: ../rpmdrake_.c:121 ../rpmdrake_.c:135 ../rpmdrake_.c:227 ../rpmdrake_.c:298
-#, fuzzy
-msgid "(none)"
-msgstr "ebet"
+#: ../rpmdrake:1
+#, c-format
+msgid "Additional packages needed"
+msgstr ""
 
-#: ../rpmdrake_.c:141 ../rpmdrake_.c:482 ../rpmdrake_.c:483
-#, fuzzy
-msgid "(Not available)"
-msgstr "parzhadur hegerz ebet"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "Ar pakadoÚ a-heul a zo war-nes bezaù staliet/lamet"
 
-#: ../rpmdrake_.c:151 ../rpmdrake_.c:208
-#, fuzzy
-msgid "Search results"
-msgstr "Servijer DNS"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
 
-#: ../rpmdrake_.c:151
-#, fuzzy
-msgid "Search results (none)"
-msgstr "Klask"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
 
-#: ../rpmdrake_.c:161 ../rpmdrake_.c:172
-#, fuzzy
-msgid "Please wait, searching..."
-msgstr "Gortozit mar plij, o prientiĂą ar staliadur"
+#: ../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_.c:175
-#, fuzzy
-msgid "Stop"
-msgstr "Rann"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "More information on package..."
+msgstr "O klask ar pakadoÚ hegerz"
 
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-#, fuzzy
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Information on packages"
+msgstr "O klask ar pakadoÚ hegerz"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
+msgstr ""
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
 msgid "Addable"
 msgstr "Taolenn"
 
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-#, fuzzy
+#: ../rpmdrake:1
+#, fuzzy, c-format
 msgid "Upgradable"
 msgstr "Bremanaat"
 
-#: ../rpmdrake_.c:211
-#, fuzzy
-msgid "Not selected"
-msgstr "Lugerezh ar voullerez"
+#: ../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_.c:211
-#, fuzzy
-msgid "Selected"
-msgstr "Diuzit ar restr"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "No update"
+msgstr "Moullerez lec'hel"
 
-#: ../rpmdrake_.c:240
-#, fuzzy
-msgid "rpmdrake"
-msgstr "Moullerez"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "(none)"
+msgstr "ebet"
 
-#: ../rpmdrake_.c:258 ../rpmdrake_.c:360 ../rpmdrake_.c:362
-#, fuzzy
-msgid "More information on package..."
-msgstr "O klask ar pakadoÚ hegerz"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, listing packages..."
+msgstr "O termeniĂą al live surentez"
 
-#: ../rpmdrake_.c:259
-#, fuzzy
+#: ../rpmdrake:1
+#, c-format
+msgid "unknown package "
+msgstr ""
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
 msgid "One of the following packages is needed:"
 msgstr "Ar pakadoÚ a-heul a zo war-nes bezaù staliet/lamet"
 
-#: ../rpmdrake_.c:259
-#, fuzzy
+#: ../rpmdrake:1
+#, fuzzy, c-format
 msgid "Please choose"
 msgstr "Dibabit seurt ho logodenn, mar plij."
 
-#: ../rpmdrake_.c:275
-msgid "unknown package "
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "rpmdrake"
+msgstr "Moullerez"
 
-#: ../rpmdrake_.c:285
-#, fuzzy
-msgid "Please wait, listing packages..."
-msgstr "O termeniĂą al live surentez"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Not selected"
+msgstr "Lugerezh ar voullerez"
 
-#: ../rpmdrake_.c:300
-#, fuzzy
-msgid "No update"
-msgstr "Moullerez lec'hel"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Selected"
+msgstr "Diuzit ar restr"
 
-#: ../rpmdrake_.c:353 ../rpmdrake_.c:354
-msgid "More infos"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Search results"
+msgstr "Servijer DNS"
 
-#: ../rpmdrake_.c:355
-#, fuzzy
-msgid "Information on packages"
-msgstr "O klask ar pakadoÚ hegerz"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Stop"
+msgstr "Rann"
 
-#: ../rpmdrake_.c:376
-#, fuzzy
-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 "Please wait, searching..."
+msgstr "Gortozit mar plij, o prientiĂą ar staliadur"
 
-#: ../rpmdrake_.c:377
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Search results (none)"
+msgstr "Klask"
 
-#: ../rpmdrake_.c:383 ../rpmdrake_.c:391
-#, fuzzy
-msgid "Some packages can't be removed"
-msgstr "Ar pakadoÚ a-heul a zo war-nes bezaù staliet/lamet"
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "All"
 
-#: ../rpmdrake_.c:384
+#: ../edit-urpm-sources.pl:1
+#, c-format
 msgid ""
-"Removing these packages would break your system, sorry:\n"
+"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_.c:392 ../rpmdrake_.c:451
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
 msgstr ""
 
-#: ../rpmdrake_.c:421
-msgid "Additional packages needed"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy..."
 msgstr ""
 
-#: ../rpmdrake_.c:422
-#, fuzzy
-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
+#, c-format
+msgid "Update..."
+msgstr ""
 
-#: ../rpmdrake_.c:435
-#, fuzzy
-msgid "Some packages can't be installed"
-msgstr "Dibabit pakadoÚ da staliaù"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add..."
+msgstr "OuzhpennaĂą"
 
-#: ../rpmdrake_.c:436
-#, fuzzy
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-msgstr "Ar pakadoÚ a-heul a zo war-nes bezaù distaliet"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Edit"
+msgstr "Kuitaat"
 
-#: ../rpmdrake_.c:450 ../rpmdrake_.c:684
-#, fuzzy
-msgid "Some packages need to be removed"
-msgstr "Ar pakadoÚ a-heul a zo war-nes bezaù staliet/lamet"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Source"
+msgstr "Dilec'hiaĂą"
 
-#: ../rpmdrake_.c:472
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
+msgid "Enabled?"
 msgstr ""
 
-#: ../rpmdrake_.c:474
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Selected size: %d MB"
-msgstr "Ment : %d Ko\n"
+msgid "Configure sources"
+msgstr "Kefluniaù servijoÚ"
 
-#: ../rpmdrake_.c:482
-#, fuzzy
-msgid "Files:\n"
-msgstr "/_Restr"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Password:"
+msgstr "Tremenger"
 
-#: ../rpmdrake_.c:483
-#, fuzzy
-msgid "Changelog:\n"
-msgstr "NullaĂą"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "User:"
+msgstr "Anv arveriad"
 
-#: ../rpmdrake_.c:486
-#, fuzzy
-msgid "Source: "
-msgstr "Servijer"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Ret eo deoc'h kaout ur parzhadur disloaĂą"
 
-#: ../rpmdrake_.c:487
-msgid "Currently installed version: "
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Proxy hostname:"
+msgstr "Anv an ostiz a-bell"
 
-#: ../rpmdrake_.c:491
-msgid "Reason for update: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
 msgstr ""
 
-#: ../rpmdrake_.c:493
-msgid "Name: "
-msgstr "Anv: "
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure proxies"
+msgstr "Kefluniaù servijoÚ"
 
-#: ../rpmdrake_.c:494
-#, fuzzy
-msgid "Version: "
-msgstr "Stumm : %s\n"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, updating medium..."
+msgstr "O termeniĂą al live surentez"
 
-#: ../rpmdrake_.c:495
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "%s KB"
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
 msgstr ""
 
-#: ../rpmdrake_.c:495
-#, fuzzy
-msgid "Size: "
-msgstr "Ment: %s"
-
-#: ../rpmdrake_.c:497
-#, fuzzy
-msgid "Importance: "
-msgstr "Talvoudegezh : %s\n"
-
-#: ../rpmdrake_.c:498
-#, fuzzy
-msgid "Summary: "
-msgstr "Evit diverriĂą"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
+msgstr ""
 
-#: ../rpmdrake_.c:499
-#, fuzzy
-msgid "Description: "
-msgstr "Spisait dibarzhoÚ"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Save changes"
+msgstr "Meuziad LaĂąsaĂą"
 
-#: ../rpmdrake_.c:548
-msgid "Bugfixes updates"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
 msgstr ""
 
-#: ../rpmdrake_.c:548
-#, fuzzy
-msgid "Normal updates"
-msgstr "Boas"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake_.c:567
-#, fuzzy
-msgid "Mandrake choices"
-msgstr "MandrakeConsulting"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing source \"%s\":"
+msgstr "Etre"
 
-#: ../rpmdrake_.c:568
-msgid "All packages, alphabetical"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Edit a source"
+msgstr "Etre"
 
-#: ../rpmdrake_.c:569
-#, fuzzy
-msgid "All packages,"
-msgstr "%d pakad"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, removing medium..."
+msgstr "O termeniĂą al live surentez"
 
-#: ../rpmdrake_.c:592
-#, fuzzy
-msgid "by group"
-msgstr "Strollad labour"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, adding medium..."
+msgstr "Gortozit mar plij, o prientiĂą ar staliadur"
 
-#: ../rpmdrake_.c:592
-#, fuzzy
-msgid "by size"
-msgstr "AdventaĂą"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Type of source:"
+msgstr "Dibabit pakadoÚ da staliaù"
 
-#: ../rpmdrake_.c:593
-#, fuzzy
-msgid "by selection state"
-msgstr "Diuz pakadoÚ unan hag unan"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Adding a source:"
+msgstr "OuzhpennaĂą un arveriad"
 
-#: ../rpmdrake_.c:594
-msgid "by source repository"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 msgstr ""
 
-#: ../rpmdrake_.c:594
-msgid "by update availability"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to fill up at least the two first entries."
 msgstr ""
 
-#: ../rpmdrake_.c:615
-#, fuzzy
-msgid "in descriptions"
-msgstr "Spisait dibarzhoÚ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "Anv:"
 
-#: ../rpmdrake_.c:615
-#, fuzzy
-msgid "in files"
-msgstr "mkraid sac'het"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
+msgstr ""
 
-#: ../rpmdrake_.c:615
-#, fuzzy
-msgid "in names"
-msgstr "Anv ar domani"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Choose a mirror..."
+msgstr "Dibabit ur skramm"
 
-#: ../rpmdrake_.c:626
-#, fuzzy
-msgid "Reload the packages list"
-msgstr "Bremanaat pakadoÚ hep ken"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Browse..."
+msgstr ""
 
-#: ../rpmdrake_.c:626
-#, fuzzy
-msgid "Reset the selection"
-msgstr "Diuz pakadoÚ unan hag unan"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Path or mount point:"
+msgstr "Poent marc'hañ : "
 
-#: ../rpmdrake_.c:652
-#, fuzzy
-msgid "Maximum information"
-msgstr "Diskouez titouroÚ"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Removable device"
+msgstr "Lemel ar steudad"
 
-#: ../rpmdrake_.c:652
-#, fuzzy
-msgid "Normal information"
-msgstr "Diskouez titouroÚ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "HTTP server"
+msgstr "Servijer HTTP"
 
-#: ../rpmdrake_.c:674
-#, fuzzy
-msgid "Too many packages are selected"
-msgstr "HemaĂą a zo ur pakad ret, n'hell ket bezaĂą andiuzet"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "Servijer FTP"
 
-#: ../rpmdrake_.c:720
-msgid "Find:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path:"
 msgstr ""
 
-#: ../rpmdrake_.c:725
-#, fuzzy
-msgid "Search"
-msgstr "Klask"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "RestroÚ lec'hel"
 
-#: ../rpmdrake_.c:731
-msgid "Install"
-msgstr "StaliaĂą"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a source"
+msgstr "OuzhpennaĂą un arveriad"
 
-#: ../rpmdrake_.c:738 data/mandrakeupdate.desktop.in.h:1
-#, fuzzy
-msgid "Mandrake Update"
-msgstr "MandrakeConsulting"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
+msgstr ""
 
-#: ../rpmdrake_.c:738
-#, fuzzy
-msgid "Software Packages Installation"
-msgstr "Diuz pakadoÚ unan hag unan"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to create medium."
+msgstr ""
 
-#: ../rpmdrake_.c:738
-#, fuzzy
-msgid "Software Packages Removal"
-msgstr "Anv rannet"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Please wait, updating media..."
+msgstr "Gortozit mar plij, o prientiĂą ar staliadur"
 
-#: ../rpmdrake_.c:779
-msgid "Please wait, contacting mirror to update packages information."
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update"
+msgstr "Bremanaat"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Select the source(s) you wish to update:"
 msgstr ""
 
-#: ../rpmdrake_.c:781
-#, fuzzy
-msgid "Error updating medium"
-msgstr "Fazi en ur lenn ar restr %s"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Please choose the desired mirror."
+msgstr "Dibabit al live surentez"
 
-#: ../rpmdrake_.c:782
-#, fuzzy
-msgid "There was an unrecoverable error while updating packages information."
-msgstr "Ur fazi a zo bet en ur staliañ ar pakadoù :"
+#: ../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_.c:787
-msgid "How to choose manually your mirror"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
 msgstr ""
 
-#: ../rpmdrake_.c:795
-msgid "Please wait, contacting mirror to initialize updates packages."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid ""
+"There was an error downloading the mirrors list:\n"
+"\n"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
 
-#: ../rpmdrake_.c:798
-msgid "Error adding update medium"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Error during download"
+msgstr "Fazi en ur lenn ar restr %s"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
 
-#: ../rpmdrake_.c:829
-#, fuzzy
-msgid "Please wait, finding available packages..."
-msgstr "O klask ar pakadoÚ hegerz"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
 
-#: ../rpmdrake_.c:861
-#, fuzzy, c-format
-msgid "Inspecting %s"
-msgstr "AdskrivaĂą %s"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United States"
+msgstr "Amerika"
 
-#: ../rpmdrake_.c:880
-#, fuzzy
-msgid "changes:"
-msgstr "Meuziad LaĂąsaĂą"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
+msgstr ""
 
-#: ../rpmdrake_.c:884
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr ""
+
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Remove .%s"
-msgstr "DibarzhoÚ ar voullerez lpd a-bell"
+msgid "Taiwan"
+msgstr "Iraniek"
 
-#: ../rpmdrake_.c:886
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr ""
+msgid "Sweden"
+msgstr "Suis"
 
-#: ../rpmdrake_.c:888
-#, fuzzy
-msgid "Do nothing"
-msgstr "N'ev ket lodaĂą"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Russia"
+msgstr "Rusiek"
 
-#: ../rpmdrake_.c:900
-#, fuzzy
-msgid "Installation finished"
-msgstr "Diuzit renkad ar staliadur"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Portugal"
+msgstr "Paour"
 
-#: ../rpmdrake_.c:910
-msgid "Inspect..."
-msgstr ""
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Poland"
+msgstr "Islandek"
 
-#: ../rpmdrake_.c:925
-#, fuzzy
-msgid "Program missing"
-msgstr "Stumm : %s\n"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
+msgstr "Norvegek"
 
-#: ../rpmdrake_.c:926
-msgid "A required program is missing (grpmi). Check your installation."
-msgstr ""
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
+msgstr "IzelvroioÚ"
 
-#: ../rpmdrake_.c:940
-msgid "Unable to get source packages."
-msgstr ""
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Korea"
+msgstr "Dilec'hiaĂą"
 
-#: ../rpmdrake_.c:941
-msgid "Unable to get source packages, sorry."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Japan"
 msgstr ""
 
-#: ../rpmdrake_.c:948
-#, fuzzy
-msgid "Change medium"
-msgstr "KemmaĂą ar spister"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Italy"
+msgstr "Italian"
 
-#: ../rpmdrake_.c:949
+#: ../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"
-
-#: ../rpmdrake_.c:957
-#, fuzzy
-msgid "Installation failed"
-msgstr "Diuzit renkad ar staliadur"
+msgid "Israel"
+msgstr "Israelian"
 
-#: ../rpmdrake_.c:958
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Gres"
 
-#: ../rpmdrake_.c:961
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr ""
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "France"
+msgstr "Gall"
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm: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 "Finland"
 msgstr ""
 
-#: ../rpmdrake_.c:982
-#, fuzzy
-msgid ""
-"some packages failed to install\n"
-"correctly"
-msgstr "Dibabit pakadoÚ da staliaù"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Spain"
+msgstr "Spagnol"
 
-#: ../rpmdrake_.c:983
-msgid "everything was installed correctly"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
 msgstr ""
 
-#: ../rpmdrake_.c:985
-msgid "Everything installed successfully"
-msgstr ""
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr "Alaman"
 
-#: ../rpmdrake_.c:986
-msgid "All requested packages were installed successfully."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
+msgstr "Tchek"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Costa Rica"
 msgstr ""
 
-#: ../rpmdrake_.c:989
-#, fuzzy
-msgid "Everything already installed."
-msgstr "N'hellit ket andiuz ar pakad-maĂą. Staliet eo endo"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Canada"
+msgstr "Kanadian (Kebek)"
 
-#: ../rpmdrake_.c:990
-msgid "Everything already installed (is this supposed to happen at all?)."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
 msgstr ""
 
-#: ../rpmdrake_.c:997
-#, fuzzy
-msgid "Problem during installation"
-msgstr "O prientiĂą ar staliadur"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Belgium"
+msgstr "Beljik"
 
-#: ../rpmdrake_.c:998
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr "Gortozit mar plij, o prientiĂą ar staliadur"
-
-#: ../rpmdrake_.c:1012
-#, fuzzy
-msgid "Please wait, reading packages database..."
-msgstr "Gortozit mar plij, o prientiĂą ar staliadur"
-
-#: ../rpmdrake_.c:1053
-#, fuzzy
-msgid "Please wait, removing packages..."
-msgstr "Gortozit mar plij, o prientiĂą ar staliadur"
+msgid "Australia"
+msgstr "a-steud"
 
-#: ../rpmdrake_.c:1056
-#, fuzzy
-msgid "Problem during removal"
-msgstr "O prientiĂą ar staliadur"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
+msgstr "Aostria"
 
-#: ../rpmdrake_.c:1057
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr "Gortozit mar plij, o prientiĂą ar staliadur"
+msgid "Info..."
+msgstr "TitouroÚ"
 
-#: ../rpmdrake_.c:1089
-msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
-msgstr ""
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
+msgstr "Ket"
 
-#: ../rpmdrake_.c:1094
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Ya"
 
-#: ../rpmdrake_.c:1099
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
-msgstr ""
+#: data/rpmdrake.desktop.in.h:1
+#, fuzzy
+msgid "Install Software"
+msgstr "StaliaĂą ar c'harger loc'haĂą"
 
 #: data/rpmdrake-remove.desktop.in.h:1
 #, fuzzy
@@ -946,11 +1136,6 @@ msgstr "Lemel ar steudad"
 msgid "Software Sources Manager"
 msgstr "Anv rannet"
 
-#: data/rpmdrake.desktop.in.h:1
-#, fuzzy
-msgid "Install Software"
-msgstr "StaliaĂą ar c'harger loc'haĂą"
-
 #, fuzzy
 #~ msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
 #~ msgstr "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
diff --git a/po/br.pom b/po/br.pom
index 051ef314..c421de6c 100644
--- a/po/br.pom
+++ b/po/br.pom
@@ -4,173 +4,177 @@ msgstr "Servijer"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
 #, fuzzy
-msgid "Network Computer (client)"
-msgstr "DibarzhoĂš ar voullerez NetWare"
+msgid "Office Workstation"
+msgstr "TitouroĂš"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Burev"
+#, fuzzy
+msgid "Workstation"
+msgstr "TitouroĂš"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 #, fuzzy
-msgid "Gnome Workstation"
-msgstr "TitouroĂš"
+msgid "Game station"
+msgstr "Teuliadur"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
+msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 #, fuzzy
-msgid "Workstation"
-msgstr "TitouroĂš"
+msgid "Multimedia station"
+msgstr "Liesvedia"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
+msgid "Sound and video playing/editing programs"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr ""
+#, fuzzy
+msgid "Internet station"
+msgstr "KefluniaĂą ar proksioĂš"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr ""
+#, fuzzy
+msgid "Network Computer (client)"
+msgstr "DibarzhoĂš ar voullerez NetWare"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
+msgid "Clients for different protocols including ssh"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr ""
+msgid "Configuration"
+msgstr "Kefluniadur"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 #, fuzzy
-msgid "KDE Workstation"
+msgid "Tools to ease the configuration of your computer"
+msgstr "Mennout a rit amprouiĂą ar c'hefluniadur ?"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+#, fuzzy
+msgid "Scientific Workstation"
 msgstr "TitouroĂš"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgid "Scientific applications such as gnuplot"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Multimedia - Video"
-msgstr "Liesvedia"
+msgid "Console Tools"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgid "Editors, shells, file tools, terminals"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 #, fuzzy
-msgid "Database"
-msgstr "StlennvonioĂš"
+msgid "KDE Workstation"
+msgstr "TitouroĂš"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Tools to ease the configuration of your computer"
-msgstr "Mennout a rit amprouiĂą ar c'hefluniadur ?"
+msgid "Graphical Environment"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 #, fuzzy
-msgid "Multimedia - Sound"
-msgstr "Liesvedia"
+msgid "Gnome Workstation"
+msgstr "TitouroĂš"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Teuliadur"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Console Tools"
+msgid "Other Graphical Desktops"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Internet station"
-msgstr "KefluniaĂą ar proksioĂš"
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+msgid "Development"
+msgstr "Diorren"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Multimedia station"
-msgstr "Liesvedia"
+msgid "C and C++ development libraries, programs and include files"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Kefluniadur"
+msgid "Documentation"
+msgstr "Teuliadur"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
+msgid "Books and Howto's on Linux and Free Software"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
+msgid "LSB"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
+msgid "Linux Standard Base. Third party applications support"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-msgid "Development"
-msgstr "Diorren"
+msgid "Web/FTP"
+msgstr "Web/FTP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -179,33 +183,44 @@ msgstr "Apache, Pro-ftpd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
+msgid "Mail/Groupware/News"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Postfix mail server, Inn news server"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 #, fuzzy
-msgid "Office Workstation"
-msgstr "TitouroĂš"
+msgid "Database"
+msgstr "StlennvonioĂš"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgid "PostgreSQL or MySQL database server"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
+msgid "Firewall/Router"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
+#, fuzzy
+msgid "Internet gateway"
+msgstr "dedennus"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "DNS/NIS "
 msgstr "DNS/NIS"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
+msgid "Domain Name and Network Information Server"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
@@ -216,18 +231,17 @@ msgstr "DibarzhoĂš ar voullerez NetWare"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
+msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Game station"
-msgstr "Teuliadur"
+msgid "Office"
+msgstr "Burev"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
@@ -238,78 +252,69 @@ msgstr "Liesvedia"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
+msgid "Graphics programs such as The Gimp"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr ""
+#, fuzzy
+msgid "Multimedia - Sound"
+msgstr "Liesvedia"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr ""
+#, fuzzy
+msgid "Multimedia - Video"
+msgstr "Liesvedia"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "LSB"
+msgid "Video players and editors"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 #, fuzzy
-msgid "Internet gateway"
-msgstr "dedennus"
+msgid "Multimedia - CD Burning"
+msgstr "Liesvedia"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
+msgid "Tools to create and burn CD's"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
+msgid "More Graphical Desktops (Gnome, IceWM)"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
+msgid "Personal Information Management"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
+msgid "Tools for your Palm Pilot or your Visor"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Multimedia - CD Burning"
-msgstr "Liesvedia"
+msgid "Personal Finance"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Scientific Workstation"
-msgstr "TitouroĂš"
+msgid "Programs to manage your finances, such as gnucash"
+msgstr ""
 
diff --git a/po/bs.po b/po/bs.po
index cf6f85b2..ecc0d2ae 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2003-01-19 16:57+0100\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\n"
 "PO-Revision-Date: 2002-09-07 10:17+0200\n"
 "Last-Translator: Vedran Ljubovic <vljubovic@smartnet.ba>\n"
 "Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -13,454 +13,623 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../edit-urpm-sources.pl_.c:39
-msgid "Unable to create medium."
-msgstr "Ne mogu kreirati medij."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Želite li da nastavim?"
 
-#: ../edit-urpm-sources.pl_.c:40
-msgid "Unable to update medium; it will be automatically disabled."
-msgstr "Ne mogu da osvježim medij; on će biti automatski isključen."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to the software installation tool!\n"
+"\n"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
+msgstr ""
+"DobrodoĹĄli u alat za instalaciju softvera!\n"
+"\n"
+"VaĹĄ Mandrake Linux sistem dolazi sa nekoliko hiljada softverskh paketa\n"
+"na CDROM-u ili DVD-u. Ovaj alat će vam pomoći da izaberete koji softver\n"
+"želite instalirati na vaš računar."
 
-#: ../edit-urpm-sources.pl_.c:51
-#, fuzzy
-msgid "Add a source"
-msgstr "Dodajem izvor:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"DobrodoĹĄli u MandrakeUpdate!\n"
+"\n"
+"Ovaj alat će vam pomoći da izaberete update koje želite instalirati na\n"
+"vaš računar."
 
-#: ../edit-urpm-sources.pl_.c:52
-msgid "Local files"
-msgstr "Lokalne datoteke"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to the software removal tool!\n"
+"\n"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
+msgstr ""
+"DobrodoĹĄli u alat za uklanjanje softvera!\n"
+"\n"
+"Ovaj alat će vam pomoći da izaberete koji softver želite ukloniti sa vašeg\n"
+"računara."
 
-#: ../edit-urpm-sources.pl_.c:52
-msgid "Path:"
-msgstr "Put:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr "DoĹĄlo je do problema prilikom instalacije."
 
-#: ../edit-urpm-sources.pl_.c:53
-msgid "FTP server"
-msgstr "FTP server"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during removal"
+msgstr "DoĹĄlo je do problema prilikom instalacije"
 
-#: ../edit-urpm-sources.pl_.c:53 ../edit-urpm-sources.pl_.c:54
-#: ../edit-urpm-sources.pl_.c:56 ../edit-urpm-sources.pl_.c:175
-msgid "URL:"
-msgstr "URL:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages..."
+msgstr "Molim sačekajte, uklanjam pakete..."
 
-#: ../edit-urpm-sources.pl_.c:54
-msgid "HTTP server"
-msgstr "HTTP server"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
+msgstr "Molim sačekajte, čitam bazu paketa..."
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Path or mount point:"
-msgstr "Put ili tačka montiranja:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr "DoĹĄlo je do problema prilikom instalacije."
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Removable device"
-msgstr "Izmjenjivi uređaj"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during installation"
+msgstr "DoĹĄlo je do problema prilikom instalacije"
 
-#: ../edit-urpm-sources.pl_.c:56 ../rpmdrake_.c:548
-msgid "Security updates"
-msgstr "Sigurnosna unaprjeđenja"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
+msgstr "Sve je već instalirano (da li se ovo uopšte smije desiti?)."
 
-#: ../edit-urpm-sources.pl_.c:67
-msgid "Browse..."
-msgstr "PotraĹži..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed."
+msgstr "Sve je već instalirano."
 
-#: ../edit-urpm-sources.pl_.c:69
-msgid "Choose a mirror..."
-msgstr "Izaberite neki mirror..."
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "Svi traĹženi paketi su uspjeĹĄno instalirani."
 
-#: ../edit-urpm-sources.pl_.c:89
-msgid "Login:"
-msgstr "Login:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr "Sve je uspjeĹĄno instalirano"
 
-#: ../edit-urpm-sources.pl_.c:89 ../edit-urpm-sources.pl_.c:215
-msgid "Password:"
-msgstr "Ĺ ifra:"
+#: ../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:"
 
-#: ../edit-urpm-sources.pl_.c:94
-msgid "Name:"
-msgstr "Ime:"
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "sve je uspjeĹĄno instalirano"
 
-#: ../edit-urpm-sources.pl_.c:96 ../edit-urpm-sources.pl_.c:176
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Relativni put do synthesis/hdlist:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"some packages failed to install\n"
+"correctly"
+msgstr ""
+"neki paketi nisu uspjeĹĄno\n"
+"instalirani"
 
-#: ../edit-urpm-sources.pl_.c:104
-msgid "You need to fill up at least the two first entries."
-msgstr "Trebate popuniti najmanje prva dva polja."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages to allow others to be upgraded..."
+msgstr ""
+"Molim sačekajte, uklanjam pakete kako bi drugi mogli biti unaprijeđeni..."
 
-#: ../edit-urpm-sources.pl_.c:116
-msgid "Adding a source:"
-msgstr "Dodajem izvor:"
+#: ../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."
 
-#: ../edit-urpm-sources.pl_.c:117
-msgid "Type of source:"
-msgstr "Tip izvora:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation failed"
+msgstr "Instalacija nije uspjela"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
+msgstr "Odustani"
 
-#: ../edit-urpm-sources.pl_.c:121 ../edit-urpm-sources.pl_.c:187
-#: ../edit-urpm-sources.pl_.c:219 ../rpmdrake.pm_.c:97 ../rpmdrake.pm_.c:136
-#: ../rpmdrake.pm_.c:319 ../rpmdrake_.c:353 ../rpmdrake_.c:365
-#: ../rpmdrake_.c:369 ../rpmdrake_.c:916 ../rpmdrake_.c:950
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
 msgid "Ok"
 msgstr "U redu"
 
-#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:180
-#: ../edit-urpm-sources.pl_.c:187 ../edit-urpm-sources.pl_.c:220
-#: ../rpmdrake.pm_.c:319 ../rpmdrake.pm_.c:352 ../rpmdrake_.c:353
-#: ../rpmdrake_.c:950
-msgid "Cancel"
-msgstr "Odustani"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Molim ubacite medij pod imenom \"%s\" u uređaj [%s]"
 
-#: ../edit-urpm-sources.pl_.c:140
-msgid "Please wait, adding medium..."
-msgstr "Molim sačekajte, dodajem medij..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr "Promjeni medij"
 
-#: ../edit-urpm-sources.pl_.c:158
-msgid "Please wait, removing medium..."
-msgstr "Molim sačekajte, brišem medij..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
+msgstr "Ne mogu da dobavim izvorne pakete, Ĺžalim."
 
-#: ../edit-urpm-sources.pl_.c:169
-msgid "Edit a source"
-msgstr "Izmijeni izvor"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages."
+msgstr "Ne mogu da dobavim izvorne pakete."
 
-#: ../edit-urpm-sources.pl_.c:173
+#: ../rpmdrake:1
 #, c-format
-msgid "Editing source \"%s\":"
-msgstr "Izmijena izvora \"%s\":"
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr "Nedostaje jedan potreban program (grpmi). Provjerite vaĹĄu instalaciju."
 
-#: ../edit-urpm-sources.pl_.c:179
-msgid "Save changes"
-msgstr "Snimi izmjene"
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
+msgstr "Program nedostaje"
 
-#: ../edit-urpm-sources.pl_.c:185
-msgid "You need to insert the medium to continue"
-msgstr "Morate ubaciti medij u uređaj za nastavak"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
+msgstr "Ispitaj..."
 
-#: ../edit-urpm-sources.pl_.c:186
-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:1
+#, c-format
+msgid "Installation finished"
+msgstr "Instalacija zavrĹĄena"
 
-#: ../edit-urpm-sources.pl_.c:191
-msgid "Please wait, updating medium..."
-msgstr "Molim sačekajte, osvježavam medij..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
+msgstr "Ne radi niĹĄta"
 
-#: ../edit-urpm-sources.pl_.c:202
-msgid "Configure proxies"
-msgstr "KonfiguriĹĄi proxije"
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
+msgstr "Koristi .%s kao glavnu datoteku"
 
-#: ../edit-urpm-sources.pl_.c:207
-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
+#, c-format
+msgid "Remove .%s"
+msgstr "Ukloni .%s"
 
-#: ../edit-urpm-sources.pl_.c:209
-msgid "Proxy hostname:"
-msgstr "Proxy ime računara:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "changes:"
+msgstr "Snimi izmjene"
 
-#: ../edit-urpm-sources.pl_.c:211
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "Možete navesti korisničko ime / šifru za proxy identifikaciju."
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr "Ispitujem %s"
 
-#: ../edit-urpm-sources.pl_.c:213
-msgid "User:"
-msgstr "Korisnik:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, finding available packages..."
+msgstr "Molim sačekajte, tražim dostupne pakete..."
 
-#: ../edit-urpm-sources.pl_.c:235
-msgid "Configure sources"
-msgstr "Podesi izvore"
+#: ../rpmdrake:1
+#, c-format
+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 ""
+"DoĹĄlo je do greĹĄke pri dodavanju update medija putem urpmi.\n"
+"\n"
+"Ovo moĹže biti zbog neispravnog ili privremeno nedostupnog mirrora, ili ako\n"
+"vaĹĄa Mandrake Linux verzija (%s) joĹĄ uvijek / viĹĄe nije podrĹžana od strane "
+"Mandrake\n"
+"Linux zvaničnog update-a.\n"
+"\n"
+"Želite li probati neki drugi mirror?"
 
-#: ../edit-urpm-sources.pl_.c:242
-msgid "Enabled?"
-msgstr "Uključeno?"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
+msgstr "GreĹĄka u dodavanju update medija"
 
-#: ../edit-urpm-sources.pl_.c:243
-msgid "Source"
-msgstr "Izvor"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
+msgstr "Molim sačekajte, kontaktiram mirror za inicijalizaciju update paketa."
 
-#: ../edit-urpm-sources.pl_.c:264 ../rpmdrake_.c:730
-msgid "Remove"
-msgstr "BriĹĄi"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Sources Manager, and then add a `Security\n"
+"updates' source.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"Možete također izabrati vaš željeni mirror ručno: da biste to\n"
+"uradili, pokrenite Upravitelj izvorima softvera, zatim dodajte\n"
+"izvor za 'Sigurnosne update'.\n"
+"\n"
+"Onda restartujte MandrakeUpdate."
 
-#: ../edit-urpm-sources.pl_.c:266
-msgid "Edit"
-msgstr "Izmjeni"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Kako da ručno izaberete vaš mirror"
 
-#: ../edit-urpm-sources.pl_.c:268
-msgid "Add..."
-msgstr "Dodaj..."
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
+msgstr ""
+"DoĹĄlo je do nepopravljive greĹĄke prilikom update-ovanja informacija o "
+"paketima."
 
-#: ../edit-urpm-sources.pl_.c:270
-msgid "Update..."
-msgstr "Unaprijedi..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
+msgstr "GreĹĄka u osvjeĹžavanju medija"
 
-#: ../edit-urpm-sources.pl_.c:271
-msgid "Proxy..."
-msgstr "Proxy..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
+msgstr "Molim sačekajte, kontaktiram mirror za update informacija o paketima."
 
-#: ../edit-urpm-sources.pl_.c:274
-msgid "Save and quit"
-msgstr "Snimi i izađi"
+#: ../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 ""
+"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?"
 
-#: ../edit-urpm-sources.pl_.c:275 ../rpmdrake_.c:733
-msgid "Quit"
-msgstr "Izlaz"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Installation"
+msgstr "Instalacija softverskih paketa"
 
-#: ../rpmdrake.pm_.c:93
-msgid "Yes"
-msgstr "Da"
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, c-format
+msgid "Mandrake Update"
+msgstr "Mandrake Update"
 
-#: ../rpmdrake.pm_.c:95
-msgid "No"
-msgstr "Ne"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
+msgstr "Uklanjanje softverskih paketa"
 
-#: ../rpmdrake.pm_.c:127
-msgid "Info..."
-msgstr "Info..."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Izlaz"
 
-#: ../rpmdrake.pm_.c:180
-msgid "Austria"
-msgstr "Austrija"
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "Instaliraj"
 
-#: ../rpmdrake.pm_.c:181
-msgid "Australia"
-msgstr "Australija"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "BriĹĄi"
 
-#: ../rpmdrake.pm_.c:182
-msgid "Belgium"
-msgstr "Belgija"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search"
+msgstr "Pretraga"
 
-#: ../rpmdrake.pm_.c:183
-msgid "Brazil"
-msgstr "Brazil"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "Pronađi:"
 
-#: ../rpmdrake.pm_.c:184
-msgid "Canada"
-msgstr "Kanada"
+#: ../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 ""
+"Sljedeći paketi trebaju biti uklonjeni kako bi ostali bili unaprijeđeni:\n"
+"\n"
+"%s\n"
+"\n"
+"Mogu li nastaviti?"
 
-#: ../rpmdrake.pm_.c:185
-msgid "Costa Rica"
-msgstr "Kostarika"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "Neke pakete treba obrisati"
 
-#: ../rpmdrake.pm_.c:186
-msgid "Czech Republic"
-msgstr "Češka"
+#: ../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?"
 
-#: ../rpmdrake.pm_.c:187
-msgid "Germany"
-msgstr "Njemačka"
+#: ../rpmdrake:1
+#, c-format
+msgid "Too many packages are selected"
+msgstr "Izabrano je previĹĄe paketa"
 
-#: ../rpmdrake.pm_.c:188
-msgid "Danmark"
-msgstr "Danska"
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
+msgstr "Maksimalne informacije"
 
-#: ../rpmdrake.pm_.c:189 ../rpmdrake.pm_.c:193
-msgid "Greece"
-msgstr "Grčka"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal information"
+msgstr "Normalne informacije"
 
-#: ../rpmdrake.pm_.c:190
-msgid "Spain"
-msgstr "Ĺ panija"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update source(s)"
+msgstr "OsvjeĹži izvore"
 
-#: ../rpmdrake.pm_.c:191
-msgid "Finland"
-msgstr "Finska"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reload the packages list"
+msgstr "Ponovo učitaj listu paketa"
 
-#: ../rpmdrake.pm_.c:192
-msgid "France"
-msgstr "Francuska"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
+msgstr "PoniĹĄti izbor"
 
-#: ../rpmdrake.pm_.c:194
-msgid "Israel"
-msgstr "Izrael"
+#: ../rpmdrake:1
+#, c-format
+msgid "in files"
+msgstr "u datotekama"
 
-#: ../rpmdrake.pm_.c:195
-msgid "Italy"
-msgstr "Italija"
+#: ../rpmdrake:1
+#, c-format
+msgid "in descriptions"
+msgstr "u opisima"
 
-#: ../rpmdrake.pm_.c:196
-msgid "Japan"
-msgstr "Japan"
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
+msgstr "u imenima"
 
-#: ../rpmdrake.pm_.c:197
-msgid "Korea"
-msgstr "Koreja"
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
+msgstr "po dostupnosti update-a"
 
-#: ../rpmdrake.pm_.c:198
-msgid "Netherlands"
-msgstr "Nizozemska"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
+msgstr "po izvornom spremiĹĄtu"
 
-#: ../rpmdrake.pm_.c:199
-msgid "Norway"
-msgstr "NorveĹĄka"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
+msgstr "po stanju izabranosti"
 
-#: ../rpmdrake.pm_.c:200
-msgid "Poland"
-msgstr "Poljska"
+#: ../rpmdrake:1
+#, c-format
+msgid "by size"
+msgstr "po veličini"
 
-#: ../rpmdrake.pm_.c:201
-msgid "Portugal"
-msgstr "Portugal"
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
+msgstr "po grupi"
 
-#: ../rpmdrake.pm_.c:202
-msgid "Russia"
-msgstr "Rusija"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages,"
+msgstr "Svi paketi,"
 
-#: ../rpmdrake.pm_.c:203
-msgid "Sweden"
-msgstr "Ĺ vedska"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
+msgstr "Svi paketi, abecedno"
 
-#: ../rpmdrake.pm_.c:204
-msgid "Taiwan"
-msgstr "Tajvan"
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
+msgstr "Mandrake izbori"
 
-#: ../rpmdrake.pm_.c:205
-msgid "United Kingdom"
-msgstr "Ujedinjeno kraljevstvo"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal updates"
+msgstr "Normalni update-i"
 
-#: ../rpmdrake.pm_.c:206
-msgid "China"
-msgstr "Kina"
+#: ../rpmdrake:1
+#, c-format
+msgid "Bugfixes updates"
+msgstr "Ispravke bugova"
 
-#: ../rpmdrake.pm_.c:207 ../rpmdrake.pm_.c:208 ../rpmdrake.pm_.c:209
-#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:261
-msgid "United States"
-msgstr "SAD"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
+msgstr "Sigurnosna unaprjeđenja"
 
-#: ../rpmdrake.pm_.c:274
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr "Molim sačekajte, skidam adrese mirrora sa MandrakeSoft web stranice."
+#: ../rpmdrake:1
+#, c-format
+msgid "Description: "
+msgstr "Opis: "
 
-#: ../rpmdrake.pm_.c:280
-msgid "Error during download"
-msgstr "GreĹĄka prilikom downloada"
+#: ../rpmdrake:1
+#, c-format
+msgid "Summary: "
+msgstr "Opis: "
 
-#: ../rpmdrake.pm_.c:289
-msgid "No mirror"
-msgstr "Nema mirrora"
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "Značaj: "
 
-#: ../rpmdrake.pm_.c:307
-msgid "Please choose the desired mirror."
-msgstr "Molimo izaberite Ĺželjeni mirror"
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake.pm_.c:339 ../rpmdrake_.c:627
-msgid "Update source(s)"
-msgstr "OsvjeĹži izvore"
+#: ../rpmdrake:1
+#, c-format
+msgid "Size: "
+msgstr "Veličina: "
 
-#: ../rpmdrake.pm_.c:343
-msgid "Select the source(s) you wish to update:"
-msgstr "Izaberite izvorne koje Ĺželite unaprijediti:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Version: "
+msgstr "Verzija: "
 
-#: ../rpmdrake.pm_.c:347
-msgid "Update"
-msgstr "Update"
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "Ime: "
 
-#: ../rpmdrake.pm_.c:358
-msgid "Please wait, updating media..."
-msgstr "Molim sačekajte, unaprjeđujem medije..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "Razlog za update: "
 
-#: ../rpmdrake_.c:99
-msgid "Other"
-msgstr "Ostalo"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
+msgstr "Trenutno instalirana verzija: "
 
-#: ../rpmdrake_.c:121 ../rpmdrake_.c:135 ../rpmdrake_.c:227 ../rpmdrake_.c:298
-msgid "(none)"
-msgstr "(niĹĄta)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Source: "
+msgstr "Izvor: "
 
-#: ../rpmdrake_.c:141 ../rpmdrake_.c:482 ../rpmdrake_.c:483
+#: ../rpmdrake:1
+#, c-format
 msgid "(Not available)"
 msgstr "(Nijedan nije dostupan)"
 
-#: ../rpmdrake_.c:151 ../rpmdrake_.c:208
-msgid "Search results"
-msgstr "Rezultati pretrage"
-
-#: ../rpmdrake_.c:151
-msgid "Search results (none)"
-msgstr "Rezultati pretrage (niĹĄta)"
-
-#: ../rpmdrake_.c:161 ../rpmdrake_.c:172
-msgid "Please wait, searching..."
-msgstr "Molim sačekajte, tražim..."
-
-#: ../rpmdrake_.c:175
-msgid "Stop"
-msgstr "Stani"
-
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-msgid "Addable"
-msgstr "MoĹže se dodati"
-
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-msgid "Upgradable"
-msgstr "MoĹže se unaprijediti"
-
-#: ../rpmdrake_.c:211
-msgid "Not selected"
-msgstr "Nije izabrano"
-
-#: ../rpmdrake_.c:211
-msgid "Selected"
-msgstr "Izabrano"
-
-#: ../rpmdrake_.c:240
-msgid "rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake_.c:258 ../rpmdrake_.c:360 ../rpmdrake_.c:362
-msgid "More information on package..."
-msgstr "ViĹĄe informacija o paketu..."
-
-#: ../rpmdrake_.c:259
-msgid "One of the following packages is needed:"
-msgstr "Potreban je jedan od sljedećih paketa:"
-
-#: ../rpmdrake_.c:259
-msgid "Please choose"
-msgstr "Molim izaberite"
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
+msgstr "Changelog:\n"
 
-#: ../rpmdrake_.c:275
-msgid "unknown package "
-msgstr "nepoznat paket"
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "Datoteke:\n"
 
-#: ../rpmdrake_.c:285
-msgid "Please wait, listing packages..."
-msgstr "Molim sačekajte, listam pakete..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected size: %d MB"
+msgstr "Veličina izabranog: %d MB"
 
-#: ../rpmdrake_.c:300
-msgid "No update"
-msgstr "Nema update-a"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Izabrano: %d MB / Slobodan prostor: %d MB"
 
-#: ../rpmdrake_.c:353 ../rpmdrake_.c:354
-msgid "More infos"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
 msgstr ""
+"Da bismo zadovoljili sve zavisnosti, sljedeće pakete trebate\n"
+"odznačiti:\n"
+"\n"
 
-#: ../rpmdrake_.c:355
-#, fuzzy
-msgid "Information on packages"
-msgstr "ViĹĄe informacija o paketu..."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+msgstr ""
+"Žalim, sljedeće pakete ne možete izabrati:\n"
+"\n"
 
-#: ../rpmdrake_.c:376
-msgid "Some additional packages need to be removed"
-msgstr "Potrebno je obrisati neke dodatne pakete"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "Neki paketi se ne mogu instalirati"
 
-#: ../rpmdrake_.c:377
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"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"
-"ukloniti:\n"
+"instalirati:\n"
 "\n"
 
-#: ../rpmdrake_.c:383 ../rpmdrake_.c:391
+#: ../rpmdrake:1
+#, c-format
+msgid "Additional packages needed"
+msgstr "Potrebni su dodatni paketi"
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "Neke pakete se ne moĹže ukloniti"
 
-#: ../rpmdrake_.c:384
-#, fuzzy
+#: ../rpmdrake:1
+#, fuzzy, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -468,585 +637,600 @@ msgstr ""
 "Žalim, uklanjanje ovog paketa bi izazvalo ruťenje sistema:\n"
 "\n"
 
-#: ../rpmdrake_.c:392 ../rpmdrake_.c:451
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"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 trebate\n"
-"odznačiti:\n"
+"Da bismo zadovoljili sve zavisnosti, sljedeće pakete takođe treba\n"
+"ukloniti:\n"
 "\n"
 
-#: ../rpmdrake_.c:421
-msgid "Additional packages needed"
-msgstr "Potrebni su dodatni paketi"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr "Potrebno je obrisati neke dodatne pakete"
 
-#: ../rpmdrake_.c:422
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
+msgstr "ViĹĄe informacija o paketu..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Information on packages"
+msgstr "ViĹĄe informacija o paketu..."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
 msgstr ""
-"Da bismo zadovoljili sve zavisnosti, sljedeće pakete takođe treba\n"
-"instalirati:\n"
-"\n"
 
-#: ../rpmdrake_.c:435
-msgid "Some packages can't be installed"
-msgstr "Neki paketi se ne mogu instalirati"
+#: ../rpmdrake:1
+#, c-format
+msgid "Addable"
+msgstr "MoĹže se dodati"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Upgradable"
+msgstr "MoĹže se unaprijediti"
 
-#: ../rpmdrake_.c:436
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
+"The list of updates is void. This 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 ""
-"Žalim, sljedeće pakete ne možete izabrati:\n"
-"\n"
+"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_.c:450 ../rpmdrake_.c:684
-msgid "Some packages need to be removed"
-msgstr "Neke pakete treba obrisati"
+#: ../rpmdrake:1
+#, c-format
+msgid "No update"
+msgstr "Nema update-a"
 
-#: ../rpmdrake_.c:472
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Izabrano: %d MB / Slobodan prostor: %d MB"
+msgid "(none)"
+msgstr "(niĹĄta)"
 
-#: ../rpmdrake_.c:474
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "Veličina izabranog: %d MB"
+msgid "Please wait, listing packages..."
+msgstr "Molim sačekajte, listam pakete..."
 
-#: ../rpmdrake_.c:482
-msgid "Files:\n"
-msgstr "Datoteke:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "unknown package "
+msgstr "nepoznat paket"
 
-#: ../rpmdrake_.c:483
-msgid "Changelog:\n"
-msgstr "Changelog:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Potreban je jedan od sljedećih paketa:"
 
-#: ../rpmdrake_.c:486
-msgid "Source: "
-msgstr "Izvor: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please choose"
+msgstr "Molim izaberite"
 
-#: ../rpmdrake_.c:487
-msgid "Currently installed version: "
-msgstr "Trenutno instalirana verzija: "
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:491
-msgid "Reason for update: "
-msgstr "Razlog za update: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Not selected"
+msgstr "Nije izabrano"
 
-#: ../rpmdrake_.c:493
-msgid "Name: "
-msgstr "Ime: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected"
+msgstr "Izabrano"
 
-#: ../rpmdrake_.c:494
-msgid "Version: "
-msgstr "Verzija: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results"
+msgstr "Rezultati pretrage"
 
-#: ../rpmdrake_.c:495
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Stop"
+msgstr "Stani"
 
-#: ../rpmdrake_.c:495
-msgid "Size: "
-msgstr "Veličina: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, searching..."
+msgstr "Molim sačekajte, tražim..."
 
-#: ../rpmdrake_.c:497
-msgid "Importance: "
-msgstr "Značaj: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
+msgstr "Rezultati pretrage (niĹĄta)"
 
-#: ../rpmdrake_.c:498
-msgid "Summary: "
-msgstr "Opis: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Ostalo"
 
-#: ../rpmdrake_.c:499
-msgid "Description: "
-msgstr "Opis: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"Welcome to the packages source editor!\n"
+"\n"
+"This tool will help you configure the packages sources you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"DobrodoĹĄli u editor izvora paketa!\n"
+"\n"
+"Ovaj alat vam omogućuje da podesite izvore paketa koje želite koristiti na\n"
+"vašem računaru. Tada će oni biti dostupni kako biste mogli instalirati "
+"nove \n"
+"softverske pakete ili unaprjeđivati vaš sistem."
 
-#: ../rpmdrake_.c:548
-msgid "Bugfixes updates"
-msgstr "Ispravke bugova"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Snimi i izađi"
 
-#: ../rpmdrake_.c:548
-msgid "Normal updates"
-msgstr "Normalni update-i"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy..."
+msgstr "Proxy..."
 
-#: ../rpmdrake_.c:567
-msgid "Mandrake choices"
-msgstr "Mandrake izbori"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
+msgstr "Unaprijedi..."
 
-#: ../rpmdrake_.c:568
-msgid "All packages, alphabetical"
-msgstr "Svi paketi, abecedno"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "Dodaj..."
 
-#: ../rpmdrake_.c:569
-msgid "All packages,"
-msgstr "Svi paketi,"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "Izmjeni"
 
-#: ../rpmdrake_.c:592
-msgid "by group"
-msgstr "po grupi"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Source"
+msgstr "Izvor"
 
-#: ../rpmdrake_.c:592
-msgid "by size"
-msgstr "po veličini"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
+msgstr "Uključeno?"
 
-#: ../rpmdrake_.c:593
-msgid "by selection state"
-msgstr "po stanju izabranosti"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure sources"
+msgstr "Podesi izvore"
 
-#: ../rpmdrake_.c:594
-msgid "by source repository"
-msgstr "po izvornom spremiĹĄtu"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "Ĺ ifra:"
 
-#: ../rpmdrake_.c:594
-msgid "by update availability"
-msgstr "po dostupnosti update-a"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
+msgstr "Korisnik:"
 
-#: ../rpmdrake_.c:615
-msgid "in descriptions"
-msgstr "u opisima"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Možete navesti korisničko ime / šifru za proxy identifikaciju."
 
-#: ../rpmdrake_.c:615
-msgid "in files"
-msgstr "u datotekama"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "Proxy ime računara:"
 
-#: ../rpmdrake_.c:615
-msgid "in names"
-msgstr "u imenima"
+#: ../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]>):"
 
-#: ../rpmdrake_.c:626
-msgid "Reload the packages list"
-msgstr "Ponovo učitaj listu paketa"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "KonfiguriĹĄi proxije"
 
-#: ../rpmdrake_.c:626
-msgid "Reset the selection"
-msgstr "PoniĹĄti izbor"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr "Molim sačekajte, osvježavam medij..."
 
-#: ../rpmdrake_.c:652
-msgid "Maximum information"
-msgstr "Maksimalne informacije"
+#: ../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"
 
-#: ../rpmdrake_.c:652
-msgid "Normal information"
-msgstr "Normalne informacije"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
+msgstr "Morate ubaciti medij u uređaj za nastavak"
 
-#: ../rpmdrake_.c:674
-msgid "Too many packages are selected"
-msgstr "Izabrano je previĹĄe paketa"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save changes"
+msgstr "Snimi izmjene"
 
-#: ../rpmdrake_.c:720
-msgid "Find:"
-msgstr "Pronađi:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Relativni put do synthesis/hdlist:"
 
-#: ../rpmdrake_.c:725
-msgid "Search"
-msgstr "Pretraga"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake_.c:731
-msgid "Install"
-msgstr "Instaliraj"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Editing source \"%s\":"
+msgstr "Izmijena izvora \"%s\":"
 
-#: ../rpmdrake_.c:738 data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrake Update"
-msgstr "Mandrake Update"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit a source"
+msgstr "Izmijeni izvor"
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Installation"
-msgstr "Instalacija softverskih paketa"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr "Molim sačekajte, brišem medij..."
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Removal"
-msgstr "Uklanjanje softverskih paketa"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, adding medium..."
+msgstr "Molim sačekajte, dodajem medij..."
 
-#: ../rpmdrake_.c:779
-msgid "Please wait, contacting mirror to update packages information."
-msgstr "Molim sačekajte, kontaktiram mirror za update informacija o paketima."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of source:"
+msgstr "Tip izvora:"
 
-#: ../rpmdrake_.c:781
-msgid "Error updating medium"
-msgstr "GreĹĄka u osvjeĹžavanju medija"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Adding a source:"
+msgstr "Dodajem izvor:"
 
-#: ../rpmdrake_.c:782
-msgid "There was an unrecoverable error while updating packages information."
+#: ../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 ""
-"DoĹĄlo je do nepopravljive greĹĄke prilikom update-ovanja informacija o "
-"paketima."
+"Već postoji medij sa tim imenom, da li ga stvarno\n"
+"Ĺželite zamjeniti?"
 
-#: ../rpmdrake_.c:787
-msgid "How to choose manually your mirror"
-msgstr "Kako da ručno izaberete vaš mirror"
+#: ../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_.c:795
-msgid "Please wait, contacting mirror to initialize updates packages."
-msgstr "Molim sačekajte, kontaktiram mirror za inicijalizaciju update paketa."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "Ime:"
 
-#: ../rpmdrake_.c:798
-msgid "Error adding update medium"
-msgstr "GreĹĄka u dodavanju update medija"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
+msgstr "Login:"
 
-#: ../rpmdrake_.c:829
-msgid "Please wait, finding available packages..."
-msgstr "Molim sačekajte, tražim dostupne pakete..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Izaberite neki mirror..."
 
-#: ../rpmdrake_.c:861
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Ispitujem %s"
+msgid "Browse..."
+msgstr "PotraĹži..."
 
-#: ../rpmdrake_.c:880
-#, fuzzy
-msgid "changes:"
-msgstr "Snimi izmjene"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Put ili tačka montiranja:"
 
-#: ../rpmdrake_.c:884
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Ukloni .%s"
+msgid "Removable device"
+msgstr "Izmjenjivi uređaj"
 
-#: ../rpmdrake_.c:886
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Koristi .%s kao glavnu datoteku"
+msgid "HTTP server"
+msgstr "HTTP server"
 
-#: ../rpmdrake_.c:888
-msgid "Do nothing"
-msgstr "Ne radi niĹĄta"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "FTP server"
 
-#: ../rpmdrake_.c:900
-msgid "Installation finished"
-msgstr "Instalacija zavrĹĄena"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path:"
+msgstr "Put:"
 
-#: ../rpmdrake_.c:910
-msgid "Inspect..."
-msgstr "Ispitaj..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "Lokalne datoteke"
 
-#: ../rpmdrake_.c:925
-msgid "Program missing"
-msgstr "Program nedostaje"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a source"
+msgstr "Dodajem izvor:"
 
-#: ../rpmdrake_.c:926
-msgid "A required program is missing (grpmi). Check your installation."
-msgstr "Nedostaje jedan potreban program (grpmi). Provjerite vaĹĄu instalaciju."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
+msgstr "Ne mogu da osvježim medij; on će biti automatski isključen."
 
-#: ../rpmdrake_.c:940
-msgid "Unable to get source packages."
-msgstr "Ne mogu da dobavim izvorne pakete."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "Ne mogu kreirati medij."
 
-#: ../rpmdrake_.c:941
-msgid "Unable to get source packages, sorry."
-msgstr "Ne mogu da dobavim izvorne pakete, Ĺžalim."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, updating media..."
+msgstr "Molim sačekajte, unaprjeđujem medije..."
 
-#: ../rpmdrake_.c:948
-msgid "Change medium"
-msgstr "Promjeni medij"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
+msgstr "Update"
 
-#: ../rpmdrake_.c:949
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Molim ubacite medij pod imenom \"%s\" u uređaj [%s]"
+msgid "Select the source(s) you wish to update:"
+msgstr "Izaberite izvorne koje Ĺželite unaprijediti:"
 
-#: ../rpmdrake_.c:957
-msgid "Installation failed"
-msgstr "Instalacija nije uspjela"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please choose the desired mirror."
+msgstr "Molimo izaberite Ĺželjeni mirror"
 
-#: ../rpmdrake_.c:958
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
-"Instalacija nije uspjela, nedostaju neke od datoteka.\n"
-"Vjerovatno trebate update-ovati vaĹĄu bazu izvora."
+"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_.c:961
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr ""
-"Molim sačekajte, uklanjam pakete kako bi drugi mogli biti unaprijeđeni..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
+msgstr "Nema mirrora"
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"There was an error downloading the mirrors list:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
-"Instalacija je zavrĹĄena; %s.\n"
+"DoĹĄlo je do greĹĄke prilikom skidanja liste mirrora:\n"
 "\n"
-"Neke konfiguracione datoteke su napravljene, kao npr. `.rpmnew' ili `."
-"rpmsave',\n"
-"sada ih moĹžete ispitati kako biste preduzeli neke akcije:"
+"%s\n"
+"MreĹža ili MandrakeSoft web stranica su moĹžda nedostupni.\n"
+"Molim probajte ponovo kasnije."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "GreĹĄka prilikom downloada"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "Molim sačekajte, skidam adrese mirrora sa MandrakeSoft web stranice."
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"some packages failed to install\n"
-"correctly"
+"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 ""
-"neki paketi nisu uspjeĹĄno\n"
-"instalirani"
+"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_.c:983
-msgid "everything was installed correctly"
-msgstr "sve je uspjeĹĄno instalirano"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United States"
+msgstr "SAD"
 
-#: ../rpmdrake_.c:985
-msgid "Everything installed successfully"
-msgstr "Sve je uspjeĹĄno instalirano"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
+msgstr "Kina"
 
-#: ../rpmdrake_.c:986
-msgid "All requested packages were installed successfully."
-msgstr "Svi traĹženi paketi su uspjeĹĄno instalirani."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr "Ujedinjeno kraljevstvo"
 
-#: ../rpmdrake_.c:989
-msgid "Everything already installed."
-msgstr "Sve je već instalirano."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "Tajvan"
 
-#: ../rpmdrake_.c:990
-msgid "Everything already installed (is this supposed to happen at all?)."
-msgstr "Sve je već instalirano (da li se ovo uopšte smije desiti?)."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "Ĺ vedska"
 
-#: ../rpmdrake_.c:997
-#, fuzzy
-msgid "Problem during installation"
-msgstr "DoĹĄlo je do problema prilikom instalacije"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
+msgstr "Rusija"
 
-#: ../rpmdrake_.c:998
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr "DoĹĄlo je do problema prilikom instalacije."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Portugal"
+msgstr "Portugal"
 
-#: ../rpmdrake_.c:1012
-msgid "Please wait, reading packages database..."
-msgstr "Molim sačekajte, čitam bazu paketa..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
+msgstr "Poljska"
 
-#: ../rpmdrake_.c:1053
-msgid "Please wait, removing packages..."
-msgstr "Molim sačekajte, uklanjam pakete..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
+msgstr "NorveĹĄka"
 
-#: ../rpmdrake_.c:1056
-#, fuzzy
-msgid "Problem during removal"
-msgstr "DoĹĄlo je do problema prilikom instalacije"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
+msgstr "Nizozemska"
 
-#: ../rpmdrake_.c:1057
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr "DoĹĄlo je do problema prilikom instalacije."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Korea"
+msgstr "Koreja"
 
-#: ../rpmdrake_.c:1089
-msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
-msgstr ""
-"DobrodoĹĄli u alat za uklanjanje softvera!\n"
-"\n"
-"Ovaj alat će vam pomoći da izaberete koji softver želite ukloniti sa vašeg\n"
-"računara."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Japan"
+msgstr "Japan"
 
-#: ../rpmdrake_.c:1094
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"DobrodoĹĄli u MandrakeUpdate!\n"
-"\n"
-"Ovaj alat će vam pomoći da izaberete update koje želite instalirati na\n"
-"vaš računar."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Italy"
+msgstr "Italija"
 
-#: ../rpmdrake_.c:1099
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
-msgstr ""
-"DobrodoĹĄli u alat za instalaciju softvera!\n"
-"\n"
-"VaĹĄ Mandrake Linux sistem dolazi sa nekoliko hiljada softverskh paketa\n"
-"na CDROM-u ili DVD-u. Ovaj alat će vam pomoći da izaberete koji softver\n"
-"želite instalirati na vaš računar."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Israel"
+msgstr "Izrael"
 
-#: data/rpmdrake-remove.desktop.in.h:1
-msgid "Remove Software"
-msgstr "Ukloni softver"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Grčka"
 
-#: data/rpmdrake-sources.desktop.in.h:1
-msgid "Software Sources Manager"
-msgstr "Upravitelj izvorima softvera"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "France"
+msgstr "Francuska"
 
-#: data/rpmdrake.desktop.in.h:1
-msgid "Install Software"
-msgstr "Instaliraj softver"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "Finska"
 
-#~ msgid ""
-#~ "There is already a medium by that name, do you\n"
-#~ "really want to replace it?"
-#~ msgstr ""
-#~ "Već postoji medij sa tim imenom, da li ga stvarno\n"
-#~ "Ĺželite zamjeniti?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "Ĺ panija"
 
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-#~ "Želite li da nastavim?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
+msgstr "Danska"
 
-#~ 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."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr "Njemačka"
 
-#~ msgid ""
-#~ "I need to contact MandrakeSoft website to get the mirrors list.\n"
-#~ "Please check that your network is currently running.\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "Sada je potrebno kontaktirati MandrakeSoft stranicu kako bi dobili\n"
-#~ "listu mirrora. Molim provjerite da li je vaĹĄa mreĹža trenutno u funkciji.\n"
-#~ "\n"
-#~ "Mogu li nastaviti?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
+msgstr "Češka"
 
-#~ msgid ""
-#~ "There was an error downloading the mirrors list:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "The network, or MandrakeSoft website, are maybe unavailable.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "DoĹĄlo je do greĹĄke prilikom skidanja liste mirrora:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "MreĹža ili MandrakeSoft web stranica su moĹžda nedostupni.\n"
-#~ "Molim probajte ponovo kasnije."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Costa Rica"
+msgstr "Kostarika"
 
-#~ 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."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Canada"
+msgstr "Kanada"
 
-#~ msgid ""
-#~ "The list of updates is void. This means that either there is\n"
-#~ "no available update for the packages installed on your computer,\n"
-#~ "or you already installed all of them."
-#~ msgstr ""
-#~ "Lista update-a je prazna. Ovo znači da ili ne postoji update\n"
-#~ "za pakete koji su instalirani na vašem računaru, ili da ste ih\n"
-#~ "već posjedujete."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
+msgstr "Brazil"
 
-#~ msgid ""
-#~ "Warning: it seems that you are attempting to add so much\n"
-#~ "packages that your filesystem may run out of free diskspace,\n"
-#~ "during or after package installation ; this is particularly\n"
-#~ "dangerous and should be considered with care.\n"
-#~ "\n"
-#~ "Do you really want to install all the selected packages?"
-#~ msgstr ""
-#~ "Upozorenje: izgleda da pokuĹĄavate dodati toliko paketa\n"
-#~ "da će vaš datotečni sistem ostati bez slobodnog prostora\n"
-#~ "na disku, tokom ili nakon instalacije paketa ; ovo je posebno\n"
-#~ "opasno i trebate to paĹžljivo razmotriti.\n"
-#~ "\n"
-#~ "Želite li stvarno instalirati sve izabrane pakete?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Belgium"
+msgstr "Belgija"
 
-#~ msgid ""
-#~ "The following packages have to be removed for others to be upgraded:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "Sljedeći paketi trebaju biti uklonjeni kako bi ostali bili unaprijeđeni:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Mogu li nastaviti?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Australia"
+msgstr "Australija"
 
-#~ msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#~ msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-2,*-r-*"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
+msgstr "Austrija"
 
-#~ 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
+#, c-format
+msgid "Info..."
+msgstr "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ž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
+#, c-format
+msgid "No"
+msgstr "Ne"
 
-#~ 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 ""
-#~ "DoĹĄlo je do greĹĄke pri dodavanju update medija putem urpmi.\n"
-#~ "\n"
-#~ "Ovo moĹže biti zbog neispravnog ili privremeno nedostupnog mirrora, ili "
-#~ "ako\n"
-#~ "vaĹĄa Mandrake Linux verzija (%s) joĹĄ uvijek / viĹĄe nije podrĹžana od "
-#~ "strane Mandrake\n"
-#~ "Linux zvaničnog update-a.\n"
-#~ "\n"
-#~ "Želite li probati neki drugi mirror?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Da"
+
+#: data/rpmdrake.desktop.in.h:1
+msgid "Install Software"
+msgstr "Instaliraj softver"
+
+#: data/rpmdrake-remove.desktop.in.h:1
+msgid "Remove Software"
+msgstr "Ukloni softver"
+
+#: data/rpmdrake-sources.desktop.in.h:1
+msgid "Software Sources Manager"
+msgstr "Upravitelj izvorima softvera"
+
+#~ msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
+#~ msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-2,*-r-*"
 
 #~ msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
 #~ msgstr "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
diff --git a/po/bs.pom b/po/bs.pom
index 07eede41..1933de9a 100644
--- a/po/bs.pom
+++ b/po/bs.pom
@@ -4,166 +4,174 @@ msgstr "Server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
+msgid "Office Workstation"
+msgstr "Uredska radna stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Mrežni računar (klijent)"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Uredski programi: obrada teksta (kword, abiword), tablični alati (kspread, "
+"gnumeric), pdf preglednici itd."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS server, SMB server, Proxy server, ssh server"
+msgid "Workstation"
+msgstr "Radna stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Ured"
+msgid "Game station"
+msgstr "Stanica za igru"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Gnome Radna stanica"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Zabavni programi: arkadne igre, igre za tablu, strategije itd."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Alati za vaĹĄ Palm Pilot ili Visor"
+msgid "Multimedia station"
+msgstr "Multimedijalna stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Radna stanica"
+msgid "Sound and video playing/editing programs"
+msgstr "Programi za pregled i editovanje zvuka i videa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Firewall/Router"
+msgid "Internet station"
+msgstr "Internet stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr "Domain Name i Network Information Server"
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
+"Skup alata za čitanje i slanje pošte i news-a (pine, mutt, tin...) i "
+"pregledanje Weba"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
-msgstr ""
-"Uredski programi: obrada teksta (kword, abiword), tablični alati (kspread, "
-"gnumeric), pdf preglednici itd."
+msgid "Network Computer (client)"
+msgstr "Mrežni računar (klijent)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "Alati vezani za zvuk: mp3 ili midi playeri, mixeri itd."
+msgid "Clients for different protocols including ssh"
+msgstr "Klijenti za razne protokole uključujući ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr ""
+msgid "Configuration"
+msgstr "PodeĹĄavanje"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Knjige i Howto-i na temu Linuxa i Slobodnog Software-a"
+msgid "Tools to ease the configuration of your computer"
+msgstr "Alati za lakše podešavanje računara"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "KDE Radna stanica"
+msgid "Scientific Workstation"
+msgstr "Znanstvena radna stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, itd."
+msgid "Scientific applications such as gnuplot"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Multimedija - Video"
+msgid "Console Tools"
+msgstr "Alati za konzolu"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr "Skup alata za mail, news, web, prenos datoteka i chat"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Editori, ljuske, datotečni alati, terminali"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Baze podataka"
+msgid "KDE Workstation"
+msgstr "KDE Radna stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL ili MySQL baza podataka"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"K Desktop Environment, osnovno grafičko okruženje sa izborom pratećih alata"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Alati za lakše podešavanje računara"
+msgid "Graphical Environment"
+msgstr "Grafičko okruženje"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "Multimedija - Zvuk"
+msgid "Gnome Workstation"
+msgstr "Gnome Radna stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dokumentacija"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+"Grafički okoliš sa skupom korisnički orjentisanih aplikacija i alata za "
+"radnu povrĹĄinu"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Alati za konzolu"
+msgid "Other Graphical Desktops"
+msgstr "Ostale grafičke okoline"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr "Postfix mail server, Inn news server"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, itd."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Internet stanica"
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+msgid "Development"
+msgstr "Programiranje"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Multimedijalna stanica"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C i C++ razvojne biblioteke, programi i include datoteke"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "PodeĹĄavanje"
+msgid "Documentation"
+msgstr "Dokumentacija"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Druge grafičke okoline (Gnome, IceWM)"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Knjige i Howto-i na temu Linuxa i Slobodnog Software-a"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
+msgid "LSB"
 msgstr ""
-"K Desktop Environment, osnovno grafičko okruženje sa izborom pratećih alata"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Grafičko okruženje"
+msgid "Linux Standard Base. Third party applications support"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-msgid "Development"
-msgstr "Programiranje"
+msgid "Web/FTP"
+msgstr "Web/FTP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -172,23 +180,33 @@ msgstr "Apache, Pro-ftpd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "Alati za pravljenje i prĹženje CDova"
+msgid "Mail/Groupware/News"
+msgstr "Mail/Groupware/News"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Uredska radna stanica"
+msgid "Postfix mail server, Inn news server"
+msgstr "Postfix mail server, Inn news server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, itd."
+msgid "Database"
+msgstr "Baze podataka"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Grafički programi kao što je Gimp"
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL ili MySQL baza podataka"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Firewall/Router"
+msgstr "Firewall/Router"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Internet gateway"
+msgstr "Internet gateway"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -197,8 +215,8 @@ msgstr "DNS/NIS "
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C i C++ razvojne biblioteke, programi i include datoteke"
+msgid "Domain Name and Network Information Server"
+msgstr "Domain Name i Network Information Server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -207,18 +225,18 @@ msgstr "Network Computer server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "Mail/Groupware/News"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS server, SMB server, Proxy server, ssh server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Stanica za igru"
+msgid "Office"
+msgstr "Ured"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Video playeri i editori"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr "Skup alata za mail, news, web, prenos datoteka i chat"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -227,79 +245,66 @@ msgstr "Multimedija - Grafika"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Zabavni programi: arkadne igre, igre za tablu, strategije itd."
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
-"Skup alata za čitanje i slanje pošte i news-a (pine, mutt, tin...) i "
-"pregledanje Weba"
+msgid "Graphics programs such as The Gimp"
+msgstr "Grafički programi kao što je Gimp"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "Lične finansije"
+msgid "Multimedia - Sound"
+msgstr "Multimedija - Zvuk"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
-"Grafički okoliš sa skupom korisnički orjentisanih aplikacija i alata za "
-"radnu povrĹĄinu"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "Alati vezani za zvuk: mp3 ili midi playeri, mixeri itd."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Klijenti za razne protokole uključujući ssh"
+msgid "Multimedia - Video"
+msgstr "Multimedija - Video"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "LSB"
-msgstr ""
+msgid "Video players and editors"
+msgstr "Video playeri i editori"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Internet gateway"
+msgid "Multimedia - CD Burning"
+msgstr "Multimedija - PrĹženje CDa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Programi za pregled i editovanje zvuka i videa"
+msgid "Tools to create and burn CD's"
+msgstr "Alati za pravljenje i prĹženje CDova"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Ostale grafičke okoline"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Druge grafičke okoline (Gnome, IceWM)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Editori, ljuske, datotečni alati, terminali"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, itd."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "Programi za upravljanje vaĹĄim finansijama, kao ĹĄto je gnucash"
+msgid "Personal Information Management"
+msgstr "Upravljanje ličnim informacijama"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "Upravljanje ličnim informacijama"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Alati za vaĹĄ Palm Pilot ili Visor"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multimedija - PrĹženje CDa"
+msgid "Personal Finance"
+msgstr "Lične finansije"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Znanstvena radna stanica"
+msgid "Programs to manage your finances, such as gnucash"
+msgstr "Programi za upravljanje vaĹĄim finansijama, kao ĹĄto je gnucash"
 
diff --git a/po/ca.po b/po/ca.po
index d48a6032..5fb5c445 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2003-01-19 16:57+0100\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\n"
 "PO-Revision-Date: 2001-09-20 20:49+0200\n"
 "Last-Translator: Softcatalŕ <traddrake@softcatala.org>\n"
 "Language-Team: Catalan <info@softcatala.org>\n"
@@ -15,1057 +15,1246 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl_.c:39
-msgid "Unable to create medium."
-msgstr "No es pot crear el support."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Esteu d'acord en continuar?"
 
-#: ../edit-urpm-sources.pl_.c:40
-msgid "Unable to update medium; it will be automatically disabled."
-msgstr "No es pot actualitzar el support; es deshabilitarŕ automŕticament."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to the software installation tool!\n"
+"\n"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
+msgstr ""
+"Benvinguts a la eina d'instalˇlació de programari!\n"
+"\n"
+"El vostre sistema Mandrake Linux vé amb uns quants milers de paquets de\n"
+"programari en CDROM o DVD. Aquesta eina us ajudarŕ a escollir quin "
+"programari\n"
+"voleu instalˇlar en el vostre ordinador."
 
-#: ../edit-urpm-sources.pl_.c:51
-msgid "Add a source"
-msgstr "Afegeix una font"
+#: ../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 ""
+"Benvinguts al MandrakeUpdate!\n"
+"\n"
+"Aquesta eina us ajudarŕ a escollir les actualitzacions que voleu instalˇlar "
+"en el vostre\n"
+"ordinador."
 
-#: ../edit-urpm-sources.pl_.c:52
-msgid "Local files"
-msgstr "Fitxers locals"
+#: ../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 ""
+"Benvinguts a una eina per a eliminar programari!\n"
+"\n"
+"Aqueta eina us ajudarŕ a escollir quin programari voleu eliminar del\n"
+"vostre ordinador."
 
-#: ../edit-urpm-sources.pl_.c:52
-msgid "Path:"
-msgstr "Camí:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"Hi ha hagut algun problema durant la instalˇlació:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:53
-msgid "FTP server"
-msgstr "Servidor FTP"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during removal"
+msgstr "Hi ha hagut un problema durant la instalˇlació"
 
-#: ../edit-urpm-sources.pl_.c:53 ../edit-urpm-sources.pl_.c:54
-#: ../edit-urpm-sources.pl_.c:56 ../edit-urpm-sources.pl_.c:175
-msgid "URL:"
-msgstr "URL:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages..."
+msgstr "Si us plau, espereu; s'estan eliminant els paquets..."
 
-#: ../edit-urpm-sources.pl_.c:54
-msgid "HTTP server"
-msgstr "Servidor HTTP"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
+msgstr "Si us plau, espereu; s'estŕ llegint la base de dades de paquets..."
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Path or mount point:"
-msgstr "Camí o punt de muntatge:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Hi ha hagut algun problema durant la instalˇlació:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Removable device"
-msgstr "Dispositius extraďbles"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during installation"
+msgstr "Hi ha hagut un problema durant la instalˇlació"
 
-#: ../edit-urpm-sources.pl_.c:56 ../rpmdrake_.c:548
-msgid "Security updates"
-msgstr "Actualitzacions de seguretat"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
+msgstr "Tot ja estŕ instalˇlat (aixň se suposa que pot passar?)."
 
-#: ../edit-urpm-sources.pl_.c:67
-msgid "Browse..."
-msgstr "Navega..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed."
+msgstr "Tot ja estŕ instalˇlat."
 
-#: ../edit-urpm-sources.pl_.c:69
-msgid "Choose a mirror..."
-msgstr "Escolliu una rčplica..."
+#: ../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_.c:89
-msgid "Login:"
-msgstr "Entrada:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr "Tot s'ha instalˇlat correctament"
 
-#: ../edit-urpm-sources.pl_.c:89 ../edit-urpm-sources.pl_.c:215
-msgid "Password:"
-msgstr "Contrasenya:"
+#: ../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:"
 
-#: ../edit-urpm-sources.pl_.c:94
-msgid "Name:"
-msgstr "Nom:"
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "tot s'ha instalˇlat correctament"
 
-#: ../edit-urpm-sources.pl_.c:96 ../edit-urpm-sources.pl_.c:176
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Camí relatiu a la síntesi/hdlist: "
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"some packages failed to install\n"
+"correctly"
+msgstr ""
+"alguns paquets no s'han instalˇlat\n"
+"correctament"
 
-#: ../edit-urpm-sources.pl_.c:104
-msgid "You need to fill up at least the two first entries."
-msgstr "Es necessita que ompliu les dues primeres entrades."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages to allow others to be upgraded..."
+msgstr ""
+"Si us plau, espereu; s'estan eliminant paquets per a permetre que "
+"s'actualitzin d'altres..."
 
-#: ../edit-urpm-sources.pl_.c:116
-msgid "Adding a source:"
-msgstr "Afegint una font:"
+#: ../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."
 
-#: ../edit-urpm-sources.pl_.c:117
-msgid "Type of source:"
-msgstr "Tipus de font:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation failed"
+msgstr "La instalˇlació ha fallat"
 
-#: ../edit-urpm-sources.pl_.c:121 ../edit-urpm-sources.pl_.c:187
-#: ../edit-urpm-sources.pl_.c:219 ../rpmdrake.pm_.c:97 ../rpmdrake.pm_.c:136
-#: ../rpmdrake.pm_.c:319 ../rpmdrake_.c:353 ../rpmdrake_.c:365
-#: ../rpmdrake_.c:369 ../rpmdrake_.c:916 ../rpmdrake_.c:950
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
+msgstr "Cancelˇla"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
 msgid "Ok"
 msgstr "D'acord"
 
-#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:180
-#: ../edit-urpm-sources.pl_.c:187 ../edit-urpm-sources.pl_.c:220
-#: ../rpmdrake.pm_.c:319 ../rpmdrake.pm_.c:352 ../rpmdrake_.c:353
-#: ../rpmdrake_.c:950
-msgid "Cancel"
-msgstr "Cancelˇla"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Per favor, inserteu el suport anomenat \"%s\" en el dispositiu [%s]"
 
-#: ../edit-urpm-sources.pl_.c:140
-msgid "Please wait, adding medium..."
-msgstr "Si us plau espereu, s'estŕ afegint el suport..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr "Canvieu el suport"
 
-#: ../edit-urpm-sources.pl_.c:158
-msgid "Please wait, removing medium..."
-msgstr "Si us plau espereu, s'estŕ afegint el suport..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
+msgstr "No he pogut obtenir els paquets fonts, ho sento."
 
-#: ../edit-urpm-sources.pl_.c:169
-msgid "Edit a source"
-msgstr "Edita una font"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages."
+msgstr "No he pogut obtenir els paquets fonts."
 
-#: ../edit-urpm-sources.pl_.c:173
+#: ../rpmdrake:1
 #, c-format
-msgid "Editing source \"%s\":"
-msgstr "Editant les fonts \"%s\":"
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr ""
+"No s'ha trobat un programa (grpmi) que es necessita. Comproveu la "
+"instalˇlació."
 
-#: ../edit-urpm-sources.pl_.c:179
-msgid "Save changes"
-msgstr "Desa canvis"
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
+msgstr "No s'ha trobat el programa"
 
-#: ../edit-urpm-sources.pl_.c:185
-msgid "You need to insert the medium to continue"
-msgstr "Heu d'inserir el support per a continuar"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
+msgstr "s'estŕ inspeccionant..."
 
-#: ../edit-urpm-sources.pl_.c:186
-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:1
+#, c-format
+msgid "Installation finished"
+msgstr "Instalˇlació finalitzada"
 
-#: ../edit-urpm-sources.pl_.c:191
-msgid "Please wait, updating medium..."
-msgstr "Si us plau, espereu, s'estŕ actualitzant el suport..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
+msgstr "No facis res"
 
-#: ../edit-urpm-sources.pl_.c:202
-msgid "Configure proxies"
-msgstr "Configureu els servidors intermediaris(proxies)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
+msgstr "Utilitza .%s com a fitxer principal"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Remove .%s"
+msgstr "Elimina .%s"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "changes:"
+msgstr "canvis:"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr "Inspeccionant %s"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, finding available packages..."
+msgstr "Si us plau espereu, s'estan buscant els paquets disponibles..."
 
-#: ../edit-urpm-sources.pl_.c:207
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+"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 ""
-"Si necessiteu un servidor intermediari, entreu el nom de l'ordinador central "
-"i un port opcional (sintaxi: <proxyhost[:port]>):"
+"Hi ha hagut un error quant s'estava afegint el suport d'actualització via "
+"urpmi.\n"
+"\n"
+"Aixň pot ser degut a una rčplica que no és correcte o estŕ temporalment "
+"inaccessible, o la\n"
+"versió (%s) del vostre Mandrake Linux no és encara suportada o ja ha estat "
+"discontinuada per Mandrake Linux\n"
+"Official Updates.\n"
+"\n"
+"Voleu provar algun altra rčplica?"
 
-#: ../edit-urpm-sources.pl_.c:209
-msgid "Proxy hostname:"
-msgstr "Nom del servidor intermediari:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
+msgstr "S'ha produďt un error afegint el suport d'actualització"
 
-#: ../edit-urpm-sources.pl_.c:211
-msgid "You may specify a user/password for the proxy authentication:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
 msgstr ""
-"Podeu especificar un usuari/contraenya en la autentificació del servidor "
-"intermediari:"
-
-#: ../edit-urpm-sources.pl_.c:213
-msgid "User:"
-msgstr "Nom d'usuari:"
+"Espereu si us plau, s'estŕ contactant la rčplica per inicialitzar les "
+"actualitzacions."
 
-#: ../edit-urpm-sources.pl_.c:235
-msgid "Configure sources"
-msgstr "Configureu les fonts"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Sources Manager, and then add a `Security\n"
+"updates' source.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"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."
 
-#: ../edit-urpm-sources.pl_.c:242
-msgid "Enabled?"
-msgstr "Habilitat?"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Com escollir manualment la rčplica"
 
-#: ../edit-urpm-sources.pl_.c:243
-msgid "Source"
-msgstr "Font"
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
+msgstr ""
+"Hi ha hagut un error irrecuperable mentres s'actualitzava la informació de "
+"paquets."
 
-#: ../edit-urpm-sources.pl_.c:264 ../rpmdrake_.c:730
-msgid "Remove"
-msgstr "Suprimir"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
+msgstr "S'ha produďt un error actualitzant el suport"
 
-#: ../edit-urpm-sources.pl_.c:266
-msgid "Edit"
-msgstr "Edita"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
+msgstr ""
+"Per favor espereu, contactant la rčplica per a info d'actualitzacions de "
+"paquets."
 
-#: ../edit-urpm-sources.pl_.c:268
-msgid "Add..."
-msgstr "Afegir..."
+#: ../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 ""
+"Necessito contactar amb la rčplica per a obtenir les últimes\n"
+"actualitzacions de paquets. Comproveu que la xarxa funcioni ara.\n"
+"\n"
+"Esteu d'acord en continuar?"
 
-#: ../edit-urpm-sources.pl_.c:270
-msgid "Update..."
-msgstr "Actualitzar..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Installation"
+msgstr "Instalˇlació de Paquets de Programari"
 
-#: ../edit-urpm-sources.pl_.c:271
-msgid "Proxy..."
-msgstr "Servidor Intermediari..."
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, c-format
+msgid "Mandrake Update"
+msgstr "Actualització de Mandrake"
 
-#: ../edit-urpm-sources.pl_.c:274
-msgid "Save and quit"
-msgstr "Desa i surt"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
+msgstr "Eliminació de Paquets de Programari"
 
-#: ../edit-urpm-sources.pl_.c:275 ../rpmdrake_.c:733
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
 msgid "Quit"
 msgstr "Surt"
 
-#: ../rpmdrake.pm_.c:93
-msgid "Yes"
-msgstr "Si"
-
-#: ../rpmdrake.pm_.c:95
-msgid "No"
-msgstr "No"
-
-#: ../rpmdrake.pm_.c:127
-msgid "Info..."
-msgstr "Info..."
-
-#: ../rpmdrake.pm_.c:180
-msgid "Austria"
-msgstr "Ŕustria"
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "Instalˇlació"
 
-#: ../rpmdrake.pm_.c:181
-msgid "Australia"
-msgstr "Austrŕlia"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "Suprimir"
 
-#: ../rpmdrake.pm_.c:182
-msgid "Belgium"
-msgstr "Bčlgica"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search"
+msgstr "Cerca"
 
-#: ../rpmdrake.pm_.c:183
-msgid "Brazil"
-msgstr "Brasil"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "Cerca:"
 
-#: ../rpmdrake.pm_.c:184
-msgid "Canada"
-msgstr "Canadŕ"
+#: ../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 ""
+"S'han d'eliminar els següents paquets perquč altres siguin actualitzats:\n"
+"\n"
+"%s\n"
+"\n"
+"Esteu d'acord en continuar?"
 
-#: ../rpmdrake.pm_.c:185
-msgid "Costa Rica"
-msgstr "Costa Rica"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "S'han d'eliminar alguns paquets"
 
-#: ../rpmdrake.pm_.c:186
-msgid "Czech Republic"
-msgstr "República Txeca"
+#: ../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?"
 
-#: ../rpmdrake.pm_.c:187
-msgid "Germany"
-msgstr "Alemanya"
+#: ../rpmdrake:1
+#, c-format
+msgid "Too many packages are selected"
+msgstr "S'han seleccionat massa paquets"
 
-#: ../rpmdrake.pm_.c:188
-msgid "Danmark"
-msgstr "Dinamarca"
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
+msgstr "Mŕxima informació"
 
-#: ../rpmdrake.pm_.c:189 ../rpmdrake.pm_.c:193
-msgid "Greece"
-msgstr "Grčcia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal information"
+msgstr "Informació normal"
 
-#: ../rpmdrake.pm_.c:190
-msgid "Spain"
-msgstr "Espanya"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update source(s)"
+msgstr "Actualitza la(es) font(s)"
 
-#: ../rpmdrake.pm_.c:191
-msgid "Finland"
-msgstr "Finlŕndia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reload the packages list"
+msgstr "Recarrega la llista de paquets"
 
-#: ../rpmdrake.pm_.c:192
-msgid "France"
-msgstr "França"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
+msgstr "Esborra la selecció"
 
-#: ../rpmdrake.pm_.c:194
-msgid "Israel"
-msgstr "Israel"
+#: ../rpmdrake:1
+#, c-format
+msgid "in files"
+msgstr "en fitxers"
 
-#: ../rpmdrake.pm_.c:195
-msgid "Italy"
-msgstr "Itŕlia"
+#: ../rpmdrake:1
+#, c-format
+msgid "in descriptions"
+msgstr "en descripcions"
 
-#: ../rpmdrake.pm_.c:196
-msgid "Japan"
-msgstr "Japó"
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
+msgstr "en noms"
 
-#: ../rpmdrake.pm_.c:197
-msgid "Korea"
-msgstr "Corea"
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
+msgstr "per disponibilitat d'actualització"
 
-#: ../rpmdrake.pm_.c:198
-msgid "Netherlands"
-msgstr "Paísos Baixos"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
+msgstr "per dipňsit de fonts"
 
-#: ../rpmdrake.pm_.c:199
-msgid "Norway"
-msgstr "Noruega"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
+msgstr "per estat de selecció"
 
-#: ../rpmdrake.pm_.c:200
-msgid "Poland"
-msgstr "Polňnia"
+#: ../rpmdrake:1
+#, c-format
+msgid "by size"
+msgstr "per mida"
 
-#: ../rpmdrake.pm_.c:201
-msgid "Portugal"
-msgstr "Portugal"
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
+msgstr "per grup"
 
-#: ../rpmdrake.pm_.c:202
-msgid "Russia"
-msgstr "Rússia"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages,"
+msgstr "Tots els paquets,"
 
-#: ../rpmdrake.pm_.c:203
-msgid "Sweden"
-msgstr "Sučcia"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
+msgstr "Tots els paquets, alfabčticament"
 
-#: ../rpmdrake.pm_.c:204
-msgid "Taiwan"
-msgstr "Taiwan"
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
+msgstr "Opcions de Mandrake"
 
-#: ../rpmdrake.pm_.c:205
-msgid "United Kingdom"
-msgstr "Regne Unit"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal updates"
+msgstr "Actualitzacions normals"
 
-#: ../rpmdrake.pm_.c:206
-msgid "China"
-msgstr "Xina"
+#: ../rpmdrake:1
+#, c-format
+msgid "Bugfixes updates"
+msgstr "Actualitzacions d'errors"
 
-#: ../rpmdrake.pm_.c:207 ../rpmdrake.pm_.c:208 ../rpmdrake.pm_.c:209
-#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:261
-msgid "United States"
-msgstr "Estats Units"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
+msgstr "Actualitzacions de seguretat"
 
-#: ../rpmdrake.pm_.c:274
-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
+#, c-format
+msgid "Description: "
+msgstr "Descripció: "
 
-#: ../rpmdrake.pm_.c:280
-msgid "Error during download"
-msgstr "S'ha produďt un error durant la baixada"
+#: ../rpmdrake:1
+#, c-format
+msgid "Summary: "
+msgstr "Resum: "
 
-#: ../rpmdrake.pm_.c:289
-msgid "No mirror"
-msgstr "Cap rčplica"
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "Importŕncia: "
 
-#: ../rpmdrake.pm_.c:307
-msgid "Please choose the desired mirror."
-msgstr "Si us plau, escolliu la rčpliqua desitjada"
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake.pm_.c:339 ../rpmdrake_.c:627
-msgid "Update source(s)"
-msgstr "Actualitza la(es) font(s)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Size: "
+msgstr "Mida: "
 
-#: ../rpmdrake.pm_.c:343
-msgid "Select the source(s) you wish to update:"
-msgstr "Seleccioneu la(es) font(s) que voleu actualitzar:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Version: "
+msgstr "Versió: "
 
-#: ../rpmdrake.pm_.c:347
-msgid "Update"
-msgstr "Actualitza"
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "Nom: "
 
-#: ../rpmdrake.pm_.c:358
-msgid "Please wait, updating media..."
-msgstr "Si us plau espereu, actualitzant dades..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "Rao d'actualització: "
 
-#: ../rpmdrake_.c:99
-msgid "Other"
-msgstr "Altres"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
+msgstr "Versió actualment instalˇlada: "
 
-#: ../rpmdrake_.c:121 ../rpmdrake_.c:135 ../rpmdrake_.c:227 ../rpmdrake_.c:298
-msgid "(none)"
-msgstr "(cap)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Source: "
+msgstr "Font: "
 
-#: ../rpmdrake_.c:141 ../rpmdrake_.c:482 ../rpmdrake_.c:483
+#: ../rpmdrake:1
+#, c-format
 msgid "(Not available)"
 msgstr "(No disponible)"
 
-#: ../rpmdrake_.c:151 ../rpmdrake_.c:208
-msgid "Search results"
-msgstr "Resultats de la cerca"
-
-#: ../rpmdrake_.c:151
-msgid "Search results (none)"
-msgstr "Resultats de la cerca (cap)"
-
-#: ../rpmdrake_.c:161 ../rpmdrake_.c:172
-msgid "Please wait, searching..."
-msgstr "Si us plau espereu, s'estŕ buscant..."
-
-#: ../rpmdrake_.c:175
-msgid "Stop"
-msgstr "Para"
-
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-msgid "Addable"
-msgstr "Afegible"
-
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-msgid "Upgradable"
-msgstr "Actualitzable"
-
-#: ../rpmdrake_.c:211
-msgid "Not selected"
-msgstr "No seleccionat"
-
-#: ../rpmdrake_.c:211
-msgid "Selected"
-msgstr "Seleccionat"
-
-#: ../rpmdrake_.c:240
-msgid "rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake_.c:258 ../rpmdrake_.c:360 ../rpmdrake_.c:362
-msgid "More information on package..."
-msgstr "Més informació del paquet..."
-
-#: ../rpmdrake_.c:259
-msgid "One of the following packages is needed:"
-msgstr "Es necessita un dels següents paquets:"
-
-#: ../rpmdrake_.c:259
-msgid "Please choose"
-msgstr "Si us plau escolliu"
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
+msgstr "Changelog:\n"
 
-#: ../rpmdrake_.c:275
-msgid "unknown package "
-msgstr "paquet desconegut "
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "Fitxers:\n"
 
-#: ../rpmdrake_.c:285
-msgid "Please wait, listing packages..."
-msgstr "Si us plau espereu, s'estan llistant els paquets..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected size: %d MB"
+msgstr "Mida seleccionada: %d MB"
 
-#: ../rpmdrake_.c:300
-msgid "No update"
-msgstr "No actualitzable"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Seleccionats: %d MB / Espai lliure en disc: %d MB"
 
-#: ../rpmdrake_.c:353 ../rpmdrake_.c:354
-msgid "More infos"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
 msgstr ""
+"A causa de les dependčncies, els següent(s) paquet(s) s'han de "
+"deseleccionar\n"
+"ara:\n"
+"\n"
 
-#: ../rpmdrake_.c:355
-#, fuzzy
-msgid "Information on packages"
-msgstr "Més informació del paquet..."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+msgstr ""
+"Ho sento, no he pogut seleccionar els següent(s) paquet(s):\n"
+"\n"
 
-#: ../rpmdrake_.c:376
-msgid "Some additional packages need to be removed"
-msgstr "Cal esborrar paquets addicionals"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "No es poden instalˇlar alguns paquets"
 
-#: ../rpmdrake_.c:377
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
 "\n"
 msgstr ""
-"Per poder satisfer totes les dependčncies, els següent(s) paquet(s)\n"
-"cal que s'eliminin:\n"
+"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
+msgid "Additional packages needed"
+msgstr "Es necessiten paquets addicionals"
 
-#: ../rpmdrake_.c:383 ../rpmdrake_.c:391
+#: ../rpmdrake:1
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "Alguns paquets no es poden suprimir"
 
-#: ../rpmdrake_.c:384
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake_.c:392 ../rpmdrake_.c:451
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
 "\n"
 msgstr ""
-"A causa de les dependčncies, els següent(s) paquet(s) s'han de "
-"deseleccionar\n"
-"ara:\n"
-"\n"
+"Per poder satisfer totes les dependčncies, els següent(s) paquet(s)\n"
+"cal que s'eliminin:\n"
 
-#: ../rpmdrake_.c:421
-msgid "Additional packages needed"
-msgstr "Es necessiten paquets addicionals"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr "Cal esborrar paquets addicionals"
 
-#: ../rpmdrake_.c:422
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
+msgstr "Més informació del paquet..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Information on packages"
+msgstr "Més informació del paquet..."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
 msgstr ""
-"Per a satisfer les dependčncies, també s'han d'instalˇlar els següent(s)\n"
-"paquet(s):\n"
-"\n"
 
-#: ../rpmdrake_.c:435
-msgid "Some packages can't be installed"
-msgstr "No es poden instalˇlar alguns paquets"
+#: ../rpmdrake:1
+#, c-format
+msgid "Addable"
+msgstr "Afegible"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Upgradable"
+msgstr "Actualitzable"
 
-#: ../rpmdrake_.c:436
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
+"The list of updates is void. This 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 ""
-"Ho sento, no he pogut seleccionar els següent(s) paquet(s):\n"
-"\n"
+"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_.c:450 ../rpmdrake_.c:684
-msgid "Some packages need to be removed"
-msgstr "S'han d'eliminar alguns paquets"
+#: ../rpmdrake:1
+#, c-format
+msgid "No update"
+msgstr "No actualitzable"
 
-#: ../rpmdrake_.c:472
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Seleccionats: %d MB / Espai lliure en disc: %d MB"
+msgid "(none)"
+msgstr "(cap)"
 
-#: ../rpmdrake_.c:474
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "Mida seleccionada: %d MB"
+msgid "Please wait, listing packages..."
+msgstr "Si us plau espereu, s'estan llistant els paquets..."
 
-#: ../rpmdrake_.c:482
-msgid "Files:\n"
-msgstr "Fitxers:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "unknown package "
+msgstr "paquet desconegut "
 
-#: ../rpmdrake_.c:483
-msgid "Changelog:\n"
-msgstr "Changelog:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Es necessita un dels següents paquets:"
 
-#: ../rpmdrake_.c:486
-msgid "Source: "
-msgstr "Font: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please choose"
+msgstr "Si us plau escolliu"
 
-#: ../rpmdrake_.c:487
-msgid "Currently installed version: "
-msgstr "Versió actualment instalˇlada: "
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:491
-msgid "Reason for update: "
-msgstr "Rao d'actualització: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Not selected"
+msgstr "No seleccionat"
 
-#: ../rpmdrake_.c:493
-msgid "Name: "
-msgstr "Nom: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected"
+msgstr "Seleccionat"
 
-#: ../rpmdrake_.c:494
-msgid "Version: "
-msgstr "Versió: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results"
+msgstr "Resultats de la cerca"
 
-#: ../rpmdrake_.c:495
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Stop"
+msgstr "Para"
 
-#: ../rpmdrake_.c:495
-msgid "Size: "
-msgstr "Mida: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, searching..."
+msgstr "Si us plau espereu, s'estŕ buscant..."
 
-#: ../rpmdrake_.c:497
-msgid "Importance: "
-msgstr "Importŕncia: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
+msgstr "Resultats de la cerca (cap)"
 
-#: ../rpmdrake_.c:498
-msgid "Summary: "
-msgstr "Resum: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Altres"
 
-#: ../rpmdrake_.c:499
-msgid "Description: "
-msgstr "Descripció: "
+#: ../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."
 
-#: ../rpmdrake_.c:548
-msgid "Bugfixes updates"
-msgstr "Actualitzacions d'errors"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Desa i surt"
 
-#: ../rpmdrake_.c:548
-msgid "Normal updates"
-msgstr "Actualitzacions normals"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy..."
+msgstr "Servidor Intermediari..."
 
-#: ../rpmdrake_.c:567
-msgid "Mandrake choices"
-msgstr "Opcions de Mandrake"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
+msgstr "Actualitzar..."
 
-#: ../rpmdrake_.c:568
-msgid "All packages, alphabetical"
-msgstr "Tots els paquets, alfabčticament"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "Afegir..."
 
-#: ../rpmdrake_.c:569
-msgid "All packages,"
-msgstr "Tots els paquets,"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "Edita"
 
-#: ../rpmdrake_.c:592
-msgid "by group"
-msgstr "per grup"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Source"
+msgstr "Font"
 
-#: ../rpmdrake_.c:592
-msgid "by size"
-msgstr "per mida"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
+msgstr "Habilitat?"
 
-#: ../rpmdrake_.c:593
-msgid "by selection state"
-msgstr "per estat de selecció"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure sources"
+msgstr "Configureu les fonts"
 
-#: ../rpmdrake_.c:594
-msgid "by source repository"
-msgstr "per dipňsit de fonts"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "Contrasenya:"
 
-#: ../rpmdrake_.c:594
-msgid "by update availability"
-msgstr "per disponibilitat d'actualització"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
+msgstr "Nom d'usuari:"
 
-#: ../rpmdrake_.c:615
-msgid "in descriptions"
-msgstr "en descripcions"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+"Podeu especificar un usuari/contraenya en la autentificació del servidor "
+"intermediari:"
 
-#: ../rpmdrake_.c:615
-msgid "in files"
-msgstr "en fitxers"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "Nom del servidor intermediari:"
 
-#: ../rpmdrake_.c:615
-msgid "in names"
-msgstr "en noms"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+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_.c:626
-msgid "Reload the packages list"
-msgstr "Recarrega la llista de paquets"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "Configureu els servidors intermediaris(proxies)"
 
-#: ../rpmdrake_.c:626
-msgid "Reset the selection"
-msgstr "Esborra la selecció"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr "Si us plau, espereu, s'estŕ actualitzant el suport..."
 
-#: ../rpmdrake_.c:652
-msgid "Maximum information"
-msgstr "Mŕxima informació"
+#: ../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."
 
-#: ../rpmdrake_.c:652
-msgid "Normal information"
-msgstr "Informació normal"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
+msgstr "Heu d'inserir el support per a continuar"
 
-#: ../rpmdrake_.c:674
-msgid "Too many packages are selected"
-msgstr "S'han seleccionat massa paquets"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save changes"
+msgstr "Desa canvis"
 
-#: ../rpmdrake_.c:720
-msgid "Find:"
-msgstr "Cerca:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Camí relatiu a la síntesi/hdlist: "
 
-#: ../rpmdrake_.c:725
-msgid "Search"
-msgstr "Cerca"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake_.c:731
-msgid "Install"
-msgstr "Instalˇlació"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Editing source \"%s\":"
+msgstr "Editant les fonts \"%s\":"
 
-#: ../rpmdrake_.c:738 data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrake Update"
-msgstr "Actualització de Mandrake"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit a source"
+msgstr "Edita una font"
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Installation"
-msgstr "Instalˇlació de Paquets de Programari"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr "Si us plau espereu, s'estŕ afegint el suport..."
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Removal"
-msgstr "Eliminació de Paquets de Programari"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, adding medium..."
+msgstr "Si us plau espereu, s'estŕ afegint el suport..."
 
-#: ../rpmdrake_.c:779
-msgid "Please wait, contacting mirror to update packages information."
-msgstr ""
-"Per favor espereu, contactant la rčplica per a info d'actualitzacions de "
-"paquets."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of source:"
+msgstr "Tipus de font:"
 
-#: ../rpmdrake_.c:781
-msgid "Error updating medium"
-msgstr "S'ha produďt un error actualitzant el suport"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Adding a source:"
+msgstr "Afegint una font:"
 
-#: ../rpmdrake_.c:782
-msgid "There was an unrecoverable error while updating packages information."
+#: ../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 ""
-"Hi ha hagut un error irrecuperable mentres s'actualitzava la informació de "
-"paquets."
+"Ja hi ha un support amb aquest nom, realment\n"
+"voleu reemplaçar-lo?"
 
-#: ../rpmdrake_.c:787
-msgid "How to choose manually your mirror"
-msgstr "Com escollir manualment la rčplica"
+#: ../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_.c:795
-msgid "Please wait, contacting mirror to initialize updates packages."
-msgstr ""
-"Espereu si us plau, s'estŕ contactant la rčplica per inicialitzar les "
-"actualitzacions."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "Nom:"
 
-#: ../rpmdrake_.c:798
-msgid "Error adding update medium"
-msgstr "S'ha produďt un error afegint el suport d'actualització"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
+msgstr "Entrada:"
 
-#: ../rpmdrake_.c:829
-msgid "Please wait, finding available packages..."
-msgstr "Si us plau espereu, s'estan buscant els paquets disponibles..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Escolliu una rčplica..."
 
-#: ../rpmdrake_.c:861
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Inspeccionant %s"
+msgid "Browse..."
+msgstr "Navega..."
 
-#: ../rpmdrake_.c:880
-msgid "changes:"
-msgstr "canvis:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Camí o punt de muntatge:"
 
-#: ../rpmdrake_.c:884
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Elimina .%s"
+msgid "Removable device"
+msgstr "Dispositius extraďbles"
 
-#: ../rpmdrake_.c:886
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Utilitza .%s com a fitxer principal"
+msgid "HTTP server"
+msgstr "Servidor HTTP"
 
-#: ../rpmdrake_.c:888
-msgid "Do nothing"
-msgstr "No facis res"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "Servidor FTP"
 
-#: ../rpmdrake_.c:900
-msgid "Installation finished"
-msgstr "Instalˇlació finalitzada"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path:"
+msgstr "Camí:"
 
-#: ../rpmdrake_.c:910
-msgid "Inspect..."
-msgstr "s'estŕ inspeccionant..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "Fitxers locals"
 
-#: ../rpmdrake_.c:925
-msgid "Program missing"
-msgstr "No s'ha trobat el programa"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add a source"
+msgstr "Afegeix una font"
 
-#: ../rpmdrake_.c:926
-msgid "A required program is missing (grpmi). Check your installation."
-msgstr ""
-"No s'ha trobat un programa (grpmi) que es necessita. Comproveu la "
-"instalˇlació."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
+msgstr "No es pot actualitzar el support; es deshabilitarŕ automŕticament."
 
-#: ../rpmdrake_.c:940
-msgid "Unable to get source packages."
-msgstr "No he pogut obtenir els paquets fonts."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "No es pot crear el support."
 
-#: ../rpmdrake_.c:941
-msgid "Unable to get source packages, sorry."
-msgstr "No he pogut obtenir els paquets fonts, ho sento."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, updating media..."
+msgstr "Si us plau espereu, actualitzant dades..."
 
-#: ../rpmdrake_.c:948
-msgid "Change medium"
-msgstr "Canvieu el suport"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
+msgstr "Actualitza"
 
-#: ../rpmdrake_.c:949
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Per favor, inserteu el suport anomenat \"%s\" en el dispositiu [%s]"
+msgid "Select the source(s) you wish to update:"
+msgstr "Seleccioneu la(es) font(s) que voleu actualitzar:"
 
-#: ../rpmdrake_.c:957
-msgid "Installation failed"
-msgstr "La instalˇlació ha fallat"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please choose the desired mirror."
+msgstr "Si us plau, escolliu la rčpliqua desitjada"
 
-#: ../rpmdrake_.c:958
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
-"Instalˇlació fallida, alguns fitxers no s'han trobat.\n"
-"Voldreu actualitzar la vostra base de dades de fonts."
+"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_.c:961
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr ""
-"Si us plau, espereu; s'estan eliminant paquets per a permetre que "
-"s'actualitzin d'altres..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
+msgstr "Cap rčplica"
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"There was an error downloading the mirrors list:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
-"La instalˇlació ha finalitzat; %s.\n"
+"Hi ha hagut un error baixant la llista de rčpliques:\n"
 "\n"
-"Alguns fitxers de configuració han estat creats com a `.rpmnew' or `."
-"rpmsave',\n"
-"ara podeu inspeccionar-los per a empendre accions:"
+"%s\n"
+"La xarxa, o la web de MandrakeSoft, deuen ser inaccessibles.\n"
+"Per favor, proveu-ho més tard."
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "S'ha produďt un error durant la baixada"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
+"Per favor espereu, baixant les adreces de les rčpliques des de la web de "
+"MandrakeSoft."
+
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"some packages failed to install\n"
-"correctly"
+"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 ""
-"alguns paquets no s'han instalˇlat\n"
-"correctament"
+"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_.c:983
-msgid "everything was installed correctly"
-msgstr "tot s'ha instalˇlat correctament"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United States"
+msgstr "Estats Units"
 
-#: ../rpmdrake_.c:985
-msgid "Everything installed successfully"
-msgstr "Tot s'ha instalˇlat correctament"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
+msgstr "Xina"
 
-#: ../rpmdrake_.c:986
-msgid "All requested packages were installed successfully."
-msgstr "Tots els paquets demanats s'han instalˇlat correctament."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr "Regne Unit"
 
-#: ../rpmdrake_.c:989
-msgid "Everything already installed."
-msgstr "Tot ja estŕ instalˇlat."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "Taiwan"
 
-#: ../rpmdrake_.c:990
-msgid "Everything already installed (is this supposed to happen at all?)."
-msgstr "Tot ja estŕ instalˇlat (aixň se suposa que pot passar?)."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "Sučcia"
 
-#: ../rpmdrake_.c:997
-msgid "Problem during installation"
-msgstr "Hi ha hagut un problema durant la instalˇlació"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
+msgstr "Rússia"
 
-#: ../rpmdrake_.c:998
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Hi ha hagut algun problema durant la instalˇlació:\n"
-"\n"
-"%s"
+msgid "Portugal"
+msgstr "Portugal"
 
-#: ../rpmdrake_.c:1012
-msgid "Please wait, reading packages database..."
-msgstr "Si us plau, espereu; s'estŕ llegint la base de dades de paquets..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
+msgstr "Polňnia"
 
-#: ../rpmdrake_.c:1053
-msgid "Please wait, removing packages..."
-msgstr "Si us plau, espereu; s'estan eliminant els paquets..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
+msgstr "Noruega"
 
-#: ../rpmdrake_.c:1056
-#, fuzzy
-msgid "Problem during removal"
-msgstr "Hi ha hagut un problema durant la instalˇlació"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
+msgstr "Paísos Baixos"
 
-#: ../rpmdrake_.c:1057
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Hi ha hagut algun problema durant la instalˇlació:\n"
-"\n"
-"%s"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Korea"
+msgstr "Corea"
 
-#: ../rpmdrake_.c:1089
-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 ""
-"Benvinguts a una eina per a eliminar programari!\n"
-"\n"
-"Aqueta eina us ajudarŕ a escollir quin programari voleu eliminar del\n"
-"vostre ordinador."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Japan"
+msgstr "Japó"
 
-#: ../rpmdrake_.c:1094
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"Benvinguts al MandrakeUpdate!\n"
-"\n"
-"Aquesta eina us ajudarŕ a escollir les actualitzacions que voleu instalˇlar "
-"en el vostre\n"
-"ordinador."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Italy"
+msgstr "Itŕlia"
 
-#: ../rpmdrake_.c:1099
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
-msgstr ""
-"Benvinguts a la eina d'instalˇlació de programari!\n"
-"\n"
-"El vostre sistema Mandrake Linux vé amb uns quants milers de paquets de\n"
-"programari en CDROM o DVD. Aquesta eina us ajudarŕ a escollir quin "
-"programari\n"
-"voleu instalˇlar en el vostre ordinador."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Israel"
+msgstr "Israel"
 
-#: data/rpmdrake-remove.desktop.in.h:1
-msgid "Remove Software"
-msgstr "Elimina el Programari"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Grčcia"
 
-#: data/rpmdrake-sources.desktop.in.h:1
-msgid "Software Sources Manager"
-msgstr "Manejador de Fonts del Programari"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "France"
+msgstr "França"
 
-#: data/rpmdrake.desktop.in.h:1
-msgid "Install Software"
-msgstr "Instalˇla el Programari"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "Finlŕndia"
 
-#~ 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?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "Espanya"
 
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-#~ "Esteu d'acord en continuar?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
+msgstr "Dinamarca"
 
-#~ 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."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr "Alemanya"
 
-#~ msgid ""
-#~ "I need to contact MandrakeSoft website to get the mirrors list.\n"
-#~ "Please check that your network is currently running.\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "Necessito contactar amb la pŕgina web de MandrakeSoft per a baixar la "
-#~ "llista de rčpliques.\n"
-#~ "Comproveu per favor que la vostra xarxa funcioni.\n"
-#~ "\n"
-#~ "Esteu d'acord en continuar?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
+msgstr "República Txeca"
 
-#~ msgid ""
-#~ "There was an error downloading the mirrors list:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "The network, or MandrakeSoft website, are maybe unavailable.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "Hi ha hagut un error baixant la llista de rčpliques:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "La xarxa, o la web de MandrakeSoft, deuen ser inaccessibles.\n"
-#~ "Per favor, proveu-ho més tard."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
-#~ 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."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Canada"
+msgstr "Canadŕ"
 
-#~ msgid ""
-#~ "The list of updates is void. This means that either there is\n"
-#~ "no available update for the packages installed on your computer,\n"
-#~ "or you already installed all of them."
-#~ msgstr ""
-#~ "La llista d'actualitzacions és buida. Aixň significa que no hi ha\n"
-#~ "actualitzacions disponibles per als paquets instalˇlats en el vostre "
-#~ "ordinador,\n"
-#~ "o que ja els heu instalˇlat tots."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
+msgstr "Brasil"
 
-#~ msgid ""
-#~ "Warning: it seems that you are attempting to add so much\n"
-#~ "packages that your filesystem may run out of free diskspace,\n"
-#~ "during or after package installation ; this is particularly\n"
-#~ "dangerous and should be considered with care.\n"
-#~ "\n"
-#~ "Do you really want to install all the selected packages?"
-#~ msgstr ""
-#~ "Avís: sembla ser que voleu afegir massa paquets; la qual cosa farŕ\n"
-#~ "que el vostre sistema de fitxers pogui quedar-se sense espai lliure,\n"
-#~ "durant o després de la instalˇlació; aixň és particularment\n"
-#~ "perillós i ho hauríeu de considerar seriosament.\n"
-#~ "\n"
-#~ "Realment voleu instalˇlar els paquets seleccionats?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Belgium"
+msgstr "Bčlgica"
 
-#~ msgid ""
-#~ "The following packages have to be removed for others to be upgraded:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "S'han d'eliminar els següents paquets perquč altres siguin actualitzats:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Esteu d'acord en continuar?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Australia"
+msgstr "Austrŕlia"
 
-#~ msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#~ msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
+msgstr "Ŕustria"
 
-#~ msgid ""
-#~ "I need to contact the mirror to get latest update packages.\n"
-#~ "Please check that your network is currently running.\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "Necessito contactar amb la rčplica per a obtenir les últimes\n"
-#~ "actualitzacions de paquets. Comproveu que la xarxa funcioni ara.\n"
-#~ "\n"
-#~ "Esteu d'acord en continuar?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Info..."
+msgstr "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 ""
-#~ "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.pm:1
+#, c-format
+msgid "No"
+msgstr "No"
 
-#~ 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 ""
-#~ "Hi ha hagut un error quant s'estava afegint el suport d'actualització via "
-#~ "urpmi.\n"
-#~ "\n"
-#~ "Aixň pot ser degut a una rčplica que no és correcte o estŕ temporalment "
-#~ "inaccessible, o la\n"
-#~ "versió (%s) del vostre Mandrake Linux no és encara suportada o ja ha "
-#~ "estat discontinuada per Mandrake Linux\n"
-#~ "Official Updates.\n"
-#~ "\n"
-#~ "Voleu provar algun altra rčplica?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Si"
+
+#: data/rpmdrake.desktop.in.h:1
+msgid "Install Software"
+msgstr "Instalˇla el Programari"
+
+#: data/rpmdrake-remove.desktop.in.h:1
+msgid "Remove Software"
+msgstr "Elimina el Programari"
+
+#: data/rpmdrake-sources.desktop.in.h:1
+msgid "Software Sources Manager"
+msgstr "Manejador de Fonts del Programari"
+
+#~ 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--*-*-*-*-*,*"
diff --git a/po/ca.pom b/po/ca.pom
index 7a06cfac..7e5941ee 100644
--- a/po/ca.pom
+++ b/po/ca.pom
@@ -4,168 +4,175 @@ msgstr "Servidor"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Ordinador de xarxa (client)"
+msgid "Office Workstation"
+msgstr "Estació de treball d'oficina"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "Servidor NFS, Servidor SMB, Servidor Proxy, Servidor SSH"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Programes d'ofimŕtica: processadors de textos (kword, abiword), fulls de "
+"cŕlcul (kspread, gnumeric), visualitzadors pdf, etc."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Oficina"
+msgid "Workstation"
+msgstr "Estació de treball"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Estació de treball GNOME"
+msgid "Game station"
+msgstr "Estació de jocs"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Eines per al Palm Pilot o per al Visor"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Programes d'entreteniment: acció, jocs de taula, estratčgia, etc."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Estació de treball"
+msgid "Multimedia station"
+msgstr "Estació multimčdia"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Tallafoc/Encaminador"
+msgid "Sound and video playing/editing programs"
+msgstr "Programes de reproducció/edició de so i vídeo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr "Servidor de Noms de Domini i d'Informació de la Xarxa (DNS/NIS)"
+msgid "Internet station"
+msgstr "Estació d'Internet"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
 msgstr ""
-"Programes d'ofimŕtica: processadors de textos (kword, abiword), fulls de "
-"cŕlcul (kspread, gnumeric), visualitzadors pdf, etc."
+"Conjunt d'eines per llegir i enviar correu i notícies (pine, mutt, tin...) i "
+"per navegar pel Web"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "Eines d'ŕudio: reproductors d'mp3 o midi, mescladors, etc."
+msgid "Network Computer (client)"
+msgstr "Ordinador de xarxa (client)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Base Estŕndard de Linux (LSB). Suport a aplicacions de tercers"
+msgid "Clients for different protocols including ssh"
+msgstr "Clients per a diferents protocols, incloent l'ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Llibres i Com es fa... sobre el Linux i el programari lliure"
+msgid "Configuration"
+msgstr "Configuració"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "Estació de treball KDE"
+msgid "Tools to ease the configuration of your computer"
+msgstr "Eines per facilitar la configuració de l'ordinador"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgid "Scientific Workstation"
+msgstr "Estació de treball científica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Multimčdia - Vídeo"
+msgid "Scientific applications such as gnuplot"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr ""
-"Conjunt d'eines per al correu, notícies, web, transferčncia de fitxers i xat"
+msgid "Console Tools"
+msgstr "Eines de consola"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Base de dades"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Editors, intčrprets d'ordres, eines de fitxer, terminals"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "Servidor de bases de dades PostgreSQL o MySQL"
+msgid "KDE Workstation"
+msgstr "Estació de treball KDE"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Eines per facilitar la configuració de l'ordinador"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"L'entorn d'escriptori K (KDE), l'entorn grŕfic bŕsic que inclou diverses "
+"eines"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "Multimčdia - So"
+msgid "Graphical Environment"
+msgstr "Entorn grŕfic"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Documentació"
+msgid "Gnome Workstation"
+msgstr "Estació de treball GNOME"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Eines de consola"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+"Entorn grŕfic amb un conjunt d'aplicacions i eines d'escriptori fŕcil "
+"d'utilitzar"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr "Servidor de correu Postfix, servidor de Notícies Inn"
+msgid "Other Graphical Desktops"
+msgstr "Altres escriptoris grŕfics"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Estació d'Internet"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Estació multimčdia"
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+msgid "Development"
+msgstr "Desenvolupament"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Configuració"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "Biblioteques de desenvolupament C i C++, programes i fitxers include"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Més escriptoris grŕfics (Gnome, IceWM)"
+msgid "Documentation"
+msgstr "Documentació"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
-"L'entorn d'escriptori K (KDE), l'entorn grŕfic bŕsic que inclou diverses "
-"eines"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Llibres i Com es fa... sobre el Linux i el programari lliure"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Entorn grŕfic"
+msgid "LSB"
+msgstr "LSB"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Base Estŕndard de Linux (LSB). Suport a aplicacions de tercers"
+
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-msgid "Development"
-msgstr "Desenvolupament"
+#: ../../share/compssUsers:999
+msgid "Web/FTP"
+msgstr "Web/FTP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -174,23 +181,33 @@ msgstr "Apache i Pro-ftpd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "Eines per crear i enregistrar CD"
+msgid "Mail/Groupware/News"
+msgstr "Correu/Programari de grup/Notícies"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Estació de treball d'oficina"
+msgid "Postfix mail server, Inn news server"
+msgstr "Servidor de correu Postfix, servidor de Notícies Inn"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc."
+msgid "Database"
+msgstr "Base de dades"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Programes grŕfics com El Gimp"
+msgid "PostgreSQL or MySQL database server"
+msgstr "Servidor de bases de dades PostgreSQL o MySQL"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Firewall/Router"
+msgstr "Tallafoc/Encaminador"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Internet gateway"
+msgstr "Passarelˇla a Internet"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -199,8 +216,8 @@ msgstr "DNS/NIS "
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "Biblioteques de desenvolupament C i C++, programes i fitxers include"
+msgid "Domain Name and Network Information Server"
+msgstr "Servidor de Noms de Domini i d'Informació de la Xarxa (DNS/NIS)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -209,18 +226,19 @@ msgstr "Servidor d'ordinador de xarxa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "Correu/Programari de grup/Notícies"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "Servidor NFS, Servidor SMB, Servidor Proxy, Servidor SSH"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Estació de jocs"
+msgid "Office"
+msgstr "Oficina"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Reproductors i editors de vídeo"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr ""
+"Conjunt d'eines per al correu, notícies, web, transferčncia de fitxers i xat"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -229,79 +247,66 @@ msgstr "Multimčdia - Grŕfics"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Programes d'entreteniment: acció, jocs de taula, estratčgia, etc."
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
-"Conjunt d'eines per llegir i enviar correu i notícies (pine, mutt, tin...) i "
-"per navegar pel Web"
+msgid "Graphics programs such as The Gimp"
+msgstr "Programes grŕfics com El Gimp"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "Comptabilitat personal"
+msgid "Multimedia - Sound"
+msgstr "Multimčdia - So"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
-"Entorn grŕfic amb un conjunt d'aplicacions i eines d'escriptori fŕcil "
-"d'utilitzar"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "Eines d'ŕudio: reproductors d'mp3 o midi, mescladors, etc."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Clients per a diferents protocols, incloent l'ssh"
+msgid "Multimedia - Video"
+msgstr "Multimčdia - Vídeo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
+msgid "Video players and editors"
+msgstr "Reproductors i editors de vídeo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Passarelˇla a Internet"
+msgid "Multimedia - CD Burning"
+msgstr "Multimčdia - Enregistrament de CD"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Programes de reproducció/edició de so i vídeo"
+msgid "Tools to create and burn CD's"
+msgstr "Eines per crear i enregistrar CD"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Altres escriptoris grŕfics"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Més escriptoris grŕfics (Gnome, IceWM)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Editors, intčrprets d'ordres, eines de fitxer, terminals"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "Programes per gestionar els vostres comptes, com ara el gnucash"
+msgid "Personal Information Management"
+msgstr "Gestió d'informació personal"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "Gestió d'informació personal"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Eines per al Palm Pilot o per al Visor"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multimčdia - Enregistrament de CD"
+msgid "Personal Finance"
+msgstr "Comptabilitat personal"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Estació de treball científica"
+msgid "Programs to manage your finances, such as gnucash"
+msgstr "Programes per gestionar els vostres comptes, com ara el gnucash"
 
diff --git a/po/cs.po b/po/cs.po
index 107c42c6..ca29a0c9 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-cs\n"
-"POT-Creation-Date: 2003-01-30 11:22+0100\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\n"
 "PO-Revision-Date: 2003-02-02 14:56GMT\n"
 "Last-Translator: Michal Bukovjan <bukm@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -17,452 +17,629 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
 
-#: ../edit-urpm-sources.pl_.c:43
-msgid "Unable to create medium."
-msgstr "Nelze vytvořit zdroj."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Mohu pokračovat?"
 
-#: ../edit-urpm-sources.pl_.c:44
-msgid "Unable to update medium; it will be automatically disabled."
-msgstr "Nelze aktualizovat zdroj, bude automaticky vypnut."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to the software installation tool!\n"
+"\n"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
+msgstr ""
+"VĂ­tejte v nĂĄstroji pro instalaci software!\n"
+"\n"
+"Vaše distribuce Mandrake Linux je dodávána s několika tisíci balíčků "
+"software\n"
+"na CD-ROM nebo DVD. Tento nĂĄstroj vĂĄm pomĹŻĹže vybrat, kterĂ˝ software\n"
+"chcete na svém počítači nainstalovat."
 
-#: ../edit-urpm-sources.pl_.c:54
-msgid "Add a source"
-msgstr "Přidat zdroj"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"VĂ­tejte v aplikaci Mandrake Update!\n"
+"\n"
+"Tento nĂĄstroj vĂĄm pomĹŻĹže vybrat aktualizace, kterĂŠ chcete instalovat na\n"
+"vašem počítači."
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Local files"
-msgstr "LokĂĄlnĂ­ soubory"
+#: ../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 ""
+"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."
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Path:"
-msgstr "Cesta:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"Během odebírání balíčků se vyskytl problém:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:56
-msgid "FTP server"
-msgstr "FTP server"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during removal"
+msgstr "Problém při odebírání"
 
-#: ../edit-urpm-sources.pl_.c:56 ../edit-urpm-sources.pl_.c:57
-#: ../edit-urpm-sources.pl_.c:59 ../edit-urpm-sources.pl_.c:187
-msgid "URL:"
-msgstr "URL:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages..."
+msgstr "Prosím počkejte, odebírám balíčky..."
 
-#: ../edit-urpm-sources.pl_.c:57
-msgid "HTTP server"
-msgstr "HTTP server"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
+msgstr "Prosím počkejte, načítám databázi balíčků..."
 
-#: ../edit-urpm-sources.pl_.c:58
-msgid "Path or mount point:"
-msgstr "Cesta nebo přípojný bod:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Během instalace se vyskytl problém:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:58
-msgid "Removable device"
-msgstr "Vyjímatelné zařízení"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during installation"
+msgstr "Problém při instalaci"
 
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:550
-msgid "Security updates"
-msgstr "Bezpečnostní aktualizace"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
+msgstr "VĹĄe je jiĹž nainstalovĂĄno. (MĹŻĹže tento stav vĹŻbec nastat?)"
 
-#: ../edit-urpm-sources.pl_.c:70
-msgid "Browse..."
-msgstr "ProbĂ­rat..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed."
+msgstr "VĹĄe je jiĹž nainstalovĂĄno."
 
-#: ../edit-urpm-sources.pl_.c:72
-msgid "Choose a mirror..."
-msgstr "Vyberte zrcadlo..."
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "Všechny požadované balíčky byly úspěšně nainstalovány."
 
-#: ../edit-urpm-sources.pl_.c:92
-msgid "Login:"
-msgstr "Přihlášení:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr "Všechno bylo úspěšně nainstalováno."
 
-#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:231
-msgid "Password:"
-msgstr "Heslo:"
+#: ../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 ""
+"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:"
 
-#: ../edit-urpm-sources.pl_.c:97
-msgid "Name:"
-msgstr "JmĂŠno:"
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "vše bylo úspěšně nainstalováno"
 
-#: ../edit-urpm-sources.pl_.c:99 ../edit-urpm-sources.pl_.c:188
-msgid "Relative path to synthesis/hdlist:"
-msgstr "RelativnĂ­ cesta pro soubor hdlist nebo syntĂŠzu:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"some packages failed to install\n"
+"correctly"
+msgstr ""
+"některé balíčky se nenainstalovaly\n"
+"správně"
 
-#: ../edit-urpm-sources.pl_.c:107
-msgid "You need to fill up at least the two first entries."
-msgstr "Musíte vyplnit alespoň první dvě políčka."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages to allow others to be upgraded..."
+msgstr "Prosím počkejte, odebírám balíčky, aby mohly být jiné aktualizovány..."
 
-#: ../edit-urpm-sources.pl_.c:120
-msgid "Adding a source:"
-msgstr "Přidávám zdroj:"
+#: ../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ů."
 
-#: ../edit-urpm-sources.pl_.c:121
-msgid "Type of source:"
-msgstr "Typ zdroje:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation failed"
+msgstr "Instalace selhala"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
+msgstr "ZruĹĄit"
 
-#: ../edit-urpm-sources.pl_.c:125 ../edit-urpm-sources.pl_.c:202
-#: ../edit-urpm-sources.pl_.c:235 ../rpmdrake.pm_.c:100 ../rpmdrake.pm_.c:139
-#: ../rpmdrake.pm_.c:322 ../rpmdrake_.c:355 ../rpmdrake_.c:367
-#: ../rpmdrake_.c:371 ../rpmdrake_.c:918 ../rpmdrake_.c:952
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../edit-urpm-sources.pl_.c:140 ../edit-urpm-sources.pl_.c:196
-#: ../edit-urpm-sources.pl_.c:202 ../edit-urpm-sources.pl_.c:242
-#: ../rpmdrake.pm_.c:322 ../rpmdrake.pm_.c:355 ../rpmdrake_.c:355
-#: ../rpmdrake_.c:952
-msgid "Cancel"
-msgstr "ZruĹĄit"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Vložte prosím zdroj nazvaný \"%s\" do zařízení [%s]"
 
-#: ../edit-urpm-sources.pl_.c:147
-msgid "Please wait, adding medium..."
-msgstr "Prosím počkejte, přidávám zdroj..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr "Změnit zdroj"
 
-#: ../edit-urpm-sources.pl_.c:168
-msgid "Please wait, removing medium..."
-msgstr "Prosím počkejte, odstraňuji zdroj..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
+msgstr "Nelze získat balíčky se zdroji, promiňte."
 
-#: ../edit-urpm-sources.pl_.c:181
-msgid "Edit a source"
-msgstr "Upravit zdroj"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages."
+msgstr "Nelze získat balíčky se zdroji."
 
-#: ../edit-urpm-sources.pl_.c:185
+#: ../rpmdrake:1
 #, c-format
-msgid "Editing source \"%s\":"
-msgstr "Upravuji zdroj \"%s\":"
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr "ChybĂ­ nezbytnĂ˝ program (grpmi). Zkontrolujte vaĹĄi instalaci."
 
-#: ../edit-urpm-sources.pl_.c:191
-msgid "Save changes"
-msgstr "Uložit změny"
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
+msgstr "Chybějící program"
 
-#: ../edit-urpm-sources.pl_.c:200
-msgid "You need to insert the medium to continue"
-msgstr "Chcete-li pokračovat, musíte vložit médium"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
+msgstr "Prozkoumat..."
 
-#: ../edit-urpm-sources.pl_.c:201
-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:1
+#, c-format
+msgid "Installation finished"
+msgstr "Instalace dokončena"
 
-#: ../edit-urpm-sources.pl_.c:206
-msgid "Please wait, updating medium..."
-msgstr "Prosím počkejte, aktualizuji zdroj..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
+msgstr "Nedělat nic"
 
-#: ../edit-urpm-sources.pl_.c:217
-msgid "Configure proxies"
-msgstr "Nastavit proxy"
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
+msgstr "PouŞít .%s jako hlavní soubor"
 
-#: ../edit-urpm-sources.pl_.c:223
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
-msgstr ""
-"Pokud potřebujete proxy, zadejte název počítače a volitelně port (ve tvaru "
-"<proxyhost[:port]>):"
+#: ../rpmdrake:1
+#, c-format
+msgid "Remove .%s"
+msgstr "Odebrat .%s"
 
-#: ../edit-urpm-sources.pl_.c:225
-msgid "Proxy hostname:"
-msgstr "Název počítače proxy:"
+#: ../rpmdrake:1
+#, c-format
+msgid "changes:"
+msgstr "změny:"
 
-#: ../edit-urpm-sources.pl_.c:227
-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
+#, c-format
+msgid "Inspecting %s"
+msgstr "ProhlíŞím %s"
 
-#: ../edit-urpm-sources.pl_.c:229
-msgid "User:"
-msgstr "UĹživatel:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, finding available packages..."
+msgstr "Prosím počkejte, hledám dostupné balíčky..."
 
-#: ../edit-urpm-sources.pl_.c:255
-msgid "Configure sources"
-msgstr "Nastavit zdroje"
+#: ../rpmdrake:1
+#, c-format
+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 ""
+"Při přidávání aktualizačního zdroje pomocí programu urpmi došlo k chybě.\n"
+"\n"
+"Chyba mohla nastat dĂ­ky poĹĄkozenĂŠmu nebo nedostupnĂŠmu zrcadlu, nebo\n"
+"tĂ­m, Ĺže verze vaĹĄĂ­ distribuce Mandrake Linux (%s) zatĂ­m / uĹž nenĂ­ "
+"podporovĂĄna\n"
+"OficiĂĄlnĂ­mi aktualizacemi.\n"
+"\n"
+"Chcete zkusit jinĂŠ zrcadlo?"
 
-#: ../edit-urpm-sources.pl_.c:262
-msgid "Enabled?"
-msgstr "Povolen?"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
+msgstr "Chyba při přidávání zdroje pro aktualizaci"
 
-#: ../edit-urpm-sources.pl_.c:263
-msgid "Source"
-msgstr "Zdroj"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
+msgstr ""
+"Prosím počkejte, kontaktuji zrcadlo a inicializuji aktualizace balíčků."
 
-#: ../edit-urpm-sources.pl_.c:286 ../rpmdrake_.c:732
-msgid "Remove"
-msgstr "Odstranit"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Sources Manager, and then add a `Security\n"
+"updates' source.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"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."
 
-#: ../edit-urpm-sources.pl_.c:288
-msgid "Edit"
-msgstr "Upravit"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Jak ručně vybrat vaše zrcadlo"
 
-#: ../edit-urpm-sources.pl_.c:290
-msgid "Add..."
-msgstr "Přidat..."
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
+msgstr "Při aktualizaci informací o balíčcích došlo k neopravitelné chybě."
 
-#: ../edit-urpm-sources.pl_.c:292
-msgid "Update..."
-msgstr "Aktualizovat..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
+msgstr "Chyba při aktualizaci zdroje"
 
-#: ../edit-urpm-sources.pl_.c:293
-msgid "Proxy..."
-msgstr "Proxy..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
+msgstr ""
+"Prosím počkejte, kontaktuji zrcadlo a stahuji poslední informace o "
+"aktualizacĂ­ch."
 
-#: ../edit-urpm-sources.pl_.c:296
-msgid "Save and quit"
-msgstr "Uložit a ukončit"
+#: ../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?"
 
-#: ../edit-urpm-sources.pl_.c:297 ../rpmdrake_.c:735
-msgid "Quit"
-msgstr "Konec"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Installation"
+msgstr "Instalace balíčků software"
 
-#: ../rpmdrake.pm_.c:96
-msgid "Yes"
-msgstr "Ano"
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, c-format
+msgid "Mandrake Update"
+msgstr "Mandrake Update"
 
-#: ../rpmdrake.pm_.c:98
-msgid "No"
-msgstr "Ne"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
+msgstr "Odstranění balíčků software"
 
-#: ../rpmdrake.pm_.c:130
-msgid "Info..."
-msgstr "Informace..."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Konec"
 
-#: ../rpmdrake.pm_.c:183
-msgid "Austria"
-msgstr "Rakousko"
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "Instalovat"
 
-#: ../rpmdrake.pm_.c:184
-msgid "Australia"
-msgstr "AustrĂĄlie"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "Odstranit"
 
-#: ../rpmdrake.pm_.c:185
-msgid "Belgium"
-msgstr "Belgie"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search"
+msgstr "Hledat"
 
-#: ../rpmdrake.pm_.c:186
-msgid "Brazil"
-msgstr "BrazĂ­lie"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "NajĂ­t:"
 
-#: ../rpmdrake.pm_.c:187
-msgid "Canada"
-msgstr "Kanada"
+#: ../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?"
 
-#: ../rpmdrake.pm_.c:188
-msgid "Costa Rica"
-msgstr "Kostarika"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "Některé balíčky musí být odebrány"
 
-#: ../rpmdrake.pm_.c:189
-msgid "Czech Republic"
-msgstr "Česká republika"
+#: ../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?"
 
-#: ../rpmdrake.pm_.c:190
-msgid "Germany"
-msgstr "Německo"
+#: ../rpmdrake:1
+#, c-format
+msgid "Too many packages are selected"
+msgstr "Je vybráno příliš mnoho balíčků"
 
-#: ../rpmdrake.pm_.c:191
-msgid "Danmark"
-msgstr "DĂĄnsko"
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
+msgstr "VĹĄechny informace"
 
-#: ../rpmdrake.pm_.c:192 ../rpmdrake.pm_.c:196
-msgid "Greece"
-msgstr "Řecko"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal information"
+msgstr "Běžné informace"
 
-#: ../rpmdrake.pm_.c:193
-msgid "Spain"
-msgstr "Španělsko"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update source(s)"
+msgstr "Aktualizovat zdroj(e)"
 
-#: ../rpmdrake.pm_.c:194
-msgid "Finland"
-msgstr "Finsko"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reload the packages list"
+msgstr "Znovu načíst seznam balíčků"
 
-#: ../rpmdrake.pm_.c:195
-msgid "France"
-msgstr "Francie"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
+msgstr "Nulovat výběr"
 
-#: ../rpmdrake.pm_.c:197
-msgid "Israel"
-msgstr "Izrael"
+#: ../rpmdrake:1
+#, c-format
+msgid "in files"
+msgstr "v souborech"
 
-#: ../rpmdrake.pm_.c:198
-msgid "Italy"
-msgstr "ItĂĄlie"
+#: ../rpmdrake:1
+#, c-format
+msgid "in descriptions"
+msgstr "v popisech"
 
-#: ../rpmdrake.pm_.c:199
-msgid "Japan"
-msgstr "Japonsko"
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
+msgstr "v nĂĄzvech"
 
-#: ../rpmdrake.pm_.c:200
-msgid "Korea"
-msgstr "Korea"
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
+msgstr "podle dostupnosti aktualizace"
 
-#: ../rpmdrake.pm_.c:201
-msgid "Netherlands"
-msgstr "NizozemĂ­"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
+msgstr "podle umístění zdroje"
 
-#: ../rpmdrake.pm_.c:202
-msgid "Norway"
-msgstr "Norsko"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
+msgstr "podle stavu výběru"
 
-#: ../rpmdrake.pm_.c:203
-msgid "Poland"
-msgstr "Polsko"
+#: ../rpmdrake:1
+#, c-format
+msgid "by size"
+msgstr "podle velikosti"
 
-#: ../rpmdrake.pm_.c:204
-msgid "Portugal"
-msgstr "Portugalsko"
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
+msgstr "podle skupiny"
 
-#: ../rpmdrake.pm_.c:205
-msgid "Russia"
-msgstr "Rusko"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages,"
+msgstr "Všechny balíčky,"
 
-#: ../rpmdrake.pm_.c:206
-msgid "Sweden"
-msgstr "Ĺ vĂŠdsko"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
+msgstr "Všechny balíčky, abecedně"
 
-#: ../rpmdrake.pm_.c:207
-msgid "Taiwan"
-msgstr "Taiwan"
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
+msgstr "Volby Mandrake"
 
-#: ../rpmdrake.pm_.c:208
-msgid "United Kingdom"
-msgstr "VelkĂĄ BritĂĄnie"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal updates"
+msgstr "Běžné aktualizace"
 
-#: ../rpmdrake.pm_.c:209
-msgid "China"
-msgstr "Čína"
+#: ../rpmdrake:1
+#, c-format
+msgid "Bugfixes updates"
+msgstr "Opravy chyb"
 
-#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:211 ../rpmdrake.pm_.c:212
-#: ../rpmdrake.pm_.c:213 ../rpmdrake.pm_.c:264
-msgid "United States"
-msgstr "SpojenĂŠ stĂĄty"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
+msgstr "Bezpečnostní aktualizace"
 
-#: ../rpmdrake.pm_.c:277
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
-"Prosím počkejte, stahuji adresy zrcadel ze stránek společnosti MandrakeSoft."
+#: ../rpmdrake:1
+#, c-format
+msgid "Description: "
+msgstr "Popis: "
 
-#: ../rpmdrake.pm_.c:283
-msgid "Error during download"
-msgstr "Chyba při stahování"
+#: ../rpmdrake:1
+#, c-format
+msgid "Summary: "
+msgstr "ShrnutĂ­: "
 
-#: ../rpmdrake.pm_.c:292
-msgid "No mirror"
-msgstr "NenĂ­ zrcadlo"
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "DĹŻleĹžitost: "
 
-#: ../rpmdrake.pm_.c:310
-msgid "Please choose the desired mirror."
-msgstr "Vyberte prosĂ­m vhodnĂŠ zrcadlo."
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s kB"
 
-#: ../rpmdrake.pm_.c:342 ../rpmdrake_.c:629
-msgid "Update source(s)"
-msgstr "Aktualizovat zdroj(e)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Size: "
+msgstr "Velikost: "
 
-#: ../rpmdrake.pm_.c:346
-msgid "Select the source(s) you wish to update:"
-msgstr "Vyberte zdroj(e), které si přejete aktualizovat:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Version: "
+msgstr "Verze: "
 
-#: ../rpmdrake.pm_.c:350
-msgid "Update"
-msgstr "Aktualizovat"
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "NĂĄzev: "
 
-#: ../rpmdrake.pm_.c:360
-msgid "Please wait, updating media..."
-msgstr "Prosím počkejte, aktualizuji zdroje..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "DĹŻvod pro aktualizaci: "
 
-#: ../rpmdrake_.c:101
-msgid "Other"
-msgstr "JinĂŠ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
+msgstr "NynĂ­ nainstalovanĂĄ verze: "
 
-#: ../rpmdrake_.c:123 ../rpmdrake_.c:137 ../rpmdrake_.c:229 ../rpmdrake_.c:300
-msgid "(none)"
-msgstr "(Şådnå)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Source: "
+msgstr "Zdroj: "
 
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:484 ../rpmdrake_.c:485
+#: ../rpmdrake:1
+#, c-format
 msgid "(Not available)"
 msgstr "(NenĂ­ k dispozici)"
 
-#: ../rpmdrake_.c:153 ../rpmdrake_.c:210
-msgid "Search results"
-msgstr "Výsledky hledåní"
-
-#: ../rpmdrake_.c:153
-msgid "Search results (none)"
-msgstr "Výsledky hledåní (ŞådnÊ)"
-
-#: ../rpmdrake_.c:163 ../rpmdrake_.c:174
-msgid "Please wait, searching..."
-msgstr "Prosím počkejte, hledám..."
-
-#: ../rpmdrake_.c:177
-msgid "Stop"
-msgstr "Stop"
-
-#: ../rpmdrake_.c:211 ../rpmdrake_.c:321
-msgid "Addable"
-msgstr "Lze přidat"
-
-#: ../rpmdrake_.c:211 ../rpmdrake_.c:321
-msgid "Upgradable"
-msgstr "Lze aktualizovat"
-
-#: ../rpmdrake_.c:213
-msgid "Not selected"
-msgstr "NevybranĂ˝"
-
-#: ../rpmdrake_.c:213
-msgid "Selected"
-msgstr "VybranĂ˝"
-
-#: ../rpmdrake_.c:242
-msgid "rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake_.c:260 ../rpmdrake_.c:362 ../rpmdrake_.c:364
-msgid "More information on package..."
-msgstr "Více informací o balíčku..."
-
-#: ../rpmdrake_.c:261
-msgid "One of the following packages is needed:"
-msgstr "Je třeba jeden z následujících balíčků:"
-
-#: ../rpmdrake_.c:261
-msgid "Please choose"
-msgstr "ProsĂ­m vyberte"
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
+msgstr "Změny:\n"
 
-#: ../rpmdrake_.c:277
-msgid "unknown package "
-msgstr "neznámý balíček"
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "Soubory:\n"
 
-#: ../rpmdrake_.c:287
-msgid "Please wait, listing packages..."
-msgstr "Prosím počkejte, vypisuji balíčky..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected size: %d MB"
+msgstr "Velikost výběru: %d MB"
 
-#: ../rpmdrake_.c:302
-msgid "No update"
-msgstr "Žådnå aktualizace"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "VybrĂĄno: %d MB / VolnĂŠ mĂ­sto na disku: %d MB"
 
-#: ../rpmdrake_.c:355 ../rpmdrake_.c:356
-msgid "More infos"
-msgstr "VĂ­ce informacĂ­"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
+msgstr ""
+"Kvůli jejich závislostem je třeba nyní zrušit výběr následujících\n"
+"balíčků:\n"
+"\n"
 
-#: ../rpmdrake_.c:357
-msgid "Information on packages"
-msgstr "Informace o balíčcích"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+msgstr ""
+"Promiňte, ale následující balíčky nelze vybrat:\n"
+"\n"
 
-#: ../rpmdrake_.c:378
-msgid "Some additional packages need to be removed"
-msgstr "Je třeba odstranit některé další balíčky"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "Některé balíčky nelze nainstalovat"
 
-#: ../rpmdrake_.c:379
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
 "\n"
 msgstr ""
-"Kvůli jejich závislostem je třeba odstranit také následující\n"
+"Aby byly splněny závislosti, je třeba nainstalovat také následující\n"
 "balíčky:\n"
 "\n"
 
-#: ../rpmdrake_.c:385 ../rpmdrake_.c:393
+#: ../rpmdrake:1
+#, c-format
+msgid "Additional packages needed"
+msgstr "Jsou potřeba další balíčky"
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "Některé balíčky nelze odstranit"
 
-#: ../rpmdrake_.c:386
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -470,421 +647,589 @@ msgstr ""
 "Odstranění těchto balíčků by poškodilo váš systém, omlouváme se:\n"
 "\n"
 
-#: ../rpmdrake_.c:394 ../rpmdrake_.c:453
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"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 nyní zrušit výběr následujících\n"
-"balíčků:\n"
+"Kvůli jejich závislostem je třeba odstranit také následující\n"
+"balíčky:\n"
 "\n"
 
-#: ../rpmdrake_.c:423
-msgid "Additional packages needed"
-msgstr "Jsou potřeba další balíčky"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr "Je třeba odstranit některé další balíčky"
 
-#: ../rpmdrake_.c:424
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
-msgstr ""
-"Aby byly splněny závislosti, je třeba nainstalovat také následující\n"
-"balíčky:\n"
-"\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
+msgstr "Více informací o balíčku..."
 
-#: ../rpmdrake_.c:437
-msgid "Some packages can't be installed"
-msgstr "Některé balíčky nelze nainstalovat"
+#: ../rpmdrake:1
+#, c-format
+msgid "Information on packages"
+msgstr "Informace o balíčcích"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
+msgstr "VĂ­ce informacĂ­"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Addable"
+msgstr "Lze přidat"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Upgradable"
+msgstr "Lze aktualizovat"
 
-#: ../rpmdrake_.c:438
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
+"The list of updates is void. This 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 ""
-"Promiňte, ale následující balíčky nelze vybrat:\n"
-"\n"
+"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_.c:452 ../rpmdrake_.c:686
-msgid "Some packages need to be removed"
-msgstr "Některé balíčky musí být odebrány"
+#: ../rpmdrake:1
+#, c-format
+msgid "No update"
+msgstr "Žådnå aktualizace"
 
-#: ../rpmdrake_.c:474
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "VybrĂĄno: %d MB / VolnĂŠ mĂ­sto na disku: %d MB"
+msgid "(none)"
+msgstr "(Şådnå)"
 
-#: ../rpmdrake_.c:476
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "Velikost výběru: %d MB"
+msgid "Please wait, listing packages..."
+msgstr "Prosím počkejte, vypisuji balíčky..."
 
-#: ../rpmdrake_.c:484
-msgid "Files:\n"
-msgstr "Soubory:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "unknown package "
+msgstr "neznámý balíček"
 
-#: ../rpmdrake_.c:485
-msgid "Changelog:\n"
-msgstr "Změny:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Je třeba jeden z následujících balíčků:"
 
-#: ../rpmdrake_.c:488
-msgid "Source: "
-msgstr "Zdroj: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please choose"
+msgstr "ProsĂ­m vyberte"
 
-#: ../rpmdrake_.c:489
-msgid "Currently installed version: "
-msgstr "NynĂ­ nainstalovanĂĄ verze: "
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:493
-msgid "Reason for update: "
-msgstr "DĹŻvod pro aktualizaci: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Not selected"
+msgstr "NevybranĂ˝"
 
-#: ../rpmdrake_.c:495
-msgid "Name: "
-msgstr "NĂĄzev: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected"
+msgstr "VybranĂ˝"
 
-#: ../rpmdrake_.c:496
-msgid "Version: "
-msgstr "Verze: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results"
+msgstr "Výsledky hledåní"
 
-#: ../rpmdrake_.c:497
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s kB"
+msgid "Stop"
+msgstr "Stop"
 
-#: ../rpmdrake_.c:497
-msgid "Size: "
-msgstr "Velikost: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, searching..."
+msgstr "Prosím počkejte, hledám..."
 
-#: ../rpmdrake_.c:499
-msgid "Importance: "
-msgstr "DĹŻleĹžitost: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
+msgstr "Výsledky hledåní (ŞådnÊ)"
 
-#: ../rpmdrake_.c:500
-msgid "Summary: "
-msgstr "ShrnutĂ­: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "JinĂŠ"
 
-#: ../rpmdrake_.c:501
-msgid "Description: "
-msgstr "Popis: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"Welcome to the packages source editor!\n"
+"\n"
+"This tool will help you configure the packages sources you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"Vítejte do editoru zdrojů balíčků!\n"
+"\n"
+"Tento nástroj vám pomůže nastavit zdroje balíčků, které si přejete na vašem\n"
+"počítači používat. Tyto zdroje pak budou k dispozici při instalaci nových\n"
+"balíčků software nebo při jejich aktualizaci."
 
-#: ../rpmdrake_.c:550
-msgid "Bugfixes updates"
-msgstr "Opravy chyb"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Uložit a ukončit"
 
-#: ../rpmdrake_.c:550
-msgid "Normal updates"
-msgstr "Běžné aktualizace"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy..."
+msgstr "Proxy..."
 
-#: ../rpmdrake_.c:569
-msgid "Mandrake choices"
-msgstr "Volby Mandrake"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
+msgstr "Aktualizovat..."
 
-#: ../rpmdrake_.c:570
-msgid "All packages, alphabetical"
-msgstr "Všechny balíčky, abecedně"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "Přidat..."
 
-#: ../rpmdrake_.c:571
-msgid "All packages,"
-msgstr "Všechny balíčky,"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "Upravit"
 
-#: ../rpmdrake_.c:594
-msgid "by group"
-msgstr "podle skupiny"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Source"
+msgstr "Zdroj"
 
-#: ../rpmdrake_.c:594
-msgid "by size"
-msgstr "podle velikosti"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
+msgstr "Povolen?"
 
-#: ../rpmdrake_.c:595
-msgid "by selection state"
-msgstr "podle stavu výběru"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure sources"
+msgstr "Nastavit zdroje"
 
-#: ../rpmdrake_.c:596
-msgid "by source repository"
-msgstr "podle umístění zdroje"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "Heslo:"
 
-#: ../rpmdrake_.c:596
-msgid "by update availability"
-msgstr "podle dostupnosti aktualizace"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
+msgstr "UĹživatel:"
 
-#: ../rpmdrake_.c:617
-msgid "in descriptions"
-msgstr "v popisech"
+#: ../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:"
 
-#: ../rpmdrake_.c:617
-msgid "in files"
-msgstr "v souborech"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "Název počítače proxy:"
 
-#: ../rpmdrake_.c:617
-msgid "in names"
-msgstr "v nĂĄzvech"
+#: ../edit-urpm-sources.pl: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]>):"
 
-#: ../rpmdrake_.c:628
-msgid "Reload the packages list"
-msgstr "Znovu načíst seznam balíčků"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "Nastavit proxy"
 
-#: ../rpmdrake_.c:628
-msgid "Reset the selection"
-msgstr "Nulovat výběr"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr "Prosím počkejte, aktualizuji zdroj..."
 
-#: ../rpmdrake_.c:654
-msgid "Maximum information"
-msgstr "VĹĄechny informace"
+#: ../edit-urpm-sources.pl: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."
 
-#: ../rpmdrake_.c:654
-msgid "Normal information"
-msgstr "Běžné informace"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
+msgstr "Chcete-li pokračovat, musíte vložit médium"
 
-#: ../rpmdrake_.c:676
-msgid "Too many packages are selected"
-msgstr "Je vybráno příliš mnoho balíčků"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save changes"
+msgstr "Uložit změny"
 
-#: ../rpmdrake_.c:722
-msgid "Find:"
-msgstr "NajĂ­t:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "RelativnĂ­ cesta pro soubor hdlist nebo syntĂŠzu:"
 
-#: ../rpmdrake_.c:727
-msgid "Search"
-msgstr "Hledat"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake_.c:733
-msgid "Install"
-msgstr "Instalovat"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Editing source \"%s\":"
+msgstr "Upravuji zdroj \"%s\":"
 
-#: ../rpmdrake_.c:740 data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrake Update"
-msgstr "Mandrake Update"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit a source"
+msgstr "Upravit zdroj"
 
-#: ../rpmdrake_.c:740
-msgid "Software Packages Installation"
-msgstr "Instalace balíčků software"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr "Prosím počkejte, odstraňuji zdroj..."
 
-#: ../rpmdrake_.c:740
-msgid "Software Packages Removal"
-msgstr "Odstranění balíčků software"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, adding medium..."
+msgstr "Prosím počkejte, přidávám zdroj..."
 
-#: ../rpmdrake_.c:781
-msgid "Please wait, contacting mirror to update packages information."
-msgstr ""
-"Prosím počkejte, kontaktuji zrcadlo a stahuji poslední informace o "
-"aktualizacĂ­ch."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of source:"
+msgstr "Typ zdroje:"
 
-#: ../rpmdrake_.c:783
-msgid "Error updating medium"
-msgstr "Chyba při aktualizaci zdroje"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Adding a source:"
+msgstr "Přidávám zdroj:"
 
-#: ../rpmdrake_.c:784
-msgid "There was an unrecoverable error while updating packages information."
-msgstr "Při aktualizaci informací o balíčcích došlo k neopravitelné chybě."
+#: ../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 ""
+"Takto pojmenovanĂ˝ zdroj jiĹž existuje, chcete\n"
+"jej opravdu nahradit?"
 
-#: ../rpmdrake_.c:789
-msgid "How to choose manually your mirror"
-msgstr "Jak ručně vybrat vaše 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."
 
-#: ../rpmdrake_.c:797
-msgid "Please wait, contacting mirror to initialize updates packages."
-msgstr ""
-"Prosím počkejte, kontaktuji zrcadlo a inicializuji aktualizace balíčků."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "JmĂŠno:"
 
-#: ../rpmdrake_.c:800
-msgid "Error adding update medium"
-msgstr "Chyba při přidávání zdroje pro aktualizaci"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
+msgstr "Přihlášení:"
 
-#: ../rpmdrake_.c:831
-msgid "Please wait, finding available packages..."
-msgstr "Prosím počkejte, hledám dostupné balíčky..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Vyberte zrcadlo..."
 
-#: ../rpmdrake_.c:863
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "ProhlíŞím %s"
+msgid "Browse..."
+msgstr "ProbĂ­rat..."
 
-#: ../rpmdrake_.c:882
-msgid "changes:"
-msgstr "změny:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Cesta nebo přípojný bod:"
 
-#: ../rpmdrake_.c:886
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Odebrat .%s"
+msgid "Removable device"
+msgstr "Vyjímatelné zařízení"
 
-#: ../rpmdrake_.c:888
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "PouŞít .%s jako hlavní soubor"
+msgid "HTTP server"
+msgstr "HTTP server"
 
-#: ../rpmdrake_.c:890
-msgid "Do nothing"
-msgstr "Nedělat nic"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "FTP server"
 
-#: ../rpmdrake_.c:902
-msgid "Installation finished"
-msgstr "Instalace dokončena"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path:"
+msgstr "Cesta:"
 
-#: ../rpmdrake_.c:912
-msgid "Inspect..."
-msgstr "Prozkoumat..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "LokĂĄlnĂ­ soubory"
 
-#: ../rpmdrake_.c:927
-msgid "Program missing"
-msgstr "Chybějící program"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add a source"
+msgstr "Přidat zdroj"
 
-#: ../rpmdrake_.c:928
-msgid "A required program is missing (grpmi). Check your installation."
-msgstr "ChybĂ­ nezbytnĂ˝ program (grpmi). Zkontrolujte vaĹĄi instalaci."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
+msgstr "Nelze aktualizovat zdroj, bude automaticky vypnut."
 
-#: ../rpmdrake_.c:942
-msgid "Unable to get source packages."
-msgstr "Nelze získat balíčky se zdroji."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "Nelze vytvořit zdroj."
 
-#: ../rpmdrake_.c:943
-msgid "Unable to get source packages, sorry."
-msgstr "Nelze získat balíčky se zdroji, promiňte."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, updating media..."
+msgstr "Prosím počkejte, aktualizuji zdroje..."
 
-#: ../rpmdrake_.c:950
-msgid "Change medium"
-msgstr "Změnit zdroj"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
+msgstr "Aktualizovat"
 
-#: ../rpmdrake_.c:951
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Vložte prosím zdroj nazvaný \"%s\" do zařízení [%s]"
+msgid "Select the source(s) you wish to update:"
+msgstr "Vyberte zdroj(e), které si přejete aktualizovat:"
 
-#: ../rpmdrake_.c:959
-msgid "Installation failed"
-msgstr "Instalace selhala"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please choose the desired mirror."
+msgstr "Vyberte prosĂ­m vhodnĂŠ zrcadlo."
 
-#: ../rpmdrake_.c:960
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
-"Instalace selhala, některé soubory chybí.\n"
-"Možná byste měl aktualizovat vaši databázi zdrojů."
+"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_.c:963
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr "Prosím počkejte, odebírám balíčky, aby mohly být jiné aktualizovány..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
+msgstr "NenĂ­ zrcadlo"
 
-#: ../rpmdrake_.c:984
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"There was an error downloading the mirrors list:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
-"Instalace byla dokončena; %s.\n"
+"Při stahování seznamu zrcadel došlo k chybě:\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:"
+"%s\n"
+"Je možné, že síť nebo stránky společnosti MandrakeSoft nejsou k dispozici.\n"
+"Zkuste to prosím později."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "Chyba při stahování"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
+"Prosím počkejte, stahuji adresy zrcadel ze stránek společnosti MandrakeSoft."
 
-#: ../rpmdrake_.c:984
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"some packages failed to install\n"
-"correctly"
+"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ěkteré balíčky se nenainstalovaly\n"
-"správně"
+"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_.c:985
-msgid "everything was installed correctly"
-msgstr "vše bylo úspěšně nainstalováno"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United States"
+msgstr "SpojenĂŠ stĂĄty"
 
-#: ../rpmdrake_.c:987
-msgid "Everything installed successfully"
-msgstr "Všechno bylo úspěšně nainstalováno."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
+msgstr "Čína"
 
-#: ../rpmdrake_.c:988
-msgid "All requested packages were installed successfully."
-msgstr "Všechny požadované balíčky byly úspěšně nainstalovány."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr "VelkĂĄ BritĂĄnie"
 
-#: ../rpmdrake_.c:991
-msgid "Everything already installed."
-msgstr "VĹĄe je jiĹž nainstalovĂĄno."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "Taiwan"
 
-#: ../rpmdrake_.c:992
-msgid "Everything already installed (is this supposed to happen at all?)."
-msgstr "VĹĄe je jiĹž nainstalovĂĄno. (MĹŻĹže tento stav vĹŻbec nastat?)"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "Ĺ vĂŠdsko"
 
-#: ../rpmdrake_.c:999
-msgid "Problem during installation"
-msgstr "Problém při instalaci"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
+msgstr "Rusko"
 
-#: ../rpmdrake_.c:1000
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Během instalace se vyskytl problém:\n"
-"\n"
-"%s"
+msgid "Portugal"
+msgstr "Portugalsko"
 
-#: ../rpmdrake_.c:1014
-msgid "Please wait, reading packages database..."
-msgstr "Prosím počkejte, načítám databázi balíčků..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
+msgstr "Polsko"
 
-#: ../rpmdrake_.c:1055
-msgid "Please wait, removing packages..."
-msgstr "Prosím počkejte, odebírám balíčky..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
+msgstr "Norsko"
 
-#: ../rpmdrake_.c:1058
-msgid "Problem during removal"
-msgstr "Problém při odebírání"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
+msgstr "NizozemĂ­"
 
-#: ../rpmdrake_.c:1059
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Během odebírání balíčků se vyskytl problém:\n"
-"\n"
-"%s"
+msgid "Korea"
+msgstr "Korea"
 
-#: ../rpmdrake_.c:1091
-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 "Japan"
+msgstr "Japonsko"
 
-#: ../rpmdrake_.c:1096
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"VĂ­tejte v aplikaci Mandrake Update!\n"
-"\n"
-"Tento nĂĄstroj vĂĄm pomĹŻĹže vybrat aktualizace, kterĂŠ chcete instalovat na\n"
-"vašem počítači."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Italy"
+msgstr "ItĂĄlie"
 
-#: ../rpmdrake_.c:1101
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
-msgstr ""
-"VĂ­tejte v nĂĄstroji pro instalaci software!\n"
-"\n"
-"Vaše distribuce Mandrake Linux je dodávána s několika tisíci balíčků "
-"software\n"
-"na CD-ROM nebo DVD. Tento nĂĄstroj vĂĄm pomĹŻĹže vybrat, kterĂ˝ software\n"
-"chcete na svém počítači nainstalovat."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Israel"
+msgstr "Izrael"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Řecko"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "France"
+msgstr "Francie"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "Finsko"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "Španělsko"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
+msgstr "DĂĄnsko"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr "Německo"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
+msgstr "Česká republika"
+
+#: ../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 "BrazĂ­lie"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Belgium"
+msgstr "Belgie"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Australia"
+msgstr "AustrĂĄlie"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
+msgstr "Rakousko"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Info..."
+msgstr "Informace..."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
+msgstr "Ne"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Ano"
+
+#: data/rpmdrake.desktop.in.h:1
+msgid "Install Software"
+msgstr "Instalovat software"
 
 #: data/rpmdrake-remove.desktop.in.h:1
 msgid "Remove Software"
@@ -894,165 +1239,8 @@ msgstr "Odebrat software"
 msgid "Software Sources Manager"
 msgstr "SprĂĄvce zdrojĹŻ software"
 
-#: data/rpmdrake.desktop.in.h:1
-msgid "Install Software"
-msgstr "Instalovat software"
-
-#~ 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 ""
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-#~ "Mohu pokračovat?"
-
-#~ msgid ""
-#~ "Welcome to the packages source editor!\n"
-#~ "\n"
-#~ "This tool will help you configure the packages sources you wish to use "
-#~ "on\n"
-#~ "your computer. They will then be available to install new software "
-#~ "package\n"
-#~ "or to perform updates."
-#~ msgstr ""
-#~ "Vítejte do editoru zdrojů balíčků!\n"
-#~ "\n"
-#~ "Tento nástroj vám pomůže nastavit zdroje balíčků, které si přejete na "
-#~ "vaĹĄem\n"
-#~ "počítači používat. Tyto zdroje pak budou k dispozici při instalaci "
-#~ "nových\n"
-#~ "balíčků software nebo při jejich aktualizaci."
-
-#~ msgid ""
-#~ "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 ""
-#~ "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 ""
-#~ "Při stahování seznamu zrcadel došlo k chybě:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "Je možné, že síť nebo stránky společnosti MandrakeSoft nejsou k "
-#~ "dispozici.\n"
-#~ "Zkuste to prosím později."
-
-#~ 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 ""
-#~ "The list of updates is void. This 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 ""
-#~ "Warning: it seems that you are attempting to add so much\n"
-#~ "packages that your filesystem may 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 ""
-#~ "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 "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
 #~ msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-2,*-r-*"
 
-#~ 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 ""
-#~ "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 ""
-#~ "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 ""
-#~ "Při přidávání aktualizačního zdroje pomocí programu urpmi došlo k chybě.\n"
-#~ "\n"
-#~ "Chyba mohla nastat dĂ­ky poĹĄkozenĂŠmu nebo nedostupnĂŠmu zrcadlu, nebo\n"
-#~ "tĂ­m, Ĺže verze vaĹĄĂ­ distribuce Mandrake Linux (%s) zatĂ­m / uĹž nenĂ­ "
-#~ "podporovĂĄna\n"
-#~ "OficiĂĄlnĂ­mi aktualizacemi.\n"
-#~ "\n"
-#~ "Chcete zkusit jinĂŠ zrcadlo?"
-
 #~ msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
 #~ msgstr "-misc-fixed-medium-r-normal-*-12-*-*-*-c-*-iso8859-2"
diff --git a/po/cs.pom b/po/cs.pom
index 73aa6d5f..6ea22001 100644
--- a/po/cs.pom
+++ b/po/cs.pom
@@ -4,168 +4,175 @@ msgstr "Server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Síťový počítač (klient)"
+msgid "Office Workstation"
+msgstr "Kancelářská stanice"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS server, SMB server, Proxy server, SSH server"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Programy pro kancelář: textové procesory (KWord, Abiword), tabulkové "
+"procesory (KSpread, Gnumeric), prohlížeče PDF a další"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Kancelář"
+msgid "Workstation"
+msgstr "Pracovní stanice"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "PracovnĂ­ stanice s Gnome"
+msgid "Game station"
+msgstr "Hry"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "NĂĄstroje pro vĂĄĹĄ Palm Pilot nebo Visor"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Zábavné programy: deskové hry, strategie, atd."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "PracovnĂ­ stanice"
+msgid "Multimedia station"
+msgstr "Multimediální stanice"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Firewall/Router"
+msgid "Sound and video playing/editing programs"
+msgstr "Programy pro přehrávání/editaci zvuku a videa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr "Doménové názvy a síťový informační server"
+msgid "Internet station"
+msgstr "Internetová stanice"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
 msgstr ""
-"Programy pro kancelář: textové procesory (KWord, Abiword), tabulkové "
-"procesory (KSpread, Gnumeric), prohlížeče PDF a další"
+"Kolekce nástrojů pro čtení a posílaní el. pošty a příspěvků do diskusních "
+"skupin (pine, mutt, tin..) a pro prohlížení Webu"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "Nástroje pro zvuk: přehrávače mp3 a midi, mixéry a další"
+msgid "Network Computer (client)"
+msgstr "Síťový počítač (klient)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Standardní Båze Linuxu (LSB): Podpora aplikací jiných dodavatelů"
+msgid "Clients for different protocols including ssh"
+msgstr "Klienti pro různé verze protokolu ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Knihy a Howto o Linuxu a Free Software"
+msgid "Configuration"
+msgstr "Nastavení"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "PracovnĂ­ stanice s KDE"
+msgid "Tools to ease the configuration of your computer"
+msgstr "Nástroje pro snadnou konfiguraci počítače"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "IceWM, Window Maker, Enlightenment, Fvwm a dalĹĄĂ­"
+msgid "Scientific Workstation"
+msgstr "Vědecká stanice"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "MultimĂŠdia - video"
+msgid "Scientific applications such as gnuplot"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr ""
-"Skupina programů pro poštu, diskusní skupiny, web, přenos souborů a chat"
+msgid "Console Tools"
+msgstr "Konzolové nástroje"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "DatabĂĄze"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Editory, shelly, souborové nástroje, terminály"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "DatabĂĄzovĂŠ servery PostgreSQL nebo MySQL"
+msgid "KDE Workstation"
+msgstr "Pracovní stanice s KDE"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Nástroje pro snadnou konfiguraci počítače"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"K Desktop Environment, základní grafické prostředí s kolekcí doprovodných "
+"nástrojů"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "MultimĂŠdia - zvuk"
+msgid "Graphical Environment"
+msgstr "Grafické prostředí"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dokumentace"
+msgid "Gnome Workstation"
+msgstr "Pracovní stanice s Gnome"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "KonzolovĂŠ nĂĄstroje"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+"Grafické prostředí s uživatelsky přívětivým seskupením aplikací a pracovní "
+"plochou"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr "PoĹĄtovnĂ­ server postfix, server pro diskusnĂ­ skupiny Inn"
+msgid "Other Graphical Desktops"
+msgstr "Další grafické desktopy"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "InternetovĂĄ stanice"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "IceWM, Window Maker, Enlightenment, Fvwm a další"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "MultimediĂĄlnĂ­ stanice"
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+msgid "Development"
+msgstr "Vývoj"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "NastavenĂ­"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "Knihovny pro vývoj v C a C++, programy a hlavičkové soubory"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "DalĹĄĂ­ grafickĂŠ desktopy Gnome, IceWM)"
+msgid "Documentation"
+msgstr "Dokumentace"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
-"K Desktop Environment, základní grafické prostředí s kolekcí doprovodných "
-"nĂĄstrojĹŻ"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Knihy a Howto o Linuxu a Free Software"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Grafické prostředí"
+msgid "LSB"
+msgstr "LSB"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Standardní Báze Linuxu (LSB): Podpora aplikací jiných dodavatelů"
+
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-msgid "Development"
-msgstr "Vývoj"
+#: ../../share/compssUsers:999
+msgid "Web/FTP"
+msgstr "Web/FTP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -174,134 +181,132 @@ msgstr "Apache a Pro-ftpd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "Nástroje pro vytváření a vypalování CD"
+msgid "Mail/Groupware/News"
+msgstr "Pošta/Groupware/Diskuse"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Kancelářská stanice"
+msgid "Postfix mail server, Inn news server"
+msgstr "Poštovní server postfix, server pro diskusní skupiny Inn"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, IceWM, Window Maker, Enlightenment, Fvwm a dalĹĄĂ­"
+msgid "Database"
+msgstr "Databáze"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Grafické programy jako např. GIMP"
+msgid "PostgreSQL or MySQL database server"
+msgstr "Databázové servery PostgreSQL nebo MySQL"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "DNS/NIS "
-msgstr "DNS/NIS "
+msgid "Firewall/Router"
+msgstr "Firewall/Router"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "Knihovny pro vývoj v C a C++, programy a hlavičkové soubory"
+msgid "Internet gateway"
+msgstr "Internetová brána"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "SĂ­ĹĽovĂ˝ server"
+msgid "DNS/NIS "
+msgstr "DNS/NIS "
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "PoĹĄta/Groupware/Diskuse"
+msgid "Domain Name and Network Information Server"
+msgstr "Doménové názvy a síťový informační server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Hry"
+msgid "Network Computer server"
+msgstr "Síťový server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Přehrávače a editory videa"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS server, SMB server, Proxy server, SSH server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Graphics"
-msgstr "MultimĂŠdia - grafika"
+msgid "Office"
+msgstr "Kancelář"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "ZĂĄbavnĂŠ programy: deskovĂŠ hry, strategie, atd."
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr ""
+"Skupina programů pro poštu, diskusní skupiny, web, přenos souborů a chat"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
-"Kolekce nástrojů pro čtení a posílaní el. pošty a příspěvků do diskusních "
-"skupin (pine, mutt, tin..) a pro prohlĂ­ĹženĂ­ Webu"
+msgid "Multimedia - Graphics"
+msgstr "Multimédia - grafika"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "SprĂĄva osobnĂ­ch financĂ­"
+msgid "Graphics programs such as The Gimp"
+msgstr "Grafické programy jako např. GIMP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
-"Grafické prostředí s uživatelsky přívětivým seskupením aplikací a pracovní "
-"plochou"
+msgid "Multimedia - Sound"
+msgstr "Multimédia - zvuk"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Klienti pro rĹŻznĂŠ verze protokolu ssh"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "Nástroje pro zvuk: přehrávače mp3 a midi, mixéry a další"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
+msgid "Multimedia - Video"
+msgstr "Multimédia - video"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "InternetovĂĄ brĂĄna"
+msgid "Video players and editors"
+msgstr "Přehrávače a editory videa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Programy pro přehrávání/editaci zvuku a videa"
+msgid "Multimedia - CD Burning"
+msgstr "Multimédia - vypalování CD"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "DalĹĄĂ­ grafickĂŠ desktopy"
+msgid "Tools to create and burn CD's"
+msgstr "Nástroje pro vytváření a vypalování CD"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Editory, shelly, souborovĂŠ nĂĄstroje, terminĂĄly"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Další grafické desktopy Gnome, IceWM)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "Programy na správu financí jako např. GnuCash"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, IceWM, Window Maker, Enlightenment, Fvwm a další"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Personal Information Management"
-msgstr "SprĂĄvce osobnĂ­ch informacĂ­ (PIM)"
+msgstr "Správce osobních informací (PIM)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "MultimĂŠdia - vypalovĂĄnĂ­ CD"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Nástroje pro váš Palm Pilot nebo Visor"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Vědecká stanice"
+msgid "Personal Finance"
+msgstr "Správa osobních financí"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Programs to manage your finances, such as gnucash"
+msgstr "Programy na správu financí jako např. GnuCash"
 
diff --git a/po/cy.po b/po/cy.po
index 9681c899..61dfa9ef 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.4\n"
-"POT-Creation-Date: 2003-01-30 11:22+0100\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\n"
 "PO-Revision-Date: 2003-01-28 22:14-0000\n"
 "Last-Translator: Rhoslyn Prys <rhoslyn.prys@meddal.org.uk>\n"
 "Language-Team: Cymraeg/Welsh <cy@li.org>\n"
@@ -13,452 +13,593 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl_.c:43
-msgid "Unable to create medium."
-msgstr "Methu creu cyfrwng."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:44
-msgid "Unable to update medium; it will be automatically disabled."
-msgstr "Methu diweddaru'r cyfrwng; bydd yn cael ei anablu'n awtomatig."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to the software installation tool!\n"
+"\n"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
+msgstr ""
+"Croeso i'r offeryn gosod meddalwedd!\n"
+"\n"
+"Mae eich system Linux Mandrake yn dod gyda rhai miloedd o becynnau\n"
+"meddalwedd ar CDROM neu DVD.  Bydd yr offeryn hwn yn eich cynorthwyo\n"
+"i ddewis pa feddalwedd rydych am ei osod ar eich cyfrifiadur."
 
-#: ../edit-urpm-sources.pl_.c:54
-msgid "Add a source"
-msgstr "Ychwanegu ffynhonnell"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Croeso i MandrakeUpdate!\n"
+"Bydd yr offeryn hwn yn eich cynorthwyo i ddewis diweddariadau i'w gosod\n"
+"ar eich cyfrifiadur."
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Local files"
-msgstr "Ffeiliau lleol"
+#: ../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 ""
+"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."
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Path:"
-msgstr "Llwybr:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"Problem wrth dynnu pecynnau:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:56
-msgid "FTP server"
-msgstr "Gwasanaethwr FTP"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during removal"
+msgstr "Problem wrth dynnu"
 
-#: ../edit-urpm-sources.pl_.c:56 ../edit-urpm-sources.pl_.c:57
-#: ../edit-urpm-sources.pl_.c:59 ../edit-urpm-sources.pl_.c:187
-msgid "URL:"
-msgstr "URL:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages..."
+msgstr "Arhoswch tynnu'r pecynnau..."
 
-#: ../edit-urpm-sources.pl_.c:57
-msgid "HTTP server"
-msgstr "Gwasanaethwr HTTP"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
+msgstr "Arhoswch, darlen cronfa ddata'r pecynnau..."
 
-#: ../edit-urpm-sources.pl_.c:58
-msgid "Path or mount point:"
-msgstr "Llwybr neu bwynt gosod:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Problem wrth osod y rhaglen\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:58
-msgid "Removable device"
-msgstr "Dyfais symudol"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during installation"
+msgstr "Problem wrth osod y rhaglen"
 
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:550
-msgid "Security updates"
-msgstr "Diweddariadau diogelwch"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
+msgstr "Mae popeth wedi ei osod (ydy hyn i fod i ddigwydd o gwbl?)"
 
-#: ../edit-urpm-sources.pl_.c:70
-msgid "Browse..."
-msgstr "Pori..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed."
+msgstr "Popeth wedi ei osod eisoes"
 
-#: ../edit-urpm-sources.pl_.c:72
-msgid "Choose a mirror..."
-msgstr "Dewis drych..."
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "Gosodwyd pob pecyn angenrheidiol yn llwyddiannus."
 
-#: ../edit-urpm-sources.pl_.c:92
-msgid "Login:"
-msgstr "Mewngofnod:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr "Gosodwyd popeth yn llwyddiannus"
 
-#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:231
-msgid "Password:"
-msgstr "Cyfrinair:"
+#: ../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 ""
+"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:"
 
-#: ../edit-urpm-sources.pl_.c:97
-msgid "Name:"
-msgstr "Enw:"
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "gosodwyd popeth yn llwyddiannus"
 
-#: ../edit-urpm-sources.pl_.c:99 ../edit-urpm-sources.pl_.c:188
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Llwybr perthynol i synthesis/hdlist:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"some packages failed to install\n"
+"correctly"
+msgstr ""
+"methodd rhai pecynnau a chael eu gosod\n"
+"yn gywir"
 
-#: ../edit-urpm-sources.pl_.c:107
-msgid "You need to fill up at least the two first entries."
-msgstr "Mae angen llanw o leiaf y ddau gofnod cyntaf"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages to allow others to be upgraded..."
+msgstr "Arhoswch, tynnu pecynnau i eraill gael eu diweddaru"
 
-#: ../edit-urpm-sources.pl_.c:120
-msgid "Adding a source:"
-msgstr "Ychwanegu ffynhonnell"
+#: ../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."
 
-#: ../edit-urpm-sources.pl_.c:121
-msgid "Type of source:"
-msgstr "Math o ffynonellau:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation failed"
+msgstr "Methodd y gosodiad"
 
-#: ../edit-urpm-sources.pl_.c:125 ../edit-urpm-sources.pl_.c:202
-#: ../edit-urpm-sources.pl_.c:235 ../rpmdrake.pm_.c:100 ../rpmdrake.pm_.c:139
-#: ../rpmdrake.pm_.c:322 ../rpmdrake_.c:355 ../rpmdrake_.c:367
-#: ../rpmdrake_.c:371 ../rpmdrake_.c:918 ../rpmdrake_.c:952
+#: ../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"
 
-#: ../edit-urpm-sources.pl_.c:140 ../edit-urpm-sources.pl_.c:196
-#: ../edit-urpm-sources.pl_.c:202 ../edit-urpm-sources.pl_.c:242
-#: ../rpmdrake.pm_.c:322 ../rpmdrake.pm_.c:355 ../rpmdrake_.c:355
-#: ../rpmdrake_.c:952
-msgid "Cancel"
-msgstr "Dileu"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Rhowch gyfrwng \"%s\" ar ddyfais [%s]"
 
-#: ../edit-urpm-sources.pl_.c:147
-msgid "Please wait, adding medium..."
-msgstr "Arhoswch, ychwanegu cyfrwng..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr "Newid cyfrwng"
 
-#: ../edit-urpm-sources.pl_.c:168
-msgid "Please wait, removing medium..."
-msgstr "Arhoswch, tynnu cyfrwng..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
+msgstr "Methu estyn pecynnau ffynhonnell."
 
-#: ../edit-urpm-sources.pl_.c:181
-msgid "Edit a source"
-msgstr "Golygu ffynhonnell"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages."
+msgstr "Methu estyn pecynnau ffynhonnell."
 
-#: ../edit-urpm-sources.pl_.c:185
+#: ../rpmdrake:1
 #, c-format
-msgid "Editing source \"%s\":"
-msgstr "Golygu ffynhonnell \"%s\":"
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr "Mae rhaglen angenrheidiol ar goll (grpmi). Gwiriwch eich gosodiad."
 
-#: ../edit-urpm-sources.pl_.c:191
-msgid "Save changes"
-msgstr "Cadw newidiadau"
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
+msgstr "Rhaglen ar goll"
 
-#: ../edit-urpm-sources.pl_.c:200
-msgid "You need to insert the medium to continue"
-msgstr "Rhaid gosod y cyfrwng i mewn i barhau"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
+msgstr "Archwilio..."
 
-#: ../edit-urpm-sources.pl_.c:201
-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:1
+#, c-format
+msgid "Installation finished"
+msgstr "Gorffennodd y gosodiad"
 
-#: ../edit-urpm-sources.pl_.c:206
-msgid "Please wait, updating medium..."
-msgstr "Arhoswch, diweddaru'r cyfrwng..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
+msgstr "Gwneud dim"
 
-#: ../edit-urpm-sources.pl_.c:217
-msgid "Configure proxies"
-msgstr "Ffurfweddu'r dirprwyon"
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
+msgstr "Defnyddio .%s fel y brif ffeil"
 
-#: ../edit-urpm-sources.pl_.c:223
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
-msgstr ""
-"Os oes angen dirprwy arnoch, rhowch enw gwesteiwr a phorth dewisol "
-"(cystrawen: <proxyhost[:port]>):"
+#: ../rpmdrake:1
+#, c-format
+msgid "Remove .%s"
+msgstr "Tynnu .%s"
 
-#: ../edit-urpm-sources.pl_.c:225
-msgid "Proxy hostname:"
-msgstr "Enw gwesteiwr y dirprwy:"
+#: ../rpmdrake:1
+#, c-format
+msgid "changes:"
+msgstr "newidiadau:"
 
-#: ../edit-urpm-sources.pl_.c:227
-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
+#, c-format
+msgid "Inspecting %s"
+msgstr "Archwilio %s"
 
-#: ../edit-urpm-sources.pl_.c:229
-msgid "User:"
-msgstr "Defnyddiwr:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, finding available packages..."
+msgstr "Arhoswch, canfod pecynnau sydd ar gael..."
 
-#: ../edit-urpm-sources.pl_.c:255
-msgid "Configure sources"
-msgstr "Ffurfweddu'r ffynonellau"
+#: ../rpmdrake:1
+#, c-format
+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 ""
 
-#: ../edit-urpm-sources.pl_.c:262
-msgid "Enabled?"
-msgstr "Galluogwyd?"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
+msgstr "Gwall wrth ychwanegu cyfrwng diweddaru"
 
-#: ../edit-urpm-sources.pl_.c:263
-msgid "Source"
-msgstr "Ffynhonell"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
+msgstr "Arhoswch, yn cysylltu â'r drych i gychwyn pecynnau diweddaru."
 
-#: ../edit-urpm-sources.pl_.c:286 ../rpmdrake_.c:732
-msgid "Remove"
-msgstr "Tynnu"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Sources Manager, and then add a `Security\n"
+"updates' source.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:288
-msgid "Edit"
-msgstr "Golygu"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Sut i ddewis drych gyda llaw."
 
-#: ../edit-urpm-sources.pl_.c:290
-msgid "Add..."
-msgstr "Ychwanegu..."
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
+msgstr ""
+"Digwyddodd gwall anadferadwy wrth ddiweddaru'r wybodaeth am y pecynnau."
 
-#: ../edit-urpm-sources.pl_.c:292
-msgid "Update..."
-msgstr "Diweddau..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
+msgstr "Gwall wrth ddiweddaru'r cyfrwng"
 
-#: ../edit-urpm-sources.pl_.c:293
-msgid "Proxy..."
-msgstr "Dirprwy..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
+msgstr "Arhoswch, yn cysylltu â'r drych i ddiweddaru gwybodaeth am y pecynnau."
 
-#: ../edit-urpm-sources.pl_.c:296
-msgid "Save and quit"
-msgstr "Cadw a gadael"
+#: ../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 ""
 
-#: ../edit-urpm-sources.pl_.c:297 ../rpmdrake_.c:735
-msgid "Quit"
-msgstr "Gadael"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Installation"
+msgstr "Gosodiad Pecynnau Meddalwedd"
 
-#: ../rpmdrake.pm_.c:96
-msgid "Yes"
-msgstr "Iawn"
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, c-format
+msgid "Mandrake Update"
+msgstr "Diweddaru Mandrake"
 
-#: ../rpmdrake.pm_.c:98
-msgid "No"
-msgstr "Na"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
+msgstr "Tynnu Pecynnau Meddalwedd"
 
-#: ../rpmdrake.pm_.c:130
-msgid "Info..."
-msgstr "Gwybodaeth..."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Gadael"
 
-#: ../rpmdrake.pm_.c:183
-msgid "Austria"
-msgstr "Awstria"
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "Gosod"
 
-#: ../rpmdrake.pm_.c:184
-msgid "Australia"
-msgstr "Awstralia"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "Tynnu"
 
-#: ../rpmdrake.pm_.c:185
-msgid "Belgium"
-msgstr "Gwlad Belg"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search"
+msgstr "Chwilio"
 
-#: ../rpmdrake.pm_.c:186
-msgid "Brazil"
-msgstr "Brasil"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "Canfod:"
 
-#: ../rpmdrake.pm_.c:187
-msgid "Canada"
-msgstr "Canada"
+#: ../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 ""
 
-#: ../rpmdrake.pm_.c:188
-msgid "Costa Rica"
-msgstr "Costa Rica"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "Rhaid tynnu rhai pecynnau"
 
-#: ../rpmdrake.pm_.c:189
-msgid "Czech Republic"
-msgstr "Gweriniaeth Tsiec"
+#: ../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 ""
 
-#: ../rpmdrake.pm_.c:190
-msgid "Germany"
-msgstr "Yr Almaen"
+#: ../rpmdrake:1
+#, c-format
+msgid "Too many packages are selected"
+msgstr "Mae gormod o becynnau wedi eu dewis"
 
-#: ../rpmdrake.pm_.c:191
-msgid "Danmark"
-msgstr "Denmarc"
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
+msgstr "Gwybodath lawn"
 
-#: ../rpmdrake.pm_.c:192 ../rpmdrake.pm_.c:196
-msgid "Greece"
-msgstr "Groeg"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal information"
+msgstr "Gwybodaeth arferol"
 
-#: ../rpmdrake.pm_.c:193
-msgid "Spain"
-msgstr "Sbaen"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update source(s)"
+msgstr "Diweddaru ffynonellau"
 
-#: ../rpmdrake.pm_.c:194
-msgid "Finland"
-msgstr "Ffindir"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reload the packages list"
+msgstr "Ail lwytho'r rhestr pecynnau"
 
-#: ../rpmdrake.pm_.c:195
-msgid "France"
-msgstr "Ffrainc"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
+msgstr "Ailosod y dewis"
 
-#: ../rpmdrake.pm_.c:197
-msgid "Israel"
-msgstr "Israel"
+#: ../rpmdrake:1
+#, c-format
+msgid "in files"
+msgstr "mewn ffeiliau"
 
-#: ../rpmdrake.pm_.c:198
-msgid "Italy"
-msgstr "Yr Eidal"
+#: ../rpmdrake:1
+#, c-format
+msgid "in descriptions"
+msgstr "disgrifiadau"
 
-#: ../rpmdrake.pm_.c:199
-msgid "Japan"
-msgstr "Siapan"
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
+msgstr "enwau"
 
-#: ../rpmdrake.pm_.c:200
-msgid "Korea"
-msgstr "Corea"
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
+msgstr "yn Ă´l diweddariad"
 
-#: ../rpmdrake.pm_.c:201
-msgid "Netherlands"
-msgstr "Yr Iseldiroedd"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
+msgstr "yn Ă´l ffynhonnell eu tarddiad"
 
-#: ../rpmdrake.pm_.c:202
-msgid "Norway"
-msgstr "Norwy"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
+msgstr "yn Ă´l cyflwr dewis"
 
-#: ../rpmdrake.pm_.c:203
-msgid "Poland"
-msgstr "Gwlad Pwyl"
+#: ../rpmdrake:1
+#, c-format
+msgid "by size"
+msgstr "yn Ă´l maint"
 
-#: ../rpmdrake.pm_.c:204
-msgid "Portugal"
-msgstr "Portiwgal"
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
+msgstr "yn Ă´l grwp"
 
-#: ../rpmdrake.pm_.c:205
-msgid "Russia"
-msgstr "Rwsia"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages,"
+msgstr "Pob pecyn,"
 
-#: ../rpmdrake.pm_.c:206
-msgid "Sweden"
-msgstr "Sweden"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
+msgstr "Pob pecyn, trefn yr wyddor"
 
-#: ../rpmdrake.pm_.c:207
-msgid "Taiwan"
-msgstr "Taiwan"
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
+msgstr "Dewisiadau Mandrake"
 
-#: ../rpmdrake.pm_.c:208
-msgid "United Kingdom"
-msgstr "Y Deyrnas Unideg"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal updates"
+msgstr "Diweddariadau arferol"
 
-#: ../rpmdrake.pm_.c:209
-msgid "China"
-msgstr "Tseina"
+#: ../rpmdrake:1
+#, c-format
+msgid "Bugfixes updates"
+msgstr "Diweddariad cywiro gwallau"
 
-#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:211 ../rpmdrake.pm_.c:212
-#: ../rpmdrake.pm_.c:213 ../rpmdrake.pm_.c:264
-msgid "United States"
-msgstr "Yr Unod Daleithiau"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
+msgstr "Diweddariadau diogelwch"
 
-#: ../rpmdrake.pm_.c:277
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
-"Arhoswch, llwytho i lawr cyfeiriaidau drychau o safle gwe MandrakeSoft."
+#: ../rpmdrake:1
+#, c-format
+msgid "Description: "
+msgstr "Disgrifiadau: "
 
-#: ../rpmdrake.pm_.c:283
-msgid "Error during download"
-msgstr "Gwall wrth lwytho i lawr"
+#: ../rpmdrake:1
+#, c-format
+msgid "Summary: "
+msgstr "Crynodeb: "
 
-#: ../rpmdrake.pm_.c:292
-msgid "No mirror"
-msgstr "Dim drych"
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "Pwysigrwydd: "
 
-#: ../rpmdrake.pm_.c:310
-msgid "Please choose the desired mirror."
-msgstr "Dewiswch ddrych"
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake.pm_.c:342 ../rpmdrake_.c:629
-msgid "Update source(s)"
-msgstr "Diweddaru ffynonellau"
+#: ../rpmdrake:1
+#, c-format
+msgid "Size: "
+msgstr "Maint: "
 
-#: ../rpmdrake.pm_.c:346
-msgid "Select the source(s) you wish to update:"
-msgstr "Dewiswch y ffynhonellau i'w diweddaru:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Version: "
+msgstr "Fersiwn: "
 
-#: ../rpmdrake.pm_.c:350
-msgid "Update"
-msgstr "Diweddaru"
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "Enw: "
 
-#: ../rpmdrake.pm_.c:360
-msgid "Please wait, updating media..."
-msgstr "Arhoswch, diweddaru cyfrwng..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "Rheswm am y diweddariad:"
 
-#: ../rpmdrake_.c:101
-msgid "Other"
-msgstr "Arall"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
+msgstr "Fersiwn sydd wedi ei osod ar hyn o bryd:"
 
-#: ../rpmdrake_.c:123 ../rpmdrake_.c:137 ../rpmdrake_.c:229 ../rpmdrake_.c:300
-msgid "(none)"
-msgstr "(dim)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Source: "
+msgstr "Ffynhonell: "
 
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:484 ../rpmdrake_.c:485
+#: ../rpmdrake:1
+#, c-format
 msgid "(Not available)"
 msgstr "(Dim ar gael)"
 
-#: ../rpmdrake_.c:153 ../rpmdrake_.c:210
-msgid "Search results"
-msgstr "Canlyniadau'r chwilio"
-
-#: ../rpmdrake_.c:153
-msgid "Search results (none)"
-msgstr "Canlyniadau'r chwilio (dim)"
-
-#: ../rpmdrake_.c:163 ../rpmdrake_.c:174
-msgid "Please wait, searching..."
-msgstr "Arhoswch, chwilio..."
-
-#: ../rpmdrake_.c:177
-msgid "Stop"
-msgstr "Atal"
-
-#: ../rpmdrake_.c:211 ../rpmdrake_.c:321
-msgid "Addable"
-msgstr "Ychwanegadwy"
-
-#: ../rpmdrake_.c:211 ../rpmdrake_.c:321
-msgid "Upgradable"
-msgstr "Diweddariadwy"
-
-#: ../rpmdrake_.c:213
-msgid "Not selected"
-msgstr "Heb ddewis"
-
-#: ../rpmdrake_.c:213
-msgid "Selected"
-msgstr "Dewiswyd"
-
-#: ../rpmdrake_.c:242
-msgid "rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake_.c:260 ../rpmdrake_.c:362 ../rpmdrake_.c:364
-msgid "More information on package..."
-msgstr "Rhagor o wybodaethar becyn..."
-
-#: ../rpmdrake_.c:261
-msgid "One of the following packages is needed:"
-msgstr "Mae angen un o'r pecynnau canlynol:"
-
-#: ../rpmdrake_.c:261
-msgid "Please choose"
-msgstr "Dewiswch"
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
+msgstr "Cofnod Newid:\n"
 
-#: ../rpmdrake_.c:277
-msgid "unknown package "
-msgstr "pecyn anhysbys"
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "Ffeiliau:\n"
 
-#: ../rpmdrake_.c:287
-msgid "Please wait, listing packages..."
-msgstr "Arhoswch, rhestri pecynnau..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected size: %d MB"
+msgstr "Maint dewisiwyd: %d MB"
 
-#: ../rpmdrake_.c:302
-msgid "No update"
-msgstr "Dim diweddariad"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Dewiswyd: %d MB / Lle gwag ar ddisg: %d MB"
 
-#: ../rpmdrake_.c:355 ../rpmdrake_.c:356
-msgid "More infos"
-msgstr "Mwy o wybodaeth"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
+msgstr ""
+"Oherwydd eu dibyniaethau, rhaid i'r pecyn(nau) canlynol gael\n"
+"eu dad-ddewis nawr:\n"
 
-#: ../rpmdrake_.c:357
-msgid "Information on packages"
-msgstr "Rhagor o wybodaeth ar becyn..."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+msgstr ""
+"Yn anffodus, nid oes modd dewis y pecyn(nau) canlynol:\n"
+"\n"
 
-#: ../rpmdrake_.c:378
-msgid "Some additional packages need to be removed"
-msgstr "Mae angen tynnu rhai pecynnau ychwanegol"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "Nid oes modd gosod rhai pecynnau"
 
-#: ../rpmdrake_.c:379
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
 "\n"
 msgstr ""
-"Oherwydd eu dibyniaethau, rhaid tynnu'r pecynnau canlynol \n"
-"hefyd: \n"
+"I fodloni dibyniaethau, mae angen gosod y pecyn(nau) canlynol\n"
+"hefyd:\n"
 "\n"
 
-#: ../rpmdrake_.c:385 ../rpmdrake_.c:393
+#: ../rpmdrake:1
+#, c-format
+msgid "Additional packages needed"
+msgstr "Pecynnau ychwanegol angenrheidiol"
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "Nid oes modd tynnu rhai pecynnau"
 
-#: ../rpmdrake_.c:386
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -466,416 +607,565 @@ msgstr ""
 "Bydd tynnu'r pecynnau hyn yn torri eich system, sori\n"
 "\n"
 
-#: ../rpmdrake_.c:394 ../rpmdrake_.c:453
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
 "\n"
 msgstr ""
-"Oherwydd eu dibyniaethau, rhaid i'r pecyn(nau) canlynol gael\n"
-"eu dad-ddewis nawr:\n"
+"Oherwydd eu dibyniaethau, rhaid tynnu'r pecynnau canlynol \n"
+"hefyd: \n"
+"\n"
 
-#: ../rpmdrake_.c:423
-msgid "Additional packages needed"
-msgstr "Pecynnau ychwanegol angenrheidiol"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr "Mae angen tynnu rhai pecynnau ychwanegol"
 
-#: ../rpmdrake_.c:424
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
-msgstr ""
-"I fodloni dibyniaethau, mae angen gosod y pecyn(nau) canlynol\n"
-"hefyd:\n"
-"\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
+msgstr "Rhagor o wybodaethar becyn..."
 
-#: ../rpmdrake_.c:437
-msgid "Some packages can't be installed"
-msgstr "Nid oes modd gosod rhai pecynnau"
+#: ../rpmdrake:1
+#, c-format
+msgid "Information on packages"
+msgstr "Rhagor o wybodaeth ar becyn..."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
+msgstr "Mwy o wybodaeth"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Addable"
+msgstr "Ychwanegadwy"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Upgradable"
+msgstr "Diweddariadwy"
 
-#: ../rpmdrake_.c:438
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
+"The list of updates is void. This 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 ""
-"Yn anffodus, nid oes modd dewis y pecyn(nau) canlynol:\n"
-"\n"
 
-#: ../rpmdrake_.c:452 ../rpmdrake_.c:686
-msgid "Some packages need to be removed"
-msgstr "Rhaid tynnu rhai pecynnau"
+#: ../rpmdrake:1
+#, c-format
+msgid "No update"
+msgstr "Dim diweddariad"
 
-#: ../rpmdrake_.c:474
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Dewiswyd: %d MB / Lle gwag ar ddisg: %d MB"
+msgid "(none)"
+msgstr "(dim)"
 
-#: ../rpmdrake_.c:476
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "Maint dewisiwyd: %d MB"
+msgid "Please wait, listing packages..."
+msgstr "Arhoswch, rhestri pecynnau..."
 
-#: ../rpmdrake_.c:484
-msgid "Files:\n"
-msgstr "Ffeiliau:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "unknown package "
+msgstr "pecyn anhysbys"
 
-#: ../rpmdrake_.c:485
-msgid "Changelog:\n"
-msgstr "Cofnod Newid:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Mae angen un o'r pecynnau canlynol:"
 
-#: ../rpmdrake_.c:488
-msgid "Source: "
-msgstr "Ffynhonell: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please choose"
+msgstr "Dewiswch"
 
-#: ../rpmdrake_.c:489
-msgid "Currently installed version: "
-msgstr "Fersiwn sydd wedi ei osod ar hyn o bryd:"
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:493
-msgid "Reason for update: "
-msgstr "Rheswm am y diweddariad:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Not selected"
+msgstr "Heb ddewis"
 
-#: ../rpmdrake_.c:495
-msgid "Name: "
-msgstr "Enw: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected"
+msgstr "Dewiswyd"
 
-#: ../rpmdrake_.c:496
-msgid "Version: "
-msgstr "Fersiwn: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results"
+msgstr "Canlyniadau'r chwilio"
 
-#: ../rpmdrake_.c:497
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Stop"
+msgstr "Atal"
 
-#: ../rpmdrake_.c:497
-msgid "Size: "
-msgstr "Maint: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, searching..."
+msgstr "Arhoswch, chwilio..."
 
-#: ../rpmdrake_.c:499
-msgid "Importance: "
-msgstr "Pwysigrwydd: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
+msgstr "Canlyniadau'r chwilio (dim)"
 
-#: ../rpmdrake_.c:500
-msgid "Summary: "
-msgstr "Crynodeb: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Arall"
 
-#: ../rpmdrake_.c:501
-msgid "Description: "
-msgstr "Disgrifiadau: "
+#: ../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_.c:550
-msgid "Bugfixes updates"
-msgstr "Diweddariad cywiro gwallau"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Cadw a gadael"
 
-#: ../rpmdrake_.c:550
-msgid "Normal updates"
-msgstr "Diweddariadau arferol"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy..."
+msgstr "Dirprwy..."
 
-#: ../rpmdrake_.c:569
-msgid "Mandrake choices"
-msgstr "Dewisiadau Mandrake"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
+msgstr "Diweddau..."
 
-#: ../rpmdrake_.c:570
-msgid "All packages, alphabetical"
-msgstr "Pob pecyn, trefn yr wyddor"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "Ychwanegu..."
 
-#: ../rpmdrake_.c:571
-msgid "All packages,"
-msgstr "Pob pecyn,"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "Golygu"
 
-#: ../rpmdrake_.c:594
-msgid "by group"
-msgstr "yn Ă´l grwp"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Source"
+msgstr "Ffynhonell"
 
-#: ../rpmdrake_.c:594
-msgid "by size"
-msgstr "yn Ă´l maint"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
+msgstr "Galluogwyd?"
 
-#: ../rpmdrake_.c:595
-msgid "by selection state"
-msgstr "yn Ă´l cyflwr dewis"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure sources"
+msgstr "Ffurfweddu'r ffynonellau"
 
-#: ../rpmdrake_.c:596
-msgid "by source repository"
-msgstr "yn Ă´l ffynhonnell eu tarddiad"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "Cyfrinair:"
 
-#: ../rpmdrake_.c:596
-msgid "by update availability"
-msgstr "yn Ă´l diweddariad"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
+msgstr "Defnyddiwr:"
 
-#: ../rpmdrake_.c:617
-msgid "in descriptions"
-msgstr "disgrifiadau"
+#: ../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:"
 
-#: ../rpmdrake_.c:617
-msgid "in files"
-msgstr "mewn ffeiliau"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "Enw gwesteiwr y dirprwy:"
 
-#: ../rpmdrake_.c:617
-msgid "in names"
-msgstr "enwau"
+#: ../edit-urpm-sources.pl: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]>):"
 
-#: ../rpmdrake_.c:628
-msgid "Reload the packages list"
-msgstr "Ail lwytho'r rhestr pecynnau"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "Ffurfweddu'r dirprwyon"
 
-#: ../rpmdrake_.c:628
-msgid "Reset the selection"
-msgstr "Ailosod y dewis"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr "Arhoswch, diweddaru'r cyfrwng..."
 
-#: ../rpmdrake_.c:654
-msgid "Maximum information"
-msgstr "Gwybodath lawn"
+#: ../edit-urpm-sources.pl: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."
 
-#: ../rpmdrake_.c:654
-msgid "Normal information"
-msgstr "Gwybodaeth arferol"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
+msgstr "Rhaid gosod y cyfrwng i mewn i barhau"
 
-#: ../rpmdrake_.c:676
-msgid "Too many packages are selected"
-msgstr "Mae gormod o becynnau wedi eu dewis"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save changes"
+msgstr "Cadw newidiadau"
 
-#: ../rpmdrake_.c:722
-msgid "Find:"
-msgstr "Canfod:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Llwybr perthynol i synthesis/hdlist:"
 
-#: ../rpmdrake_.c:727
-msgid "Search"
-msgstr "Chwilio"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake_.c:733
-msgid "Install"
-msgstr "Gosod"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Editing source \"%s\":"
+msgstr "Golygu ffynhonnell \"%s\":"
 
-#: ../rpmdrake_.c:740 data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrake Update"
-msgstr "Diweddaru Mandrake"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit a source"
+msgstr "Golygu ffynhonnell"
 
-#: ../rpmdrake_.c:740
-msgid "Software Packages Installation"
-msgstr "Gosodiad Pecynnau Meddalwedd"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr "Arhoswch, tynnu cyfrwng..."
 
-#: ../rpmdrake_.c:740
-msgid "Software Packages Removal"
-msgstr "Tynnu Pecynnau Meddalwedd"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, adding medium..."
+msgstr "Arhoswch, ychwanegu cyfrwng..."
 
-#: ../rpmdrake_.c:781
-msgid "Please wait, contacting mirror to update packages information."
-msgstr "Arhoswch, yn cysylltu â'r drych i ddiweddaru gwybodaeth am y pecynnau."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of source:"
+msgstr "Math o ffynonellau:"
 
-#: ../rpmdrake_.c:783
-msgid "Error updating medium"
-msgstr "Gwall wrth ddiweddaru'r cyfrwng"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Adding a source:"
+msgstr "Ychwanegu ffynhonnell"
 
-#: ../rpmdrake_.c:784
-msgid "There was an unrecoverable error while updating packages information."
+#: ../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 ""
-"Digwyddodd gwall anadferadwy wrth ddiweddaru'r wybodaeth am y pecynnau."
 
-#: ../rpmdrake_.c:789
-msgid "How to choose manually your mirror"
-msgstr "Sut i ddewis drych gyda llaw."
+#: ../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"
 
-#: ../rpmdrake_.c:797
-msgid "Please wait, contacting mirror to initialize updates packages."
-msgstr "Arhoswch, yn cysylltu â'r drych i gychwyn pecynnau diweddaru."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "Enw:"
 
-#: ../rpmdrake_.c:800
-msgid "Error adding update medium"
-msgstr "Gwall wrth ychwanegu cyfrwng diweddaru"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
+msgstr "Mewngofnod:"
 
-#: ../rpmdrake_.c:831
-msgid "Please wait, finding available packages..."
-msgstr "Arhoswch, canfod pecynnau sydd ar gael..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Dewis drych..."
 
-#: ../rpmdrake_.c:863
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Archwilio %s"
+msgid "Browse..."
+msgstr "Pori..."
 
-#: ../rpmdrake_.c:882
-msgid "changes:"
-msgstr "newidiadau:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Llwybr neu bwynt gosod:"
 
-#: ../rpmdrake_.c:886
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Tynnu .%s"
+msgid "Removable device"
+msgstr "Dyfais symudol"
 
-#: ../rpmdrake_.c:888
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Defnyddio .%s fel y brif ffeil"
+msgid "HTTP server"
+msgstr "Gwasanaethwr HTTP"
 
-#: ../rpmdrake_.c:890
-msgid "Do nothing"
-msgstr "Gwneud dim"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "Gwasanaethwr FTP"
 
-#: ../rpmdrake_.c:902
-msgid "Installation finished"
-msgstr "Gorffennodd y gosodiad"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path:"
+msgstr "Llwybr:"
 
-#: ../rpmdrake_.c:912
-msgid "Inspect..."
-msgstr "Archwilio..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "Ffeiliau lleol"
 
-#: ../rpmdrake_.c:927
-msgid "Program missing"
-msgstr "Rhaglen ar goll"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add a source"
+msgstr "Ychwanegu ffynhonnell"
 
-#: ../rpmdrake_.c:928
-msgid "A required program is missing (grpmi). Check your installation."
-msgstr "Mae rhaglen angenrheidiol ar goll (grpmi). Gwiriwch eich gosodiad."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
+msgstr "Methu diweddaru'r cyfrwng; bydd yn cael ei anablu'n awtomatig."
 
-#: ../rpmdrake_.c:942
-msgid "Unable to get source packages."
-msgstr "Methu estyn pecynnau ffynhonnell."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "Methu creu cyfrwng."
 
-#: ../rpmdrake_.c:943
-msgid "Unable to get source packages, sorry."
-msgstr "Methu estyn pecynnau ffynhonnell."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, updating media..."
+msgstr "Arhoswch, diweddaru cyfrwng..."
 
-#: ../rpmdrake_.c:950
-msgid "Change medium"
-msgstr "Newid cyfrwng"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
+msgstr "Diweddaru"
 
-#: ../rpmdrake_.c:951
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Rhowch gyfrwng \"%s\" ar ddyfais [%s]"
+msgid "Select the source(s) you wish to update:"
+msgstr "Dewiswch y ffynhonellau i'w diweddaru:"
 
-#: ../rpmdrake_.c:959
-msgid "Installation failed"
-msgstr "Methodd y gosodiad"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please choose the desired mirror."
+msgstr "Dewiswch ddrych"
 
-#: ../rpmdrake_.c:960
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
-"Methodd y gosodiad, mae rhai ffeiliau ar goll.\n"
-"Efallai'r hoffech ddiweddaru eich cronfa ddata o ffynonellau."
 
-#: ../rpmdrake_.c:963
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr "Arhoswch, tynnu pecynnau i eraill gael eu diweddaru"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
+msgstr "Dim drych"
 
-#: ../rpmdrake_.c:984
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"There was an error downloading the mirrors list:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
-"Mae'r gosod wedi gorffen;%s.\n"
-"\n"
-"Cafodd rhai ffeiliau ffurfweddu eu creu fel  `.rpmnew' neu `.rpmsave',\n"
-"mae modd eu harchwilio i weithredu arnynt:"
 
-#: ../rpmdrake_.c:984
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "Gwall wrth lwytho i lawr"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
+"Arhoswch, llwytho i lawr cyfeiriaidau drychau o safle gwe MandrakeSoft."
+
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"some packages failed to install\n"
-"correctly"
+"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 ""
-"methodd rhai pecynnau a chael eu gosod\n"
-"yn gywir"
 
-#: ../rpmdrake_.c:985
-msgid "everything was installed correctly"
-msgstr "gosodwyd popeth yn llwyddiannus"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United States"
+msgstr "Yr Unod Daleithiau"
 
-#: ../rpmdrake_.c:987
-msgid "Everything installed successfully"
-msgstr "Gosodwyd popeth yn llwyddiannus"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
+msgstr "Tseina"
 
-#: ../rpmdrake_.c:988
-msgid "All requested packages were installed successfully."
-msgstr "Gosodwyd pob pecyn angenrheidiol yn llwyddiannus."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr "Y Deyrnas Unideg"
 
-#: ../rpmdrake_.c:991
-msgid "Everything already installed."
-msgstr "Popeth wedi ei osod eisoes"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "Taiwan"
 
-#: ../rpmdrake_.c:992
-msgid "Everything already installed (is this supposed to happen at all?)."
-msgstr "Mae popeth wedi ei osod (ydy hyn i fod i ddigwydd o gwbl?)"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "Sweden"
 
-#: ../rpmdrake_.c:999
-msgid "Problem during installation"
-msgstr "Problem wrth osod y rhaglen"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
+msgstr "Rwsia"
 
-#: ../rpmdrake_.c:1000
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Problem wrth osod y rhaglen\n"
-"\n"
-"%s"
+msgid "Portugal"
+msgstr "Portiwgal"
 
-#: ../rpmdrake_.c:1014
-msgid "Please wait, reading packages database..."
-msgstr "Arhoswch, darlen cronfa ddata'r pecynnau..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
+msgstr "Gwlad Pwyl"
 
-#: ../rpmdrake_.c:1055
-msgid "Please wait, removing packages..."
-msgstr "Arhoswch tynnu'r pecynnau..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
+msgstr "Norwy"
 
-#: ../rpmdrake_.c:1058
-msgid "Problem during removal"
-msgstr "Problem wrth dynnu"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
+msgstr "Yr Iseldiroedd"
 
-#: ../rpmdrake_.c:1059
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Problem wrth dynnu pecynnau:\n"
-"\n"
-"%s"
+msgid "Korea"
+msgstr "Corea"
 
-#: ../rpmdrake_.c:1091
-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 "Japan"
+msgstr "Siapan"
 
-#: ../rpmdrake_.c:1096
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"Croeso i MandrakeUpdate!\n"
-"Bydd yr offeryn hwn yn eich cynorthwyo i ddewis diweddariadau i'w gosod\n"
-"ar eich cyfrifiadur."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Italy"
+msgstr "Yr Eidal"
 
-#: ../rpmdrake_.c:1101
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
-msgstr ""
-"Croeso i'r offeryn gosod meddalwedd!\n"
-"\n"
-"Mae eich system Linux Mandrake yn dod gyda rhai miloedd o becynnau\n"
-"meddalwedd ar CDROM neu DVD.  Bydd yr offeryn hwn yn eich cynorthwyo\n"
-"i ddewis pa feddalwedd rydych am ei osod ar eich cyfrifiadur."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Israel"
+msgstr "Israel"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Groeg"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "France"
+msgstr "Ffrainc"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "Ffindir"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "Sbaen"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
+msgstr "Denmarc"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr "Yr Almaen"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
+msgstr "Gweriniaeth Tsiec"
+
+#: ../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 "Gwlad Belg"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Australia"
+msgstr "Awstralia"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
+msgstr "Awstria"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Info..."
+msgstr "Gwybodaeth..."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
+msgstr "Na"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Iawn"
+
+#: data/rpmdrake.desktop.in.h:1
+msgid "Install Software"
+msgstr "Gosod Meddalwedd"
 
 #: data/rpmdrake-remove.desktop.in.h:1
 msgid "Remove Software"
@@ -884,7 +1174,3 @@ msgstr "Tynnu Meddalwedd"
 #: data/rpmdrake-sources.desktop.in.h:1
 msgid "Software Sources Manager"
 msgstr "Rheolwr Ffynhonnell Meddalwedd"
-
-#: data/rpmdrake.desktop.in.h:1
-msgid "Install Software"
-msgstr "Gosod Meddalwedd"
diff --git a/po/cy.pom b/po/cy.pom
index 1561901a..0c85cd52 100644
--- a/po/cy.pom
+++ b/po/cy.pom
@@ -4,170 +4,175 @@ msgstr "Gwasanaethwr"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Gwe/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Cyfrifiadur Rhwydwaith (cleient)"
+msgid "Office Workstation"
+msgstr "Gweithfan Swyddfa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
 msgstr ""
-"Gwasanaethwr NFS, gwasanaethwr SMB, gwasanaethwr dirprwyol, gwasanaethwr ssh"
+"Rhaglenni swyddfa: prosesydd geiriau (Kword, abiword, taenlenni (kspread, "
+"gnumeric), darllennydd pdf, ag ati"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Swyddfa"
+msgid "Workstation"
+msgstr "Man Gwaith"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Man Gwaith Gnome"
+msgid "Game station"
+msgstr "Man chwarae"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Offer ar gyfer eich Palm PiloT neu eich Visor"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Rhaglenni difyrrwch: arcĂŞd, byrddau, strategaeth, ag ati"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Man Gwaith"
+msgid "Multimedia station"
+msgstr "Man Aml-gyfrwng"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Mur Gwarchod/Llwybrydd"
+msgid "Sound and video playing/editing programs"
+msgstr "Chwarae sain a fideo/rhaglenni golygu"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr "Enw Parth a gwasanaethwr Gwybodaeth Rhwydwaith"
+msgid "Internet station"
+msgstr "Man Rhyngrwyd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
 msgstr ""
-"Rhaglenni swyddfa: prosesydd geiriau (Kword, abiword, taenlenni (kspread, "
-"gnumeric), darllennydd pdf, ag ati"
+"Casgliad o offer i ddarllen ac anfon e-bost a newyddion (pine, mutt, tin..) "
+"ac i bori'r We"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "Offer Sain: mp3 neu chwarewyr midi, cymysgwyr, ag ati"
+msgid "Network Computer (client)"
+msgstr "Cyfrifiadur Rhwydwaith (cleient)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Linux Standard Base. Cefnogaeth i raglenni trydydd parti"
+msgid "Clients for different protocols including ssh"
+msgstr "Clientiaid ar gyfer protocolau amrywiol yn cynnwys ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Llyfrau a Howto's ar Linux a Meddalwedd Rhydd"
+msgid "Configuration"
+msgstr "Ffurfweddiad"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "Man Gwaith KDE"
+msgid "Tools to ease the configuration of your computer"
+msgstr "Offer i wneud ffurfweddu'ch cyfrifiadur yn haws"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, ag ati"
+msgid "Scientific Workstation"
+msgstr "Gweithfan Gwyddonol"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Aml-gyfrwng - Fideo"
+msgid "Scientific applications such as gnuplot"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr ""
-"Casgliad o offer ar gyfer e-bost, newyddion, y we, trosglwyddo ffeiliau, a "
-"sgwrsio"
+msgid "Console Tools"
+msgstr "Offer y Consol"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Cronfa Ddata"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Golygyddion, cregyn, offer ffeilio, terfynellau"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "Gwasanaethwr cronfa data PostgreSQL neu MySQL"
+msgid "KDE Workstation"
+msgstr "Man Gwaith KDE"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Offer i wneud ffurfweddu'ch cyfrifiadur yn haws"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"KDE - Amgylchedd Penbwrdd K, yr amgylchedd graffig sylfaenol gyda chasgliad "
+"o offer"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "Aml-gyfrwng - Sain"
+msgid "Graphical Environment"
+msgstr "Amgylchedd Graffig"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dogfennaeth"
+msgid "Gnome Workstation"
+msgstr "Man Gwaith Gnome"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Offer y Consol"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+"Amgylchedd graffig gyda chasgliad o raglenni ac offer penbwrdd hawdd eu "
+"defnyddio."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr "Gwasanaethwr e-bost Postfix, gwasanaethwr newyddion Inn"
+msgid "Other Graphical Desktops"
+msgstr "Pen Desg Graffigol Eraill"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Man Rhyngrwyd"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, ag ati"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Man Aml-gyfrwng"
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+msgid "Development"
+msgstr "Datblygiad"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Ffurfweddiad"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "Llyfrgelloedd datblygiadol C a C++, rhaglenni a ffeiliau cynnwys"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Rhagor o Ben Bwrdd Graffig (Gnome, IceWM)"
+msgid "Documentation"
+msgstr "Dogfennaeth"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
-"KDE - Amgylchedd Penbwrdd K, yr amgylchedd graffig sylfaenol gyda chasgliad "
-"o offer"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Llyfrau a Howto's ar Linux a Meddalwedd Rhydd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Amgylchedd Graffig"
+msgid "LSB"
+msgstr "LSB"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Linux Standard Base. Cefnogaeth i raglenni trydydd parti"
+
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-msgid "Development"
-msgstr "Datblygiad"
+#: ../../share/compssUsers:999
+msgid "Web/FTP"
+msgstr "Gwe/FTP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -176,23 +181,33 @@ msgstr "Apache, Pro-ftpd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "Offer i greu a llosgi CDau"
+msgid "Mail/Groupware/News"
+msgstr "E-bost/Offer Grwp/Newyddion"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Gweithfan Swyddfa"
+msgid "Postfix mail server, Inn news server"
+msgstr "Gwasanaethwr e-bost Postfix, gwasanaethwr newyddion Inn"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, ag ati"
+msgid "Database"
+msgstr "Cronfa Ddata"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Rhaglenni graffeg megis The Gimp"
+msgid "PostgreSQL or MySQL database server"
+msgstr "Gwasanaethwr cronfa data PostgreSQL neu MySQL"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Firewall/Router"
+msgstr "Mur Gwarchod/Llwybrydd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Internet gateway"
+msgstr "Porth i'r rhyngrwyd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -201,8 +216,8 @@ msgstr "DNS/NIS "
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "Llyfrgelloedd datblygiadol C a C++, rhaglenni a ffeiliau cynnwys"
+msgid "Domain Name and Network Information Server"
+msgstr "Enw Parth a gwasanaethwr Gwybodaeth Rhwydwaith"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -211,18 +226,21 @@ msgstr "Gwasanaethwr Cyfrifiadur Rhwydwaith"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "E-bost/Offer Grwp/Newyddion"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr ""
+"Gwasanaethwr NFS, gwasanaethwr SMB, gwasanaethwr dirprwyol, gwasanaethwr ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Man chwarae"
+msgid "Office"
+msgstr "Swyddfa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Chwarewyr a golygyddion fideo"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr ""
+"Casgliad o offer ar gyfer e-bost, newyddion, y we, trosglwyddo ffeiliau, a "
+"sgwrsio"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -231,79 +249,66 @@ msgstr "Aml-gyfrwng - Graffig"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Rhaglenni difyrrwch: arcĂŞd, byrddau, strategaeth, ag ati"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
-"Casgliad o offer i ddarllen ac anfon e-bost a newyddion (pine, mutt, tin..) "
-"ac i bori'r We"
+msgid "Graphics programs such as The Gimp"
+msgstr "Rhaglenni graffeg megis The Gimp"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "Cyllid Personol"
+msgid "Multimedia - Sound"
+msgstr "Aml-gyfrwng - Sain"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
-"Amgylchedd graffig gyda chasgliad o raglenni ac offer penbwrdd hawdd eu "
-"defnyddio."
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "Offer Sain: mp3 neu chwarewyr midi, cymysgwyr, ag ati"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Clientiaid ar gyfer protocolau amrywiol yn cynnwys ssh"
+msgid "Multimedia - Video"
+msgstr "Aml-gyfrwng - Fideo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
+msgid "Video players and editors"
+msgstr "Chwarewyr a golygyddion fideo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Porth i'r rhyngrwyd"
+msgid "Multimedia - CD Burning"
+msgstr "Aml-gyfrwng - Llosgi CD"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Chwarae sain a fideo/rhaglenni golygu"
+msgid "Tools to create and burn CD's"
+msgstr "Offer i greu a llosgi CDau"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Pen Desg Graffigol Eraill"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Rhagor o Ben Bwrdd Graffig (Gnome, IceWM)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Golygyddion, cregyn, offer ffeilio, terfynellau"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, ag ati"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "Rhaglenni i reoli eich cyllid, megis gnucash"
+msgid "Personal Information Management"
+msgstr "Rheoli Gwybodaeth Bersonol"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "Rheoli Gwybodaeth Bersonol"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Offer ar gyfer eich Palm PiloT neu eich Visor"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Aml-gyfrwng - Llosgi CD"
+msgid "Personal Finance"
+msgstr "Cyllid Personol"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Gweithfan Gwyddonol"
+msgid "Programs to manage your finances, such as gnucash"
+msgstr "Rhaglenni i reoli eich cyllid, fel gnucash"
 
diff --git a/po/da.po b/po/da.po
index eb37bc00..ea6abc12 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-01-30 11:22+0100\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\n"
 "PO-Revision-Date: 2003-01-31 22:35+0100\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -16,451 +16,625 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl_.c:43
-msgid "Unable to create medium."
-msgstr "Kan ikke lave media."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Er det O.k. at fortsćtte?"
 
-#: ../edit-urpm-sources.pl_.c:44
-msgid "Unable to update medium; it will be automatically disabled."
-msgstr "Kan ikke opdatere media; det vil automatisk vćre deaktiveret."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to the software installation tool!\n"
+"\n"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
+msgstr ""
+"Velkommen til vćrktřjet for programinstallation!\n"
+"\n"
+"Mandrake Linux-systemet distribueres med flere tusind programpakker\n"
+"pĺ cd-rom eller dvd. Dette vćrktřj hjćlper dig med at vćlge hvilke "
+"programmer\n"
+"du vil installere pĺ maskinen."
 
-#: ../edit-urpm-sources.pl_.c:54
-msgid "Add a source"
-msgstr "Tilfřj en kilde"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Velkommen til MandrakeUpdate!\n"
+"\n"
+"Dette vćrktřj hjćlper dig med at vćlge opdateringarne du vil\n"
+"installere pĺ maskinen."
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Local files"
-msgstr "Lokale filer"
+#: ../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 ""
+"Velkommen til vćrktřjet for fjernelse af pakker!\n"
+"\n"
+"Dette vćrktřj hjćlper dig med at vćlge hvilke programmer du vil fjerne fra\n"
+"maskinen."
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Path:"
-msgstr "Sti:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"Der opstod et problem under fjernelsen af pakker:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:56
-msgid "FTP server"
-msgstr "FTP-server"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during removal"
+msgstr "Problem ved fjernelse"
 
-#: ../edit-urpm-sources.pl_.c:56 ../edit-urpm-sources.pl_.c:57
-#: ../edit-urpm-sources.pl_.c:59 ../edit-urpm-sources.pl_.c:187
-msgid "URL:"
-msgstr "URL: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages..."
+msgstr "Vent venligst, fjerner pakker..."
 
-#: ../edit-urpm-sources.pl_.c:57
-msgid "HTTP server"
-msgstr "HTTP-server"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
+msgstr "Vent venligst, lćser pakkedatabase..."
 
-#: ../edit-urpm-sources.pl_.c:58
-msgid "Path or mount point:"
-msgstr "sti eller monteringspunkt:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Der opstod et problem under installationen:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:58
-msgid "Removable device"
-msgstr "Udskiftelig enhed"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during installation"
+msgstr "Problem ved installationen"
 
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:550
-msgid "Security updates"
-msgstr "Sikkerhedsopdateringer"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
+msgstr "Alt er allerede installeret (břr dette ske overhovedet?)."
 
-#: ../edit-urpm-sources.pl_.c:70
-msgid "Browse..."
-msgstr "Gennemse..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed."
+msgstr "Alting er allerede installeret."
 
-#: ../edit-urpm-sources.pl_.c:72
-msgid "Choose a mirror..."
-msgstr "Vćlg et spejl..."
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "Alle řnskede pakker blev installeret uden problemer."
 
-#: ../edit-urpm-sources.pl_.c:92
-msgid "Login:"
-msgstr "Login:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr "Alting installeret uden problemer"
 
-#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:231
-msgid "Password:"
-msgstr "Adgangskode:"
+#: ../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 ""
+"Installationen er fćrdig; %s.\n"
+"\n"
+"Nogen konfigurationsfiler blev oprette som '.rpmnew' eller '.rpmsave',\n"
+"du kan nu kigge pĺ nogen for at tage aktion:"
 
-#: ../edit-urpm-sources.pl_.c:97
-msgid "Name:"
-msgstr "Navn:"
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "alting blev installeret korrekt"
 
-#: ../edit-urpm-sources.pl_.c:99 ../edit-urpm-sources.pl_.c:188
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Relativ sti til syntese eller hdlist:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"some packages failed to install\n"
+"correctly"
+msgstr ""
+"visse pakker kunne ikke installeres\n"
+"korrekt"
 
-#: ../edit-urpm-sources.pl_.c:107
-msgid "You need to fill up at least the two first entries."
-msgstr "Du skal udfylde i det mindste de to fřrste indgange."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages to allow others to be upgraded..."
+msgstr "Vent venligst, fjerner pakker for at andre skal kunne opdateres..."
 
-#: ../edit-urpm-sources.pl_.c:120
-msgid "Adding a source:"
-msgstr "Tilfřjer en kilde:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
+msgstr ""
+"Installationen mislykkedes, visse filer mangler.\n"
+"Du skal mĺske opdatere din kildedatabase."
 
-#: ../edit-urpm-sources.pl_.c:121
-msgid "Type of source:"
-msgstr "Kildetype:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation failed"
+msgstr "Installationen mislykkedes"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
+msgstr "Annullér"
 
-#: ../edit-urpm-sources.pl_.c:125 ../edit-urpm-sources.pl_.c:202
-#: ../edit-urpm-sources.pl_.c:235 ../rpmdrake.pm_.c:100 ../rpmdrake.pm_.c:139
-#: ../rpmdrake.pm_.c:322 ../rpmdrake_.c:355 ../rpmdrake_.c:367
-#: ../rpmdrake_.c:371 ../rpmdrake_.c:918 ../rpmdrake_.c:952
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
 msgid "Ok"
 msgstr "O.k."
 
-#: ../edit-urpm-sources.pl_.c:140 ../edit-urpm-sources.pl_.c:196
-#: ../edit-urpm-sources.pl_.c:202 ../edit-urpm-sources.pl_.c:242
-#: ../rpmdrake.pm_.c:322 ../rpmdrake.pm_.c:355 ../rpmdrake_.c:355
-#: ../rpmdrake_.c:952
-msgid "Cancel"
-msgstr "Annullér"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Indsćt venligst media med navn \"%s\" i enhed [%s]"
 
-#: ../edit-urpm-sources.pl_.c:147
-msgid "Please wait, adding medium..."
-msgstr "Vent venligst, tilfřjer medie..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr "Skift media"
 
-#: ../edit-urpm-sources.pl_.c:168
-msgid "Please wait, removing medium..."
-msgstr "Vent venligst, fjerner medie..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
+msgstr "Desvćrre, kunne ikke hente kildepakker."
 
-#: ../edit-urpm-sources.pl_.c:181
-msgid "Edit a source"
-msgstr "Redigér en kilde"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages."
+msgstr "Kunne ikke hente kildepakker."
 
-#: ../edit-urpm-sources.pl_.c:185
+#: ../rpmdrake:1
 #, c-format
-msgid "Editing source \"%s\":"
-msgstr "Redigerer kilde '%s':"
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr "Et nřdvendigt program mangler (grpmi). Tjek din installation."
 
-#: ../edit-urpm-sources.pl_.c:191
-msgid "Save changes"
-msgstr "Gem ćndringer"
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
+msgstr "Program mangler"
 
-#: ../edit-urpm-sources.pl_.c:200
-msgid "You need to insert the medium to continue"
-msgstr "Du skal indsćtte mediet for at fortsćtte"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
+msgstr "Undersřg..."
 
-#: ../edit-urpm-sources.pl_.c:201
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "For at gemme ćndringerne skal du indsćtte mediet i drevet."
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation finished"
+msgstr "Installationen fćrdig"
 
-#: ../edit-urpm-sources.pl_.c:206
-msgid "Please wait, updating medium..."
-msgstr "Vent venligst, opdaterer medie..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
+msgstr "Gřr ingenting"
 
-#: ../edit-urpm-sources.pl_.c:217
-msgid "Configure proxies"
-msgstr "Konfigurér proxyer"
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
+msgstr "Brug .%s som hovedfil"
 
-#: ../edit-urpm-sources.pl_.c:223
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
-msgstr ""
-"Hvis du har brug for en proxy, skal du indtaste vćrtsnavnet og eventuelt en "
-"port (syntaks: <proxyvćrt[:port]>):"
+#: ../rpmdrake:1
+#, c-format
+msgid "Remove .%s"
+msgstr "Fjern .%s"
 
-#: ../edit-urpm-sources.pl_.c:225
-msgid "Proxy hostname:"
-msgstr "Vćrtsnavn for proxy:"
+#: ../rpmdrake:1
+#, c-format
+msgid "changes:"
+msgstr "ćndringer:"
 
-#: ../edit-urpm-sources.pl_.c:227
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr ""
-"Du kan angive en bruger og en adgangskode for autentifikation af proxy:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr "Undersřger %s"
 
-#: ../edit-urpm-sources.pl_.c:229
-msgid "User:"
-msgstr "Bruger:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, finding available packages..."
+msgstr "Vent venligst, finder tilgćngelige pakker..."
 
-#: ../edit-urpm-sources.pl_.c:255
-msgid "Configure sources"
-msgstr "Konfigurér kilder"
+#: ../rpmdrake:1
+#, c-format
+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 ""
+"Der opstod en fejl da opdateringsmedia skulle tilfřjes.\n"
+"\n"
+"Dette kan ske pĺ grund af et řdelagt eller temporćrt utilgćngeligt spejl "
+"eller\n"
+"hvis din Mandrake Linux version (%s) endnu ikke/ikke lćngere understřttes af "
+"Mandrake Linux'\n"
+"officielle opdateringer.\n"
+"\n"
+"Vil du forsřge med et andet spejl?"
 
-#: ../edit-urpm-sources.pl_.c:262
-msgid "Enabled?"
-msgstr "Aktiveret?"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
+msgstr "Fejl ved tilfřjelse af opdateringsmedia"
 
-#: ../edit-urpm-sources.pl_.c:263
-msgid "Source"
-msgstr "Kilde"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
+msgstr "Vent venligst, kontakter spejl for at initiere opdateringspakker."
 
-#: ../edit-urpm-sources.pl_.c:286 ../rpmdrake_.c:732
-msgid "Remove"
-msgstr "Fjern"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Sources Manager, and then add a `Security\n"
+"updates' source.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"Du kan ogsĺ vćlge dit řnskede spejl manuelt; for at gřre dette skal du "
+"starte Administrationen af programmelkilder, og dernćst tilfřje en kilde til "
+"'Sikkerhedsopdateringer'.\n"
+"Derefter skal MandrakeUpdate genstartes."
 
-#: ../edit-urpm-sources.pl_.c:288
-msgid "Edit"
-msgstr "Redigér"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Hvordan du manuelt vćlger dit spejl"
 
-#: ../edit-urpm-sources.pl_.c:290
-msgid "Add..."
-msgstr "Tilfřj..."
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
+msgstr ""
+"En fejl som ikke kan reddes opstod under opdatering af pakkeinformation."
 
-#: ../edit-urpm-sources.pl_.c:292
-msgid "Update..."
-msgstr "Opdatér..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
+msgstr "Fejl ved opdatering af medie"
 
-#: ../edit-urpm-sources.pl_.c:293
-msgid "Proxy..."
-msgstr "Proxy..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
+msgstr "Vent venligst, kontakter spejl for at opdatere pakkeinformation."
 
-#: ../edit-urpm-sources.pl_.c:296
-msgid "Save and quit"
-msgstr "gem og afslut"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Mĺ kontakte spejlet for at hente de seneste opdateringspakker.\n"
+"Kontrollér venligst at dit netvćrk er startet.\n"
+"\n"
+"Er det O.k. at fortsćtte?"
 
-#: ../edit-urpm-sources.pl_.c:297 ../rpmdrake_.c:735
-msgid "Quit"
-msgstr "Afslut"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Installation"
+msgstr "Installation af programmelpakker"
 
-#: ../rpmdrake.pm_.c:96
-msgid "Yes"
-msgstr "Ja"
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, c-format
+msgid "Mandrake Update"
+msgstr "Mandrake Opdatér"
 
-#: ../rpmdrake.pm_.c:98
-msgid "No"
-msgstr "Nej"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
+msgstr "Fjernelse af programmelpakker"
 
-#: ../rpmdrake.pm_.c:130
-msgid "Info..."
-msgstr "Info..."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Afslut"
 
-#: ../rpmdrake.pm_.c:183
-msgid "Austria"
-msgstr "Řstrig"
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "Installér"
 
-#: ../rpmdrake.pm_.c:184
-msgid "Australia"
-msgstr "Australien"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "Fjern"
 
-#: ../rpmdrake.pm_.c:185
-msgid "Belgium"
-msgstr "Belgien"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search"
+msgstr "Sřg"
 
-#: ../rpmdrake.pm_.c:186
-msgid "Brazil"
-msgstr "Brasilien"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "Find:"
 
-#: ../rpmdrake.pm_.c:187
-msgid "Canada"
-msgstr "Canada"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Fřlgende pakker skal fjernes for at andre skal kunne opdateres:\n"
+"\n"
+"%s\n"
+"\n"
+"Er det O.k. at fortsćtte?"
 
-#: ../rpmdrake.pm_.c:188
-msgid "Costa Rica"
-msgstr "Costa Rica"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "Visse pakker skal fjernes"
 
-#: ../rpmdrake.pm_.c:189
-msgid "Czech Republic"
-msgstr "Tjekkiet"
+#: ../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 ud til at du prřver pĺ at tilfřje sĺ mange pakker at dit "
+"filsystem kan lřbe třr for fri diskplads, under eller efter "
+"pakkeinstallationen; dette er sćrlig farligt og břr overvejes omhyggeligt.\n"
+"\n"
+"Řnsker du virkeligt at installere alle de valgte pakker?"
 
-#: ../rpmdrake.pm_.c:190
-msgid "Germany"
-msgstr "Tyskland"
+#: ../rpmdrake:1
+#, c-format
+msgid "Too many packages are selected"
+msgstr "For mange pakker er valgt"
 
-#: ../rpmdrake.pm_.c:191
-msgid "Danmark"
-msgstr "Danmark"
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
+msgstr "Mest information"
 
-#: ../rpmdrake.pm_.c:192 ../rpmdrake.pm_.c:196
-msgid "Greece"
-msgstr "Grćkenland"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal information"
+msgstr "Normal information"
 
-#: ../rpmdrake.pm_.c:193
-msgid "Spain"
-msgstr "Spanien"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update source(s)"
+msgstr "Opdatér kilder"
 
-#: ../rpmdrake.pm_.c:194
-msgid "Finland"
-msgstr "Finland"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reload the packages list"
+msgstr "Genindlćs pakkelisten"
 
-#: ../rpmdrake.pm_.c:195
-msgid "France"
-msgstr "Frankrig"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
+msgstr "Nulstil det valgte"
 
-#: ../rpmdrake.pm_.c:197
-msgid "Israel"
-msgstr "Israel"
+#: ../rpmdrake:1
+#, c-format
+msgid "in files"
+msgstr "i filer"
 
-#: ../rpmdrake.pm_.c:198
-msgid "Italy"
-msgstr "Italien"
+#: ../rpmdrake:1
+#, c-format
+msgid "in descriptions"
+msgstr "i beskrivelser"
 
-#: ../rpmdrake.pm_.c:199
-msgid "Japan"
-msgstr "Japan"
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
+msgstr "i navne"
 
-#: ../rpmdrake.pm_.c:200
-msgid "Korea"
-msgstr "Korea"
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
+msgstr "efter opdateringstilgćngelighed"
 
-#: ../rpmdrake.pm_.c:201
-msgid "Netherlands"
-msgstr "Holland"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
+msgstr "efter kildelagringsplads"
 
-#: ../rpmdrake.pm_.c:202
-msgid "Norway"
-msgstr "Norge"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
+msgstr "efter valgstatus"
 
-#: ../rpmdrake.pm_.c:203
-msgid "Poland"
-msgstr "Polen"
+#: ../rpmdrake:1
+#, c-format
+msgid "by size"
+msgstr "efter střrrelse"
 
-#: ../rpmdrake.pm_.c:204
-msgid "Portugal"
-msgstr "Portugal"
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
+msgstr "efter gruppe"
 
-#: ../rpmdrake.pm_.c:205
-msgid "Russia"
-msgstr "Rusland"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages,"
+msgstr "Alle pakker,"
 
-#: ../rpmdrake.pm_.c:206
-msgid "Sweden"
-msgstr "Sverige"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
+msgstr "Alle pakker, alfabetisk"
 
-#: ../rpmdrake.pm_.c:207
-msgid "Taiwan"
-msgstr "Taiwan"
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
+msgstr "Mandrake-valg"
 
-#: ../rpmdrake.pm_.c:208
-msgid "United Kingdom"
-msgstr "Storbritannien"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal updates"
+msgstr "Normale opdateringer"
 
-#: ../rpmdrake.pm_.c:209
-msgid "China"
-msgstr "Kina"
+#: ../rpmdrake:1
+#, c-format
+msgid "Bugfixes updates"
+msgstr "Fejlretningsopdateringer"
 
-#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:211 ../rpmdrake.pm_.c:212
-#: ../rpmdrake.pm_.c:213 ../rpmdrake.pm_.c:264
-msgid "United States"
-msgstr "U.S.A."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
+msgstr "Sikkerhedsopdateringer"
 
-#: ../rpmdrake.pm_.c:277
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr "Vent venligst, henter spejladresser fra MandrakeSofts websted."
+#: ../rpmdrake:1
+#, c-format
+msgid "Description: "
+msgstr "Beskrivelse: "
 
-#: ../rpmdrake.pm_.c:283
-msgid "Error during download"
-msgstr "Fejl under hentning"
+#: ../rpmdrake:1
+#, c-format
+msgid "Summary: "
+msgstr "Resumé: "
 
-#: ../rpmdrake.pm_.c:292
-msgid "No mirror"
-msgstr "Intet spejl"
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "Vigtighed: "
 
-#: ../rpmdrake.pm_.c:310
-msgid "Please choose the desired mirror."
-msgstr "Vćlg řnsket spejl."
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake.pm_.c:342 ../rpmdrake_.c:629
-msgid "Update source(s)"
-msgstr "Opdatér kilder"
+#: ../rpmdrake:1
+#, c-format
+msgid "Size: "
+msgstr "Střrrelse: "
 
-#: ../rpmdrake.pm_.c:346
-msgid "Select the source(s) you wish to update:"
-msgstr "Venligst vćlg de kilder du řnsker at opdatere:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Version: "
+msgstr "Version: "
 
-#: ../rpmdrake.pm_.c:350
-msgid "Update"
-msgstr "Opdatér"
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "Navn: "
 
-#: ../rpmdrake.pm_.c:360
-msgid "Please wait, updating media..."
-msgstr "Vent venligst, opdaterer medie..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "Ĺrsag til opdatering: "
 
-#: ../rpmdrake_.c:101
-msgid "Other"
-msgstr "Andet"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
+msgstr "Nuvćrende installeret version: "
 
-#: ../rpmdrake_.c:123 ../rpmdrake_.c:137 ../rpmdrake_.c:229 ../rpmdrake_.c:300
-msgid "(none)"
-msgstr "(ingen)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Source: "
+msgstr "Kilde: "
 
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:484 ../rpmdrake_.c:485
+#: ../rpmdrake:1
+#, c-format
 msgid "(Not available)"
 msgstr "(Ingen tilgćngelig)"
 
-#: ../rpmdrake_.c:153 ../rpmdrake_.c:210
-msgid "Search results"
-msgstr "Sřgeresultater"
-
-#: ../rpmdrake_.c:153
-msgid "Search results (none)"
-msgstr "Sřgeresultater (ingen)"
-
-#: ../rpmdrake_.c:163 ../rpmdrake_.c:174
-msgid "Please wait, searching..."
-msgstr "Vent venligst, sřger..."
-
-#: ../rpmdrake_.c:177
-msgid "Stop"
-msgstr "Stop"
-
-#: ../rpmdrake_.c:211 ../rpmdrake_.c:321
-msgid "Addable"
-msgstr "Kan tilfřjes"
-
-#: ../rpmdrake_.c:211 ../rpmdrake_.c:321
-msgid "Upgradable"
-msgstr "Kan opdateres"
-
-#: ../rpmdrake_.c:213
-msgid "Not selected"
-msgstr "Ikke valgt"
-
-#: ../rpmdrake_.c:213
-msgid "Selected"
-msgstr "Valgt"
-
-#: ../rpmdrake_.c:242
-msgid "rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake_.c:260 ../rpmdrake_.c:362 ../rpmdrake_.c:364
-msgid "More information on package..."
-msgstr "Mere information om pakken..."
-
-#: ../rpmdrake_.c:261
-msgid "One of the following packages is needed:"
-msgstr "En af fřlgende pakker behřves:"
-
-#: ../rpmdrake_.c:261
-msgid "Please choose"
-msgstr "Vćlg"
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
+msgstr "Ćndringslog:\n"
 
-#: ../rpmdrake_.c:277
-msgid "unknown package "
-msgstr "Ukendt pakke "
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "Filer:\n"
 
-#: ../rpmdrake_.c:287
-msgid "Please wait, listing packages..."
-msgstr "Vent venligst, lister pakker..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected size: %d MB"
+msgstr "Valgt střrrelse: %d MB"
 
-#: ../rpmdrake_.c:302
-msgid "No update"
-msgstr "Ingen opdatering"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Valgt: %d MB / Fri diskplads: %d MB"
 
-#: ../rpmdrake_.c:355 ../rpmdrake_.c:356
-msgid "More infos"
-msgstr "Mere info"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
+msgstr ""
+"Pĺ grund af deres afhćngigheder skal fřlgende pakker\n"
+"afmarkeres nu:\n"
+"\n"
 
-#: ../rpmdrake_.c:357
-msgid "Information on packages"
-msgstr "Information om pakker"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+msgstr ""
+"Desvćrre, fřlgende pakker kan ikke vćlges:\n"
+"\n"
 
-#: ../rpmdrake_.c:378
-msgid "Some additional packages need to be removed"
-msgstr "Nogle yderligere pakker skal fjernes"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "Visse pakker kan ikke installeres"
 
-#: ../rpmdrake_.c:379
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
 "\n"
 msgstr ""
-"Pĺ grund af deres afhćngigheder vil disse pakker ogsĺ blive fjernet:\n"
+"For at opfylde afhćngigheder skal fřlgende pakker ogsĺ installeres:\n"
 "\n"
 
-#: ../rpmdrake_.c:385 ../rpmdrake_.c:393
+#: ../rpmdrake:1
+#, c-format
+msgid "Additional packages needed"
+msgstr "Yderligere pakker behřves"
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "Visse pakker kan ikke fjernes"
 
-#: ../rpmdrake_.c:386
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -468,582 +642,599 @@ msgstr ""
 "Desvćrre, fjernelse af disse pakker ville řdelćgge systemet:\n"
 "\n"
 
-#: ../rpmdrake_.c:394 ../rpmdrake_.c:453
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
 "\n"
 msgstr ""
-"Pĺ grund af deres afhćngigheder skal fřlgende pakker\n"
-"afmarkeres nu:\n"
+"Pĺ grund af deres afhćngigheder vil disse pakker ogsĺ blive fjernet:\n"
 "\n"
 
-#: ../rpmdrake_.c:423
-msgid "Additional packages needed"
-msgstr "Yderligere pakker behřves"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr "Nogle yderligere pakker skal fjernes"
 
-#: ../rpmdrake_.c:424
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
-msgstr ""
-"For at opfylde afhćngigheder skal fřlgende pakker ogsĺ installeres:\n"
-"\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
+msgstr "Mere information om pakken..."
 
-#: ../rpmdrake_.c:437
-msgid "Some packages can't be installed"
-msgstr "Visse pakker kan ikke installeres"
+#: ../rpmdrake:1
+#, c-format
+msgid "Information on packages"
+msgstr "Information om pakker"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
+msgstr "Mere info"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Addable"
+msgstr "Kan tilfřjes"
 
-#: ../rpmdrake_.c:438
+#: ../rpmdrake:1
+#, c-format
+msgid "Upgradable"
+msgstr "Kan opdateres"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
+"The list of updates is void. This 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 ""
-"Desvćrre, fřlgende pakker kan ikke vćlges:\n"
-"\n"
+"Listen over opdateringer er tom. Dette betyder at der ikke\n"
+"findes nogen tilgćngelige opdateringer for programmerne installeret\n"
+"pĺ maskinen eller at du allerede har installeret dem alle."
 
-#: ../rpmdrake_.c:452 ../rpmdrake_.c:686
-msgid "Some packages need to be removed"
-msgstr "Visse pakker skal fjernes"
+#: ../rpmdrake:1
+#, c-format
+msgid "No update"
+msgstr "Ingen opdatering"
 
-#: ../rpmdrake_.c:474
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Valgt: %d MB / Fri diskplads: %d MB"
+msgid "(none)"
+msgstr "(ingen)"
 
-#: ../rpmdrake_.c:476
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "Valgt střrrelse: %d MB"
+msgid "Please wait, listing packages..."
+msgstr "Vent venligst, lister pakker..."
 
-#: ../rpmdrake_.c:484
-msgid "Files:\n"
-msgstr "Filer:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "unknown package "
+msgstr "Ukendt pakke "
 
-#: ../rpmdrake_.c:485
-msgid "Changelog:\n"
-msgstr "Ćndringslog:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "En af fřlgende pakker behřves:"
 
-#: ../rpmdrake_.c:488
-msgid "Source: "
-msgstr "Kilde: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please choose"
+msgstr "Vćlg"
 
-#: ../rpmdrake_.c:489
-msgid "Currently installed version: "
-msgstr "Nuvćrende installeret version: "
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:493
-msgid "Reason for update: "
-msgstr "Ĺrsag til opdatering: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Not selected"
+msgstr "Ikke valgt"
 
-#: ../rpmdrake_.c:495
-msgid "Name: "
-msgstr "Navn: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected"
+msgstr "Valgt"
 
-#: ../rpmdrake_.c:496
-msgid "Version: "
-msgstr "Version: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results"
+msgstr "Sřgeresultater"
 
-#: ../rpmdrake_.c:497
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Stop"
+msgstr "Stop"
 
-#: ../rpmdrake_.c:497
-msgid "Size: "
-msgstr "Střrrelse: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, searching..."
+msgstr "Vent venligst, sřger..."
 
-#: ../rpmdrake_.c:499
-msgid "Importance: "
-msgstr "Vigtighed: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
+msgstr "Sřgeresultater (ingen)"
 
-#: ../rpmdrake_.c:500
-msgid "Summary: "
-msgstr "Resumé: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Andet"
 
-#: ../rpmdrake_.c:501
-msgid "Description: "
-msgstr "Beskrivelse: "
+#: ../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 ""
+"Velkommen til redigering af kildepakker!\n"
+"\n"
+"Dette vćrktřj hjćlper dig med at konfigurere pakkekilderne du vil bruge\n"
+"pĺ maskinen. De vil derefter vćre tilgćngelige sĺ du kan installere nye\n"
+"programmer eller udfřre opdateringer."
 
-#: ../rpmdrake_.c:550
-msgid "Bugfixes updates"
-msgstr "Fejlretningsopdateringer"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "gem og afslut"
 
-#: ../rpmdrake_.c:550
-msgid "Normal updates"
-msgstr "Normale opdateringer"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy..."
+msgstr "Proxy..."
 
-#: ../rpmdrake_.c:569
-msgid "Mandrake choices"
-msgstr "Mandrake-valg"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
+msgstr "Opdatér..."
 
-#: ../rpmdrake_.c:570
-msgid "All packages, alphabetical"
-msgstr "Alle pakker, alfabetisk"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "Tilfřj..."
 
-#: ../rpmdrake_.c:571
-msgid "All packages,"
-msgstr "Alle pakker,"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "Redigér"
 
-#: ../rpmdrake_.c:594
-msgid "by group"
-msgstr "efter gruppe"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Source"
+msgstr "Kilde"
 
-#: ../rpmdrake_.c:594
-msgid "by size"
-msgstr "efter střrrelse"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
+msgstr "Aktiveret?"
 
-#: ../rpmdrake_.c:595
-msgid "by selection state"
-msgstr "efter valgstatus"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure sources"
+msgstr "Konfigurér kilder"
 
-#: ../rpmdrake_.c:596
-msgid "by source repository"
-msgstr "efter kildelagringsplads"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "Adgangskode:"
 
-#: ../rpmdrake_.c:596
-msgid "by update availability"
-msgstr "efter opdateringstilgćngelighed"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
+msgstr "Bruger:"
 
-#: ../rpmdrake_.c:617
-msgid "in descriptions"
-msgstr "i beskrivelser"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+"Du kan angive en bruger og en adgangskode for autentifikation af proxy:"
 
-#: ../rpmdrake_.c:617
-msgid "in files"
-msgstr "i filer"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "Vćrtsnavn for proxy:"
 
-#: ../rpmdrake_.c:617
-msgid "in names"
-msgstr "i navne"
+#: ../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 har brug for en proxy, skal du indtaste vćrtsnavnet og eventuelt en "
+"port (syntaks: <proxyvćrt[:port]>):"
 
-#: ../rpmdrake_.c:628
-msgid "Reload the packages list"
-msgstr "Genindlćs pakkelisten"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "Konfigurér proxyer"
 
-#: ../rpmdrake_.c:628
-msgid "Reset the selection"
-msgstr "Nulstil det valgte"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr "Vent venligst, opdaterer medie..."
 
-#: ../rpmdrake_.c:654
-msgid "Maximum information"
-msgstr "Mest information"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "For at gemme ćndringerne skal du indsćtte mediet i drevet."
 
-#: ../rpmdrake_.c:654
-msgid "Normal information"
-msgstr "Normal information"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
+msgstr "Du skal indsćtte mediet for at fortsćtte"
 
-#: ../rpmdrake_.c:676
-msgid "Too many packages are selected"
-msgstr "For mange pakker er valgt"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save changes"
+msgstr "Gem ćndringer"
 
-#: ../rpmdrake_.c:722
-msgid "Find:"
-msgstr "Find:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Relativ sti til syntese eller hdlist:"
 
-#: ../rpmdrake_.c:727
-msgid "Search"
-msgstr "Sřg"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL: "
 
-#: ../rpmdrake_.c:733
-msgid "Install"
-msgstr "Installér"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Editing source \"%s\":"
+msgstr "Redigerer kilde '%s':"
 
-#: ../rpmdrake_.c:740 data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrake Update"
-msgstr "Mandrake Opdatér"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit a source"
+msgstr "Redigér en kilde"
 
-#: ../rpmdrake_.c:740
-msgid "Software Packages Installation"
-msgstr "Installation af programmelpakker"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr "Vent venligst, fjerner medie..."
 
-#: ../rpmdrake_.c:740
-msgid "Software Packages Removal"
-msgstr "Fjernelse af programmelpakker"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, adding medium..."
+msgstr "Vent venligst, tilfřjer medie..."
 
-#: ../rpmdrake_.c:781
-msgid "Please wait, contacting mirror to update packages information."
-msgstr "Vent venligst, kontakter spejl for at opdatere pakkeinformation."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of source:"
+msgstr "Kildetype:"
 
-#: ../rpmdrake_.c:783
-msgid "Error updating medium"
-msgstr "Fejl ved opdatering af medie"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Adding a source:"
+msgstr "Tilfřjer en kilde:"
 
-#: ../rpmdrake_.c:784
-msgid "There was an unrecoverable error while updating packages information."
+#: ../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 ""
-"En fejl som ikke kan reddes opstod under opdatering af pakkeinformation."
+"Der er allerede et medie med dette navn, řnsker du\n"
+"virkelig at erstatte dette?"
 
-#: ../rpmdrake_.c:789
-msgid "How to choose manually your mirror"
-msgstr "Hvordan du manuelt vćlger dit spejl"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to fill up at least the two first entries."
+msgstr "Du skal udfylde i det mindste de to fřrste indgange."
 
-#: ../rpmdrake_.c:797
-msgid "Please wait, contacting mirror to initialize updates packages."
-msgstr "Vent venligst, kontakter spejl for at initiere opdateringspakker."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "Navn:"
 
-#: ../rpmdrake_.c:800
-msgid "Error adding update medium"
-msgstr "Fejl ved tilfřjelse af opdateringsmedia"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
+msgstr "Login:"
 
-#: ../rpmdrake_.c:831
-msgid "Please wait, finding available packages..."
-msgstr "Vent venligst, finder tilgćngelige pakker..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Vćlg et spejl..."
 
-#: ../rpmdrake_.c:863
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Undersřger %s"
+msgid "Browse..."
+msgstr "Gennemse..."
 
-#: ../rpmdrake_.c:882
-msgid "changes:"
-msgstr "ćndringer:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "sti eller monteringspunkt:"
 
-#: ../rpmdrake_.c:886
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Fjern .%s"
+msgid "Removable device"
+msgstr "Udskiftelig enhed"
 
-#: ../rpmdrake_.c:888
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Brug .%s som hovedfil"
+msgid "HTTP server"
+msgstr "HTTP-server"
 
-#: ../rpmdrake_.c:890
-msgid "Do nothing"
-msgstr "Gřr ingenting"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "FTP-server"
 
-#: ../rpmdrake_.c:902
-msgid "Installation finished"
-msgstr "Installationen fćrdig"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path:"
+msgstr "Sti:"
 
-#: ../rpmdrake_.c:912
-msgid "Inspect..."
-msgstr "Undersřg..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "Lokale filer"
 
-#: ../rpmdrake_.c:927
-msgid "Program missing"
-msgstr "Program mangler"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add a source"
+msgstr "Tilfřj en kilde"
 
-#: ../rpmdrake_.c:928
-msgid "A required program is missing (grpmi). Check your installation."
-msgstr "Et nřdvendigt program mangler (grpmi). Tjek din installation."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
+msgstr "Kan ikke opdatere media; det vil automatisk vćre deaktiveret."
 
-#: ../rpmdrake_.c:942
-msgid "Unable to get source packages."
-msgstr "Kunne ikke hente kildepakker."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "Kan ikke lave media."
 
-#: ../rpmdrake_.c:943
-msgid "Unable to get source packages, sorry."
-msgstr "Desvćrre, kunne ikke hente kildepakker."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, updating media..."
+msgstr "Vent venligst, opdaterer medie..."
 
-#: ../rpmdrake_.c:950
-msgid "Change medium"
-msgstr "Skift media"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
+msgstr "Opdatér"
 
-#: ../rpmdrake_.c:951
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Indsćt venligst media med navn \"%s\" i enhed [%s]"
+msgid "Select the source(s) you wish to update:"
+msgstr "Venligst vćlg de kilder du řnsker at opdatere:"
 
-#: ../rpmdrake_.c:959
-msgid "Installation failed"
-msgstr "Installationen mislykkedes"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please choose the desired mirror."
+msgstr "Vćlg řnsket spejl."
 
-#: ../rpmdrake_.c:960
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
-"Installationen mislykkedes, visse filer mangler.\n"
-"Du skal mĺske opdatere din kildedatabase."
+"Kan ikke finde noget passende spejl.\n"
+"\n"
+"Det kan vćre mange ĺrsager til dette problem; det mest almindelige er\n"
+"nĺr arkitekturen pĺ din processor ikke understřttes af\n"
+"Mandrake Linux' officielle opdateringer."
 
-#: ../rpmdrake_.c:963
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr "Vent venligst, fjerner pakker for at andre skal kunne opdateres..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
+msgstr "Intet spejl"
 
-#: ../rpmdrake_.c:984
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"There was an error downloading the mirrors list:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
-"Installationen er fćrdig; %s.\n"
+"Der opstod en fejl ved hentning af spejllisten:\n"
 "\n"
-"Nogen konfigurationsfiler blev oprette som '.rpmnew' eller '.rpmsave',\n"
-"du kan nu kigge pĺ nogen for at tage aktion:"
+"%s\n"
+"Netvćrket eller MandrakeSofts websted kan vćre utilgćngelige.\n"
+"Forsřg igen senere."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "Fejl under hentning"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "Vent venligst, henter spejladresser fra MandrakeSofts websted."
 
-#: ../rpmdrake_.c:984
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"some packages failed to install\n"
-"correctly"
+"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 ""
-"visse pakker kunne ikke installeres\n"
-"korrekt"
+"Mĺ kontakte MandrakeSofts websted for at hente spejllisten.\n"
+"Kontrollér venligst at dit netvćrk er startet.\n"
+"\n"
+"Er det O.k. at fortsćtte?"
 
-#: ../rpmdrake_.c:985
-msgid "everything was installed correctly"
-msgstr "alting blev installeret korrekt"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United States"
+msgstr "U.S.A."
 
-#: ../rpmdrake_.c:987
-msgid "Everything installed successfully"
-msgstr "Alting installeret uden problemer"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
+msgstr "Kina"
 
-#: ../rpmdrake_.c:988
-msgid "All requested packages were installed successfully."
-msgstr "Alle řnskede pakker blev installeret uden problemer."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr "Storbritannien"
 
-#: ../rpmdrake_.c:991
-msgid "Everything already installed."
-msgstr "Alting er allerede installeret."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "Taiwan"
 
-#: ../rpmdrake_.c:992
-msgid "Everything already installed (is this supposed to happen at all?)."
-msgstr "Alt er allerede installeret (břr dette ske overhovedet?)."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "Sverige"
 
-#: ../rpmdrake_.c:999
-msgid "Problem during installation"
-msgstr "Problem ved installationen"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
+msgstr "Rusland"
 
-#: ../rpmdrake_.c:1000
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Der opstod et problem under installationen:\n"
-"\n"
-"%s"
+msgid "Portugal"
+msgstr "Portugal"
 
-#: ../rpmdrake_.c:1014
-msgid "Please wait, reading packages database..."
-msgstr "Vent venligst, lćser pakkedatabase..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
+msgstr "Polen"
 
-#: ../rpmdrake_.c:1055
-msgid "Please wait, removing packages..."
-msgstr "Vent venligst, fjerner pakker..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
+msgstr "Norge"
 
-#: ../rpmdrake_.c:1058
-msgid "Problem during removal"
-msgstr "Problem ved fjernelse"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
+msgstr "Holland"
 
-#: ../rpmdrake_.c:1059
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Der opstod et problem under fjernelsen af pakker:\n"
-"\n"
-"%s"
+msgid "Korea"
+msgstr "Korea"
 
-#: ../rpmdrake_.c:1091
-msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
-msgstr ""
-"Velkommen til vćrktřjet for fjernelse af pakker!\n"
-"\n"
-"Dette vćrktřj hjćlper dig med at vćlge hvilke programmer du vil fjerne fra\n"
-"maskinen."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Japan"
+msgstr "Japan"
 
-#: ../rpmdrake_.c:1096
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"Velkommen til MandrakeUpdate!\n"
-"\n"
-"Dette vćrktřj hjćlper dig med at vćlge opdateringarne du vil\n"
-"installere pĺ maskinen."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Italy"
+msgstr "Italien"
 
-#: ../rpmdrake_.c:1101
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
-msgstr ""
-"Velkommen til vćrktřjet for programinstallation!\n"
-"\n"
-"Mandrake Linux-systemet distribueres med flere tusind programpakker\n"
-"pĺ cd-rom eller dvd. Dette vćrktřj hjćlper dig med at vćlge hvilke "
-"programmer\n"
-"du vil installere pĺ maskinen."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Israel"
+msgstr "Israel"
 
-#: data/rpmdrake-remove.desktop.in.h:1
-msgid "Remove Software"
-msgstr "Fjern programmel"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Grćkenland"
 
-#: data/rpmdrake-sources.desktop.in.h:1
-msgid "Software Sources Manager"
-msgstr "Administration af programmelkilder"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "France"
+msgstr "Frankrig"
 
-#: data/rpmdrake.desktop.in.h:1
-msgid "Install Software"
-msgstr "Installér programmel"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "Finland"
 
-#~ msgid ""
-#~ "There is already a medium by that name, do you\n"
-#~ "really want to replace it?"
-#~ msgstr ""
-#~ "Der er allerede et medie med dette navn, řnsker du\n"
-#~ "virkelig at erstatte dette?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "Spanien"
 
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-#~ "Er det O.k. at fortsćtte?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
+msgstr "Danmark"
 
-#~ 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 redigering af kildepakker!\n"
-#~ "\n"
-#~ "Dette vćrktřj hjćlper dig med at konfigurere pakkekilderne du vil bruge\n"
-#~ "pĺ maskinen. De vil derefter vćre tilgćngelige sĺ du kan installere nye\n"
-#~ "programmer eller udfřre opdateringer."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr "Tyskland"
 
-#~ msgid ""
-#~ "I need to contact MandrakeSoft website to get the mirrors list.\n"
-#~ "Please check that your network is currently running.\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "Mĺ kontakte MandrakeSofts websted for at hente spejllisten.\n"
-#~ "Kontrollér venligst at dit netvćrk er startet.\n"
-#~ "\n"
-#~ "Er det O.k. at fortsćtte?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
+msgstr "Tjekkiet"
 
-#~ 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 ""
-#~ "Der opstod en fejl ved hentning af spejllisten:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "Netvćrket eller MandrakeSofts websted kan vćre utilgćngelige.\n"
-#~ "Forsřg igen senere."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
-#~ msgid ""
-#~ "I can't find any suitable mirror.\n"
-#~ "\n"
-#~ "There can be many reasons for this problem; the most frequent is\n"
-#~ "the case when the architecture of your processor is not supported\n"
-#~ "by Mandrake Linux Official Updates."
-#~ msgstr ""
-#~ "Kan ikke finde noget passende spejl.\n"
-#~ "\n"
-#~ "Det kan vćre mange ĺrsager til dette problem; det mest almindelige er\n"
-#~ "nĺr arkitekturen pĺ din processor ikke understřttes af\n"
-#~ "Mandrake Linux' officielle opdateringer."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Canada"
+msgstr "Canada"
 
-#~ msgid ""
-#~ "The list of updates is void. This means that either there is\n"
-#~ "no available update for the packages installed on your computer,\n"
-#~ "or you already installed all of them."
-#~ msgstr ""
-#~ "Listen over opdateringer er tom. Dette betyder at der ikke\n"
-#~ "findes nogen tilgćngelige opdateringer for programmerne installeret\n"
-#~ "pĺ maskinen eller at du allerede har installeret dem alle."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
+msgstr "Brasilien"
 
-#~ 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 ud til at du prřver pĺ at tilfřje sĺ mange pakker at "
-#~ "dit filsystem kan lřbe třr for fri diskplads, under eller efter "
-#~ "pakkeinstallationen; dette er sćrlig farligt og břr overvejes "
-#~ "omhyggeligt.\n"
-#~ "\n"
-#~ "Řnsker du virkeligt at installere alle de valgte pakker?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Belgium"
+msgstr "Belgien"
 
-#~ msgid ""
-#~ "The following packages have to be removed for others to be upgraded:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "Fřlgende pakker skal fjernes for at andre skal kunne opdateres:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Er det O.k. at fortsćtte?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Australia"
+msgstr "Australien"
 
-#~ msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#~ msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
+msgstr "Řstrig"
 
-#~ msgid ""
-#~ "I need to contact the mirror to get latest update packages.\n"
-#~ "Please check that your network is currently running.\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "Mĺ kontakte spejlet for at hente de seneste opdateringspakker.\n"
-#~ "Kontrollér venligst at dit netvćrk er startet.\n"
-#~ "\n"
-#~ "Er det O.k. at fortsćtte?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Info..."
+msgstr "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 ""
-#~ "Du kan ogsĺ vćlge dit řnskede spejl manuelt; for at gřre dette skal du "
-#~ "starte Administrationen af programmelkilder, og dernćst tilfřje en kilde "
-#~ "til 'Sikkerhedsopdateringer'.\n"
-#~ "Derefter skal MandrakeUpdate genstartes."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
+msgstr "Nej"
 
-#~ 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 ""
-#~ "Der opstod en fejl da opdateringsmedia skulle tilfřjes.\n"
-#~ "\n"
-#~ "Dette kan ske pĺ grund af et řdelagt eller temporćrt utilgćngeligt spejl "
-#~ "eller\n"
-#~ "hvis din Mandrake Linux version (%s) endnu ikke/ikke lćngere understřttes "
-#~ "af Mandrake Linux'\n"
-#~ "officielle opdateringer.\n"
-#~ "\n"
-#~ "Vil du forsřge med et andet spejl?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Ja"
+
+#: data/rpmdrake.desktop.in.h:1
+msgid "Install Software"
+msgstr "Installér programmel"
+
+#: data/rpmdrake-remove.desktop.in.h:1
+msgid "Remove Software"
+msgstr "Fjern programmel"
+
+#: data/rpmdrake-sources.desktop.in.h:1
+msgid "Software Sources Manager"
+msgstr "Administration af programmelkilder"
+
+#~ 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--*-*-*-*-*,*"
diff --git a/po/da.pom b/po/da.pom
index 8897c3ac..eb423747 100644
--- a/po/da.pom
+++ b/po/da.pom
@@ -4,167 +4,173 @@ msgstr "Server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Netvćrksmaskine (klient)"
+msgid "Office Workstation"
+msgstr "Kontor-arbejdsstation"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS-vćrt, SMB-vćrt, mellemvćrt (proxy), SSH-vćrt"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Kontor-programmer: Tekstbehandler (kword, abiword), regneark (kspread, "
+"gnumeric), pdf-visere, o.lign."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Kontor"
+msgid "Workstation"
+msgstr "Arbejdsstation"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Gnome-arbejdsstation"
+msgid "Game station"
+msgstr "Spillemaskine"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Vćrktřjer til Palm Pilot og Visor"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Underholdnings-programmer: arkade, brćt, strategi, osv."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Arbejdsstation"
+msgid "Multimedia station"
+msgstr "Multimedie-station"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Brandmur/router"
+msgid "Sound and video playing/editing programs"
+msgstr "Lyd- og video-afspillere og redigeringsvćrktřjer"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr "Server for domćnenavne (DNS) og netvćrksinformation (NIS)"
+msgid "Internet station"
+msgstr "Internet-station"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
 msgstr ""
-"Kontor-programmer: Tekstbehandler (kword, abiword), regneark (kspread, "
-"gnumeric), pdf-visere, o.lign."
+"Vćrktřjssćt til at lćse samt sende post og nyheder (pine, mutt, tin..) , og "
+"til at browse pĺ nettet"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "Lyd-relaterede vćrktřjer: mp3 eller midi-afspillere, mixere o.lign."
+msgid "Network Computer (client)"
+msgstr "Netvćrksmaskine (klient)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Linux Standard Base. Understřttelse for tredjeparts-programmer"
+msgid "Clients for different protocols including ssh"
+msgstr "Klienter for forskellige protokoller inklusiv ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Břger og vejledninger om Linux og Frit Programmel"
+msgid "Configuration"
+msgstr "Konfiguration"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "KDE-arbejdsstation"
+msgid "Tools to ease the configuration of your computer"
+msgstr "Vćrktřjer til at lette indstillingen af din maskine"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgid "Scientific Workstation"
+msgstr "Videnskabelig arbejdsstation"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Multimedie - Video"
+msgid "Scientific applications such as gnuplot"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr "Samling af vćrktřjer til post, nyheder, filoverfřrsel og chat"
+msgid "Console Tools"
+msgstr "Konsolvćrktřjer"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Database"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Redigeringsvćrktřjer, skaller, filvćrktřjer, terminaler"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL eller MySQL database-server"
+msgid "KDE Workstation"
+msgstr "KDE-arbejdsstation"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Vćrktřjer til at lette indstillingen af din maskine"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"K Desktop -miljřet, det grundlćggende grafiske miljř, med en vifte af "
+"supplerende vćrktřjer."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "Multimedie - Lyd"
+msgid "Graphical Environment"
+msgstr "Grafisk miljř"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dokumentation"
+msgid "Gnome Workstation"
+msgstr "Gnome-arbejdsstation"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Konsolvćrktřjer"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr "Et grafisk miljř med brugervenlig samling af programmer og vćrktřjer"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr "Postfix postserver, Inn nyhedsserver"
+msgid "Other Graphical Desktops"
+msgstr "Andre grafiske miljřer"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Internet-station"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Multimedie-station"
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+msgid "Development"
+msgstr "Udvikling"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Konfiguration"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C og C++ udviklingsbiblioteker, programmer, og include-filer."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Flere grafiske miljřer (Gnome, IceWM)"
+msgid "Documentation"
+msgstr "Dokumentation"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
-"K Desktop -miljřet, det grundlćggende grafiske miljř, med en vifte af "
-"supplerende vćrktřjer."
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Břger og vejledninger om Linux og Frit Programmel"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Grafisk miljř"
+msgid "LSB"
+msgstr "LSB"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Linux Standard Base. Understřttelse for tredjeparts-programmer"
+
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-msgid "Development"
-msgstr "Udvikling"
+#: ../../share/compssUsers:999
+msgid "Web/FTP"
+msgstr "Web/FTP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -173,23 +179,33 @@ msgstr "Apache og Pro-ftpd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "Vćrktřjer til at skabe og brćnde CD-er"
+msgid "Mail/Groupware/News"
+msgstr "Post/nyhedsgrupper"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Kontor-arbejdsstation"
+msgid "Postfix mail server, Inn news server"
+msgstr "Postfix postserver, Inn nyhedsserver"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, o.lign."
+msgid "Database"
+msgstr "Database"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Grafiske programmer som fx The Gimp"
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL eller MySQL database-server"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Firewall/Router"
+msgstr "Brandmur/router"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Internet gateway"
+msgstr "Internetadgang"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -198,8 +214,8 @@ msgstr "DNS/NIS "
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C og C++ udviklingsbiblioteker, programmer, og include-filer."
+msgid "Domain Name and Network Information Server"
+msgstr "Server for domćnenavne (DNS) og netvćrksinformation (NIS)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -208,18 +224,18 @@ msgstr "Netvćrksmaskine server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "Post/nyhedsgrupper"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS-vćrt, SMB-vćrt, mellemvćrt (proxy), SSH-vćrt"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Spillemaskine"
+msgid "Office"
+msgstr "Kontor"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Videoafspillere og redigeringsvćrktřjer"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr "Samling af vćrktřjer til post, nyheder, filoverfřrsel og chat"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -228,77 +244,66 @@ msgstr "Multimedie - Grafik"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Underholdnings-programmer: arkade, brćt, strategi, osv."
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
-"Vćrktřjssćt til at lćse samt sende post og nyheder (pine, mutt, tin..) , og "
-"til at browse pĺ nettet"
+msgid "Graphics programs such as The Gimp"
+msgstr "Grafiske programmer som fx The Gimp"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "Personlig řkonomi"
+msgid "Multimedia - Sound"
+msgstr "Multimedie - Lyd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr "Et grafisk miljř med brugervenlig samling af programmer og vćrktřjer"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "Lyd-relaterede vćrktřjer: mp3 eller midi-afspillere, mixere o.lign."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Klienter for forskellige protokoller inklusiv ssh"
+msgid "Multimedia - Video"
+msgstr "Multimedie - Video"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
+msgid "Video players and editors"
+msgstr "Videoafspillere og redigeringsvćrktřjer"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Internetadgang"
+msgid "Multimedia - CD Burning"
+msgstr "Multimedie - CD-brćnding"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Lyd- og video-afspillere og redigeringsvćrktřjer"
+msgid "Tools to create and burn CD's"
+msgstr "Vćrktřjer til at skabe og brćnde CD-er"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Andre grafiske miljřer"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Flere grafiske miljřer (Gnome, IceWM)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Redigeringsvćrktřjer, skaller, filvćrktřjer, terminaler"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, o.lign."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "Programmer til at hĺndtere din řkonomi, som fx gnucash"
+msgid "Personal Information Management"
+msgstr "Personlig informationshĺndtering"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "Personlig informationshĺndtering"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Vćrktřjer til Palm Pilot og Visor"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multimedie - CD-brćnding"
+msgid "Personal Finance"
+msgstr "Personlig řkonomi"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Videnskabelig arbejdsstation"
+msgid "Programs to manage your finances, such as gnucash"
+msgstr "Programmer til at hĺndtere din řkonomi, som fx gnucash"
 
diff --git a/po/de.po b/po/de.po
index f0c737d4..2ee0cee0 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: RpmDrake\n"
-"POT-Creation-Date: 2003-01-19 16:57+0100\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\n"
 "PO-Revision-Date: 2003-02-09 17:17+0100\n"
 "Last-Translator: Stefan Siegel <siegel@linux-mandrake.com>\n"
 "Language-Team: German <cooker-i18n@linux-mandrake.com>\n"
@@ -14,454 +14,631 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl_.c:39
-msgid "Unable to create medium."
-msgstr "Ich kann das Medium nicht anlegen."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Wollen Sie fortfahren?"
 
-#: ../edit-urpm-sources.pl_.c:40
-msgid "Unable to update medium; it will be automatically disabled."
-msgstr "Da ich das Medium nicht aktualisieren kann, wird es deaktiviert."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to the software installation tool!\n"
+"\n"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
+msgstr ""
+"Wilkommen zum Software Installationsprogramm!\n"
+"\n"
+"Ihre Mandrake Linux Distributin kommt mit mehreren tausend\n"
+"Softwarepaketen auf DC-ROM oder DVD. Dieses Programm mĂśchte\n"
+"Ihnen bei der Auwahl der fĂźr Sie interessanten Pakete helfen."
 
-#: ../edit-urpm-sources.pl_.c:51
-msgid "Add a source"
-msgstr "HinzufĂźgen einer Quelle"
+#: ../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 ""
+"Willkommen zu MandrakeUpdate!\n"
+"\n"
+"Dieses Werkzeug mĂśchte Ihnen ber der Entscheidung helfen, welche \n"
+"aktualisierten Pakete Sie installieren wollen."
 
-#: ../edit-urpm-sources.pl_.c:52
-msgid "Local files"
-msgstr "Lokale Dateien"
+#: ../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 ""
+"Wilkommen zum Paketentfernungs-Programm!\n"
+"\n"
+"Dieses Programm wird Ihnen helfen, die Softwarepakete auszuwählen,\n"
+"die Sie von Ihrem Rechner entfernen wollen.."
 
-#: ../edit-urpm-sources.pl_.c:52
-msgid "Path:"
-msgstr "Pfad:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"Während des Entfernens sind Fehler aufgetreten:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:53
-msgid "FTP server"
-msgstr "FTP-Server"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during removal"
+msgstr "Fehler beim Entfernen"
 
-#: ../edit-urpm-sources.pl_.c:53 ../edit-urpm-sources.pl_.c:54
-#: ../edit-urpm-sources.pl_.c:56 ../edit-urpm-sources.pl_.c:175
-msgid "URL:"
-msgstr "URL:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages..."
+msgstr "Entfernen der Pakete, bitte warten ..."
 
-#: ../edit-urpm-sources.pl_.c:54
-msgid "HTTP server"
-msgstr "HTTP-Server"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
+msgstr "Lesen der Paketdatenbank, bitte warten ..."
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Path or mount point:"
-msgstr "Pfad oder Einhängpunkt:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Während der Installation sind Fehler aufgetreten:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Removable device"
-msgstr "Wechselmedium"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during installation"
+msgstr "Fehler bei der Installation"
 
-#: ../edit-urpm-sources.pl_.c:56 ../rpmdrake_.c:548
-msgid "Security updates"
-msgstr "Sicherheitsaktualisierungen"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
+msgstr ""
+"Alle gewĂźnschten Pakete sind bereits installiert (Das sollte eigentlich nie "
+"Workommen!)"
 
-#: ../edit-urpm-sources.pl_.c:67
-msgid "Browse..."
-msgstr "DurchstĂśbern ..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed."
+msgstr "Alle gewĂźnschten Pakete sind bereits installiert"
 
-#: ../edit-urpm-sources.pl_.c:69
-msgid "Choose a mirror..."
-msgstr "Wählen Sie einen Mirror ..."
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "Alle gewählten Pakete wurden erfolgreich installiert."
 
-#: ../edit-urpm-sources.pl_.c:89
-msgid "Login:"
-msgstr "Login:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr "Alles erfolgreich installiert"
 
-#: ../edit-urpm-sources.pl_.c:89 ../edit-urpm-sources.pl_.c:215
-msgid "Password:"
-msgstr "Passwort:"
+#: ../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:"
 
-#: ../edit-urpm-sources.pl_.c:94
-msgid "Name:"
-msgstr "Name:"
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "Alles korrekt installiert"
 
-#: ../edit-urpm-sources.pl_.c:96 ../edit-urpm-sources.pl_.c:176
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Relativer Pfad zur Synthesis- oder HD-Liste: "
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"some packages failed to install\n"
+"correctly"
+msgstr ""
+"Einige Pakete konnten nicht\n"
+"richtig installiert werden"
 
-#: ../edit-urpm-sources.pl_.c:104
-msgid "You need to fill up at least the two first entries."
-msgstr "Sie mĂźssen zumindest die ersten beiden Felder ausfĂźllen."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages to allow others to be upgraded..."
+msgstr ""
+"Pakete entfernen, um Aktualisierung anderer zu ermĂśglichen, bitte warten ..."
 
-#: ../edit-urpm-sources.pl_.c:116
-msgid "Adding a source:"
-msgstr "HinzufĂźgen einer Quelle:"
+#: ../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."
 
-#: ../edit-urpm-sources.pl_.c:117
-msgid "Type of source:"
-msgstr "Typ der Quelle:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation failed"
+msgstr "Installation schlug fehl"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
+msgstr "Abbruch"
 
-#: ../edit-urpm-sources.pl_.c:121 ../edit-urpm-sources.pl_.c:187
-#: ../edit-urpm-sources.pl_.c:219 ../rpmdrake.pm_.c:97 ../rpmdrake.pm_.c:136
-#: ../rpmdrake.pm_.c:319 ../rpmdrake_.c:353 ../rpmdrake_.c:365
-#: ../rpmdrake_.c:369 ../rpmdrake_.c:916 ../rpmdrake_.c:950
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:180
-#: ../edit-urpm-sources.pl_.c:187 ../edit-urpm-sources.pl_.c:220
-#: ../rpmdrake.pm_.c:319 ../rpmdrake.pm_.c:352 ../rpmdrake_.c:353
-#: ../rpmdrake_.c:950
-msgid "Cancel"
-msgstr "Abbruch"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Bitte legen Sie das Medium „%s“ in Laufwerk [%s]."
 
-#: ../edit-urpm-sources.pl_.c:140
-msgid "Please wait, adding medium..."
-msgstr "HinzufĂźgen der Quelle, bitte warten ..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr "Medienwechsel"
 
-#: ../edit-urpm-sources.pl_.c:158
-msgid "Please wait, removing medium..."
-msgstr "Entfernen der Quelle, bitte warten ..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
+msgstr "Ich kann leider die Quellpakete nicht bekommen."
 
-#: ../edit-urpm-sources.pl_.c:169
-msgid "Edit a source"
-msgstr "Quelle bearbeiten"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages."
+msgstr "Kann Quellpakete nicht bekommen."
 
-#: ../edit-urpm-sources.pl_.c:173
+#: ../rpmdrake:1
 #, c-format
-msgid "Editing source \"%s\":"
-msgstr "Quelle „%s“ bearbeiten:"
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr ""
+"Ein zum Funktionieren benĂśtigtes Programm (grpmi) fehlt, bitte Kontrollieren "
+"Sie Ihr System."
 
-#: ../edit-urpm-sources.pl_.c:179
-msgid "Save changes"
-msgstr "Änderungen speichern"
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
+msgstr "Programm fehlt"
 
-#: ../edit-urpm-sources.pl_.c:185
-msgid "You need to insert the medium to continue"
-msgstr "Sie mĂźssen das Medium einlegen, um fortfahren zu kĂśnnen"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
+msgstr "Untersuche ..."
 
-#: ../edit-urpm-sources.pl_.c:186
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr ""
-"Un die Änderungen zu speichern, müssen Sie das Medium ins Laufwerk legen"
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation finished"
+msgstr "Installation beendet"
 
-#: ../edit-urpm-sources.pl_.c:191
-msgid "Please wait, updating medium..."
-msgstr "Aktualisieren der Quelle, bitte warten ..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
+msgstr "Tue nichts"
 
-#: ../edit-urpm-sources.pl_.c:202
-msgid "Configure proxies"
-msgstr "Proxy einrichten"
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
+msgstr "Verwende .%s als Hauptdatei"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Remove .%s"
+msgstr "Entferne .%s"
 
-#: ../edit-urpm-sources.pl_.c:207
+#: ../rpmdrake:1
+#, c-format
+msgid "changes:"
+msgstr "Änderungen:"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr "Untersuche %s"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, finding available packages..."
+msgstr "Suche nach vorhandenen Pakete, bitte warten ..."
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+"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 ""
-"Falls Sie einen Proxy verwenden mĂźssen, geben Sie dessen Rechnernamen/IP und "
-"- falls nĂśtig auch den Port - an (Syntax: <Proxyrechner[:Port]>):"
+"Beim HinzufĂźgen des Aktualisierungsmediums mit urpmi trat ein Fehler auf.\n"
+"Ein Grund dafĂźr kann ein nicht gepflegter oder nicht erreichbarer\n"
+"Spiegelserver sein. MĂśglicherweise wird Ihre Mandrake Linux Version\n"
+"(%s) auch noch nicht/nichtmehr mit offiziellen Aktualisierungen versorgt.\n"
+"\n"
+"Wollen Sie einen anderen Server versuchen?"
 
-#: ../edit-urpm-sources.pl_.c:209
-msgid "Proxy hostname:"
-msgstr "Proxy:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
+msgstr "Fehler beim Erstellen eines Aktualisierungsmediums"
 
-#: ../edit-urpm-sources.pl_.c:211
-msgid "You may specify a user/password for the proxy authentication:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
 msgstr ""
-"Sie kĂśnnen auch ein Benutzerkennzeichen und Passwort fĂźr die "
-"Proxyauthentifizierung angeben:"
-
-#: ../edit-urpm-sources.pl_.c:213
-msgid "User:"
-msgstr "Kennzeichen:"
+"Besorge Liste der zu aktualisierenden Pakete vom Server, bitte warten ..."
 
-#: ../edit-urpm-sources.pl_.c:235
-msgid "Configure sources"
-msgstr "Quellen einrichten"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Sources Manager, and then add a `Security\n"
+"updates' source.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"Sie kĂśn Ihren bevorzugten Paketserver auch selbst angeben:\n"
+"Starten Sie den Paketquellen-Manager, und fĂźgen Sie eine \n"
+"„Sicherheitsaktualisierungen“ Quelle hinzu.\n"
+"\n"
+"Starten Sie anschließend erneut MandrakeUpdate."
 
-#: ../edit-urpm-sources.pl_.c:242
-msgid "Enabled?"
-msgstr "Aktiviert?"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Wie Sie Ihren Paketserver selbst auswählen"
 
-#: ../edit-urpm-sources.pl_.c:243
-msgid "Source"
-msgstr "Quelle"
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
+msgstr ""
+"Es trat ein gravierender Fehler beim Aktualisieren der Paketinformationen "
+"auf."
 
-#: ../edit-urpm-sources.pl_.c:264 ../rpmdrake_.c:730
-msgid "Remove"
-msgstr "Entfernen"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
+msgstr "Fehler beim Aktualisieren des Mediums"
 
-#: ../edit-urpm-sources.pl_.c:266
-msgid "Edit"
-msgstr "Bearbeiten"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
+msgstr "Besorge Paketinformationen vom Server, bitte warten ..."
 
-#: ../edit-urpm-sources.pl_.c:268
-msgid "Add..."
-msgstr "HinzufĂźgen ..."
+#: ../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 ""
+"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?"
 
-#: ../edit-urpm-sources.pl_.c:270
-msgid "Update..."
-msgstr "Aktualisieren ..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Installation"
+msgstr "Softwarepakete-Installierer"
 
-#: ../edit-urpm-sources.pl_.c:271
-msgid "Proxy..."
-msgstr "Proxy ..."
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, c-format
+msgid "Mandrake Update"
+msgstr "Mandrake Aktualisierung"
 
-#: ../edit-urpm-sources.pl_.c:274
-msgid "Save and quit"
-msgstr "Speichern und beenden"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
+msgstr "Softwarepakete-Entferner"
 
-#: ../edit-urpm-sources.pl_.c:275 ../rpmdrake_.c:733
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
 msgid "Quit"
 msgstr "Beenden"
 
-#: ../rpmdrake.pm_.c:93
-msgid "Yes"
-msgstr "Ja"
-
-#: ../rpmdrake.pm_.c:95
-msgid "No"
-msgstr "Nein"
-
-#: ../rpmdrake.pm_.c:127
-msgid "Info..."
-msgstr "Info ..."
-
-#: ../rpmdrake.pm_.c:180
-msgid "Austria"
-msgstr "Östereich"
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "Installieren"
 
-#: ../rpmdrake.pm_.c:181
-msgid "Australia"
-msgstr "Australien"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "Entfernen"
 
-#: ../rpmdrake.pm_.c:182
-msgid "Belgium"
-msgstr "Belgien"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search"
+msgstr "Suche"
 
-#: ../rpmdrake.pm_.c:183
-msgid "Brazil"
-msgstr "Brasilien"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "Finden:"
 
-#: ../rpmdrake.pm_.c:184
-msgid "Canada"
-msgstr "Kanada"
+#: ../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 ""
+"Die Folgenden Pakete mĂźssen entfernt weden, um andere zu aktualisieren:\n"
+"\n"
+"%s\n"
+"\n"
+"Soll ich fortfahren?"
 
-#: ../rpmdrake.pm_.c:185
-msgid "Costa Rica"
-msgstr "Costa Rica"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "Einige Pakete mĂźssen entfernt werden"
 
-#: ../rpmdrake.pm_.c:186
-msgid "Czech Republic"
-msgstr "Tschechei"
+#: ../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?"
 
-#: ../rpmdrake.pm_.c:187
-msgid "Germany"
-msgstr "Deutschland"
+#: ../rpmdrake:1
+#, c-format
+msgid "Too many packages are selected"
+msgstr "Zu viele Pakete ausgewählt"
 
-#: ../rpmdrake.pm_.c:188
-msgid "Danmark"
-msgstr "Dänemark"
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
+msgstr "Maximale Infonformationen"
 
-#: ../rpmdrake.pm_.c:189 ../rpmdrake.pm_.c:193
-msgid "Greece"
-msgstr "Griechenland"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal information"
+msgstr "Normale Informationen"
 
-#: ../rpmdrake.pm_.c:190
-msgid "Spain"
-msgstr "Spanien"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update source(s)"
+msgstr "Quelle(n) aktualisieren"
 
-#: ../rpmdrake.pm_.c:191
-msgid "Finland"
-msgstr "Finland"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reload the packages list"
+msgstr "Paketliste neu laden"
 
-#: ../rpmdrake.pm_.c:192
-msgid "France"
-msgstr "Frankreich"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
+msgstr "Auswahl zurĂźcksetzen"
 
-#: ../rpmdrake.pm_.c:194
-msgid "Israel"
-msgstr "Insrael"
+#: ../rpmdrake:1
+#, c-format
+msgid "in files"
+msgstr "in Dateien"
 
-#: ../rpmdrake.pm_.c:195
-msgid "Italy"
-msgstr "Italien"
+#: ../rpmdrake:1
+#, c-format
+msgid "in descriptions"
+msgstr "in Beschreibungen"
 
-#: ../rpmdrake.pm_.c:196
-msgid "Japan"
-msgstr "Japan"
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
+msgstr "in Namen"
 
-#: ../rpmdrake.pm_.c:197
-msgid "Korea"
-msgstr "Korea"
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
+msgstr "nach VerfĂźgbarkeit"
 
-#: ../rpmdrake.pm_.c:198
-msgid "Netherlands"
-msgstr "Niederlande"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
+msgstr "nach Quellen"
 
-#: ../rpmdrake.pm_.c:199
-msgid "Norway"
-msgstr "Norwegen"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
+msgstr "nach Auswahlstadium"
 
-#: ../rpmdrake.pm_.c:200
-msgid "Poland"
-msgstr "Polen"
+#: ../rpmdrake:1
+#, c-format
+msgid "by size"
+msgstr "nach Größe"
 
-#: ../rpmdrake.pm_.c:201
-msgid "Portugal"
-msgstr "Portugal"
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
+msgstr "nach Gruppen"
 
-#: ../rpmdrake.pm_.c:202
-msgid "Russia"
-msgstr "Russland"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages,"
+msgstr "Alle Pakete,"
 
-#: ../rpmdrake.pm_.c:203
-msgid "Sweden"
-msgstr "Schweden"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
+msgstr "Alle Pakete, alphabetisch sortiert"
 
-#: ../rpmdrake.pm_.c:204
-msgid "Taiwan"
-msgstr "Taiwan"
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
+msgstr "Mandrake Auswahl"
 
-#: ../rpmdrake.pm_.c:205
-msgid "United Kingdom"
-msgstr "Großbritannien"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal updates"
+msgstr "Normale Aktualisierungen"
 
-#: ../rpmdrake.pm_.c:206
-msgid "China"
-msgstr "China"
+#: ../rpmdrake:1
+#, c-format
+msgid "Bugfixes updates"
+msgstr "Fehlerkorrekturen"
 
-#: ../rpmdrake.pm_.c:207 ../rpmdrake.pm_.c:208 ../rpmdrake.pm_.c:209
-#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:261
-msgid "United States"
-msgstr "Vereinigte Staaten"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
+msgstr "Sicherheitsaktualisierungen"
 
-#: ../rpmdrake.pm_.c:274
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr "Bitte Waten: Besorgen der Serverliste vom MandrakeSoft-Server ..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Description: "
+msgstr "Beschreibung: "
 
-#: ../rpmdrake.pm_.c:280
-msgid "Error during download"
-msgstr "Fehler beim Herunterladen"
+#: ../rpmdrake:1
+#, c-format
+msgid "Summary: "
+msgstr "Zusammenfassung: "
 
-#: ../rpmdrake.pm_.c:289
-msgid "No mirror"
-msgstr "Kein Mirror"
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "Wichtigkeit: "
 
-#: ../rpmdrake.pm_.c:307
-msgid "Please choose the desired mirror."
-msgstr "Bitte wählen Sie Ihren bevorzugten Mirror."
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake.pm_.c:339 ../rpmdrake_.c:627
-msgid "Update source(s)"
-msgstr "Quelle(n) aktualisieren"
+#: ../rpmdrake:1
+#, c-format
+msgid "Size: "
+msgstr "Größe: "
 
-#: ../rpmdrake.pm_.c:343
-msgid "Select the source(s) you wish to update:"
-msgstr "Bitte wählen Sie die zu aktualisierenden Quelle(n):"
+#: ../rpmdrake:1
+#, c-format
+msgid "Version: "
+msgstr "Version:"
 
-#: ../rpmdrake.pm_.c:347
-msgid "Update"
-msgstr "Neue Version"
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "Name: "
 
-#: ../rpmdrake.pm_.c:358
-msgid "Please wait, updating media..."
-msgstr "Quellen aktualisieren, bitte warten ..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "AktualisierungsgrĂźnde:"
 
-#: ../rpmdrake_.c:99
-msgid "Other"
-msgstr "Sonstige"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
+msgstr "Momentan installierte Version:"
 
-#: ../rpmdrake_.c:121 ../rpmdrake_.c:135 ../rpmdrake_.c:227 ../rpmdrake_.c:298
-msgid "(none)"
-msgstr "(keine)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Source: "
+msgstr "Quelle: "
 
-#: ../rpmdrake_.c:141 ../rpmdrake_.c:482 ../rpmdrake_.c:483
+#: ../rpmdrake:1
+#, c-format
 msgid "(Not available)"
 msgstr "(Nicht vorhanden)"
 
-#: ../rpmdrake_.c:151 ../rpmdrake_.c:208
-msgid "Search results"
-msgstr "Suchergebnisse"
-
-#: ../rpmdrake_.c:151
-msgid "Search results (none)"
-msgstr "Suchergebnisse (keine)"
-
-#: ../rpmdrake_.c:161 ../rpmdrake_.c:172
-msgid "Please wait, searching..."
-msgstr "Bitte warten, ich suche ..."
-
-#: ../rpmdrake_.c:175
-msgid "Stop"
-msgstr "Stopp"
-
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-msgid "Addable"
-msgstr "VerfĂźgbar"
-
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-msgid "Upgradable"
-msgstr "Aktualisierbar"
-
-#: ../rpmdrake_.c:211
-msgid "Not selected"
-msgstr "Nicht markiert"
-
-#: ../rpmdrake_.c:211
-msgid "Selected"
-msgstr "Markiert"
-
-#: ../rpmdrake_.c:240
-msgid "rpmdrake"
-msgstr "RpmDrake"
-
-#: ../rpmdrake_.c:258 ../rpmdrake_.c:360 ../rpmdrake_.c:362
-msgid "More information on package..."
-msgstr "Mehr Paketinformationen ..."
-
-#: ../rpmdrake_.c:259
-msgid "One of the following packages is needed:"
-msgstr "Sie benĂśtigen eines der folgenden Pakete:"
-
-#: ../rpmdrake_.c:259
-msgid "Please choose"
-msgstr "Bitte Wählen Sie"
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
+msgstr "ChangeLog:\n"
 
-#: ../rpmdrake_.c:275
-msgid "unknown package "
-msgstr "Unbekanntes Paket "
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "Dateien:\n"
 
-#: ../rpmdrake_.c:285
-msgid "Please wait, listing packages..."
-msgstr "Auflisten der Pakete, bitte warten ..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected size: %d MB"
+msgstr "Gewählte Größe: %d MB"
 
-#: ../rpmdrake_.c:300
-msgid "No update"
-msgstr "Keine Aktualisierungen"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Ausgewählt: %d MB / Freier Plattenplatz: %d MB"
 
-#: ../rpmdrake_.c:353 ../rpmdrake_.c:354
-msgid "More infos"
-msgstr "Weitere Infos"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
+msgstr ""
+"Um die Abhängigkeiten zu berßcksichtigen, muss die Auswahl folgender\n"
+"Pakete zurĂźchgesetzt werden:\n"
 
-#: ../rpmdrake_.c:355
-msgid "Information on packages"
-msgstr "Paketinformationen"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+msgstr ""
+"Die folgenden Pakete kÜnnen nicht ausgewählt werden:\n"
+"\n"
 
-#: ../rpmdrake_.c:376
-msgid "Some additional packages need to be removed"
-msgstr "Einige weitere Pakete mĂźssen ebenfalls entfernt werden."
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "Einige Pakete konnten nicht installiert werden"
 
-#: ../rpmdrake_.c:377
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
 "\n"
 msgstr ""
-"Um alle Abhängigkeiten gewährleisten zu kÜnnen\n"
-"werden folgende Pakete gelĂśscht:\n"
+"Um die Abhängigkeiten zu berßcksichtigen, mßssen die folgenden\n"
+"Pakete ebenfalls installiert werden:\n"
 "\n"
 
-#: ../rpmdrake_.c:383 ../rpmdrake_.c:391
+#: ../rpmdrake:1
+#, c-format
+msgid "Additional packages needed"
+msgstr "Es werden zusätzliche Pakete benÜtigt"
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "Einige Pakete kĂśnnen nicht entfernt werden"
 
-#: ../rpmdrake_.c:384
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -469,588 +646,601 @@ msgstr ""
 "Entfernen dieser Pakete wĂźrde Ihr System unbrauchbar machen:\n"
 "\n"
 
-#: ../rpmdrake_.c:392 ../rpmdrake_.c:451
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
 "\n"
 msgstr ""
-"Um die Abhängigkeiten zu berßcksichtigen, muss die Auswahl folgender\n"
-"Pakete zurĂźchgesetzt werden:\n"
+"Um alle Abhängigkeiten gewährleisten zu kÜnnen\n"
+"werden folgende Pakete gelĂśscht:\n"
+"\n"
 
-#: ../rpmdrake_.c:421
-msgid "Additional packages needed"
-msgstr "Es werden zusätzliche Pakete benÜtigt"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr "Einige weitere Pakete mĂźssen ebenfalls entfernt werden."
 
-#: ../rpmdrake_.c:422
-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
+msgid "More information on package..."
+msgstr "Mehr Paketinformationen ..."
 
-#: ../rpmdrake_.c:435
-msgid "Some packages can't be installed"
-msgstr "Einige Pakete konnten nicht installiert werden"
+#: ../rpmdrake:1
+#, c-format
+msgid "Information on packages"
+msgstr "Paketinformationen"
 
-#: ../rpmdrake_.c:436
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
+msgstr "Weitere Infos"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Addable"
+msgstr "VerfĂźgbar"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Upgradable"
+msgstr "Aktualisierbar"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
+"The list of updates is void. This 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 folgenden Pakete kÜnnen nicht ausgewählt werden:\n"
-"\n"
+"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_.c:450 ../rpmdrake_.c:684
-msgid "Some packages need to be removed"
-msgstr "Einige Pakete mĂźssen entfernt werden"
+#: ../rpmdrake:1
+#, c-format
+msgid "No update"
+msgstr "Keine Aktualisierungen"
 
-#: ../rpmdrake_.c:472
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Ausgewählt: %d MB / Freier Plattenplatz: %d MB"
+msgid "(none)"
+msgstr "(keine)"
 
-#: ../rpmdrake_.c:474
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "Gewählte Größe: %d MB"
+msgid "Please wait, listing packages..."
+msgstr "Auflisten der Pakete, bitte warten ..."
 
-#: ../rpmdrake_.c:482
-msgid "Files:\n"
-msgstr "Dateien:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "unknown package "
+msgstr "Unbekanntes Paket "
 
-#: ../rpmdrake_.c:483
-msgid "Changelog:\n"
-msgstr "ChangeLog:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Sie benĂśtigen eines der folgenden Pakete:"
 
-#: ../rpmdrake_.c:486
-msgid "Source: "
-msgstr "Quelle: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please choose"
+msgstr "Bitte Wählen Sie"
 
-#: ../rpmdrake_.c:487
-msgid "Currently installed version: "
-msgstr "Momentan installierte Version:"
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "RpmDrake"
 
-#: ../rpmdrake_.c:491
-msgid "Reason for update: "
-msgstr "AktualisierungsgrĂźnde:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Not selected"
+msgstr "Nicht markiert"
 
-#: ../rpmdrake_.c:493
-msgid "Name: "
-msgstr "Name: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected"
+msgstr "Markiert"
 
-#: ../rpmdrake_.c:494
-msgid "Version: "
-msgstr "Version:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results"
+msgstr "Suchergebnisse"
 
-#: ../rpmdrake_.c:495
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Stop"
+msgstr "Stopp"
 
-#: ../rpmdrake_.c:495
-msgid "Size: "
-msgstr "Größe: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, searching..."
+msgstr "Bitte warten, ich suche ..."
 
-#: ../rpmdrake_.c:497
-msgid "Importance: "
-msgstr "Wichtigkeit: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
+msgstr "Suchergebnisse (keine)"
 
-#: ../rpmdrake_.c:498
-msgid "Summary: "
-msgstr "Zusammenfassung: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Sonstige"
 
-#: ../rpmdrake_.c:499
-msgid "Description: "
-msgstr "Beschreibung: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"Welcome to the packages source editor!\n"
+"\n"
+"This tool will help you configure the packages sources you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"Willkommen zum Paketquellen-Editor!\n"
+"\n"
+"Mit diesem Programm kĂśnnen Sie einstellen, welche Paketquellen Sie fĂźr\n"
+"Ihren Rechner verwenden wollen. Sie stehen dann zur Verfgung, um\n"
+"Softwarepakete von dort zu installieren bzw. zu aktualisieren."
 
-#: ../rpmdrake_.c:548
-msgid "Bugfixes updates"
-msgstr "Fehlerkorrekturen"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Speichern und beenden"
 
-#: ../rpmdrake_.c:548
-msgid "Normal updates"
-msgstr "Normale Aktualisierungen"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy..."
+msgstr "Proxy ..."
 
-#: ../rpmdrake_.c:567
-msgid "Mandrake choices"
-msgstr "Mandrake Auswahl"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
+msgstr "Aktualisieren ..."
 
-#: ../rpmdrake_.c:568
-msgid "All packages, alphabetical"
-msgstr "Alle Pakete, alphabetisch sortiert"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "HinzufĂźgen ..."
 
-#: ../rpmdrake_.c:569
-msgid "All packages,"
-msgstr "Alle Pakete,"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "Bearbeiten"
 
-#: ../rpmdrake_.c:592
-msgid "by group"
-msgstr "nach Gruppen"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Source"
+msgstr "Quelle"
 
-#: ../rpmdrake_.c:592
-msgid "by size"
-msgstr "nach Größe"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
+msgstr "Aktiviert?"
 
-#: ../rpmdrake_.c:593
-msgid "by selection state"
-msgstr "nach Auswahlstadium"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure sources"
+msgstr "Quellen einrichten"
 
-#: ../rpmdrake_.c:594
-msgid "by source repository"
-msgstr "nach Quellen"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "Passwort:"
 
-#: ../rpmdrake_.c:594
-msgid "by update availability"
-msgstr "nach VerfĂźgbarkeit"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
+msgstr "Kennzeichen:"
 
-#: ../rpmdrake_.c:615
-msgid "in descriptions"
-msgstr "in Beschreibungen"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+"Sie kĂśnnen auch ein Benutzerkennzeichen und Passwort fĂźr die "
+"Proxyauthentifizierung angeben:"
 
-#: ../rpmdrake_.c:615
-msgid "in files"
-msgstr "in Dateien"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "Proxy:"
 
-#: ../rpmdrake_.c:615
-msgid "in names"
-msgstr "in Namen"
+#: ../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]>):"
 
-#: ../rpmdrake_.c:626
-msgid "Reload the packages list"
-msgstr "Paketliste neu laden"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "Proxy einrichten"
 
-#: ../rpmdrake_.c:626
-msgid "Reset the selection"
-msgstr "Auswahl zurĂźcksetzen"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr "Aktualisieren der Quelle, bitte warten ..."
 
-#: ../rpmdrake_.c:652
-msgid "Maximum information"
-msgstr "Maximale Infonformationen"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr ""
+"Un die Änderungen zu speichern, müssen Sie das Medium ins Laufwerk legen"
 
-#: ../rpmdrake_.c:652
-msgid "Normal information"
-msgstr "Normale Informationen"
+#: ../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"
 
-#: ../rpmdrake_.c:674
-msgid "Too many packages are selected"
-msgstr "Zu viele Pakete ausgewählt"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save changes"
+msgstr "Änderungen speichern"
 
-#: ../rpmdrake_.c:720
-msgid "Find:"
-msgstr "Finden:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Relativer Pfad zur Synthesis- oder HD-Liste: "
 
-#: ../rpmdrake_.c:725
-msgid "Search"
-msgstr "Suche"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake_.c:731
-msgid "Install"
-msgstr "Installieren"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Editing source \"%s\":"
+msgstr "Quelle „%s“ bearbeiten:"
 
-#: ../rpmdrake_.c:738 data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrake Update"
-msgstr "Mandrake Aktualisierung"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit a source"
+msgstr "Quelle bearbeiten"
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Installation"
-msgstr "Softwarepakete-Installierer"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr "Entfernen der Quelle, bitte warten ..."
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Removal"
-msgstr "Softwarepakete-Entferner"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, adding medium..."
+msgstr "HinzufĂźgen der Quelle, bitte warten ..."
 
-#: ../rpmdrake_.c:779
-msgid "Please wait, contacting mirror to update packages information."
-msgstr "Besorge Paketinformationen vom Server, bitte warten ..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of source:"
+msgstr "Typ der Quelle:"
 
-#: ../rpmdrake_.c:781
-msgid "Error updating medium"
-msgstr "Fehler beim Aktualisieren des Mediums"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Adding a source:"
+msgstr "HinzufĂźgen einer Quelle:"
 
-#: ../rpmdrake_.c:782
-msgid "There was an unrecoverable error while updating packages information."
+#: ../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 trat ein gravierender Fehler beim Aktualisieren der Paketinformationen "
-"auf."
+"Es existiert bereits ein Medium mit diesem Namen,\n"
+"wollen Sie es ersetzen?"
 
-#: ../rpmdrake_.c:787
-msgid "How to choose manually your mirror"
-msgstr "Wie Sie Ihren Paketserver selbst auswählen"
+#: ../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_.c:795
-msgid "Please wait, contacting mirror to initialize updates packages."
-msgstr ""
-"Besorge Liste der zu aktualisierenden Pakete vom Server, bitte warten ..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "Name:"
 
-#: ../rpmdrake_.c:798
-msgid "Error adding update medium"
-msgstr "Fehler beim Erstellen eines Aktualisierungsmediums"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
+msgstr "Login:"
 
-#: ../rpmdrake_.c:829
-msgid "Please wait, finding available packages..."
-msgstr "Suche nach vorhandenen Pakete, bitte warten ..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Wählen Sie einen Mirror ..."
 
-#: ../rpmdrake_.c:861
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Untersuche %s"
+msgid "Browse..."
+msgstr "DurchstĂśbern ..."
 
-#: ../rpmdrake_.c:880
-msgid "changes:"
-msgstr "Änderungen:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Pfad oder Einhängpunkt:"
 
-#: ../rpmdrake_.c:884
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Entferne .%s"
+msgid "Removable device"
+msgstr "Wechselmedium"
 
-#: ../rpmdrake_.c:886
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Verwende .%s als Hauptdatei"
+msgid "HTTP server"
+msgstr "HTTP-Server"
 
-#: ../rpmdrake_.c:888
-msgid "Do nothing"
-msgstr "Tue nichts"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "FTP-Server"
 
-#: ../rpmdrake_.c:900
-msgid "Installation finished"
-msgstr "Installation beendet"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path:"
+msgstr "Pfad:"
 
-#: ../rpmdrake_.c:910
-msgid "Inspect..."
-msgstr "Untersuche ..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "Lokale Dateien"
 
-#: ../rpmdrake_.c:925
-msgid "Program missing"
-msgstr "Programm fehlt"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add a source"
+msgstr "HinzufĂźgen einer Quelle"
 
-#: ../rpmdrake_.c:926
-msgid "A required program is missing (grpmi). Check your installation."
-msgstr ""
-"Ein zum Funktionieren benĂśtigtes Programm (grpmi) fehlt, bitte Kontrollieren "
-"Sie Ihr System."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
+msgstr "Da ich das Medium nicht aktualisieren kann, wird es deaktiviert."
 
-#: ../rpmdrake_.c:940
-msgid "Unable to get source packages."
-msgstr "Kann Quellpakete nicht bekommen."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "Ich kann das Medium nicht anlegen."
 
-#: ../rpmdrake_.c:941
-msgid "Unable to get source packages, sorry."
-msgstr "Ich kann leider die Quellpakete nicht bekommen."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, updating media..."
+msgstr "Quellen aktualisieren, bitte warten ..."
 
-#: ../rpmdrake_.c:948
-msgid "Change medium"
-msgstr "Medienwechsel"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
+msgstr "Neue Version"
 
-#: ../rpmdrake_.c:949
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Bitte legen Sie das Medium „%s“ in Laufwerk [%s]."
+msgid "Select the source(s) you wish to update:"
+msgstr "Bitte wählen Sie die zu aktualisierenden Quelle(n):"
 
-#: ../rpmdrake_.c:957
-msgid "Installation failed"
-msgstr "Installation schlug fehl"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please choose the desired mirror."
+msgstr "Bitte wählen Sie Ihren bevorzugten Mirror."
 
-#: ../rpmdrake_.c:958
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
-"Die Installation schlug fehl, da einige Pakete fehlen.\n"
-"Sie sollten Ihre Paketliste aktualisieren."
+"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_.c:961
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr ""
-"Pakete entfernen, um Aktualisierung anderer zu ermĂśglichen, bitte warten ..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
+msgstr "Kein Mirror"
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"There was an error downloading the mirrors list:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
-"Die Installation ist abgeschlossen; %s.\n"
+"Es trat ein Fehler beim Besorgen der Serverliste auf:\n"
 "\n"
-"Einige Konfigurationsdateien wurden als „.rpmnew“ bzw. „.rpmsave“ angelegt. "
-"Sie kĂśn diese nun genauer betrachten, um mĂśglicherweise notwendige Aktionen "
-"vorzunehmen:"
+"%s\n"
+"Bitte versuchen Sie es später erneut."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "Fehler beim Herunterladen"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "Bitte Waten: Besorgen der Serverliste vom MandrakeSoft-Server ..."
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"some packages failed to install\n"
-"correctly"
+"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 ""
-"Einige Pakete konnten nicht\n"
-"richtig installiert werden"
+"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_.c:983
-msgid "everything was installed correctly"
-msgstr "Alles korrekt installiert"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United States"
+msgstr "Vereinigte Staaten"
 
-#: ../rpmdrake_.c:985
-msgid "Everything installed successfully"
-msgstr "Alles erfolgreich installiert"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
+msgstr "China"
 
-#: ../rpmdrake_.c:986
-msgid "All requested packages were installed successfully."
-msgstr "Alle gewählten Pakete wurden erfolgreich installiert."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr "Großbritannien"
 
-#: ../rpmdrake_.c:989
-msgid "Everything already installed."
-msgstr "Alle gewĂźnschten Pakete sind bereits installiert"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "Taiwan"
 
-#: ../rpmdrake_.c:990
-msgid "Everything already installed (is this supposed to happen at all?)."
-msgstr ""
-"Alle gewĂźnschten Pakete sind bereits installiert (Das sollte eigentlich nie "
-"Workommen!)"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "Schweden"
 
-#: ../rpmdrake_.c:997
-msgid "Problem during installation"
-msgstr "Fehler bei der Installation"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
+msgstr "Russland"
 
-#: ../rpmdrake_.c:998
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Während der Installation sind Fehler aufgetreten:\n"
-"\n"
-"%s"
+msgid "Portugal"
+msgstr "Portugal"
 
-#: ../rpmdrake_.c:1012
-msgid "Please wait, reading packages database..."
-msgstr "Lesen der Paketdatenbank, bitte warten ..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
+msgstr "Polen"
 
-#: ../rpmdrake_.c:1053
-msgid "Please wait, removing packages..."
-msgstr "Entfernen der Pakete, bitte warten ..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
+msgstr "Norwegen"
 
-#: ../rpmdrake_.c:1056
-msgid "Problem during removal"
-msgstr "Fehler beim Entfernen"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
+msgstr "Niederlande"
 
-#: ../rpmdrake_.c:1057
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Während des Entfernens sind Fehler aufgetreten:\n"
-"\n"
-"%s"
+msgid "Korea"
+msgstr "Korea"
 
-#: ../rpmdrake_.c:1089
-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 ""
-"Wilkommen zum Paketentfernungs-Programm!\n"
-"\n"
-"Dieses Programm wird Ihnen helfen, die Softwarepakete auszuwählen,\n"
-"die Sie von Ihrem Rechner entfernen wollen.."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Japan"
+msgstr "Japan"
 
-#: ../rpmdrake_.c:1094
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"Willkommen zu MandrakeUpdate!\n"
-"\n"
-"Dieses Werkzeug mĂśchte Ihnen ber der Entscheidung helfen, welche \n"
-"aktualisierten Pakete Sie installieren wollen."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Italy"
+msgstr "Italien"
 
-#: ../rpmdrake_.c:1099
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
-msgstr ""
-"Wilkommen zum Software Installationsprogramm!\n"
-"\n"
-"Ihre Mandrake Linux Distributin kommt mit mehreren tausend\n"
-"Softwarepaketen auf DC-ROM oder DVD. Dieses Programm mĂśchte\n"
-"Ihnen bei der Auwahl der fĂźr Sie interessanten Pakete helfen."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Israel"
+msgstr "Insrael"
 
-#: data/rpmdrake-remove.desktop.in.h:1
-msgid "Remove Software"
-msgstr "Software entfernen"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Griechenland"
 
-#: data/rpmdrake-sources.desktop.in.h:1
-msgid "Software Sources Manager"
-msgstr "Paketquellen verwalten"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "France"
+msgstr "Frankreich"
 
-#: data/rpmdrake.desktop.in.h:1
-msgid "Install Software"
-msgstr "Software installieren"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "Finland"
 
-#~ 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
+#, c-format
+msgid "Spain"
+msgstr "Spanien"
 
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-#~ "Wollen Sie fortfahren?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
+msgstr "Dänemark"
 
-#~ 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."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr "Deutschland"
 
-#~ 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 ""
-#~ "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.pm:1
+#, c-format
+msgid "Czech Republic"
+msgstr "Tschechei"
 
-#~ 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.pm:1
+#, c-format
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
-#~ 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 ""
-#~ "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
+#, c-format
+msgid "Canada"
+msgstr "Kanada"
 
-#~ msgid ""
-#~ "The list of updates is void. This 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
+#, c-format
+msgid "Brazil"
+msgstr "Brasilien"
 
-#~ msgid ""
-#~ "Warning: it seems that you are attempting to add so much\n"
-#~ "packages that your filesystem may run out of free diskspace,\n"
-#~ "during or after package installation ; this is particularly\n"
-#~ "dangerous and should be considered with care.\n"
-#~ "\n"
-#~ "Do you really want to install all the selected packages?"
-#~ msgstr ""
-#~ "WARNUNG: Es scheint, dass Sie mehr Pakete installieren wollen\n"
-#~ "als Plattenplatz auf Ihren Dateisystemen vorhanden ist.\n"
-#~ "Dies kann im ungĂźnstigstem Fall zu einem inkonsistenten und\n"
-#~ "daher unbrauchbarem System fĂźhren.\n"
-#~ "\n"
-#~ "Wollen Sie wirklich alle markierten Pakete installieren?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Belgium"
+msgstr "Belgien"
 
-#~ msgid ""
-#~ "The following packages have to be removed for others to be upgraded:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "Die Folgenden Pakete mĂźssen entfernt weden, um andere zu aktualisieren:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Soll ich fortfahren?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Australia"
+msgstr "Australien"
 
-#~ msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#~ msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
+msgstr "Östereich"
 
-#~ 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
+#, c-format
+msgid "Info..."
+msgstr "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 ""
-#~ "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
+#, c-format
+msgid "No"
+msgstr "Nein"
 
-#~ 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 ""
-#~ "Beim HinzufĂźgen des Aktualisierungsmediums mit urpmi trat ein Fehler "
-#~ "auf.\n"
-#~ "Ein Grund dafĂźr kann ein nicht gepflegter oder nicht erreichbarer\n"
-#~ "Spiegelserver sein. MĂśglicherweise wird Ihre Mandrake Linux Version\n"
-#~ "(%s) auch noch nicht/nichtmehr mit offiziellen Aktualisierungen "
-#~ "versorgt.\n"
-#~ "\n"
-#~ "Wollen Sie einen anderen Server versuchen?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Ja"
+
+#: data/rpmdrake.desktop.in.h:1
+msgid "Install Software"
+msgstr "Software installieren"
+
+#: data/rpmdrake-remove.desktop.in.h:1
+msgid "Remove Software"
+msgstr "Software entfernen"
+
+#: data/rpmdrake-sources.desktop.in.h:1
+msgid "Software Sources Manager"
+msgstr "Paketquellen verwalten"
+
+#~ 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--*-*-*-*-*,*"
diff --git a/po/de.pom b/po/de.pom
index a812dc5d..7ce27ba2 100644
--- a/po/de.pom
+++ b/po/de.pom
@@ -4,169 +4,174 @@ msgstr "Server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Server, Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Netzwerk-Computer (Klient)"
+msgid "Office Workstation"
+msgstr "BĂźro-Arbeitsplatz"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS-Server, SMB-Server, Proxy-Server, SSH-Server"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Office-Programme: Textverarbeitung (KWord, Abiword), Tabellenkalkulation "
+"(KSpread, Gnumeric), PDF-Betrachter, usw."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Office"
+msgid "Workstation"
+msgstr "Arbeitsplatzrechner"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Gnome-Arbeitsplatz"
+msgid "Game station"
+msgstr "Spiel-Station"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Werkzeuge fĂźr Ihren Palm Pilot oder Ihren Visor"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Spiele: Arcade-, Brett-, Strategiespiele, usw."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Arbeitsplatzrechner"
+msgid "Multimedia station"
+msgstr "Multimediarechner"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Server, Firewall/Router"
+msgid "Sound and video playing/editing programs"
+msgstr "Sound- und Video-Abspieler/Editoren"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr "Domänen- (DNS) und Netzwerk Informationsserver (NIS)"
+msgid "Internet station"
+msgstr "Internetrechner"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
 msgstr ""
-"Office-Programme: Textverarbeitung (KWord, Abiword), Tabellenkalkulation "
-"(KSpread, Gnumeric), PDF-Betrachter, usw."
+"Programme zum E-Mail bzw. News lesen und senden (pine, mutt, tin, ...)sowie "
+"zum durchstĂśbern des WWW"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "Audio Programme: MP3- und Midi-Abspieler, Mixer, usw."
+msgid "Network Computer (client)"
+msgstr "Netzwerk-Computer (Klient)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Linux Standard Base. DrittanbieterunterstĂźtzung"
+msgid "Clients for different protocols including ssh"
+msgstr "Klienten fĂźr verschiedene Protokolle, u.a. SSH"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "BĂźcher und HOWTOs zu GNU/Linux und Freier Software"
+msgid "Configuration"
+msgstr "Konfiguration"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "KDE-Arbeitsplatz"
+msgid "Tools to ease the configuration of your computer"
+msgstr "Werkzeuge, die die Konfiguration Ihres Rechners erleichtern"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, usw."
+msgid "Scientific Workstation"
+msgstr "Wissenschaftlicher Arbeitsplatzrechner"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Multimedia / Video"
+msgid "Scientific applications such as gnuplot"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr "Programme fĂźr Mail, News, WWW, FTP und Chat"
+msgid "Console Tools"
+msgstr "Konsolen-Werkzeuge"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Server, Datenbank"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Editoren, Shells, Dateiwerkzeuge, Konsolen"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgeSQL oder MySQL Datenbankserver"
+msgid "KDE Workstation"
+msgstr "KDE-Arbeitsplatz"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Werkzeuge, die die Konfiguration Ihres Rechners erleichtern"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"Das K Desktop Environment, die Standard-Arbeitsoberfläche mit einer Sammlung "
+"zugehĂśriger Programme"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "Multimedia / Sound"
+msgid "Graphical Environment"
+msgstr "Grafische Arbeitsoberfläche"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dokumentation"
+msgid "Gnome Workstation"
+msgstr "Gnome-Arbeitsplatz"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Konsolen-Werkzeuge"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+"Eine grafische Oberfläche mit anwenderfreundlichen Anwendungen und Werkzeugen"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr ""
-"Postfix E-Mail-Server und\n"
-"Inn Diskussionsforen-Server"
+msgid "Other Graphical Desktops"
+msgstr "Andere grafische Arbeitsoberflächen"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Internetrechner"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, usw."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Multimediarechner"
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+msgid "Development"
+msgstr "Entwicklungsplattform"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Konfiguration"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C und C++ Entwicklung: Bibliotheken, Programme und Include-Dateien"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Weitere Arbeitsoberflächen (GNOME, IceWM)"
+msgid "Documentation"
+msgstr "Dokumentation"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
-"Das K Desktop Environment, die Standard-Arbeitsoberfläche mit einer Sammlung "
-"zugehĂśriger Programme"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "BĂźcher und HOWTOs zu GNU/Linux und Freier Software"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Grafische Arbeitsoberfläche"
+msgid "LSB"
+msgstr "Linux Standard Base (LSB)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Linux Standard Base. DrittanbieterunterstĂźtzung"
+
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-msgid "Development"
-msgstr "Entwicklungsplattform"
+#: ../../share/compssUsers:999
+msgid "Web/FTP"
+msgstr "Server, Web/FTP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -175,23 +180,35 @@ msgstr "Apache und Pro-ftpd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "Werkzeuge zur Erstellung und zum Brennen von CDs"
+msgid "Mail/Groupware/News"
+msgstr "Server, Mail/Groupware/News"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "BĂźro-Arbeitsplatz"
+msgid "Postfix mail server, Inn news server"
+msgstr ""
+"Postfix E-Mail-Server und\n"
+"Inn Diskussionsforen-Server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "GNOME, IceWM, Window Maker, Enlightenment, Fvwm, usw."
+msgid "Database"
+msgstr "Server, Datenbank"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Bildverarbeitungsprogramme wie der GIMP"
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgeSQL oder MySQL Datenbankserver"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Firewall/Router"
+msgstr "Server, Firewall/Router"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Internet gateway"
+msgstr "Internet-Gateway"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -200,8 +217,8 @@ msgstr "DNS/NIS"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C und C++ Entwicklung: Bibliotheken, Programme und Include-Dateien"
+msgid "Domain Name and Network Information Server"
+msgstr "Domänen- (DNS) und Netzwerk Informationsserver (NIS)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -210,18 +227,18 @@ msgstr "Netzwerkrechner Server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "Server, Mail/Groupware/News"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS-Server, SMB-Server, Proxy-Server, SSH-Server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Spiel-Station"
+msgid "Office"
+msgstr "Office"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Videoabspieler und Editoren"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr "Programme fĂźr Mail, News, WWW, FTP und Chat"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -230,78 +247,66 @@ msgstr "Multimedia / Grafik"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Spiele: Arcade-, Brett-, Strategiespiele, usw."
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
-"Programme zum E-Mail bzw. News lesen und senden (pine, mutt, tin, ...)sowie "
-"zum durchstĂśbern des WWW"
+msgid "Graphics programs such as The Gimp"
+msgstr "Bildverarbeitungsprogramme wie der GIMP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "Finanzverwaltung"
+msgid "Multimedia - Sound"
+msgstr "Multimedia / Sound"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
-"Eine grafische Oberfläche mit anwenderfreundlichen Anwendungen und Werkzeugen"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "Audio Programme: MP3- und Midi-Abspieler, Mixer, usw."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Klienten fĂźr verschiedene Protokolle, u.a. SSH"
+msgid "Multimedia - Video"
+msgstr "Multimedia / Video"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "LSB"
-msgstr ""
+msgid "Video players and editors"
+msgstr "Videoabspieler und Editoren"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Internet-Gateway"
+msgid "Multimedia - CD Burning"
+msgstr "Multimedia / CD-Brenner"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Sound- und Video-Abspieler/Editoren"
+msgid "Tools to create and burn CD's"
+msgstr "Werkzeuge zur Erstellung und zum Brennen von CDs"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Andere grafische Arbeitsoberflächen"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Weitere Arbeitsoberflächen (GNOME, IceWM)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Editoren, Shells, Dateiwerkzeuge, Konsolen"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "GNOME, IceWM, Window Maker, Enlightenment, Fvwm, usw."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "Finanzverwaltungsprogramme, etwa Gnucash"
+msgid "Personal Information Management"
+msgstr "PersĂśnliches Informationsmanagement"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "PersĂśnliches Informationsmanagement"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Werkzeuge fĂźr Ihren Palm Pilot oder Ihren Visor"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multimedia / CD-Brenner"
+msgid "Personal Finance"
+msgstr "Finanzverwaltung"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Wissenschaftlicher Arbeitsplatzrechner"
+msgid "Programs to manage your finances, such as gnucash"
+msgstr "Finanzverwaltungsprogramme, etwa Gnucash"
 
diff --git a/po/el.po b/po/el.po
index 095e2885..3f2aadca 100644
--- a/po/el.po
+++ b/po/el.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2003-01-19 16:57+0100\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\n"
 "PO-Revision-Date: 2002-08-30 16:13+0300\n"
 "Last-Translator: Íßęďň Íýęôáńçň (Nick Niktaris) <niktaris@yahoo.com>\n"
 "Language-Team: Greek <nls@hellug.gr>\n"
@@ -14,457 +14,623 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../edit-urpm-sources.pl_.c:39
-msgid "Unable to create medium."
-msgstr "Áäőíáěßá äçěéďőńăßáň ěÝóďő."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Íá óőíĺ÷éóôĺß;"
 
-#: ../edit-urpm-sources.pl_.c:40
-msgid "Unable to update medium; it will be automatically disabled."
-msgstr "Áäőíáěßá áíáâÜčěéóçň ôďő ěÝóďő, čá áđĺíĺńăďđďéçčĺß áőôüěáôá."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to the software installation tool!\n"
+"\n"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
+msgstr ""
+"Ęáëţň ďńßóáôĺ óôď ĺńăáëĺßď ĺăęáôÜóôáóçň ëďăéóěéęďý!\n"
+"\n"
+"Ôď Mandrake Linux Ýń÷ĺôáé ěĺ ÷éëéÜäĺň đńďăńÜěěáôá óĺ CDROM Ţ DVD\n"
+"Áőôü ôď ĺńăáëĺßď čá óáň âďçčŢóĺé íá ĺđéëÝîĺôĺ ôď đńüăńáěěá đďő čÝëĺôĺ\n"
+"íá ĺăęáôáóôŢóĺôĺ óôďí őđďëďăéóôŢ óáň."
 
-#: ../edit-urpm-sources.pl_.c:51
-#, fuzzy
-msgid "Add a source"
-msgstr "ĐńďóčŢęç đçăŢň:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Ęáëţň ďńßóáôĺ óôď MandrakeUpdate!\n"
+"\n"
+"Áőôü ôď ĺńăáëĺßď čá óáň âďçčŢóĺé íá ĺđéëÝîĺôĺ ôéň áíáâáčěßóĺéň đďő čÝëĺôĺ\n"
+"íá ĺăęáôáóôŢóĺôĺ óôďí őđďëďăéóôŢ óáň."
 
-#: ../edit-urpm-sources.pl_.c:52
-msgid "Local files"
-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"
+"íá áöáéńÝóĺôĺ áđü ôďí őđďëďăéóôŢ óáň."
 
-#: ../edit-urpm-sources.pl_.c:52
-msgid "Path:"
-msgstr "ČÝóç:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr "ŐđŢńîĺ Ýíá đńüâëçěá ęáôÜ ôçí ĺăęáôÜóôáóç."
 
-#: ../edit-urpm-sources.pl_.c:53
-msgid "FTP server"
-msgstr "ÄéáęďěéóôŢň FTP"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during removal"
+msgstr "ŐđŢńîáí đńďâëŢěáôá ęáôÜ ôçí ĺăęáôÜóôáóç"
 
-#: ../edit-urpm-sources.pl_.c:53 ../edit-urpm-sources.pl_.c:54
-#: ../edit-urpm-sources.pl_.c:56 ../edit-urpm-sources.pl_.c:175
-msgid "URL:"
-msgstr "URL:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages..."
+msgstr "Đáńáęáëţ đĺńéěÝíĺôĺ, áöáéńďýíôáé ôá đáęÝôá..."
 
-#: ../edit-urpm-sources.pl_.c:54
-msgid "HTTP server"
-msgstr "ÄéáęďěéóôŢň HTTP"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
+msgstr "Đáńáęáëţ đĺńéěÝíĺôĺ, äéáâÜćĺôáé ç âÜóç äĺäďěÝíůí ôůí đáęÝôůí..."
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Path or mount point:"
-msgstr "ČÝóç Ţ óçěĺßď đńďóÜńôçóçň: "
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr "ŐđŢńîĺ Ýíá đńüâëçěá ęáôÜ ôçí ĺăęáôÜóôáóç."
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Removable device"
-msgstr "Áöáéńďýěĺíç óőóęĺőŢ"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during installation"
+msgstr "ŐđŢńîáí đńďâëŢěáôá ęáôÜ ôçí ĺăęáôÜóôáóç"
 
-#: ../edit-urpm-sources.pl_.c:56 ../rpmdrake_.c:548
-msgid "Security updates"
-msgstr "Áíáíĺţóĺéň Áóöáëĺßáň"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
+msgstr "źëá ĺßíáé Ţäç ĺăęáôĺóôçěÝíá.(čá Ýđńĺđĺ íá óőěâáßíĺé áőôü;)"
 
-#: ../edit-urpm-sources.pl_.c:67
-msgid "Browse..."
-msgstr "ÁíáćŢôçóç..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed."
+msgstr "źëá ĺßíáé Ţäç ĺăęáôĺóôçěÝíá."
 
-#: ../edit-urpm-sources.pl_.c:69
-msgid "Choose a mirror..."
-msgstr "ĹđéëÝîôĺ ěéá ĺíáëëáęôéęŢ..."
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "źëá ôá ćçôçčÝíôá đáęÝôá ĺăęáôáóôÜčçęáí ĺđéôő÷ţň."
 
-#: ../edit-urpm-sources.pl_.c:89
-msgid "Login:"
-msgstr "ĐńďóđÝëáóç:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr "źëá ĺăęáôáóôÜčçęáí ĺđéôő÷ţň"
 
-#: ../edit-urpm-sources.pl_.c:89 ../edit-urpm-sources.pl_.c:215
-msgid "Password:"
-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"
+"ßóůň íá đńÝđĺé íá ôá ĺëÝăîĺôĺ ăéá íá ĺęôĺëÝóĺôĺ ďńéóěÝíĺň ĺíÝńăĺéĺň:"
 
-#: ../edit-urpm-sources.pl_.c:94
-msgid "Name:"
-msgstr "źíďěá:"
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "üëá ĺăęáôáóôÜčçęáí óůóôÜ"
 
-#: ../edit-urpm-sources.pl_.c:96 ../edit-urpm-sources.pl_.c:176
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Ó÷ĺôéęŢ čÝóç ôůí synthesis/hdlist: "
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"some packages failed to install\n"
+"correctly"
+msgstr ""
+"ďńéóěÝíá đáęÝôá áđÝôő÷áí íá \n"
+"ĺăęáôáóôáčďýí"
 
-#: ../edit-urpm-sources.pl_.c:104
-msgid "You need to fill up at least the two first entries."
-msgstr "ĐńÝđĺé íá óőěđëçńţóĺôĺ ôďőëÜ÷éóôďí ôá äýď đńţôá đĺäßá."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages to allow others to be upgraded..."
+msgstr ""
+"Đáńáęáëţ đĺńéěÝíĺôĺ, áöáéńďýíôáé đáęÝôá ăéá íá ěđďńÝóďőí íá áíáâáčěéóôďýí "
+"Üëëá..."
 
-#: ../edit-urpm-sources.pl_.c:116
-msgid "Adding a source:"
-msgstr "ĐńďóčŢęç đçăŢň:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
+msgstr ""
+"Ç ĺăęáôÜóôáóç áđÝôő÷ĺ, ďńéóěÝíá áń÷ĺßá äĺí őđÜń÷ďőí.\n"
+"şóůň íá đńÝđĺé íá áíáâáčěßóĺôĺ ôçí âÜóç äĺäďěÝíůí ôůí đçăţí."
 
-#: ../edit-urpm-sources.pl_.c:117
-msgid "Type of source:"
-msgstr "Ôýđďň đçăŢň:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation failed"
+msgstr "Ç ĺăęáôÜóôáóç áđÝôő÷ĺ"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
+msgstr "Áęýńůóç"
 
-#: ../edit-urpm-sources.pl_.c:121 ../edit-urpm-sources.pl_.c:187
-#: ../edit-urpm-sources.pl_.c:219 ../rpmdrake.pm_.c:97 ../rpmdrake.pm_.c:136
-#: ../rpmdrake.pm_.c:319 ../rpmdrake_.c:353 ../rpmdrake_.c:365
-#: ../rpmdrake_.c:369 ../rpmdrake_.c:916 ../rpmdrake_.c:950
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:180
-#: ../edit-urpm-sources.pl_.c:187 ../edit-urpm-sources.pl_.c:220
-#: ../rpmdrake.pm_.c:319 ../rpmdrake.pm_.c:352 ../rpmdrake_.c:353
-#: ../rpmdrake_.c:950
-msgid "Cancel"
-msgstr "Áęýńůóç"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Đáńáęáëţ ĺéóÜăĺôĺ ôď ěÝóď ěĺ üíďěá \"%s\" óôç óőóęĺőŢ [%s]"
 
-#: ../edit-urpm-sources.pl_.c:140
-msgid "Please wait, adding medium..."
-msgstr "Đáńáęáëţ đĺńéěÝíĺôĺ, đńďóôßčĺôáé ôď ěÝóď..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr "ÁëëáăŢ ěÝóďő"
 
-#: ../edit-urpm-sources.pl_.c:158
-msgid "Please wait, removing medium..."
-msgstr "Đáńáęáëţ đĺńéěÝíĺôĺ, áöáéńĺßôáé ôď ěÝóď..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
+msgstr "Áäýíáôç ç ëŢřç ôůí đçăáßůí đáęÝôůí, óőăíţěç."
 
-#: ../edit-urpm-sources.pl_.c:169
-msgid "Edit a source"
-msgstr "Ĺđĺîĺńăáóßá đçăŢň"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages."
+msgstr "Áäýíáôç ç ëŢřç ôůí đçăáßůí đáęÝôůí."
 
-#: ../edit-urpm-sources.pl_.c:173
+#: ../rpmdrake:1
 #, c-format
-msgid "Editing source \"%s\":"
-msgstr "Ĺđĺîĺńăáóßá đçăŢň \"%s\":"
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr "¸íá áđáéôďýěĺíď đńüăńáěěá (ôď grpmi).ĹëÝăîôĺ ôçí ĺăęáôÜóôáóŢ óáň"
 
-#: ../edit-urpm-sources.pl_.c:179
-msgid "Save changes"
-msgstr "ÁđďčŢęĺőóç áëëáăţí"
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
+msgstr "Ëĺßđĺé đńüăńáěěá"
 
-#: ../edit-urpm-sources.pl_.c:185
-msgid "You need to insert the medium to continue"
-msgstr "ĐńÝđĺé íá ĺéóÜăĺôĺ ôď ěÝóď ăéá íá óőíĺ÷ßóĺôĺ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
+msgstr "¸ëĺă÷ďň..."
 
-#: ../edit-urpm-sources.pl_.c:186
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr ""
-"Ăéá íá áđďčçęĺőôďýí ďé áëëáăÝň, čá đńÝđĺé íá ĺéóÜăĺôĺ ôď ěÝóď óôďí ďäçăü."
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation finished"
+msgstr "Ç ĺăęáôÜóôáóç ôĺëĺßůóĺ"
 
-#: ../edit-urpm-sources.pl_.c:191
-msgid "Please wait, updating medium..."
-msgstr "Đáńáęáëţ đĺńéěÝíĺôĺ, áíáíĺţíĺôáé ôď ěÝóď..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
+msgstr "Íá ěç ăßíĺé ôßđďôá"
 
-#: ../edit-urpm-sources.pl_.c:202
-#, fuzzy
-msgid "Configure proxies"
-msgstr "Ńýčěéóç đçăţí"
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
+msgstr "×ńŢóç ôďő .%s ůň ęýńéď áń÷ĺßď"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Remove .%s"
+msgstr "Áöáßńĺóç.%s"
 
-#: ../edit-urpm-sources.pl_.c:207
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "changes:"
+msgstr "ÁđďčŢęĺőóç áëëáăţí"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr "ĹëÝă÷ĺôáé ôď %s"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, finding available packages..."
+msgstr "Đáńáęáëţ đĺńéěÝíĺôĺ, áíáćçôďýíôáé ôá äéáčÝóéěá đáęÝôá..."
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+"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 ""
+"ÓőíÝâç Ýíá óöÜëěá ęáôÜ ôçí áíáíÝůóç ôďő ěÝóďő ěÝóů ôďő urpmi.\n"
+"\n"
+"Áőôü ěđďńĺß íá óőěâáßíĺé ĺđĺéäŢ áőôŢ ôç óôéăěŢ äĺí ĺßíáé äéáčÝóéěç ç \n"
+"ĺíáëëáęôéęŢ Ţ áí ç Ýęäďóç Mandrake Linux (%s) äĺí őđďóôçńßćĺôáé\n"
+"áęüěá/đéá áđü ôéň \n"
+"Ĺđßóçěĺň Áíáâáčěßóĺéň \n"
+"ôçň Mandrake Linux \n"
+"\n"
+"ČÝëĺôĺ íá äďęéěÜóĺôĺ Üëëç ĺíáëëáęôéęŢ;"
 
-#: ../edit-urpm-sources.pl_.c:209
-msgid "Proxy hostname:"
-msgstr ""
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
+msgstr "ÓöÜëěá ęáôÜ ôçí đńďóčŢęç ôďő ěÝóďő áíáâáčěßóĺůí"
 
-#: ../edit-urpm-sources.pl_.c:211
-msgid "You may specify a user/password for the proxy authentication:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
 msgstr ""
+"Đáńáęáëţ đĺńéěÝíĺôĺ, ăßíĺôáé óýíäĺóç ěĺ ôçí ĺíáëëáęôéęŢ äéĺýčőíóç ăéá ôçí "
+"ĺęęßíçóç ôůí áíáâáčěßóĺůí ôůí đáęÝôůí."
 
-#: ../edit-urpm-sources.pl_.c:213
-msgid "User:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Sources Manager, and then add a `Security\n"
+"updates' source.\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
+"Ěđďńĺßôĺ ěüíďé óáň íá äéáëÝîĺôĺ ôçí ĺđéčőěçôŢ óĺ ĺóÜň ĺíáëëáęôéęŢ\n"
+"äéĺýčőíóç: ăéá íá ôď ęÜíĺôĺ ĺęęéíŢóôĺ ôď Äéá÷ĺéńéóôŢň Đçăáßůí ĐáęÝôůí\n"
+"ęáé đńďóčÝóôĺ ěéá  đçăŢ `ÁíáâÜčěéóç áóöáëĺßáň' \n"
+"\n"
+"ĚĺôÜ, îĺęéíŢóôĺ îáíÜ ôď MandrakeUpdate."
 
-#: ../edit-urpm-sources.pl_.c:235
-msgid "Configure sources"
-msgstr "Ńýčěéóç đçăţí"
-
-#: ../edit-urpm-sources.pl_.c:242
-msgid "Enabled?"
-msgstr "Ĺíĺńăďđďßçóç;"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Đůň íá äéáëÝîĺôĺ ěüíďé óáň ôçí ĺíáëëáęôéęŢ óáň"
 
-#: ../edit-urpm-sources.pl_.c:243
-msgid "Source"
-msgstr "ĐçăŢ"
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
+msgstr ""
+"ŐđŢńîĺ Ýíá áíĺđáíüńčůôď óöÜëěá ęáôÜ ôçí áíáâÜčěéóç ôůí đëçńďöďńéţí ôůí "
+"đáęÝôůí."
 
-#: ../edit-urpm-sources.pl_.c:264 ../rpmdrake_.c:730
-msgid "Remove"
-msgstr "Áöáßńĺóç"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
+msgstr "ÓöÜëěá ęáôÜ ôçí áíáíÝůóç ôďő ěÝóďő"
 
-#: ../edit-urpm-sources.pl_.c:266
-msgid "Edit"
-msgstr "Ĺđĺîĺńăáóßá"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
+msgstr ""
+"Đáńáęáëţ đĺńéěÝíĺôĺ, ăßíĺôáé óýíäĺóç ěĺ ôçí ĺíáëëáęôéęŢ äéĺýčőíóç ăéá ôçí "
+"áíáâÜčěéóç ôůí đëçńďöďńéţí ôůí đáęÝôůí."
 
-#: ../edit-urpm-sources.pl_.c:268
-msgid "Add..."
-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"
+"\n"
+"Íá óőíĺ÷ßóů;"
 
-#: ../edit-urpm-sources.pl_.c:270
-msgid "Update..."
-msgstr "ÁíáíÝůóç..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Installation"
+msgstr "ĹăęáôÜóôáóç ĐáęÝôůí Ëďăéóěéęďý"
 
-#: ../edit-urpm-sources.pl_.c:271
-#, fuzzy
-msgid "Proxy..."
-msgstr "ÓöÜëěá..."
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, c-format
+msgid "Mandrake Update"
+msgstr "Mandrake Update"
 
-#: ../edit-urpm-sources.pl_.c:274
-msgid "Save and quit"
-msgstr "ÁđďčŢęĺőóç ęáé Ýîďäďň"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
+msgstr "Áöáßńĺóç ĐáęÝôůí Ëďăéóěéęďý"
 
-#: ../edit-urpm-sources.pl_.c:275 ../rpmdrake_.c:733
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
 msgid "Quit"
 msgstr "¸îďäďň"
 
-#: ../rpmdrake.pm_.c:93
-msgid "Yes"
-msgstr "Íáé"
-
-#: ../rpmdrake.pm_.c:95
-msgid "No"
-msgstr "ź÷é"
-
-#: ../rpmdrake.pm_.c:127
-msgid "Info..."
-msgstr "Đëçńďöďńßĺň..."
-
-#: ../rpmdrake.pm_.c:180
-msgid "Austria"
-msgstr "Áőóôńßá"
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "ĹăęáôÜóôáóç"
 
-#: ../rpmdrake.pm_.c:181
-msgid "Australia"
-msgstr "Áőóôńáëßá"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "Áöáßńĺóç"
 
-#: ../rpmdrake.pm_.c:182
-msgid "Belgium"
-msgstr "ÂÝëăéď"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search"
+msgstr "ÁíáćŢôçóç"
 
-#: ../rpmdrake.pm_.c:183
-msgid "Brazil"
-msgstr "Âńáćéëßá"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "Ĺýńĺóç:"
 
-#: ../rpmdrake.pm_.c:184
-msgid "Canada"
-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"
+"Íá óőíĺ÷éóôĺß;"
 
-#: ../rpmdrake.pm_.c:185
-msgid "Costa Rica"
-msgstr "Ęüóôá Ńßęá"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "ĎńéóěÝíá đáęÝôá đńÝđĺé íá áöáéńĺčďýí"
 
-#: ../rpmdrake.pm_.c:186
-msgid "Czech Republic"
-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 ""
 
-#: ../rpmdrake.pm_.c:187
-msgid "Germany"
-msgstr "Ăĺńěáíßá"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Too many packages are selected"
+msgstr "ĎńéóěÝíá đáęÝôá äĺí ěđďńďýí íá ĺăęáôáóôáčďýí"
 
-#: ../rpmdrake.pm_.c:188
-msgid "Danmark"
-msgstr "Äáíßá"
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
+msgstr "ĚÝăéóôĺň đëçńďöďńßĺň"
 
-#: ../rpmdrake.pm_.c:189 ../rpmdrake.pm_.c:193
-msgid "Greece"
-msgstr "ĹëëÜäá"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal information"
+msgstr "ĘáíďíéęÝň đëçńďöďńßĺň"
 
-#: ../rpmdrake.pm_.c:190
-msgid "Spain"
-msgstr "Éóđáíßá"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update source(s)"
+msgstr "ÁíáíÝůóç đçăŢň(ţí)"
 
-#: ../rpmdrake.pm_.c:191
-msgid "Finland"
-msgstr "Öéíëáíäßá"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Reload the packages list"
+msgstr "Ôď đáęÝôď %s äĺí Ý÷ĺé őđďăńáöŢ"
 
-#: ../rpmdrake.pm_.c:192
-msgid "France"
-msgstr "Ăáëëßá"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
+msgstr ""
 
-#: ../rpmdrake.pm_.c:194
-msgid "Israel"
-msgstr "ÉóńáŢë"
+#: ../rpmdrake:1
+#, c-format
+msgid "in files"
+msgstr "óôá áń÷ĺßá"
 
-#: ../rpmdrake.pm_.c:195
-msgid "Italy"
-msgstr "Éôáëßá"
+#: ../rpmdrake:1
+#, c-format
+msgid "in descriptions"
+msgstr "óôéň đĺńéăńáöÝň"
 
-#: ../rpmdrake.pm_.c:196
-msgid "Japan"
-msgstr "Éáđůíßá"
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
+msgstr "óôá ďíüěáôá"
 
-#: ../rpmdrake.pm_.c:197
-msgid "Korea"
-msgstr "ĘďńÝá"
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
+msgstr "âÜóç äéáčĺóéěüôçôáň áíáâÜčěéóçň"
 
-#: ../rpmdrake.pm_.c:198
-msgid "Netherlands"
-msgstr "Ďëëáíäßá"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
+msgstr "âÜóç áđďčçęĺőěÝíůí đçăţí"
 
-#: ../rpmdrake.pm_.c:199
-msgid "Norway"
-msgstr "Íďńâçăßá"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
+msgstr "âÜóç ęáôÜóôáóçň ĺđéëďăŢň"
 
-#: ../rpmdrake.pm_.c:200
-msgid "Poland"
-msgstr "Đďëůíßá"
+#: ../rpmdrake:1
+#, c-format
+msgid "by size"
+msgstr "âÜóç ěĺăÝčďőň"
 
-#: ../rpmdrake.pm_.c:201
-msgid "Portugal"
-msgstr "Đďńôďăáëßá"
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
+msgstr "âÜóç ďěÜäáň"
 
-#: ../rpmdrake.pm_.c:202
-msgid "Russia"
-msgstr "Ńůóßá"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages,"
+msgstr "źëá ôá đáęÝôá,"
 
-#: ../rpmdrake.pm_.c:203
-msgid "Sweden"
-msgstr "Óďőçäßá"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
+msgstr "źëá ôá đáęÝôá, áëöáâçôéęÜ"
 
-#: ../rpmdrake.pm_.c:204
-msgid "Taiwan"
-msgstr "ÔáúâÜí"
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
+msgstr "ĹđéëďăÝň Mandrake"
 
-#: ../rpmdrake.pm_.c:205
-msgid "United Kingdom"
-msgstr "ÇíůěÝíď Âáóßëĺéď"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal updates"
+msgstr "ĘáíďíéęÝň áíáâáčěßóĺéň"
 
-#: ../rpmdrake.pm_.c:206
-msgid "China"
-msgstr "Ęßíá"
+#: ../rpmdrake:1
+#, c-format
+msgid "Bugfixes updates"
+msgstr "Áíáâáčěßóĺéň äéďńčţóĺůí"
 
-#: ../rpmdrake.pm_.c:207 ../rpmdrake.pm_.c:208 ../rpmdrake.pm_.c:209
-#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:261
-msgid "United States"
-msgstr "ÇíůěÝíĺň Đďëéôĺßĺň ÁěĺńéęŢň"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
+msgstr "Áíáíĺţóĺéň Áóöáëĺßáň"
 
-#: ../rpmdrake.pm_.c:274
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
-"Đáńáęáëţ đĺńéěÝíĺôĺ ăßíĺôáé ç ëŢřç ôůí äéĺőčýíóĺůí ôůí ĺíáëëáęôéęţí čÝóĺůí "
-"áđü ôçí MandrakeSoft."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Description: "
+msgstr "óôéň đĺńéăńáöÝň"
 
-#: ../rpmdrake.pm_.c:280
-msgid "Error during download"
-msgstr "ÓöÜëěá ęáôÜ ôç ëŢřç"
+#: ../rpmdrake:1
+#, c-format
+msgid "Summary: "
+msgstr "Óýíďřç: "
 
-#: ../rpmdrake.pm_.c:289
-msgid "No mirror"
-msgstr "×ůńßň ĺíáëëáęôéęÝň"
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "Óđďőäáéüôçôá: "
 
-#: ../rpmdrake.pm_.c:307
-msgid "Please choose the desired mirror."
-msgstr "Đáńáęáëţ ĺđéëÝîôĺ ôçí ĺđéčőěçôŢ ĺíáëëáęôéęŢ."
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake.pm_.c:339 ../rpmdrake_.c:627
-msgid "Update source(s)"
-msgstr "ÁíáíÝůóç đçăŢň(ţí)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Size: "
+msgstr "ĚÝăĺčďň: "
 
-#: ../rpmdrake.pm_.c:343
-msgid "Select the source(s) you wish to update:"
-msgstr "ĹđéëÝîôĺ ôéň đçăÝň đďő čÝëĺôĺ íá áíáíĺţóĺôĺ:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Version: "
+msgstr "¸ęäďóç: "
 
-#: ../rpmdrake.pm_.c:347
-msgid "Update"
-msgstr "ÁíáíÝůóç"
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "źíďěá: "
 
-#: ../rpmdrake.pm_.c:358
-msgid "Please wait, updating media..."
-msgstr "Đáńáęáëţ đĺńéěÝíĺôĺ, áíáíĺţíĺôáé ôď ěÝóď..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr ""
 
-#: ../rpmdrake_.c:99
-msgid "Other"
-msgstr "śëëá"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
+msgstr ""
 
-#: ../rpmdrake_.c:121 ../rpmdrake_.c:135 ../rpmdrake_.c:227 ../rpmdrake_.c:298
-msgid "(none)"
-msgstr "(ęáíÝíá)"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Source: "
+msgstr "ĐçăŢ"
 
-#: ../rpmdrake_.c:141 ../rpmdrake_.c:482 ../rpmdrake_.c:483
+#: ../rpmdrake:1
+#, c-format
 msgid "(Not available)"
 msgstr "(Äĺí ĺßíáé äéáčÝóéěď/ç)"
 
-#: ../rpmdrake_.c:151 ../rpmdrake_.c:208
-msgid "Search results"
-msgstr "ÁđďôÝëĺóěá ÁíáćŢôçóçň"
-
-#: ../rpmdrake_.c:151
-msgid "Search results (none)"
-msgstr "ÁđďôÝëĺóěá ÁíáćŢôçóçň (ęáíÝíá)"
-
-#: ../rpmdrake_.c:161 ../rpmdrake_.c:172
-msgid "Please wait, searching..."
-msgstr "Đáńáęáëţ đĺńéěÝíĺôĺ, ăßíĺôáé áíáćŢôçóç..."
-
-#: ../rpmdrake_.c:175
-msgid "Stop"
-msgstr "Ôĺńěáôéóěüň"
-
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-msgid "Addable"
-msgstr "ĐńďóôéčÝěĺíá"
-
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-msgid "Upgradable"
-msgstr "Áíáâáčěßóéěá"
-
-#: ../rpmdrake_.c:211
-msgid "Not selected"
-msgstr "Ěç ĹđéëĺăěÝíá"
-
-#: ../rpmdrake_.c:211
-msgid "Selected"
-msgstr "ĹđéëĺăěÝíá"
-
-#: ../rpmdrake_.c:240
-msgid "rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake_.c:258 ../rpmdrake_.c:360 ../rpmdrake_.c:362
-msgid "More information on package..."
-msgstr "Đĺńéóóüôĺńĺň đëçńďöďńßĺň ăéá ôď đáęÝôď..."
-
-#: ../rpmdrake_.c:259
-msgid "One of the following packages is needed:"
-msgstr "¸íá áđü ôá đáńáęÜôů đáęÝôá áđáéôďýíôáé:"
-
-#: ../rpmdrake_.c:259
-msgid "Please choose"
-msgstr "Đáńáęáëţ ĺđéëÝîôĺ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
+msgstr "ÁëëáăÝň:\n"
 
-#: ../rpmdrake_.c:275
-msgid "unknown package "
-msgstr "śăíůóôď đáęÝôď"
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "śń÷ĺßá:\n"
 
-#: ../rpmdrake_.c:285
-msgid "Please wait, listing packages..."
-msgstr "Đáńáęáëţ đĺńéěÝíĺôĺ, ôáîéíďěďýíôáé ôá đáęÝôá"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected size: %d MB"
+msgstr "ĹđéëĺăěÝíď ěÝăĺčďň: %d MB"
 
-#: ../rpmdrake_.c:300
-msgid "No update"
-msgstr "×ůńßň áíáâáčěßóĺéň"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "ĹđéëĺăěÝíď: %d MB/ Ĺëĺýčĺńďň ÷ţńďň óôďí äßóęď: %d MB"
 
-#: ../rpmdrake_.c:353 ../rpmdrake_.c:354
-msgid "More infos"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
 msgstr ""
+"Ăéá íá éęáíďđďéçčďýí ďé ĺîáńôŢóĺéň ôďőň ôá đáńáęÜôů đáęÝôá đńÝđĺé\n"
+"íá áđďĺđéëĺăďýí:\n"
+"\n"
 
-#: ../rpmdrake_.c:355
-#, fuzzy
-msgid "Information on packages"
-msgstr "Đĺńéóóüôĺńĺň đëçńďöďńßĺň ăéá ôď đáęÝôď..."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+msgstr ""
+"Óőăíţěç, ôá đáńáęÜôů đáęÝôá äĺí ěđďńďýí íá ĺđéëĺăďýí:\n"
+"\n"
 
-#: ../rpmdrake_.c:376
-msgid "Some additional packages need to be removed"
-msgstr "ĎńéóěÝíá ĺđéđëÝďí đáęÝôá đńÝđĺé íá áöáéńĺčďýí"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "ĎńéóěÝíá đáęÝôá äĺí ěđďńďýí íá ĺăęáôáóôáčďýí"
 
-#: ../rpmdrake_.c:377
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
 "\n"
 msgstr ""
-"Ăéá íá éęáíďđďéçčďýí ďé ĺîáńôŢóĺéň ôďőň ôá đáńáęÜôů đáęÝôá đńÝđĺé ĺđßóçň\n"
-"íá áöáéńĺčďýí:\n"
+"Ăéá íá éęáíďđďéçčďýí ďé ĺîáńôŢóĺéň, đńÝđĺé íá ĺăęáôáóôáčďýí ęáé\n"
+" ôá đáńáęÜôů đáęÝôá:\n"
 "\n"
 
-#: ../rpmdrake_.c:383 ../rpmdrake_.c:391
+#: ../rpmdrake:1
+#, c-format
+msgid "Additional packages needed"
+msgstr "Áđáéôďýíôáé ĺđéđëÝďí đáęÝôá"
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "ĎńéóěÝíá đáęÝôá äĺí ěđďńďýí íá áöáéńĺčďýí"
 
-#: ../rpmdrake_.c:384
-#, fuzzy
+#: ../rpmdrake:1
+#, fuzzy, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -472,583 +638,602 @@ msgstr ""
 "Óőăíţěç, ç áöáßńĺóç áőôţí ôůí đáęÝôůí čá ęáôáóôńÝřĺé ôď óýóôçěÜ óáň:\n"
 "\n"
 
-#: ../rpmdrake_.c:392 ../rpmdrake_.c:451
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
 "\n"
 msgstr ""
-"Ăéá íá éęáíďđďéçčďýí ďé ĺîáńôŢóĺéň ôďőň ôá đáńáęÜôů đáęÝôá đńÝđĺé\n"
-"íá áđďĺđéëĺăďýí:\n"
+"Ăéá íá éęáíďđďéçčďýí ďé ĺîáńôŢóĺéň ôďőň ôá đáńáęÜôů đáęÝôá đńÝđĺé ĺđßóçň\n"
+"íá áöáéńĺčďýí:\n"
 "\n"
 
-#: ../rpmdrake_.c:421
-msgid "Additional packages needed"
-msgstr "Áđáéôďýíôáé ĺđéđëÝďí đáęÝôá"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr "ĎńéóěÝíá ĺđéđëÝďí đáęÝôá đńÝđĺé íá áöáéńĺčďýí"
 
-#: ../rpmdrake_.c:422
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
+msgstr "Đĺńéóóüôĺńĺň đëçńďöďńßĺň ăéá ôď đáęÝôď..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Information on packages"
+msgstr "Đĺńéóóüôĺńĺň đëçńďöďńßĺň ăéá ôď đáęÝôď..."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
 msgstr ""
-"Ăéá íá éęáíďđďéçčďýí ďé ĺîáńôŢóĺéň, đńÝđĺé íá ĺăęáôáóôáčďýí ęáé\n"
-" ôá đáńáęÜôů đáęÝôá:\n"
-"\n"
 
-#: ../rpmdrake_.c:435
-msgid "Some packages can't be installed"
-msgstr "ĎńéóěÝíá đáęÝôá äĺí ěđďńďýí íá ĺăęáôáóôáčďýí"
+#: ../rpmdrake:1
+#, c-format
+msgid "Addable"
+msgstr "ĐńďóôéčÝěĺíá"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Upgradable"
+msgstr "Áíáâáčěßóéěá"
 
-#: ../rpmdrake_.c:436
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
+"The list of updates is void. This means that either there is\n"
+"no available update for the packages installed on your computer,\n"
+"or you already installed all of them."
 msgstr ""
-"Óőăíţěç, ôá đáńáęÜôů đáęÝôá äĺí ěđďńďýí íá ĺđéëĺăďýí:\n"
-"\n"
+"Ç ëßóôá ěĺ ôéň áíáâáčěßóĺéň ĺßíáé ęĺíŢ. Áőôü óçěáßíĺé üôé Ţ äĺí \n"
+"őđÜń÷ďőí äéáčÝóéěá đáęÝôá ăéá áíáâÜčěéóç ăéá ôá ĺăęáôĺóôçěÝíá\n"
+"đáęÝôá ôďő őđďëďăéóôŢ óáň Ţ ôá Ý÷ĺôĺ Ţäç áíáâáčěßóĺé."
 
-#: ../rpmdrake_.c:450 ../rpmdrake_.c:684
-msgid "Some packages need to be removed"
-msgstr "ĎńéóěÝíá đáęÝôá đńÝđĺé íá áöáéńĺčďýí"
+#: ../rpmdrake:1
+#, c-format
+msgid "No update"
+msgstr "×ůńßň áíáâáčěßóĺéň"
 
-#: ../rpmdrake_.c:472
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "ĹđéëĺăěÝíď: %d MB/ Ĺëĺýčĺńďň ÷ţńďň óôďí äßóęď: %d MB"
+msgid "(none)"
+msgstr "(ęáíÝíá)"
 
-#: ../rpmdrake_.c:474
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "ĹđéëĺăěÝíď ěÝăĺčďň: %d MB"
+msgid "Please wait, listing packages..."
+msgstr "Đáńáęáëţ đĺńéěÝíĺôĺ, ôáîéíďěďýíôáé ôá đáęÝôá"
 
-#: ../rpmdrake_.c:482
-msgid "Files:\n"
-msgstr "śń÷ĺßá:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "unknown package "
+msgstr "śăíůóôď đáęÝôď"
 
-#: ../rpmdrake_.c:483
-msgid "Changelog:\n"
-msgstr "ÁëëáăÝň:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "¸íá áđü ôá đáńáęÜôů đáęÝôá áđáéôďýíôáé:"
 
-#: ../rpmdrake_.c:486
-#, fuzzy
-msgid "Source: "
-msgstr "ĐçăŢ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please choose"
+msgstr "Đáńáęáëţ ĺđéëÝîôĺ"
 
-#: ../rpmdrake_.c:487
-msgid "Currently installed version: "
-msgstr ""
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:491
-msgid "Reason for update: "
-msgstr ""
+#: ../rpmdrake:1
+#, c-format
+msgid "Not selected"
+msgstr "Ěç ĹđéëĺăěÝíá"
 
-#: ../rpmdrake_.c:493
-msgid "Name: "
-msgstr "źíďěá: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected"
+msgstr "ĹđéëĺăěÝíá"
 
-#: ../rpmdrake_.c:494
-msgid "Version: "
-msgstr "¸ęäďóç: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results"
+msgstr "ÁđďôÝëĺóěá ÁíáćŢôçóçň"
 
-#: ../rpmdrake_.c:495
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Stop"
+msgstr "Ôĺńěáôéóěüň"
 
-#: ../rpmdrake_.c:495
-msgid "Size: "
-msgstr "ĚÝăĺčďň: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, searching..."
+msgstr "Đáńáęáëţ đĺńéěÝíĺôĺ, ăßíĺôáé áíáćŢôçóç..."
 
-#: ../rpmdrake_.c:497
-msgid "Importance: "
-msgstr "Óđďőäáéüôçôá: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
+msgstr "ÁđďôÝëĺóěá ÁíáćŢôçóçň (ęáíÝíá)"
 
-#: ../rpmdrake_.c:498
-msgid "Summary: "
-msgstr "Óýíďřç: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "śëëá"
 
-#: ../rpmdrake_.c:499
-#, fuzzy
-msgid "Description: "
-msgstr "óôéň đĺńéăńáöÝň"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"Welcome to the packages source editor!\n"
+"\n"
+"This tool will help you configure the packages sources you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"Ęáëţň ďńßóáôĺ óôďí ĺđĺîĺńăáóôŢ ôůí đçăáßůí đáęÝôůí!\n"
+"\n"
+"Áőôü ôď ĺńăáëĺßď čá óáň âďçčŢóĺé íá ńőčěßóĺôĺ ôá đçăáßá đáęÝôá đďő čÝëĺôĺ\n"
+"íá ÷ńçóéěďđďéŢóĺôĺ óĺ áőôüí ôďí őđďëďăéóôŢ. '¸đĺéôá čá ĺßíáé äéáčÝóéěá íá \n"
+"ĺăęáôáóôáčďýí óáí íÝá đáęÝôá Ţ íá áíáâáčěßóĺôĺ őđÜń÷ďíôá đáęÝôá."
 
-#: ../rpmdrake_.c:548
-msgid "Bugfixes updates"
-msgstr "Áíáâáčěßóĺéň äéďńčţóĺůí"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "ÁđďčŢęĺőóç ęáé Ýîďäďň"
 
-#: ../rpmdrake_.c:548
-msgid "Normal updates"
-msgstr "ĘáíďíéęÝň áíáâáčěßóĺéň"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Proxy..."
+msgstr "ÓöÜëěá..."
 
-#: ../rpmdrake_.c:567
-msgid "Mandrake choices"
-msgstr "ĹđéëďăÝň Mandrake"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
+msgstr "ÁíáíÝůóç..."
 
-#: ../rpmdrake_.c:568
-msgid "All packages, alphabetical"
-msgstr "źëá ôá đáęÝôá, áëöáâçôéęÜ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "ĐńďóčŢęç..."
 
-#: ../rpmdrake_.c:569
-msgid "All packages,"
-msgstr "źëá ôá đáęÝôá,"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "Ĺđĺîĺńăáóßá"
 
-#: ../rpmdrake_.c:592
-msgid "by group"
-msgstr "âÜóç ďěÜäáň"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Source"
+msgstr "ĐçăŢ"
 
-#: ../rpmdrake_.c:592
-msgid "by size"
-msgstr "âÜóç ěĺăÝčďőň"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
+msgstr "Ĺíĺńăďđďßçóç;"
 
-#: ../rpmdrake_.c:593
-msgid "by selection state"
-msgstr "âÜóç ęáôÜóôáóçň ĺđéëďăŢň"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure sources"
+msgstr "Ńýčěéóç đçăţí"
 
-#: ../rpmdrake_.c:594
-msgid "by source repository"
-msgstr "âÜóç áđďčçęĺőěÝíůí đçăţí"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "Ęůäéęüň đńüóâáóçň:"
 
-#: ../rpmdrake_.c:594
-msgid "by update availability"
-msgstr "âÜóç äéáčĺóéěüôçôáň áíáâÜčěéóçň"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
+msgstr ""
 
-#: ../rpmdrake_.c:615
-msgid "in descriptions"
-msgstr "óôéň đĺńéăńáöÝň"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
 
-#: ../rpmdrake_.c:615
-msgid "in files"
-msgstr "óôá áń÷ĺßá"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr ""
 
-#: ../rpmdrake_.c:615
-msgid "in names"
-msgstr "óôá ďíüěáôá"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
 
-#: ../rpmdrake_.c:626
-#, fuzzy
-msgid "Reload the packages list"
-msgstr "Ôď đáęÝôď %s äĺí Ý÷ĺé őđďăńáöŢ"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure proxies"
+msgstr "Ńýčěéóç đçăţí"
 
-#: ../rpmdrake_.c:626
-msgid "Reset the selection"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr "Đáńáęáëţ đĺńéěÝíĺôĺ, áíáíĺţíĺôáé ôď ěÝóď..."
 
-#: ../rpmdrake_.c:652
-msgid "Maximum information"
-msgstr "ĚÝăéóôĺň đëçńďöďńßĺň"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr ""
+"Ăéá íá áđďčçęĺőôďýí ďé áëëáăÝň, čá đńÝđĺé íá ĺéóÜăĺôĺ ôď ěÝóď óôďí ďäçăü."
 
-#: ../rpmdrake_.c:652
-msgid "Normal information"
-msgstr "ĘáíďíéęÝň đëçńďöďńßĺň"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
+msgstr "ĐńÝđĺé íá ĺéóÜăĺôĺ ôď ěÝóď ăéá íá óőíĺ÷ßóĺôĺ"
 
-#: ../rpmdrake_.c:674
-#, fuzzy
-msgid "Too many packages are selected"
-msgstr "ĎńéóěÝíá đáęÝôá äĺí ěđďńďýí íá ĺăęáôáóôáčďýí"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save changes"
+msgstr "ÁđďčŢęĺőóç áëëáăţí"
 
-#: ../rpmdrake_.c:720
-msgid "Find:"
-msgstr "Ĺýńĺóç:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Ó÷ĺôéęŢ čÝóç ôůí synthesis/hdlist: "
 
-#: ../rpmdrake_.c:725
-msgid "Search"
-msgstr "ÁíáćŢôçóç"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake_.c:731
-msgid "Install"
-msgstr "ĹăęáôÜóôáóç"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Editing source \"%s\":"
+msgstr "Ĺđĺîĺńăáóßá đçăŢň \"%s\":"
 
-#: ../rpmdrake_.c:738 data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrake Update"
-msgstr "Mandrake Update"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit a source"
+msgstr "Ĺđĺîĺńăáóßá đçăŢň"
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Installation"
-msgstr "ĹăęáôÜóôáóç ĐáęÝôůí Ëďăéóěéęďý"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr "Đáńáęáëţ đĺńéěÝíĺôĺ, áöáéńĺßôáé ôď ěÝóď..."
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Removal"
-msgstr "Áöáßńĺóç ĐáęÝôůí Ëďăéóěéęďý"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, adding medium..."
+msgstr "Đáńáęáëţ đĺńéěÝíĺôĺ, đńďóôßčĺôáé ôď ěÝóď..."
 
-#: ../rpmdrake_.c:779
-msgid "Please wait, contacting mirror to update packages information."
-msgstr ""
-"Đáńáęáëţ đĺńéěÝíĺôĺ, ăßíĺôáé óýíäĺóç ěĺ ôçí ĺíáëëáęôéęŢ äéĺýčőíóç ăéá ôçí "
-"áíáâÜčěéóç ôůí đëçńďöďńéţí ôůí đáęÝôůí."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of source:"
+msgstr "Ôýđďň đçăŢň:"
 
-#: ../rpmdrake_.c:781
-msgid "Error updating medium"
-msgstr "ÓöÜëěá ęáôÜ ôçí áíáíÝůóç ôďő ěÝóďő"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Adding a source:"
+msgstr "ĐńďóčŢęç đçăŢň:"
 
-#: ../rpmdrake_.c:782
-msgid "There was an unrecoverable error while updating packages information."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 msgstr ""
-"ŐđŢńîĺ Ýíá áíĺđáíüńčůôď óöÜëěá ęáôÜ ôçí áíáâÜčěéóç ôůí đëçńďöďńéţí ôůí "
-"đáęÝôůí."
+"ŐđÜń÷ĺé Ţäç Ýíá ěÝóď ěĺ áőôü ôď üíďěá, ĺßóôĺ âÝâáéďé\n"
+"ăéá ôçí áíôéęáôÜóôáóŢ ôďő;"
 
-#: ../rpmdrake_.c:787
-msgid "How to choose manually your mirror"
-msgstr "Đůň íá äéáëÝîĺôĺ ěüíďé óáň ôçí ĺíáëëáęôéęŢ óáň"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to fill up at least the two first entries."
+msgstr "ĐńÝđĺé íá óőěđëçńţóĺôĺ ôďőëÜ÷éóôďí ôá äýď đńţôá đĺäßá."
 
-#: ../rpmdrake_.c:795
-msgid "Please wait, contacting mirror to initialize updates packages."
-msgstr ""
-"Đáńáęáëţ đĺńéěÝíĺôĺ, ăßíĺôáé óýíäĺóç ěĺ ôçí ĺíáëëáęôéęŢ äéĺýčőíóç ăéá ôçí "
-"ĺęęßíçóç ôůí áíáâáčěßóĺůí ôůí đáęÝôůí."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "źíďěá:"
 
-#: ../rpmdrake_.c:798
-msgid "Error adding update medium"
-msgstr "ÓöÜëěá ęáôÜ ôçí đńďóčŢęç ôďő ěÝóďő áíáâáčěßóĺůí"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
+msgstr "ĐńďóđÝëáóç:"
 
-#: ../rpmdrake_.c:829
-msgid "Please wait, finding available packages..."
-msgstr "Đáńáęáëţ đĺńéěÝíĺôĺ, áíáćçôďýíôáé ôá äéáčÝóéěá đáęÝôá..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "ĹđéëÝîôĺ ěéá ĺíáëëáęôéęŢ..."
 
-#: ../rpmdrake_.c:861
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "ĹëÝă÷ĺôáé ôď %s"
+msgid "Browse..."
+msgstr "ÁíáćŢôçóç..."
 
-#: ../rpmdrake_.c:880
-#, fuzzy
-msgid "changes:"
-msgstr "ÁđďčŢęĺőóç áëëáăţí"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "ČÝóç Ţ óçěĺßď đńďóÜńôçóçň: "
 
-#: ../rpmdrake_.c:884
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Áöáßńĺóç.%s"
+msgid "Removable device"
+msgstr "Áöáéńďýěĺíç óőóęĺőŢ"
 
-#: ../rpmdrake_.c:886
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "×ńŢóç ôďő .%s ůň ęýńéď áń÷ĺßď"
+msgid "HTTP server"
+msgstr "ÄéáęďěéóôŢň HTTP"
 
-#: ../rpmdrake_.c:888
-msgid "Do nothing"
-msgstr "Íá ěç ăßíĺé ôßđďôá"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "ÄéáęďěéóôŢň FTP"
 
-#: ../rpmdrake_.c:900
-msgid "Installation finished"
-msgstr "Ç ĺăęáôÜóôáóç ôĺëĺßůóĺ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path:"
+msgstr "ČÝóç:"
 
-#: ../rpmdrake_.c:910
-msgid "Inspect..."
-msgstr "¸ëĺă÷ďň..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "ÔďđéęÜ áń÷ĺßá"
 
-#: ../rpmdrake_.c:925
-msgid "Program missing"
-msgstr "Ëĺßđĺé đńüăńáěěá"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a source"
+msgstr "ĐńďóčŢęç đçăŢň:"
 
-#: ../rpmdrake_.c:926
-msgid "A required program is missing (grpmi). Check your installation."
-msgstr "¸íá áđáéôďýěĺíď đńüăńáěěá (ôď grpmi).ĹëÝăîôĺ ôçí ĺăęáôÜóôáóŢ óáň"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
+msgstr "Áäőíáěßá áíáâÜčěéóçň ôďő ěÝóďő, čá áđĺíĺńăďđďéçčĺß áőôüěáôá."
 
-#: ../rpmdrake_.c:940
-msgid "Unable to get source packages."
-msgstr "Áäýíáôç ç ëŢřç ôůí đçăáßůí đáęÝôůí."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "Áäőíáěßá äçěéďőńăßáň ěÝóďő."
 
-#: ../rpmdrake_.c:941
-msgid "Unable to get source packages, sorry."
-msgstr "Áäýíáôç ç ëŢřç ôůí đçăáßůí đáęÝôůí, óőăíţěç."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, updating media..."
+msgstr "Đáńáęáëţ đĺńéěÝíĺôĺ, áíáíĺţíĺôáé ôď ěÝóď..."
 
-#: ../rpmdrake_.c:948
-msgid "Change medium"
-msgstr "ÁëëáăŢ ěÝóďő"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
+msgstr "ÁíáíÝůóç"
 
-#: ../rpmdrake_.c:949
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Đáńáęáëţ ĺéóÜăĺôĺ ôď ěÝóď ěĺ üíďěá \"%s\" óôç óőóęĺőŢ [%s]"
+msgid "Select the source(s) you wish to update:"
+msgstr "ĹđéëÝîôĺ ôéň đçăÝň đďő čÝëĺôĺ íá áíáíĺţóĺôĺ:"
 
-#: ../rpmdrake_.c:957
-msgid "Installation failed"
-msgstr "Ç ĺăęáôÜóôáóç áđÝôő÷ĺ"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please choose the desired mirror."
+msgstr "Đáńáęáëţ ĺđéëÝîôĺ ôçí ĺđéčőěçôŢ ĺíáëëáęôéęŢ."
 
-#: ../rpmdrake_.c:958
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
-"Ç ĺăęáôÜóôáóç áđÝôő÷ĺ, ďńéóěÝíá áń÷ĺßá äĺí őđÜń÷ďőí.\n"
-"şóůň íá đńÝđĺé íá áíáâáčěßóĺôĺ ôçí âÜóç äĺäďěÝíůí ôůí đçăţí."
+"Äĺí ěđďńţ íá âńů ęáôÜëëçëç ĺíáëëáęôéęŢ.\n"
+"\n"
+"Ďé ëüăďé ěđďńĺß íá ĺßíáé đďëëďß, ď óőíçčÝóôĺńďň ĺßíáé üôáí äĺí "
+"őđďóôçńßćĺôáé\n"
+"ç áń÷éôĺęôďíéęŢ ôďő ĺđĺîĺńăáóôŢ óáň áđü ôéň ĺđßóçěĺň áíáâáčěßóĺéň áđü ôď \n"
+"Mandrake Linux"
 
-#: ../rpmdrake_.c:961
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr ""
-"Đáńáęáëţ đĺńéěÝíĺôĺ, áöáéńďýíôáé đáęÝôá ăéá íá ěđďńÝóďőí íá áíáâáčěéóôďýí "
-"Üëëá..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
+msgstr "×ůńßň ĺíáëëáęôéęÝň"
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"There was an error downloading the mirrors list:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
-"Ç ĺăęáôÜóôáóç ôĺëĺßůóĺ %s.\n"
+"ÓöÜëěá ęáôÜ ôç ëŢřç ôçň ëßóôáň ôůí ĺíáëëáęôéęţí äéĺőčýíóĺůí:\n"
 "\n"
-"ĎńéóěÝíá áń÷ĺßá ńýčěéóĺůí äçěéďőńăŢčçęáí ůň `.rpmnew' Ţ`.rpmsave',\n"
-"ßóůň íá đńÝđĺé íá ôá ĺëÝăîĺôĺ ăéá íá ĺęôĺëÝóĺôĺ ďńéóěÝíĺň ĺíÝńăĺéĺň:"
+"%s\n"
+"Ôď äßęôőď Ţ ç éóôďóĺëßäá ôçň MandrakeSoft ěđďńĺß íá ěçí ĺßíáé äéáčÝóéěç.\n"
+"Đáńáęáëţ đńďóđáčŢóôĺ îáíÜ áńăüôĺńá."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "ÓöÜëěá ęáôÜ ôç ëŢřç"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
+"Đáńáęáëţ đĺńéěÝíĺôĺ ăßíĺôáé ç ëŢřç ôůí äéĺőčýíóĺůí ôůí ĺíáëëáęôéęţí čÝóĺůí "
+"áđü ôçí MandrakeSoft."
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"some packages failed to install\n"
-"correctly"
+"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"
-"ĺăęáôáóôáčďýí"
+"ĐńÝđĺé íá ĺđéęďéíůíŢóů ěĺ ôçí éóôďóĺëßäá ôçň MandrakeSoft  ăéá íá đÜńů\n"
+"ôçí ëßóôá ěĺ ôéň ĺíáëëáęôéęÝň äéĺőčýíóĺéň\n"
+"Đáńáęáëţ ĺëÝăîôĺ üôé ôď äßęôőü óáň ĺßíáé ĺíĺńăü\n"
+"\n"
+"Íá óőíĺ÷éóôĺß;"
 
-#: ../rpmdrake_.c:983
-msgid "everything was installed correctly"
-msgstr "üëá ĺăęáôáóôÜčçęáí óůóôÜ"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United States"
+msgstr "ÇíůěÝíĺň Đďëéôĺßĺň ÁěĺńéęŢň"
 
-#: ../rpmdrake_.c:985
-msgid "Everything installed successfully"
-msgstr "źëá ĺăęáôáóôÜčçęáí ĺđéôő÷ţň"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
+msgstr "Ęßíá"
 
-#: ../rpmdrake_.c:986
-msgid "All requested packages were installed successfully."
-msgstr "źëá ôá ćçôçčÝíôá đáęÝôá ĺăęáôáóôÜčçęáí ĺđéôő÷ţň."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr "ÇíůěÝíď Âáóßëĺéď"
 
-#: ../rpmdrake_.c:989
-msgid "Everything already installed."
-msgstr "źëá ĺßíáé Ţäç ĺăęáôĺóôçěÝíá."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "ÔáúâÜí"
 
-#: ../rpmdrake_.c:990
-msgid "Everything already installed (is this supposed to happen at all?)."
-msgstr "źëá ĺßíáé Ţäç ĺăęáôĺóôçěÝíá.(čá Ýđńĺđĺ íá óőěâáßíĺé áőôü;)"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "Óďőçäßá"
 
-#: ../rpmdrake_.c:997
-#, fuzzy
-msgid "Problem during installation"
-msgstr "ŐđŢńîáí đńďâëŢěáôá ęáôÜ ôçí ĺăęáôÜóôáóç"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
+msgstr "Ńůóßá"
 
-#: ../rpmdrake_.c:998
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr "ŐđŢńîĺ Ýíá đńüâëçěá ęáôÜ ôçí ĺăęáôÜóôáóç."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Portugal"
+msgstr "Đďńôďăáëßá"
 
-#: ../rpmdrake_.c:1012
-msgid "Please wait, reading packages database..."
-msgstr "Đáńáęáëţ đĺńéěÝíĺôĺ, äéáâÜćĺôáé ç âÜóç äĺäďěÝíůí ôůí đáęÝôůí..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
+msgstr "Đďëůíßá"
 
-#: ../rpmdrake_.c:1053
-msgid "Please wait, removing packages..."
-msgstr "Đáńáęáëţ đĺńéěÝíĺôĺ, áöáéńďýíôáé ôá đáęÝôá..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
+msgstr "Íďńâçăßá"
 
-#: ../rpmdrake_.c:1056
-#, fuzzy
-msgid "Problem during removal"
-msgstr "ŐđŢńîáí đńďâëŢěáôá ęáôÜ ôçí ĺăęáôÜóôáóç"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
+msgstr "Ďëëáíäßá"
 
-#: ../rpmdrake_.c:1057
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr "ŐđŢńîĺ Ýíá đńüâëçěá ęáôÜ ôçí ĺăęáôÜóôáóç."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Korea"
+msgstr "ĘďńÝá"
 
-#: ../rpmdrake_.c:1089
-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 "Japan"
+msgstr "Éáđůíßá"
 
-#: ../rpmdrake_.c:1094
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"Ęáëţň ďńßóáôĺ óôď MandrakeUpdate!\n"
-"\n"
-"Áőôü ôď ĺńăáëĺßď čá óáň âďçčŢóĺé íá ĺđéëÝîĺôĺ ôéň áíáâáčěßóĺéň đďő čÝëĺôĺ\n"
-"íá ĺăęáôáóôŢóĺôĺ óôďí őđďëďăéóôŢ óáň."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Italy"
+msgstr "Éôáëßá"
 
-#: ../rpmdrake_.c:1099
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
-msgstr ""
-"Ęáëţň ďńßóáôĺ óôď ĺńăáëĺßď ĺăęáôÜóôáóçň ëďăéóěéęďý!\n"
-"\n"
-"Ôď Mandrake Linux Ýń÷ĺôáé ěĺ ÷éëéÜäĺň đńďăńÜěěáôá óĺ CDROM Ţ DVD\n"
-"Áőôü ôď ĺńăáëĺßď čá óáň âďçčŢóĺé íá ĺđéëÝîĺôĺ ôď đńüăńáěěá đďő čÝëĺôĺ\n"
-"íá ĺăęáôáóôŢóĺôĺ óôďí őđďëďăéóôŢ óáň."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Israel"
+msgstr "ÉóńáŢë"
 
-#: data/rpmdrake-remove.desktop.in.h:1
-msgid "Remove Software"
-msgstr "Áöáßńĺóç Ëďăéóěéęďý"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "ĹëëÜäá"
 
-#: data/rpmdrake-sources.desktop.in.h:1
-msgid "Software Sources Manager"
-msgstr "Äéá÷ĺéńéóôŢň Đçăáßďő Ëďăéóěéęďý"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "France"
+msgstr "Ăáëëßá"
 
-#: data/rpmdrake.desktop.in.h:1
-msgid "Install Software"
-msgstr "ĹăęáôÜóôáóç Ëďăéóěéęďý"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "Öéíëáíäßá"
 
-#~ msgid ""
-#~ "There is already a medium by that name, do you\n"
-#~ "really want to replace it?"
-#~ msgstr ""
-#~ "ŐđÜń÷ĺé Ţäç Ýíá ěÝóď ěĺ áőôü ôď üíďěá, ĺßóôĺ âÝâáéďé\n"
-#~ "ăéá ôçí áíôéęáôÜóôáóŢ ôďő;"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "Éóđáíßá"
 
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-#~ "Íá óőíĺ÷éóôĺß;"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
+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
+#, c-format
+msgid "Germany"
+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"
-#~ "\n"
-#~ "Íá óőíĺ÷éóôĺß;"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
+msgstr "Ôóĺ÷ßá"
 
-#~ msgid ""
-#~ "There was an error downloading the mirrors list:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "The network, or MandrakeSoft website, are maybe unavailable.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "ÓöÜëěá ęáôÜ ôç ëŢřç ôçň ëßóôáň ôůí ĺíáëëáęôéęţí äéĺőčýíóĺůí:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "Ôď äßęôőď Ţ ç éóôďóĺëßäá ôçň MandrakeSoft ěđďńĺß íá ěçí ĺßíáé äéáčÝóéěç.\n"
-#~ "Đáńáęáëţ đńďóđáčŢóôĺ îáíÜ áńăüôĺńá."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Costa Rica"
+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 "Canada"
+msgstr "ĘáíáäÜň"
 
-#~ msgid ""
-#~ "The list of updates is void. This means that either there is\n"
-#~ "no available update for the packages installed on your computer,\n"
-#~ "or you already installed all of them."
-#~ msgstr ""
-#~ "Ç ëßóôá ěĺ ôéň áíáâáčěßóĺéň ĺßíáé ęĺíŢ. Áőôü óçěáßíĺé üôé Ţ äĺí \n"
-#~ "őđÜń÷ďőí äéáčÝóéěá đáęÝôá ăéá áíáâÜčěéóç ăéá ôá ĺăęáôĺóôçěÝíá\n"
-#~ "đáęÝôá ôďő őđďëďăéóôŢ óáň Ţ ôá Ý÷ĺôĺ Ţäç áíáâáčěßóĺé."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
+msgstr "Âńáćéëßá"
 
-#~ msgid ""
-#~ "The following packages have to be removed for others to be upgraded:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "Ôá đáńáęÜôů đáęÝôá đńÝđĺé íá áöáéńĺčďýí ăéá íá áíáâáčěéóôďýí ęÜđďéá "
-#~ "Üëëá:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Íá óőíĺ÷éóôĺß;"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Belgium"
+msgstr "ÂÝëăéď"
 
-#~ msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#~ msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Australia"
+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"
-#~ "Íá óőíĺ÷ßóů;"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
+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.pm:1
+#, c-format
+msgid "Info..."
+msgstr "Đëçńďöďńßĺň..."
 
-#~ 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 ""
-#~ "ÓőíÝâç Ýíá óöÜëěá ęáôÜ ôçí áíáíÝůóç ôďő ěÝóďő ěÝóů ôďő urpmi.\n"
-#~ "\n"
-#~ "Áőôü ěđďńĺß íá óőěâáßíĺé ĺđĺéäŢ áőôŢ ôç óôéăěŢ äĺí ĺßíáé äéáčÝóéěç ç \n"
-#~ "ĺíáëëáęôéęŢ Ţ áí ç Ýęäďóç Mandrake Linux (%s) äĺí őđďóôçńßćĺôáé\n"
-#~ "áęüěá/đéá áđü ôéň \n"
-#~ "Ĺđßóçěĺň Áíáâáčěßóĺéň \n"
-#~ "ôçň Mandrake Linux \n"
-#~ "\n"
-#~ "ČÝëĺôĺ íá äďęéěÜóĺôĺ Üëëç ĺíáëëáęôéęŢ;"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
+msgstr "ź÷é"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Íáé"
+
+#: data/rpmdrake.desktop.in.h:1
+msgid "Install Software"
+msgstr "ĹăęáôÜóôáóç Ëďăéóěéęďý"
+
+#: data/rpmdrake-remove.desktop.in.h:1
+msgid "Remove Software"
+msgstr "Áöáßńĺóç Ëďăéóěéęďý"
+
+#: data/rpmdrake-sources.desktop.in.h:1
+msgid "Software Sources Manager"
+msgstr "Äéá÷ĺéńéóôŢň Đçăáßďő Ëďăéóěéęďý"
+
+#~ 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--*-*-*-*-*,*"
diff --git a/po/el.pom b/po/el.pom
index 61bd3519..90d91da8 100644
--- a/po/el.pom
+++ b/po/el.pom
@@ -4,168 +4,171 @@ msgstr "ĹîőđçńĺôçôŢň"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "ŐđďëďăéóôŢň Äéęôýďő (đĺëÜôçň)"
+msgid "Office Workstation"
+msgstr "Óôáčěüň Ĺńăáóßáň Ăńáöĺßďő"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
 msgstr ""
-"ĺîőđçńĺôçôŢň NFS, ĺîőđçńĺôçôŢň SMB, ĺîőđçńĺôçôŢň Proxy, ĺîőđçńĺôçôŢň ssh"
+"Ĺńăáëĺßá ăńáöĺßďő: ĹđĺîĺńăáóôÝň ęĺéěÝíďő(kword, abiword), ëďăéóôéęÜ öýëëá "
+"(kspread, gnumeric), áń÷ĺßá pdf ęëđ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Ăńáöĺßď"
+msgid "Workstation"
+msgstr "Óôáčěüň Ĺńăáóßáň"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Óôáčěüň Ĺńăáóßáň Gnome"
+msgid "Game station"
+msgstr "Óôáčěüň đáé÷íéäéţí"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Ĺńăáëĺßá ăéá Palm Pilot Ţ Visor"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "ÄéáóęÝäáóç (đáé÷íßäéá)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Óôáčěüň Ĺńăáóßáň"
+msgid "Multimedia station"
+msgstr "Óôáčěüň đďëőěÝóůí"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Ôďß÷ďň Đńďóôáóßáň/ÄńďěďëďăçôŢň"
+msgid "Sound and video playing/editing programs"
+msgstr "ĐńďăńÜěěáôá áíáđáńáăůăŢň ęáé äéá÷ĺßńéóçň video ęáé Ţ÷ďő"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr "ĹîőđçńĺôçôŢň źíďěá ÔďěÝá ęáé Đëçńďöďńéţí Äéęôýďő"
+msgid "Internet station"
+msgstr "Óôáčěüň Äéáäéęôýďő"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
 msgstr ""
-"Ĺńăáëĺßá ăńáöĺßďő: ĹđĺîĺńăáóôÝň ęĺéěÝíďő(kword, abiword), ëďăéóôéęÜ öýëëá "
-"(kspread, gnumeric), áń÷ĺßá pdf ęëđ"
+"Ĺńăáëĺßá ăéá áđďóôďëŢ ęáé ëŢřç áëëçëďăńáößáň ęáé ĺéäŢóĺůí (pine, mutt, "
+"tin...) ęáé đĺńéŢăçóç óôď Äéáäßęôőď"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "Ĺńăáëĺßá Ţ÷ďő:đńďăńÜěěáôá áíáđáńáăůăŢň mp3 Ţ midi, ěßęôĺň ęëđ"
+msgid "Network Computer (client)"
+msgstr "ŐđďëďăéóôŢň Äéęôýďő (đĺëÜôçň)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr ""
+msgid "Clients for different protocols including ssh"
+msgstr "ĐĺëÜôĺň ăéá äéáöďńĺôéęÜ đńůôüęďëëá óőěđĺńéëáěâáíďěÝíďő ôďő ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Âéâëßá ęáé ďäçăďß ăéá ôď Linux ęáé ôď Ĺëĺýčĺńď Ëďăéóěéęü"
+msgid "Configuration"
+msgstr "Ńýčěéóç"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "Óôáčěüň ĺńăáóßáň KDE"
+msgid "Tools to ease the configuration of your computer"
+msgstr "Ĺńăáëĺßá ăéá äéĺőęüëőíóç ôçň ńýčěéóçň ôďő őđďëďăéóôŢ óáň"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, ęëđ"
+msgid "Scientific Workstation"
+msgstr "Óôáčěüň Ĺńăáóßáň Ĺđéóôçěďíéęţí ĺöáńěďăţí"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "ĐďëőěÝóá - Video"
+msgid "Scientific applications such as gnuplot"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr ""
-"Ĺńăáëĺßá ăéá áëëçëďăńáößá, ĺéäŢóĺéň, éóôďóĺëßäĺň, ěĺôáöďńÜ áń÷ĺßůí ęáé "
-"óőíďěéëßá"
+msgid "Console Tools"
+msgstr "Ĺńăáëĺßá Ęďíóüëáň"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "ÂÜóç ÄĺäďěÝíůí"
+msgid "Editors, shells, file tools, terminals"
+msgstr "ĹđĺîĺńăáóôÝň ęĺéěÝíďő, ęĺëýöç, ĺńăáëĺßá áń÷ĺßůí, ôĺńěáôéęÜ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "ĹîőđçńĺôçôŢň âÜóçň äĺäďěÝíůí PostgreSQL Ţ MySQL"
+msgid "KDE Workstation"
+msgstr "Óôáčěüň ĺńăáóßáň KDE"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Ĺńăáëĺßá ăéá äéĺőęüëőíóç ôçň ńýčěéóçň ôďő őđďëďăéóôŢ óáň"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr "Ôď đĺńéâÜëëďí ăńáöĺßďő KDE ěĺ ěéá óőëëďăŢ óőíďäĺőôéęţí ĺńăáëĺßůí"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "ĐďëőěÝóá - š÷ďň"
+msgid "Graphical Environment"
+msgstr "Ăńáöéęü ĐĺńéâÜëëďí"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Ôĺęěçńßůóç"
+msgid "Gnome Workstation"
+msgstr "Óôáčěüň Ĺńăáóßáň Gnome"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Ĺńăáëĺßá Ęďíóüëáň"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr "Ăńáöéęü đĺńéâÜëëďí ěĺ öéëéęÜ ĺńăáëĺßá ęáé ĺöáńěďăÝň"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr "ĹîőđçńĺôçôŢň ôá÷őäńďěĺßďő Postfix, ĺîőđçńĺôçôŢň ĺéäŢóĺůí Inn"
+msgid "Other Graphical Desktops"
+msgstr "śëëá ăńáöéęÜ đĺńéâÜëëďíôá"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Óôáčěüň Äéáäéęôýďő"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, ęëđ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Óôáčěüň đďëőěÝóůí"
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+msgid "Development"
+msgstr "ÁíÜđôőîç"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Ńýčěéóç"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "ÂéâëéďčŢęĺň áíÜđôőîçň C ęáé C++, đńďăńÜěěáôá ęáé Üëëá áń÷ĺßá"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Đĺńéóóüôĺńá ăńáöéęÜ đĺńéâÜëëďíôá (Gnome, IceWM)"
+msgid "Documentation"
+msgstr "Ôĺęěçńßůóç"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr "Ôď đĺńéâÜëëďí ăńáöĺßďő KDE ěĺ ěéá óőëëďăŢ óőíďäĺőôéęţí ĺńăáëĺßůí"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Âéâëßá ęáé ďäçăďß ăéá ôď Linux ęáé ôď Ĺëĺýčĺńď Ëďăéóěéęü"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Ăńáöéęü ĐĺńéâÜëëďí"
+msgid "LSB"
+msgstr "LSB"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
+msgid "Linux Standard Base. Third party applications support"
+msgstr ""
+
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-msgid "Development"
-msgstr "ÁíÜđôőîç"
+#: ../../share/compssUsers:999
+msgid "Web/FTP"
+msgstr "Web/FTP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -174,23 +177,33 @@ msgstr "Apache, Pro-ftpd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "Ĺńăáëĺßá ăéá äçěéďőńăßá ęáé ĺăăńáöŢ CD"
+msgid "Mail/Groupware/News"
+msgstr "Ôá÷őäńďěĺßď/Groupware/ĹéäŢóĺéň"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Óôáčěüň Ĺńăáóßáň Ăńáöĺßďő"
+msgid "Postfix mail server, Inn news server"
+msgstr "ĹîőđçńĺôçôŢň ôá÷őäńďěĺßďő Postfix, ĺîőđçńĺôçôŢň ĺéäŢóĺůí Inn"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, ęëđ"
+msgid "Database"
+msgstr "ÂÜóç ÄĺäďěÝíůí"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "ĐńďăńÜěěáôá ăńáöéęţí üđůň ôď Gimp"
+msgid "PostgreSQL or MySQL database server"
+msgstr "ĹîőđçńĺôçôŢň âÜóçň äĺäďěÝíůí PostgreSQL Ţ MySQL"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Firewall/Router"
+msgstr "Ôďß÷ďň Đńďóôáóßáň/ÄńďěďëďăçôŢň"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Internet gateway"
+msgstr "Đýëç Äéáäéęôýďő"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -199,8 +212,8 @@ msgstr "DNS/NIS "
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "ÂéâëéďčŢęĺň áíÜđôőîçň C ęáé C++, đńďăńÜěěáôá ęáé Üëëá áń÷ĺßá"
+msgid "Domain Name and Network Information Server"
+msgstr "ĹîőđçńĺôçôŢň źíďěá ÔďěÝá ęáé Đëçńďöďńéţí Äéęôýďő"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -209,18 +222,21 @@ msgstr "ĹîőđçńĺôçôŢň äéęôýďő"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "Ôá÷őäńďěĺßď/Groupware/ĹéäŢóĺéň"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr ""
+"ĺîőđçńĺôçôŢň NFS, ĺîőđçńĺôçôŢň SMB, ĺîőđçńĺôçôŢň Proxy, ĺîőđçńĺôçôŢň ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Óôáčěüň đáé÷íéäéţí"
+msgid "Office"
+msgstr "Ăńáöĺßď"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "ĐńďăńÜěěáôá áíáđáńáăůăŢň ęáé ĺđĺîĺńăáóßáň âßíôĺď"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr ""
+"Ĺńăáëĺßá ăéá áëëçëďăńáößá, ĺéäŢóĺéň, éóôďóĺëßäĺň, ěĺôáöďńÜ áń÷ĺßůí ęáé "
+"óőíďěéëßá"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -229,77 +245,66 @@ msgstr "ĐďëőěÝóá - ĂńáöéęÜ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "ÄéáóęÝäáóç (đáé÷íßäéá)"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
-"Ĺńăáëĺßá ăéá áđďóôďëŢ ęáé ëŢřç áëëçëďăńáößáň ęáé ĺéäŢóĺůí (pine, mutt, "
-"tin...) ęáé đĺńéŢăçóç óôď Äéáäßęôőď"
+msgid "Graphics programs such as The Gimp"
+msgstr "ĐńďăńÜěěáôá ăńáöéęţí üđůň ôď Gimp"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "ĐńďóůđéęÜ ďéęďíďěéęÜ"
+msgid "Multimedia - Sound"
+msgstr "ĐďëőěÝóá - š÷ďň"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr "Ăńáöéęü đĺńéâÜëëďí ěĺ öéëéęÜ ĺńăáëĺßá ęáé ĺöáńěďăÝň"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "Ĺńăáëĺßá Ţ÷ďő:đńďăńÜěěáôá áíáđáńáăůăŢň mp3 Ţ midi, ěßęôĺň ęëđ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "ĐĺëÜôĺň ăéá äéáöďńĺôéęÜ đńůôüęďëëá óőěđĺńéëáěâáíďěÝíďő ôďő ssh"
+msgid "Multimedia - Video"
+msgstr "ĐďëőěÝóá - Video"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
+msgid "Video players and editors"
+msgstr "ĐńďăńÜěěáôá áíáđáńáăůăŢň ęáé ĺđĺîĺńăáóßáň âßíôĺď"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Đýëç Äéáäéęôýďő"
+msgid "Multimedia - CD Burning"
+msgstr "ĐďëőěÝóá - ĹăăńáöŢ CD"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "ĐńďăńÜěěáôá áíáđáńáăůăŢň ęáé äéá÷ĺßńéóçň video ęáé Ţ÷ďő"
+msgid "Tools to create and burn CD's"
+msgstr "Ĺńăáëĺßá ăéá äçěéďőńăßá ęáé ĺăăńáöŢ CD"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "śëëá ăńáöéęÜ đĺńéâÜëëďíôá"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Đĺńéóóüôĺńá ăńáöéęÜ đĺńéâÜëëďíôá (Gnome, IceWM)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "ĹđĺîĺńăáóôÝň ęĺéěÝíďő, ęĺëýöç, ĺńăáëĺßá áń÷ĺßůí, ôĺńěáôéęÜ"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, ęëđ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "ĐńďăńÜěěáôá ďéęďíďěéęŢň äéá÷ĺßńéóçň, üđůň ôď gnucash"
+msgid "Personal Information Management"
+msgstr "Äéá÷ĺßńéóç Đńďóůđéęţí ÄĺäďěÝíůí"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "Äéá÷ĺßńéóç Đńďóůđéęţí ÄĺäďěÝíůí"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Ĺńăáëĺßá ăéá Palm Pilot Ţ Visor"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "ĐďëőěÝóá - ĹăăńáöŢ CD"
+msgid "Personal Finance"
+msgstr "ĐńďóůđéęÜ ďéęďíďěéęÜ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Óôáčěüň Ĺńăáóßáň Ĺđéóôçěďíéęţí ĺöáńěďăţí"
+msgid "Programs to manage your finances, such as gnucash"
+msgstr "ĐńďăńÜěěáôá ďéęďíďěéęŢň äéá÷ĺßńéóçň, üđůň ôď gnucash"
 
diff --git a/po/eo.po b/po/eo.po
index 83e3ce53..34521926 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2003-01-19 16:57+0100\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\n"
 "PO-Revision-Date: 2001-09-14 07:53-0500\n"
 "Last-Translator: D. Dale Gulledge <dsplat@rochester.rr.com>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
@@ -13,913 +13,1133 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-3\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl_.c:39
-#, fuzzy
-msgid "Unable to create medium."
-msgstr "Ne povis krei raportdosieron, ćesigas.\n"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:40
-msgid "Unable to update medium; it will be automatically disabled."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to the software installation tool!\n"
+"\n"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:51
-#, fuzzy
-msgid "Add a source"
+#: ../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 ""
-"Bonvole Atendu\n"
-"Aldonas fonton"
 
-#: ../edit-urpm-sources.pl_.c:52
-#, fuzzy
-msgid "Local files"
-msgstr "Loka"
+#: ../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_.c:52
-#, fuzzy
-msgid "Path:"
-msgstr "serćvojo:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr "Problemo okazis dum instalado"
 
-#: ../edit-urpm-sources.pl_.c:53
-msgid "FTP server"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during removal"
+msgstr "Problemo okazis dum instalado"
 
-#: ../edit-urpm-sources.pl_.c:53 ../edit-urpm-sources.pl_.c:54
-#: ../edit-urpm-sources.pl_.c:56 ../edit-urpm-sources.pl_.c:175
-msgid "URL:"
-msgstr "URL:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, removing packages..."
+msgstr "Bonvole atendu dum rpm-o malinstalas ći tiujn pakaźojn:"
 
-#: ../edit-urpm-sources.pl_.c:54
-msgid "HTTP server"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:55
-#, fuzzy
-msgid "Path or mount point:"
-msgstr "surmetingo:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr "Problemo okazis dum instalado"
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Removable device"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during installation"
+msgstr "Problemo okazis dum instalado"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:56 ../rpmdrake_.c:548
-msgid "Security updates"
-msgstr "Sekurecaj řisdatigoj"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Everything already installed."
+msgstr "Pakaźo estas jam instalata"
 
-#: ../edit-urpm-sources.pl_.c:67
-msgid "Browse..."
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:69
-#, fuzzy
-msgid "Choose a mirror..."
-msgstr "Elektu vian spegulon:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:89
-#, fuzzy
-msgid "Login:"
-msgstr "salutnomo:"
+#: ../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 ""
 
-#: ../edit-urpm-sources.pl_.c:89 ../edit-urpm-sources.pl_.c:215
-msgid "Password:"
-msgstr "Passvorto:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "everything was installed correctly"
+msgstr "Pakaźo estas jam instalata"
 
-#: ../edit-urpm-sources.pl_.c:94
-msgid "Name:"
-msgstr "Nomo:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"some packages failed to install\n"
+"correctly"
+msgstr "Pakaźoj jam estas instalataj"
 
-#: ../edit-urpm-sources.pl_.c:96 ../edit-urpm-sources.pl_.c:176
-#, fuzzy
-msgid "Relative path to synthesis/hdlist:"
-msgstr "relativa vojo al hdlist: "
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, removing packages to allow others to be upgraded..."
+msgstr "Bonvole elektu la pakaźojn vi deziras řisdatigi"
 
-#: ../edit-urpm-sources.pl_.c:104
-msgid "You need to fill up at least the two first entries."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:116
-#, fuzzy
-msgid "Adding a source:"
-msgstr ""
-"Bonvole Atendu\n"
-"Aldonas fonton"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Installation failed"
+msgstr "Instalebla"
 
-#: ../edit-urpm-sources.pl_.c:117
-msgid "Type of source:"
-msgstr "Speco de fonto:"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
+msgstr "Forigu"
 
-#: ../edit-urpm-sources.pl_.c:121 ../edit-urpm-sources.pl_.c:187
-#: ../edit-urpm-sources.pl_.c:219 ../rpmdrake.pm_.c:97 ../rpmdrake.pm_.c:136
-#: ../rpmdrake.pm_.c:319 ../rpmdrake_.c:353 ../rpmdrake_.c:365
-#: ../rpmdrake_.c:369 ../rpmdrake_.c:916 ../rpmdrake_.c:950
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
 msgid "Ok"
 msgstr "Jes"
 
-#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:180
-#: ../edit-urpm-sources.pl_.c:187 ../edit-urpm-sources.pl_.c:220
-#: ../rpmdrake.pm_.c:319 ../rpmdrake.pm_.c:352 ../rpmdrake_.c:353
-#: ../rpmdrake_.c:950
-msgid "Cancel"
-msgstr "Forigu"
-
-#: ../edit-urpm-sources.pl_.c:140
-#, fuzzy
-msgid "Please wait, adding medium..."
-msgstr "Kontrolas dependaźojn..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:158
-#, fuzzy
-msgid "Please wait, removing medium..."
-msgstr "Kontrolas dependaźojn..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:169
-#, fuzzy
-msgid "Edit a source"
-msgstr "Redaktu Fontojn"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:173
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "Redaktu Fontojn"
+msgid "Unable to get source packages."
+msgstr "Malbonaj, nelegeblaj aý netrovataj pakaźoj"
 
-#: ../edit-urpm-sources.pl_.c:179
-#, fuzzy
-msgid "Save changes"
-msgstr "Pakaźoj"
+#: ../rpmdrake:1
+#, c-format
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:185
-msgid "You need to insert the medium to continue"
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:186
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:191
-#, fuzzy
-msgid "Please wait, updating medium..."
-msgstr "Kontrolas dependaźojn..."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Installation finished"
+msgstr "Instalebla"
 
-#: ../edit-urpm-sources.pl_.c:202
-#, fuzzy
-msgid "Configure proxies"
-msgstr "Ću konfiguri fonton?"
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:207
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:209
-#, fuzzy
-msgid "Proxy hostname:"
-msgstr "Salutnomo por prokura servilo:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Remove .%s"
+msgstr "Deprenebla"
 
-#: ../edit-urpm-sources.pl_.c:211
-msgid "You may specify a user/password for the proxy authentication:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "changes:"
+msgstr "Pakaźoj"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:213
-#, fuzzy
-msgid "User:"
-msgstr "Salutnomo:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, finding available packages..."
+msgstr "resarřu listojn de haveblaj pakaźoj"
 
-#: ../edit-urpm-sources.pl_.c:235
-#, fuzzy
-msgid "Configure sources"
-msgstr "Ću konfiguri fonton?"
+#: ../rpmdrake:1
+#, c-format
+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 ""
 
-#: ../edit-urpm-sources.pl_.c:242
-msgid "Enabled?"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:243
-msgid "Source"
-msgstr "Fonto"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:264 ../rpmdrake_.c:730
-#, fuzzy
-msgid "Remove"
-msgstr "Deprenebla"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Sources Manager, and then add a `Security\n"
+"updates' source.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:266
-msgid "Edit"
-msgstr "Redaktu"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:268
-msgid "Add..."
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:270
-msgid "Update..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:271
-#, fuzzy
-msgid "Proxy..."
-msgstr "Eraro..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:274
-msgid "Save and quit"
+#: ../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 ""
 
-#: ../edit-urpm-sources.pl_.c:275 ../rpmdrake_.c:733
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Software Packages Installation"
+msgstr "Instalado de pakaźoj"
+
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, fuzzy, c-format
+msgid "Mandrake Update"
+msgstr ""
+"Mandrake\n"
+"Řisdatigilo"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Software Packages Removal"
+msgstr " ProgramarAdministrilo "
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
 msgid "Quit"
 msgstr "Forlasu"
 
-#: ../rpmdrake.pm_.c:93
-msgid "Yes"
-msgstr ""
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "Instalu"
 
-#: ../rpmdrake.pm_.c:95
-msgid "No"
-msgstr ""
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Remove"
+msgstr "Deprenebla"
 
-#: ../rpmdrake.pm_.c:127
-msgid "Info..."
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Search"
+msgstr "serću"
 
-#: ../rpmdrake.pm_.c:180
-msgid "Austria"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "Trovu:"
+
+#: ../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 ""
 
-#: ../rpmdrake.pm_.c:181
-msgid "Australia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:182
-msgid "Belgium"
+#: ../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 ""
 
-#: ../rpmdrake.pm_.c:183
-msgid "Brazil"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Too many packages are selected"
+msgstr "Pakaźoj jam estas instalataj"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:184
-msgid "Canada"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Normal information"
+msgstr "normaj řisdatigoj"
+
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update source(s)"
+msgstr "Redaktu Fontojn"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Reload the packages list"
+msgstr "La pakaźo %s ne estas subskribita"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:185
-msgid "Costa Rica"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "in files"
+msgstr "Loka"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "in descriptions"
+msgstr "Priskriboj"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:186
-msgid "Czech Republic"
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:187
-msgid "Germany"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:188
-msgid "Danmark"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:189 ../rpmdrake.pm_.c:193
-msgid "Greece"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "by size"
+msgstr "Profunda grandeca"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:190
-msgid "Spain"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "All packages,"
+msgstr "0 pakaźoj, 0 bitokoj"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:191
-#, fuzzy
-msgid "Finland"
-msgstr "Trovu:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mandrake choices"
+msgstr "MandrakeŘisdatigilo"
 
-#: ../rpmdrake.pm_.c:192
-#, fuzzy
-msgid "France"
-msgstr "Nuligu"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Normal updates"
+msgstr "normaj řisdatigoj"
 
-#: ../rpmdrake.pm_.c:194
-#, fuzzy
-msgid "Israel"
-msgstr "Instalataj"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Bugfixes updates"
+msgstr "Sekurecaj řisdatigoj"
 
-#: ../rpmdrake.pm_.c:195
-#, fuzzy
-msgid "Italy"
-msgstr "Instalataj"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
+msgstr "Sekurecaj řisdatigoj"
 
-#: ../rpmdrake.pm_.c:196
-msgid "Japan"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Description: "
+msgstr "Priskriboj"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Summary: "
+msgstr "Resumo: "
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
 msgstr ""
 
-#: ../rpmdrake.pm_.c:197
-msgid "Korea"
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Size: "
+msgstr "Grandeco: "
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Version: "
+msgstr "Versio: "
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "Nomo: "
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
 msgstr ""
 
-#: ../rpmdrake.pm_.c:198
-msgid "Netherlands"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
 msgstr ""
 
-#: ../rpmdrake.pm_.c:199
-msgid "Norway"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Source: "
+msgstr "Fonto"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "(Not available)"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:200
-msgid "Poland"
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:201
-#, fuzzy
-msgid "Portugal"
-msgstr "Pordo:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Files:\n"
+msgstr "/_Dosiero"
 
-#: ../rpmdrake.pm_.c:202
-msgid "Russia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected size: %d MB"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:203
-msgid "Sweden"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:204
-msgid "Taiwan"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:205
-msgid "United Kingdom"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:206
-msgid "China"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be installed"
+msgstr "Pakaźoj jam estas instalataj"
 
-#: ../rpmdrake.pm_.c:207 ../rpmdrake.pm_.c:208 ../rpmdrake.pm_.c:209
-#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:261
-msgid "United States"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:274
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+#: ../rpmdrake:1
+#, c-format
+msgid "Additional packages needed"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:280
-msgid "Error during download"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be removed"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:289
-#, fuzzy
-msgid "No mirror"
-msgstr "Neniu eraro"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
 
-#: ../rpmdrake.pm_.c:307
-#, fuzzy
-msgid "Please choose the desired mirror."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
 msgstr ""
-"Bonvole Atendu\n"
-"Prenas la liston de speguloj"
+"Por plenumi ćiujn el la dependaźoj,\n"
+"ći tiuj pakaźoj estos malinstalataj:"
 
-#: ../rpmdrake.pm_.c:339 ../rpmdrake_.c:627
-#, fuzzy
-msgid "Update source(s)"
-msgstr "Redaktu Fontojn"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some additional packages need to be removed"
+msgstr "Vi devas instali ći tiujn pakaźojn por ćiuj bone funkcias:"
 
-#: ../rpmdrake.pm_.c:343
-#, fuzzy
-msgid "Select the source(s) you wish to update:"
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
 msgstr ""
-"Bonvole elektu la fontojn\n"
-"vi deziras řisdatigi:"
 
-#: ../rpmdrake.pm_.c:347
-msgid "Update"
-msgstr "Řisdatigu"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Information on packages"
+msgstr "Ne povas malfermi pakaźon"
 
-#: ../rpmdrake.pm_.c:358
-#, fuzzy
-msgid "Please wait, updating media..."
-msgstr "Kontrolas dependaźojn..."
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
+msgstr ""
 
-#: ../rpmdrake_.c:99
-msgid "Other"
+#: ../rpmdrake:1
+#, c-format
+msgid "Addable"
 msgstr ""
 
-#: ../rpmdrake_.c:121 ../rpmdrake_.c:135 ../rpmdrake_.c:227 ../rpmdrake_.c:298
-msgid "(none)"
-msgstr "(nenio)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Upgradable"
+msgstr ""
 
-#: ../rpmdrake_.c:141 ../rpmdrake_.c:482 ../rpmdrake_.c:483
-msgid "(Not available)"
+#: ../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_.c:151 ../rpmdrake_.c:208
-#, fuzzy
-msgid "Search results"
-msgstr "Serćrezulto"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "No update"
+msgstr "normaj řisdatigoj"
 
-#: ../rpmdrake_.c:151
-#, fuzzy
-msgid "Search results (none)"
-msgstr "Serćrezulto"
+#: ../rpmdrake:1
+#, c-format
+msgid "(none)"
+msgstr "(nenio)"
 
-#: ../rpmdrake_.c:161 ../rpmdrake_.c:172
-#, fuzzy
-msgid "Please wait, searching..."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, listing packages..."
 msgstr "Bonvole atendu dum rpm-o malinstalas ći tiujn pakaźojn:"
 
-#: ../rpmdrake_.c:175
-msgid "Stop"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "Nekonata pařo"
 
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-msgid "Addable"
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
 msgstr ""
 
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-msgid "Upgradable"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please choose"
 msgstr ""
 
-#: ../rpmdrake_.c:211
-#, fuzzy
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
 msgid "Not selected"
 msgstr ""
 "Malelektu\n"
 "ćiujn"
 
-#: ../rpmdrake_.c:211
-#, fuzzy
+#: ../rpmdrake:1
+#, fuzzy, c-format
 msgid "Selected"
 msgstr "Elektu ćiujn"
 
-#: ../rpmdrake_.c:240
-msgid "rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake_.c:258 ../rpmdrake_.c:360 ../rpmdrake_.c:362
-msgid "More information on package..."
-msgstr ""
-
-#: ../rpmdrake_.c:259
-msgid "One of the following packages is needed:"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Search results"
+msgstr "Serćrezulto"
 
-#: ../rpmdrake_.c:259
-msgid "Please choose"
+#: ../rpmdrake:1
+#, c-format
+msgid "Stop"
 msgstr ""
 
-#: ../rpmdrake_.c:275
-#, fuzzy
-msgid "unknown package "
-msgstr "Nekonata pařo"
-
-#: ../rpmdrake_.c:285
-#, fuzzy
-msgid "Please wait, listing packages..."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, searching..."
 msgstr "Bonvole atendu dum rpm-o malinstalas ći tiujn pakaźojn:"
 
-#: ../rpmdrake_.c:300
-#, fuzzy
-msgid "No update"
-msgstr "normaj řisdatigoj"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Search results (none)"
+msgstr "Serćrezulto"
 
-#: ../rpmdrake_.c:353 ../rpmdrake_.c:354
-msgid "More infos"
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
 msgstr ""
 
-#: ../rpmdrake_.c:355
-#, fuzzy
-msgid "Information on packages"
-msgstr "Ne povas malfermi pakaźon"
-
-#: ../rpmdrake_.c:376
-#, fuzzy
-msgid "Some additional packages need to be removed"
-msgstr "Vi devas instali ći tiujn pakaźojn por ćiuj bone funkcias:"
-
-#: ../rpmdrake_.c:377
-#, fuzzy
+#: ../edit-urpm-sources.pl:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"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 ""
-"Por plenumi ćiujn el la dependaźoj,\n"
-"ći tiuj pakaźoj estos malinstalataj:"
 
-#: ../rpmdrake_.c:383 ../rpmdrake_.c:391
-msgid "Some packages can't be removed"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
 msgstr ""
 
-#: ../rpmdrake_.c:384
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Proxy..."
+msgstr "Eraro..."
 
-#: ../rpmdrake_.c:392 ../rpmdrake_.c:451
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
 msgstr ""
 
-#: ../rpmdrake_.c:421
-msgid "Additional packages needed"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
 msgstr ""
 
-#: ../rpmdrake_.c:422
-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 "Edit"
+msgstr "Redaktu"
 
-#: ../rpmdrake_.c:435
-#, fuzzy
-msgid "Some packages can't be installed"
-msgstr "Pakaźoj jam estas instalataj"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Source"
+msgstr "Fonto"
 
-#: ../rpmdrake_.c:436
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
 msgstr ""
 
-#: ../rpmdrake_.c:450 ../rpmdrake_.c:684
-msgid "Some packages need to be removed"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure sources"
+msgstr "Ću konfiguri fonton?"
 
-#: ../rpmdrake_.c:472
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr ""
+msgid "Password:"
+msgstr "Passvorto:"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "User:"
+msgstr "Salutnomo:"
 
-#: ../rpmdrake_.c:474
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected size: %d MB"
+msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 
-#: ../rpmdrake_.c:482
-#, fuzzy
-msgid "Files:\n"
-msgstr "/_Dosiero"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Proxy hostname:"
+msgstr "Salutnomo por prokura servilo:"
 
-#: ../rpmdrake_.c:483
-msgid "Changelog:\n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
 msgstr ""
 
-#: ../rpmdrake_.c:486
-#, fuzzy
-msgid "Source: "
-msgstr "Fonto"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure proxies"
+msgstr "Ću konfiguri fonton?"
 
-#: ../rpmdrake_.c:487
-msgid "Currently installed version: "
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, updating medium..."
+msgstr "Kontrolas dependaźojn..."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
 msgstr ""
 
-#: ../rpmdrake_.c:491
-msgid "Reason for update: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
 msgstr ""
 
-#: ../rpmdrake_.c:493
-msgid "Name: "
-msgstr "Nomo: "
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Save changes"
+msgstr "Pakaźoj"
 
-#: ../rpmdrake_.c:494
-msgid "Version: "
-msgstr "Versio: "
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "relativa vojo al hdlist: "
 
-#: ../rpmdrake_.c:495
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake_.c:495
-msgid "Size: "
-msgstr "Grandeco: "
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing source \"%s\":"
+msgstr "Redaktu Fontojn"
 
-#: ../rpmdrake_.c:497
-msgid "Importance: "
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Edit a source"
+msgstr "Redaktu Fontojn"
 
-#: ../rpmdrake_.c:498
-msgid "Summary: "
-msgstr "Resumo: "
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, removing medium..."
+msgstr "Kontrolas dependaźojn..."
 
-#: ../rpmdrake_.c:499
-#, fuzzy
-msgid "Description: "
-msgstr "Priskriboj"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, adding medium..."
+msgstr "Kontrolas dependaźojn..."
 
-#: ../rpmdrake_.c:548
-#, fuzzy
-msgid "Bugfixes updates"
-msgstr "Sekurecaj řisdatigoj"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of source:"
+msgstr "Speco de fonto:"
 
-#: ../rpmdrake_.c:548
-#, fuzzy
-msgid "Normal updates"
-msgstr "normaj řisdatigoj"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Adding a source:"
+msgstr ""
+"Bonvole Atendu\n"
+"Aldonas fonton"
 
-#: ../rpmdrake_.c:567
-#, fuzzy
-msgid "Mandrake choices"
-msgstr "MandrakeŘisdatigilo"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
 
-#: ../rpmdrake_.c:568
-msgid "All packages, alphabetical"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to fill up at least the two first entries."
 msgstr ""
 
-#: ../rpmdrake_.c:569
-#, fuzzy
-msgid "All packages,"
-msgstr "0 pakaźoj, 0 bitokoj"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "Nomo:"
 
-#: ../rpmdrake_.c:592
-msgid "by group"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Login:"
+msgstr "salutnomo:"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Choose a mirror..."
+msgstr "Elektu vian spegulon:"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Browse..."
 msgstr ""
 
-#: ../rpmdrake_.c:592
-#, fuzzy
-msgid "by size"
-msgstr "Profunda grandeca"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Path or mount point:"
+msgstr "surmetingo:"
 
-#: ../rpmdrake_.c:593
-msgid "by selection state"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Removable device"
 msgstr ""
 
-#: ../rpmdrake_.c:594
-msgid "by source repository"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "HTTP server"
 msgstr ""
 
-#: ../rpmdrake_.c:594
-msgid "by update availability"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
 msgstr ""
 
-#: ../rpmdrake_.c:615
-#, fuzzy
-msgid "in descriptions"
-msgstr "Priskriboj"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Path:"
+msgstr "serćvojo:"
 
-#: ../rpmdrake_.c:615
-#, fuzzy
-msgid "in files"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Local files"
 msgstr "Loka"
 
-#: ../rpmdrake_.c:615
-msgid "in names"
-msgstr ""
-
-#: ../rpmdrake_.c:626
-#, fuzzy
-msgid "Reload the packages list"
-msgstr "La pakaźo %s ne estas subskribita"
-
-#: ../rpmdrake_.c:626
-msgid "Reset the selection"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a source"
 msgstr ""
+"Bonvole Atendu\n"
+"Aldonas fonton"
 
-#: ../rpmdrake_.c:652
-msgid "Maximum information"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
 msgstr ""
 
-#: ../rpmdrake_.c:652
-#, fuzzy
-msgid "Normal information"
-msgstr "normaj řisdatigoj"
-
-#: ../rpmdrake_.c:674
-#, fuzzy
-msgid "Too many packages are selected"
-msgstr "Pakaźoj jam estas instalataj"
-
-#: ../rpmdrake_.c:720
-msgid "Find:"
-msgstr "Trovu:"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Unable to create medium."
+msgstr "Ne povis krei raportdosieron, ćesigas.\n"
 
-#: ../rpmdrake_.c:725
-#, fuzzy
-msgid "Search"
-msgstr "serću"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Please wait, updating media..."
+msgstr "Kontrolas dependaźojn..."
 
-#: ../rpmdrake_.c:731
-msgid "Install"
-msgstr "Instalu"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
+msgstr "Řisdatigu"
 
-#: ../rpmdrake_.c:738 data/mandrakeupdate.desktop.in.h:1
-#, fuzzy
-msgid "Mandrake Update"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Select the source(s) you wish to update:"
 msgstr ""
-"Mandrake\n"
-"Řisdatigilo"
-
-#: ../rpmdrake_.c:738
-#, fuzzy
-msgid "Software Packages Installation"
-msgstr "Instalado de pakaźoj"
-
-#: ../rpmdrake_.c:738
-#, fuzzy
-msgid "Software Packages Removal"
-msgstr " ProgramarAdministrilo "
+"Bonvole elektu la fontojn\n"
+"vi deziras řisdatigi:"
 
-#: ../rpmdrake_.c:779
-msgid "Please wait, contacting mirror to update packages information."
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Please choose the desired mirror."
 msgstr ""
+"Bonvole Atendu\n"
+"Prenas la liston de speguloj"
 
-#: ../rpmdrake_.c:781
-msgid "Error updating medium"
+#: ../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_.c:782
-msgid "There was an unrecoverable error while updating packages information."
-msgstr ""
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "No mirror"
+msgstr "Neniu eraro"
 
-#: ../rpmdrake_.c:787
-msgid "How to choose manually your mirror"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid ""
+"There was an error downloading the mirrors list:\n"
+"\n"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
 
-#: ../rpmdrake_.c:795
-msgid "Please wait, contacting mirror to initialize updates packages."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
 msgstr ""
 
-#: ../rpmdrake_.c:798
-msgid "Error adding update medium"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
 
-#: ../rpmdrake_.c:829
-#, fuzzy
-msgid "Please wait, finding available packages..."
-msgstr "resarřu listojn de haveblaj pakaźoj"
-
-#: ../rpmdrake_.c:861
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Inspecting %s"
+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_.c:880
-#, fuzzy
-msgid "changes:"
-msgstr "Pakaźoj"
-
-#: ../rpmdrake_.c:884
-#, fuzzy, c-format
-msgid "Remove .%s"
-msgstr "Deprenebla"
-
-#: ../rpmdrake_.c:886
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Use .%s as main file"
+msgid "United States"
 msgstr ""
 
-#: ../rpmdrake_.c:888
-msgid "Do nothing"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
 msgstr ""
 
-#: ../rpmdrake_.c:900
-#, fuzzy
-msgid "Installation finished"
-msgstr "Instalebla"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr ""
 
-#: ../rpmdrake_.c:910
-msgid "Inspect..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
 msgstr ""
 
-#: ../rpmdrake_.c:925
-msgid "Program missing"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
 msgstr ""
 
-#: ../rpmdrake_.c:926
-msgid "A required program is missing (grpmi). Check your installation."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
 msgstr ""
 
-#: ../rpmdrake_.c:940
-#, fuzzy
-msgid "Unable to get source packages."
-msgstr "Malbonaj, nelegeblaj aý netrovataj pakaźoj"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Portugal"
+msgstr "Pordo:"
 
-#: ../rpmdrake_.c:941
-msgid "Unable to get source packages, sorry."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
 msgstr ""
 
-#: ../rpmdrake_.c:948
-msgid "Change medium"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
 msgstr ""
 
-#: ../rpmdrake_.c:949
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+msgid "Netherlands"
 msgstr ""
 
-#: ../rpmdrake_.c:957
-#, fuzzy
-msgid "Installation failed"
-msgstr "Instalebla"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Korea"
+msgstr ""
 
-#: ../rpmdrake_.c:958
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Japan"
 msgstr ""
 
-#: ../rpmdrake_.c:961
-#, fuzzy
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr "Bonvole elektu la pakaźojn vi deziras řisdatigi"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Italy"
+msgstr "Instalataj"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Israel"
+msgstr "Instalataj"
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm: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 "Greece"
 msgstr ""
 
-#: ../rpmdrake_.c:982
-#, fuzzy
-msgid ""
-"some packages failed to install\n"
-"correctly"
-msgstr "Pakaźoj jam estas instalataj"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "France"
+msgstr "Nuligu"
 
-#: ../rpmdrake_.c:983
-#, fuzzy
-msgid "everything was installed correctly"
-msgstr "Pakaźo estas jam instalata"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Finland"
+msgstr "Trovu:"
 
-#: ../rpmdrake_.c:985
-msgid "Everything installed successfully"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
 msgstr ""
 
-#: ../rpmdrake_.c:986
-msgid "All requested packages were installed successfully."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
 msgstr ""
 
-#: ../rpmdrake_.c:989
-#, fuzzy
-msgid "Everything already installed."
-msgstr "Pakaźo estas jam instalata"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr ""
 
-#: ../rpmdrake_.c:990
-msgid "Everything already installed (is this supposed to happen at all?)."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
 msgstr ""
 
-#: ../rpmdrake_.c:997
-#, fuzzy
-msgid "Problem during installation"
-msgstr "Problemo okazis dum instalado"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Costa Rica"
+msgstr ""
 
-#: ../rpmdrake_.c:998
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr "Problemo okazis dum instalado"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Canada"
+msgstr ""
 
-#: ../rpmdrake_.c:1012
-msgid "Please wait, reading packages database..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
 msgstr ""
 
-#: ../rpmdrake_.c:1053
-#, fuzzy
-msgid "Please wait, removing packages..."
-msgstr "Bonvole atendu dum rpm-o malinstalas ći tiujn pakaźojn:"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Belgium"
+msgstr ""
 
-#: ../rpmdrake_.c:1056
-#, fuzzy
-msgid "Problem during removal"
-msgstr "Problemo okazis dum instalado"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Australia"
+msgstr ""
 
-#: ../rpmdrake_.c:1057
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr "Problemo okazis dum instalado"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
+msgstr ""
 
-#: ../rpmdrake_.c:1089
-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."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Info..."
 msgstr ""
 
-#: ../rpmdrake_.c:1094
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
 msgstr ""
 
-#: ../rpmdrake_.c:1099
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
 msgstr ""
 
+#: data/rpmdrake.desktop.in.h:1
+#, fuzzy
+msgid "Install Software"
+msgstr "Instalu ćio"
+
 #: data/rpmdrake-remove.desktop.in.h:1
 msgid "Remove Software"
 msgstr ""
@@ -928,11 +1148,6 @@ msgstr ""
 msgid "Software Sources Manager"
 msgstr ""
 
-#: data/rpmdrake.desktop.in.h:1
-#, fuzzy
-msgid "Install Software"
-msgstr "Instalu ćio"
-
 #, fuzzy
 #~ msgid "Update sources"
 #~ msgstr "Redaktu Fontojn"
diff --git a/po/eo.pom b/po/eo.pom
index fba891b5..e4448180 100644
--- a/po/eo.pom
+++ b/po/eo.pom
@@ -4,170 +4,176 @@ msgstr "Servilo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "TTT/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
 #, fuzzy
-msgid "Network Computer (client)"
-msgstr "Reta Printilo (ingo)"
+msgid "Office Workstation"
+msgstr "Laborstacio"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Oficejo"
+msgid "Workstation"
+msgstr "Laborstacio"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Gnoma Laborstacio"
+#, fuzzy
+msgid "Game station"
+msgstr "Dokumentaro"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
+msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Laborstacio"
+#, fuzzy
+msgid "Multimedia station"
+msgstr "Plurmedia - Sono"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
+msgid "Sound and video playing/editing programs"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr ""
+#, fuzzy
+msgid "Internet station"
+msgstr "Interreta Konfigurado"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr ""
+#, fuzzy
+msgid "Network Computer (client)"
+msgstr "Reta Printilo (ingo)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
+msgid "Clients for different protocols including ssh"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr ""
+#, fuzzy
+msgid "Configuration"
+msgstr "LAN KonfiguraÄľo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "KDE Laborstacio"
+#, fuzzy
+msgid "Tools to ease the configuration of your computer"
+msgstr "Ĉu vi deziras provi la konfiguraľon?"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr ""
+#, fuzzy
+msgid "Scientific Workstation"
+msgstr "Laborstacio"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Plurmedia - Video"
+msgid "Scientific applications such as gnuplot"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgid "Console Tools"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Database"
-msgstr "Datumbazoj"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Redaktiloj, ŝeloj, dosieriloj, terminaloj"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
+msgid "KDE Workstation"
+msgstr "KDE Laborstacio"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Tools to ease the configuration of your computer"
-msgstr "Ću vi deziras provi la konfiguraźon?"
+msgid "Graphical Environment"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "Plurmedia - Sono"
+msgid "Gnome Workstation"
+msgstr "Gnoma Laborstacio"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dokumentaro"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Console Tools"
+msgid "Other Graphical Desktops"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 #, fuzzy
-msgid "Internet station"
-msgstr "Interreta Konfigurado"
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+msgid "Development"
+msgstr "Programisto"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Multimedia station"
-msgstr "Plurmedia - Sono"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C kaj C++ programadaj bibliotekoj, programoj kaj ĉapdosieroj"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Configuration"
-msgstr "LAN Konfiguraźo"
+msgid "Documentation"
+msgstr "Dokumentaro"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
+msgid "Books and Howto's on Linux and Free Software"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
+msgid "LSB"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
+msgid "Linux Standard Base. Third party applications support"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-msgid "Development"
-msgstr "Programisto"
+msgid "Web/FTP"
+msgstr "TTT/FTP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -176,34 +182,45 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
+msgid "Mail/Groupware/News"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Postfix mail server, Inn news server"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 #, fuzzy
-msgid "Office Workstation"
-msgstr "Laborstacio"
+msgid "Database"
+msgstr "Datumbazoj"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgid "PostgreSQL or MySQL database server"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
+msgid "Firewall/Router"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
+#, fuzzy
+msgid "Internet gateway"
+msgstr "Interreto"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "DNS/NIS "
 msgstr "DNS/NIS"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C kaj C++ programadaj bibliotekoj, programoj kaj ćapdosieroj"
+msgid "Domain Name and Network Information Server"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -213,18 +230,17 @@ msgstr "Reta Printilo (ingo)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
+msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Game station"
-msgstr "Dokumentaro"
+msgid "Office"
+msgstr "Oficejo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
@@ -234,77 +250,66 @@ msgstr "Plurmedia - Grafiko"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
+msgid "Graphics programs such as The Gimp"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr ""
+msgid "Multimedia - Sound"
+msgstr "Plurmedia - Sono"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr ""
+msgid "Multimedia - Video"
+msgstr "Plurmedia - Video"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "LSB"
+msgid "Video players and editors"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Internet gateway"
-msgstr "Interreto"
+msgid "Multimedia - CD Burning"
+msgstr "Plurmedia - KD-ROM Kreado"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
+msgid "Tools to create and burn CD's"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
+msgid "More Graphical Desktops (Gnome, IceWM)"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Redaktiloj, ţeloj, dosieriloj, terminaloj"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
+msgid "Personal Information Management"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
+msgid "Tools for your Palm Pilot or your Visor"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Plurmedia - KD-ROM Kreado"
+msgid "Personal Finance"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Scientific Workstation"
-msgstr "Laborstacio"
+msgid "Programs to manage your finances, such as gnucash"
+msgstr ""
 
diff --git a/po/es.po b/po/es.po
index 64f9c0d2..e18ad0ad 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2003-01-24 16:31+0100\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\n"
 "PO-Revision-Date: 2003-01-24 10:33-0300\n"
 "Last-Translator: Carlos SĂĄnchez <vcbsaorc@vc.ehu.es>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -17,1053 +17,1236 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../edit-urpm-sources.pl_.c:39
-msgid "Unable to create medium."
-msgstr "No se puede crear el soporte."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"ÂżDesea continuar?"
 
-#: ../edit-urpm-sources.pl_.c:40
-msgid "Unable to update medium; it will be automatically disabled."
-msgstr "No se puede actualizar el soporte; se deshabilitarĂĄ automĂĄticamente."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to the software installation tool!\n"
+"\n"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
+msgstr ""
+"ÂĄBienvenido a la herramienta de instalaciĂłn de software!\n"
+"\n"
+"Su sistema Mandrake Linux viene con varios miles de paquetes de software en\n"
+"CDROM o DVD. Esta herramienta lo ayudarĂĄ a elegir el software que desea\n"
+"instalar en su computadora."
 
-#: ../edit-urpm-sources.pl_.c:50
-msgid "Add a source"
-msgstr "Agregar una fuente"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"ÂĄBienvenido a MandrakeUpdate!\n"
+"\n"
+"Esta herramienta lo ayudarĂĄ a elegir las actualizaciones que desea instalar "
+"en su computadora."
 
-#: ../edit-urpm-sources.pl_.c:51
-msgid "Local files"
-msgstr "Archivos locales"
+#: ../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 ""
+"ÂĄBienvenido a la herramienta para quitar software!\n"
+"\n"
+"Esta herramienta lo ayudarĂĄ a elegir el software que desea quitar de su "
+"computadora."
 
-#: ../edit-urpm-sources.pl_.c:51
-msgid "Path:"
-msgstr "Ruta:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"Hubo un problema durante la eliminaciĂłn de paquetes:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:52
-msgid "FTP server"
-msgstr "Servidor FTP"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during removal"
+msgstr "Problema durante la eliminaciĂłn"
 
-#: ../edit-urpm-sources.pl_.c:52 ../edit-urpm-sources.pl_.c:53
-#: ../edit-urpm-sources.pl_.c:55 ../edit-urpm-sources.pl_.c:183
-msgid "URL:"
-msgstr "URL:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages..."
+msgstr "Por favor espere, quitando paquetes..."
 
-#: ../edit-urpm-sources.pl_.c:53
-msgid "HTTP server"
-msgstr "Servidor HTTP"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
+msgstr "Por favor espere, leyendo la base de datos de paquetes..."
 
-#: ../edit-urpm-sources.pl_.c:54
-msgid "Path or mount point:"
-msgstr "Ruta o punto de montaje:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Hubo un problema durante la instalaciĂłn:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:54
-msgid "Removable device"
-msgstr "Dispositivo removible"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during installation"
+msgstr "Problema durante la instalaciĂłn"
 
-#: ../edit-urpm-sources.pl_.c:55 ../rpmdrake_.c:548
-msgid "Security updates"
-msgstr "Actualizaciones de seguridad"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
+msgstr "Ya estĂĄ todo instalado (Âżseguro que deberĂ­a ocurrir esto?)."
 
-#: ../edit-urpm-sources.pl_.c:66
-msgid "Browse..."
-msgstr "Examinar..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed."
+msgstr "Ya estĂĄ todo instalado."
 
-#: ../edit-urpm-sources.pl_.c:68
-msgid "Choose a mirror..."
-msgstr "Elija un sitio de rĂŠplica..."
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "Se instalaron satisfactoriamente todos los paquetes pedidos."
 
-#: ../edit-urpm-sources.pl_.c:88
-msgid "Login:"
-msgstr "Cuenta:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr "Se instalĂł todo satisfactoriamente"
 
-#: ../edit-urpm-sources.pl_.c:88 ../edit-urpm-sources.pl_.c:227
-msgid "Password:"
-msgstr "ContraseĂąa:"
+#: ../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 ""
+"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:"
 
-#: ../edit-urpm-sources.pl_.c:93
-msgid "Name:"
-msgstr "Nombre:"
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "se instalĂł todo correctamente"
 
-#: ../edit-urpm-sources.pl_.c:95 ../edit-urpm-sources.pl_.c:184
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Ruta relativa de synthesis/hdlist:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"some packages failed to install\n"
+"correctly"
+msgstr ""
+"no se pueden instalar correctamente algunos\n"
+"paquetes"
 
-#: ../edit-urpm-sources.pl_.c:103
-msgid "You need to fill up at least the two first entries."
-msgstr "Debe completar al menos las dos primeras entradas."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages to allow others to be upgraded..."
+msgstr "Por favor espere, quitando paquetes para permitir actualizar otros..."
 
-#: ../edit-urpm-sources.pl_.c:116
-msgid "Adding a source:"
-msgstr "Agregando una fuente:"
+#: ../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."
 
-#: ../edit-urpm-sources.pl_.c:117
-msgid "Type of source:"
-msgstr "Tipo de fuente:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation failed"
+msgstr "FallĂł la instalaciĂłn"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
+msgstr "Cancelar"
 
-#: ../edit-urpm-sources.pl_.c:121 ../edit-urpm-sources.pl_.c:198
-#: ../edit-urpm-sources.pl_.c:231 ../rpmdrake.pm_.c:100 ../rpmdrake.pm_.c:139
-#: ../rpmdrake.pm_.c:322 ../rpmdrake_.c:353 ../rpmdrake_.c:365
-#: ../rpmdrake_.c:369 ../rpmdrake_.c:916 ../rpmdrake_.c:950
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
 msgid "Ok"
 msgstr "Aceptar"
 
-#: ../edit-urpm-sources.pl_.c:136 ../edit-urpm-sources.pl_.c:192
-#: ../edit-urpm-sources.pl_.c:198 ../edit-urpm-sources.pl_.c:238
-#: ../rpmdrake.pm_.c:322 ../rpmdrake.pm_.c:355 ../rpmdrake_.c:353
-#: ../rpmdrake_.c:950
-msgid "Cancel"
-msgstr "Cancelar"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Por favor inserte el soporte denominado \"%s\" en el dispositivo [%s]"
 
-#: ../edit-urpm-sources.pl_.c:143
-msgid "Please wait, adding medium..."
-msgstr "Por favor espere, agregando soporte..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr "Cambiar el soporte"
 
-#: ../edit-urpm-sources.pl_.c:164
-msgid "Please wait, removing medium..."
-msgstr "Por favor espere, quitando soporte..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
+msgstr "No se pueden obtener los paquetes de la fuente, lo siento."
 
-#: ../edit-urpm-sources.pl_.c:177
-msgid "Edit a source"
-msgstr "Editar una fuente"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages."
+msgstr "No se pueden obtener los paquetes de la fuente."
 
-#: ../edit-urpm-sources.pl_.c:181
+#: ../rpmdrake:1
 #, c-format
-msgid "Editing source \"%s\":"
-msgstr "Editando fuente \"%s\":"
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr "Falta un programa necesario (grpmi). Verifique su instalaciĂłn."
 
-#: ../edit-urpm-sources.pl_.c:187
-msgid "Save changes"
-msgstr "Guardar cambios"
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
+msgstr "Falta un programa"
 
-#: ../edit-urpm-sources.pl_.c:196
-msgid "You need to insert the medium to continue"
-msgstr "Necesita insertar el soporte para continuar"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
+msgstr "Inspeccionar..."
 
-#: ../edit-urpm-sources.pl_.c:197
-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:1
+#, c-format
+msgid "Installation finished"
+msgstr "FinalizĂł la instalaciĂłn"
 
-#: ../edit-urpm-sources.pl_.c:202
-msgid "Please wait, updating medium..."
-msgstr "Por favor espere, actualizando soporte..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
+msgstr "Hacer nada"
 
-#: ../edit-urpm-sources.pl_.c:213
-msgid "Configure proxies"
-msgstr "Configurar proxies"
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
+msgstr "Usar .%s como archivo principal"
 
-#: ../edit-urpm-sources.pl_.c:219
+#: ../rpmdrake:1
+#, c-format
+msgid "Remove .%s"
+msgstr "Quitar .%s"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "changes:"
+msgstr "cambios:"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr "Inspeccionando %s"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, finding available packages..."
+msgstr "Por favor espere, encontrando los paquetes disponibles..."
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+"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 ""
-"Si necesita un proxy, ingrese el nombre del host y un puerto opcional "
-"(sintaxis: <host_proxy[:puerto]>):"
+"Hubo un error mientras se agregaba el soporte de actualizaciones con urpmi.\n"
+"\n"
+"Puede ser debido a un sitio de rĂŠplica malo o no disponible por el momento,\n"
+"o si su versiĂłn de Mandrake Linux (%s) todavĂ­a no estĂĄ soportada, o ya no\n"
+"estĂĄ soportada, por las Actualizaciones Oficiales de Mandrake Linux.\n"
+"\n"
+"ÂżDesea intentar con otro sitio de rĂŠplica?"
 
-#: ../edit-urpm-sources.pl_.c:221
-msgid "Proxy hostname:"
-msgstr "Nombre de host del proxy:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
+msgstr "Error agregando soporte de actualizaciones"
 
-#: ../edit-urpm-sources.pl_.c:223
-msgid "You may specify a user/password for the proxy authentication:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
 msgstr ""
-"Puede especificar un usuario/contraseĂąa para la autenticaciĂłn del proxy:"
-
-#: ../edit-urpm-sources.pl_.c:225
-msgid "User:"
-msgstr "Usuario:"
+"Por favor espere, contactando al sitio de rĂŠplica para inicializar los "
+"paquetes actualizados."
 
-#: ../edit-urpm-sources.pl_.c:251
-msgid "Configure sources"
-msgstr "Configurar fuentes"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Sources Manager, and then add a `Security\n"
+"updates' source.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"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."
 
-#: ../edit-urpm-sources.pl_.c:258
-msgid "Enabled?"
-msgstr "ÂżHabilitada?"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "CĂłmo elegir manualmente su sitio de rĂŠplica"
 
-#: ../edit-urpm-sources.pl_.c:259
-msgid "Source"
-msgstr "Fuente"
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
+msgstr ""
+"Hubo un error irrecuperable mientras se actualizaba la informaciĂłn de los "
+"paquetes."
 
-#: ../edit-urpm-sources.pl_.c:282 ../rpmdrake_.c:730
-msgid "Remove"
-msgstr "Quitar"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
+msgstr "Error actualizando soporte"
 
-#: ../edit-urpm-sources.pl_.c:284
-msgid "Edit"
-msgstr "Editar"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
+msgstr ""
+"Por favor espere, contactando al sitio de rĂŠplica para actualizar la "
+"informaciĂłn de los paquetes."
 
-#: ../edit-urpm-sources.pl_.c:286
-msgid "Add..."
-msgstr "Agregar..."
+#: ../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?"
 
-#: ../edit-urpm-sources.pl_.c:288
-msgid "Update..."
-msgstr "Actualizar..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Installation"
+msgstr "InstalaciĂłn de paquetes de software"
 
-#: ../edit-urpm-sources.pl_.c:289
-msgid "Proxy..."
-msgstr "Proxy..."
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, c-format
+msgid "Mandrake Update"
+msgstr "ActualizaciĂłn de Mandrake"
 
-#: ../edit-urpm-sources.pl_.c:292
-msgid "Save and quit"
-msgstr "Guardar y salir"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
+msgstr "Quitar paquetes de software"
 
-#: ../edit-urpm-sources.pl_.c:293 ../rpmdrake_.c:733
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
 msgid "Quit"
 msgstr "Salir"
 
-#: ../rpmdrake.pm_.c:96
-msgid "Yes"
-msgstr "SĂ­"
-
-#: ../rpmdrake.pm_.c:98
-msgid "No"
-msgstr "No"
-
-#: ../rpmdrake.pm_.c:130
-msgid "Info..."
-msgstr "Info..."
-
-#: ../rpmdrake.pm_.c:183
-msgid "Austria"
-msgstr "Austria"
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "Instalar"
 
-#: ../rpmdrake.pm_.c:184
-msgid "Australia"
-msgstr "Australia"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "Quitar"
 
-#: ../rpmdrake.pm_.c:185
-msgid "Belgium"
-msgstr "BĂŠlgica"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search"
+msgstr "Buscar"
 
-#: ../rpmdrake.pm_.c:186
-msgid "Brazil"
-msgstr "Brasil"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "Encontrar:"
 
-#: ../rpmdrake.pm_.c:187
-msgid "Canada"
-msgstr "CanadĂĄ"
+#: ../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?"
 
-#: ../rpmdrake.pm_.c:188
-msgid "Costa Rica"
-msgstr "Costa Rica"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "Se necesita quitar algunos paquetes"
 
-#: ../rpmdrake.pm_.c:189
-msgid "Czech Republic"
-msgstr "RepĂşblica Checa"
+#: ../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?"
 
-#: ../rpmdrake.pm_.c:190
-msgid "Germany"
-msgstr "Alemania"
+#: ../rpmdrake:1
+#, c-format
+msgid "Too many packages are selected"
+msgstr "Se han seleccionado demasiados paquetes."
 
-#: ../rpmdrake.pm_.c:191
-msgid "Danmark"
-msgstr "Dinamarca"
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
+msgstr "InformaciĂłn mĂĄxima"
 
-#: ../rpmdrake.pm_.c:192 ../rpmdrake.pm_.c:196
-msgid "Greece"
-msgstr "Grecia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal information"
+msgstr "InformaciĂłn normal"
 
-#: ../rpmdrake.pm_.c:193
-msgid "Spain"
-msgstr "EspaĂąa"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update source(s)"
+msgstr "Actualizar fuente(s)"
 
-#: ../rpmdrake.pm_.c:194
-msgid "Finland"
-msgstr "Finlandia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reload the packages list"
+msgstr "Recargar la lista de paquetes"
 
-#: ../rpmdrake.pm_.c:195
-msgid "France"
-msgstr "Francia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
+msgstr "Reiniciar la selecciĂłn"
 
-#: ../rpmdrake.pm_.c:197
-msgid "Israel"
-msgstr "Israel"
+#: ../rpmdrake:1
+#, c-format
+msgid "in files"
+msgstr "en archivos"
 
-#: ../rpmdrake.pm_.c:198
-msgid "Italy"
-msgstr "Italia"
+#: ../rpmdrake:1
+#, c-format
+msgid "in descriptions"
+msgstr "en descripciones"
 
-#: ../rpmdrake.pm_.c:199
-msgid "Japan"
-msgstr "JapĂłn"
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
+msgstr "en nombres"
 
-#: ../rpmdrake.pm_.c:200
-msgid "Korea"
-msgstr "Corea"
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
+msgstr "por disponibilidad de actualizaciĂłn"
 
-#: ../rpmdrake.pm_.c:201
-msgid "Netherlands"
-msgstr "PaĂ­ses Bajos"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
+msgstr "por repositorio fuente"
 
-#: ../rpmdrake.pm_.c:202
-msgid "Norway"
-msgstr "Noruega"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
+msgstr "por estado de la selecciĂłn"
 
-#: ../rpmdrake.pm_.c:203
-msgid "Poland"
-msgstr "Polonia"
+#: ../rpmdrake:1
+#, c-format
+msgid "by size"
+msgstr "por tamaĂąo"
 
-#: ../rpmdrake.pm_.c:204
-msgid "Portugal"
-msgstr "Portugal"
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
+msgstr "por grupo"
 
-#: ../rpmdrake.pm_.c:205
-msgid "Russia"
-msgstr "Rusia"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages,"
+msgstr "Todos los paquetes,"
 
-#: ../rpmdrake.pm_.c:206
-msgid "Sweden"
-msgstr "Suecia"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
+msgstr "Todos los paquetes, alfabĂŠtico"
 
-#: ../rpmdrake.pm_.c:207
-msgid "Taiwan"
-msgstr "Taiwan"
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
+msgstr "Selecciones de Mandrake"
 
-#: ../rpmdrake.pm_.c:208
-msgid "United Kingdom"
-msgstr "Reino Unido"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal updates"
+msgstr "Actualizaciones normales"
 
-#: ../rpmdrake.pm_.c:209
-msgid "China"
-msgstr "China"
+#: ../rpmdrake:1
+#, c-format
+msgid "Bugfixes updates"
+msgstr "Actualizaciones que corrigen bugs"
 
-#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:211 ../rpmdrake.pm_.c:212
-#: ../rpmdrake.pm_.c:213 ../rpmdrake.pm_.c:264
-msgid "United States"
-msgstr "Estados Unidos"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
+msgstr "Actualizaciones de seguridad"
 
-#: ../rpmdrake.pm_.c:277
-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
+#, c-format
+msgid "Description: "
+msgstr "DescripciĂłn: "
 
-#: ../rpmdrake.pm_.c:283
-msgid "Error during download"
-msgstr "Error durante la descarga"
+#: ../rpmdrake:1
+#, c-format
+msgid "Summary: "
+msgstr "Resumen: "
 
-#: ../rpmdrake.pm_.c:292
-msgid "No mirror"
-msgstr "Sin sitio de rĂŠplica"
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "Importancia: "
 
-#: ../rpmdrake.pm_.c:310
-msgid "Please choose the desired mirror."
-msgstr "Por favor, elija el sitio de rĂŠplica deseado."
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake.pm_.c:342 ../rpmdrake_.c:627
-msgid "Update source(s)"
-msgstr "Actualizar fuente(s)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Size: "
+msgstr "TamaĂąo: "
 
-#: ../rpmdrake.pm_.c:346
-msgid "Select the source(s) you wish to update:"
-msgstr "Seleccione la(s) fuente(s) que desea actualizar:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Version: "
+msgstr "VersiĂłn: "
 
-#: ../rpmdrake.pm_.c:350
-msgid "Update"
-msgstr "Actualizar"
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "Nombre: "
 
-#: ../rpmdrake.pm_.c:360
-msgid "Please wait, updating media..."
-msgstr "Por favor espere, actualizando soportes..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "RazĂłn para actualizar: "
 
-#: ../rpmdrake_.c:99
-msgid "Other"
-msgstr "Otro"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
+msgstr "VersiĂłn actualmente instalada: "
 
-#: ../rpmdrake_.c:121 ../rpmdrake_.c:135 ../rpmdrake_.c:227 ../rpmdrake_.c:298
-msgid "(none)"
-msgstr "(ninguno)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Source: "
+msgstr "Fuente: "
 
-#: ../rpmdrake_.c:141 ../rpmdrake_.c:482 ../rpmdrake_.c:483
+#: ../rpmdrake:1
+#, c-format
 msgid "(Not available)"
 msgstr "(No disponible)"
 
-#: ../rpmdrake_.c:151 ../rpmdrake_.c:208
-msgid "Search results"
-msgstr "Resultados de la bĂşsqueda"
-
-#: ../rpmdrake_.c:151
-msgid "Search results (none)"
-msgstr "Resultados de la bĂşsqueda (ninguno)"
-
-#: ../rpmdrake_.c:161 ../rpmdrake_.c:172
-msgid "Please wait, searching..."
-msgstr "Por favor espere, buscando ..."
-
-#: ../rpmdrake_.c:175
-msgid "Stop"
-msgstr "Detener"
-
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-msgid "Addable"
-msgstr "Agregable"
-
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-msgid "Upgradable"
-msgstr "Actualizable"
-
-#: ../rpmdrake_.c:211
-msgid "Not selected"
-msgstr "No seleccionado"
-
-#: ../rpmdrake_.c:211
-msgid "Selected"
-msgstr "Seleccionado"
-
-#: ../rpmdrake_.c:240
-msgid "rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake_.c:258 ../rpmdrake_.c:360 ../rpmdrake_.c:362
-msgid "More information on package..."
-msgstr "MĂĄs informaciĂłn sobre el paquete..."
-
-#: ../rpmdrake_.c:259
-msgid "One of the following packages is needed:"
-msgstr "Se necesita uno de los paquetes siguientes:"
-
-#: ../rpmdrake_.c:259
-msgid "Please choose"
-msgstr "Por favor, elija"
-
-#: ../rpmdrake_.c:275
-msgid "unknown package "
-msgstr "paquete desconocido "
-
-#: ../rpmdrake_.c:285
-msgid "Please wait, listing packages..."
-msgstr "Por favor espere, listando paquetes..."
-
-#: ../rpmdrake_.c:300
-msgid "No update"
-msgstr "Sin actualizaciones"
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
+msgstr "Cambios:\n"
 
-#: ../rpmdrake_.c:353 ../rpmdrake_.c:354
-msgid "More infos"
-msgstr "MĂĄs informaciĂłn"
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "Archivos:\n"
 
-#: ../rpmdrake_.c:355
-msgid "Information on packages"
-msgstr "InformaciĂłn sobre paquetes"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected size: %d MB"
+msgstr "TamaĂąo seleccionado: %d MB"
 
-#: ../rpmdrake_.c:376
-msgid "Some additional packages need to be removed"
-msgstr "Se necesitan quitar algunos paquetes adicionales"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Seleccionado: %d MB / Disponible en disco: %d MB"
 
-#: ../rpmdrake_.c:377
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
 msgstr ""
-"Debido a sus dependencias, tambiĂŠn se debe quitar el o los paquetes\n"
-"siguientes:\n"
+"Debido a sus dependencias, ahora se debe deseleccionar el o los\n"
+"paquetes siguientes:\n"
 "\n"
 
-#: ../rpmdrake_.c:383 ../rpmdrake_.c:391
-msgid "Some packages can't be removed"
-msgstr "No se pueden quitar algunos paquetes"
-
-#: ../rpmdrake_.c:384
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Removing these packages would break your system, sorry:\n"
+"Sorry, the following package(s) can't be selected:\n"
 "\n"
 msgstr ""
-"Eliminando estos paquetes podria estropear su sistema, lo siento:\n"
+"Lo siento, no se puede seleccionar el o los paquetes siguientes:\n"
 "\n"
 
-#: ../rpmdrake_.c:392 ../rpmdrake_.c:451
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "No se pueden instalar algunos paquetes"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
 "\n"
 msgstr ""
-"Debido a sus dependencias, ahora se debe deseleccionar el o los\n"
+"Para satisfacer las dependencias, tambiĂŠn se debe instalar el o los\n"
 "paquetes siguientes:\n"
 "\n"
 
-#: ../rpmdrake_.c:421
+#: ../rpmdrake:1
+#, c-format
 msgid "Additional packages needed"
 msgstr "Se necesitan paquetes adicionales"
 
-#: ../rpmdrake_.c:422
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be removed"
+msgstr "No se pueden quitar algunos paquetes"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
+"Removing these packages would break your system, sorry:\n"
 "\n"
 msgstr ""
-"Para satisfacer las dependencias, tambiĂŠn se debe instalar el o los\n"
-"paquetes siguientes:\n"
+"Eliminando estos paquetes podria estropear su sistema, lo siento:\n"
 "\n"
 
-#: ../rpmdrake_.c:435
-msgid "Some packages can't be installed"
-msgstr "No se pueden instalar algunos paquetes"
-
-#: ../rpmdrake_.c:436
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
 "\n"
 msgstr ""
-"Lo siento, no se puede seleccionar el o los paquetes siguientes:\n"
+"Debido a sus dependencias, tambiĂŠn se debe quitar el o los paquetes\n"
+"siguientes:\n"
 "\n"
 
-#: ../rpmdrake_.c:450 ../rpmdrake_.c:684
-msgid "Some packages need to be removed"
-msgstr "Se necesita quitar algunos paquetes"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr "Se necesitan quitar algunos paquetes adicionales"
 
-#: ../rpmdrake_.c:472
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Seleccionado: %d MB / Disponible en disco: %d MB"
+msgid "More information on package..."
+msgstr "MĂĄs informaciĂłn sobre el paquete..."
 
-#: ../rpmdrake_.c:474
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "TamaĂąo seleccionado: %d MB"
+msgid "Information on packages"
+msgstr "InformaciĂłn sobre paquetes"
 
-#: ../rpmdrake_.c:482
-msgid "Files:\n"
-msgstr "Archivos:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
+msgstr "MĂĄs informaciĂłn"
 
-#: ../rpmdrake_.c:483
-msgid "Changelog:\n"
-msgstr "Cambios:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "Addable"
+msgstr "Agregable"
 
-#: ../rpmdrake_.c:486
-msgid "Source: "
-msgstr "Fuente: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Upgradable"
+msgstr "Actualizable"
 
-#: ../rpmdrake_.c:487
-msgid "Currently installed version: "
-msgstr "VersiĂłn actualmente instalada: "
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"The list of updates is void. This means that either there is\n"
+"no available update for the packages installed on your computer,\n"
+"or you already installed all of them."
+msgstr ""
+"La lista de actualizaciones estĂĄ vacĂ­a. Esto significa que, o bien no hay\n"
+"actualizaciones disponibles para los paquetes instalados en su computadora,\n"
+"o bien ya los instalĂł a todos."
 
-#: ../rpmdrake_.c:491
-msgid "Reason for update: "
-msgstr "RazĂłn para actualizar: "
+#: ../rpmdrake:1
+#, c-format
+msgid "No update"
+msgstr "Sin actualizaciones"
 
-#: ../rpmdrake_.c:493
-msgid "Name: "
-msgstr "Nombre: "
+#: ../rpmdrake:1
+#, c-format
+msgid "(none)"
+msgstr "(ninguno)"
 
-#: ../rpmdrake_.c:494
-msgid "Version: "
-msgstr "VersiĂłn: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, listing packages..."
+msgstr "Por favor espere, listando paquetes..."
 
-#: ../rpmdrake_.c:495
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "unknown package "
+msgstr "paquete desconocido "
 
-#: ../rpmdrake_.c:495
-msgid "Size: "
-msgstr "TamaĂąo: "
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Se necesita uno de los paquetes siguientes:"
 
-#: ../rpmdrake_.c:497
-msgid "Importance: "
-msgstr "Importancia: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please choose"
+msgstr "Por favor, elija"
 
-#: ../rpmdrake_.c:498
-msgid "Summary: "
-msgstr "Resumen: "
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:499
-msgid "Description: "
-msgstr "DescripciĂłn: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Not selected"
+msgstr "No seleccionado"
 
-#: ../rpmdrake_.c:548
-msgid "Bugfixes updates"
-msgstr "Actualizaciones que corrigen bugs"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected"
+msgstr "Seleccionado"
 
-#: ../rpmdrake_.c:548
-msgid "Normal updates"
-msgstr "Actualizaciones normales"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results"
+msgstr "Resultados de la bĂşsqueda"
 
-#: ../rpmdrake_.c:567
-msgid "Mandrake choices"
-msgstr "Selecciones de Mandrake"
+#: ../rpmdrake:1
+#, c-format
+msgid "Stop"
+msgstr "Detener"
 
-#: ../rpmdrake_.c:568
-msgid "All packages, alphabetical"
-msgstr "Todos los paquetes, alfabĂŠtico"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, searching..."
+msgstr "Por favor espere, buscando ..."
 
-#: ../rpmdrake_.c:569
-msgid "All packages,"
-msgstr "Todos los paquetes,"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
+msgstr "Resultados de la bĂşsqueda (ninguno)"
 
-#: ../rpmdrake_.c:592
-msgid "by group"
-msgstr "por grupo"
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Otro"
 
-#: ../rpmdrake_.c:592
-msgid "by size"
-msgstr "por tamaĂąo"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"Welcome to the packages source editor!\n"
+"\n"
+"This tool will help you configure the packages sources you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"ÂĄBienvenido al editor de fuentes de paquetes!\n"
+"\n"
+"Esta herramienta lo ayudarĂĄ a configurar las fuentes de paquetes que desea\n"
+"utilizar en su computadora. Luego, las mismas estarĂĄn disponibles para\n"
+"instalar paquetes de software nuevos o realizar actualizaciones."
 
-#: ../rpmdrake_.c:593
-msgid "by selection state"
-msgstr "por estado de la selecciĂłn"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Guardar y salir"
 
-#: ../rpmdrake_.c:594
-msgid "by source repository"
-msgstr "por repositorio fuente"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy..."
+msgstr "Proxy..."
 
-#: ../rpmdrake_.c:594
-msgid "by update availability"
-msgstr "por disponibilidad de actualizaciĂłn"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
+msgstr "Actualizar..."
 
-#: ../rpmdrake_.c:615
-msgid "in descriptions"
-msgstr "en descripciones"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "Agregar..."
 
-#: ../rpmdrake_.c:615
-msgid "in files"
-msgstr "en archivos"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "Editar"
 
-#: ../rpmdrake_.c:615
-msgid "in names"
-msgstr "en nombres"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Source"
+msgstr "Fuente"
 
-#: ../rpmdrake_.c:626
-msgid "Reload the packages list"
-msgstr "Recargar la lista de paquetes"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
+msgstr "ÂżHabilitada?"
 
-#: ../rpmdrake_.c:626
-msgid "Reset the selection"
-msgstr "Reiniciar la selecciĂłn"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure sources"
+msgstr "Configurar fuentes"
 
-#: ../rpmdrake_.c:652
-msgid "Maximum information"
-msgstr "InformaciĂłn mĂĄxima"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "ContraseĂąa:"
 
-#: ../rpmdrake_.c:652
-msgid "Normal information"
-msgstr "InformaciĂłn normal"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
+msgstr "Usuario:"
 
-#: ../rpmdrake_.c:674
-msgid "Too many packages are selected"
-msgstr "Se han seleccionado demasiados paquetes."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+"Puede especificar un usuario/contraseĂąa para la autenticaciĂłn del proxy:"
 
-#: ../rpmdrake_.c:720
-msgid "Find:"
-msgstr "Encontrar:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "Nombre de host del proxy:"
 
-#: ../rpmdrake_.c:725
-msgid "Search"
-msgstr "Buscar"
+#: ../edit-urpm-sources.pl: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]>):"
 
-#: ../rpmdrake_.c:731
-msgid "Install"
-msgstr "Instalar"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "Configurar proxies"
 
-#: ../rpmdrake_.c:738 data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrake Update"
-msgstr "ActualizaciĂłn de Mandrake"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr "Por favor espere, actualizando soporte..."
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Installation"
-msgstr "InstalaciĂłn de paquetes de software"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "Para guardar los cambios, necesita insertar el soporte en la unidad."
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Removal"
-msgstr "Quitar paquetes de software"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
+msgstr "Necesita insertar el soporte para continuar"
 
-#: ../rpmdrake_.c:779
-msgid "Please wait, contacting mirror to update packages information."
-msgstr ""
-"Por favor espere, contactando al sitio de rĂŠplica para actualizar la "
-"informaciĂłn de los paquetes."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save changes"
+msgstr "Guardar cambios"
 
-#: ../rpmdrake_.c:781
-msgid "Error updating medium"
-msgstr "Error actualizando soporte"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Ruta relativa de synthesis/hdlist:"
 
-#: ../rpmdrake_.c:782
-msgid "There was an unrecoverable error while updating packages information."
-msgstr ""
-"Hubo un error irrecuperable mientras se actualizaba la informaciĂłn de los "
-"paquetes."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake_.c:787
-msgid "How to choose manually your mirror"
-msgstr "CĂłmo elegir manualmente su sitio de rĂŠplica"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Editing source \"%s\":"
+msgstr "Editando fuente \"%s\":"
 
-#: ../rpmdrake_.c:795
-msgid "Please wait, contacting mirror to initialize updates packages."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit a source"
+msgstr "Editar una fuente"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr "Por favor espere, quitando soporte..."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, adding medium..."
+msgstr "Por favor espere, agregando soporte..."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of source:"
+msgstr "Tipo de fuente:"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Adding a source:"
+msgstr "Agregando una fuente:"
+
+#: ../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 ""
-"Por favor espere, contactando al sitio de rĂŠplica para inicializar los "
-"paquetes actualizados."
+"Ya hay un soporte con ese nombre, Âżrealmente\n"
+"desea reemplazarlo?"
 
-#: ../rpmdrake_.c:798
-msgid "Error adding update medium"
-msgstr "Error agregando soporte de actualizaciones"
+#: ../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."
 
-#: ../rpmdrake_.c:829
-msgid "Please wait, finding available packages..."
-msgstr "Por favor espere, encontrando los paquetes disponibles..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "Nombre:"
 
-#: ../rpmdrake_.c:861
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Inspeccionando %s"
+msgid "Login:"
+msgstr "Cuenta:"
 
-#: ../rpmdrake_.c:880
-msgid "changes:"
-msgstr "cambios:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Elija un sitio de rĂŠplica..."
 
-#: ../rpmdrake_.c:884
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Quitar .%s"
+msgid "Browse..."
+msgstr "Examinar..."
 
-#: ../rpmdrake_.c:886
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Usar .%s como archivo principal"
+msgid "Path or mount point:"
+msgstr "Ruta o punto de montaje:"
 
-#: ../rpmdrake_.c:888
-msgid "Do nothing"
-msgstr "Hacer nada"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Removable device"
+msgstr "Dispositivo removible"
 
-#: ../rpmdrake_.c:900
-msgid "Installation finished"
-msgstr "FinalizĂł la instalaciĂłn"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "HTTP server"
+msgstr "Servidor HTTP"
 
-#: ../rpmdrake_.c:910
-msgid "Inspect..."
-msgstr "Inspeccionar..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "Servidor FTP"
 
-#: ../rpmdrake_.c:925
-msgid "Program missing"
-msgstr "Falta un programa"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path:"
+msgstr "Ruta:"
 
-#: ../rpmdrake_.c:926
-msgid "A required program is missing (grpmi). Check your installation."
-msgstr "Falta un programa necesario (grpmi). Verifique su instalaciĂłn."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "Archivos locales"
 
-#: ../rpmdrake_.c:940
-msgid "Unable to get source packages."
-msgstr "No se pueden obtener los paquetes de la fuente."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add a source"
+msgstr "Agregar una fuente"
 
-#: ../rpmdrake_.c:941
-msgid "Unable to get source packages, sorry."
-msgstr "No se pueden obtener los paquetes de la fuente, lo siento."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
+msgstr "No se puede actualizar el soporte; se deshabilitarĂĄ automĂĄticamente."
 
-#: ../rpmdrake_.c:948
-msgid "Change medium"
-msgstr "Cambiar el soporte"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "No se puede crear el soporte."
 
-#: ../rpmdrake_.c:949
+#: ../rpmdrake.pm:1
 #, 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 "Please wait, updating media..."
+msgstr "Por favor espere, actualizando soportes..."
 
-#: ../rpmdrake_.c:957
-msgid "Installation failed"
-msgstr "FallĂł la instalaciĂłn"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
+msgstr "Actualizar"
 
-#: ../rpmdrake_.c:958
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Select the source(s) you wish to update:"
+msgstr "Seleccione la(s) fuente(s) que desea actualizar:"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please choose the desired mirror."
+msgstr "Por favor, elija el sitio de rĂŠplica deseado."
+
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
-"FallĂł la instalaciĂłn, faltan algunos archivos.\n"
-"Puede que desee actualizar la base de datos de sus fuentes."
+"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_.c:961
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr "Por favor espere, quitando paquetes para permitir actualizar otros..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
+msgstr "Sin sitio de rĂŠplica"
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"There was an error downloading the mirrors list:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
-"FinalizĂł la instalaciĂłn; %s.\n"
+"Hubo un error descargando la lista de sitios de rĂŠplica:\n"
 "\n"
-"Algunos archivos de configuraciĂłn se crearon como `.rpmnew' o `.rpmsave',\n"
-"ahora puede inspeccionar algunos para poder tomar acciĂłn:"
+"%s\n"
+"Tal vez no estĂĄ disponible la red, o el sitio web de MandrakeSoft.\n"
+"Por favor, intente nuevamente mĂĄs tarde."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "Error durante la descarga"
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm: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."
+
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"some packages failed to install\n"
-"correctly"
+"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 ""
-"no se pueden instalar correctamente algunos\n"
-"paquetes"
+"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_.c:983
-msgid "everything was installed correctly"
-msgstr "se instalĂł todo correctamente"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United States"
+msgstr "Estados Unidos"
 
-#: ../rpmdrake_.c:985
-msgid "Everything installed successfully"
-msgstr "Se instalĂł todo satisfactoriamente"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
+msgstr "China"
 
-#: ../rpmdrake_.c:986
-msgid "All requested packages were installed successfully."
-msgstr "Se instalaron satisfactoriamente todos los paquetes pedidos."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr "Reino Unido"
 
-#: ../rpmdrake_.c:989
-msgid "Everything already installed."
-msgstr "Ya estĂĄ todo instalado."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "Taiwan"
 
-#: ../rpmdrake_.c:990
-msgid "Everything already installed (is this supposed to happen at all?)."
-msgstr "Ya estĂĄ todo instalado (Âżseguro que deberĂ­a ocurrir esto?)."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "Suecia"
 
-#: ../rpmdrake_.c:997
-msgid "Problem during installation"
-msgstr "Problema durante la instalaciĂłn"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
+msgstr "Rusia"
 
-#: ../rpmdrake_.c:998
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Hubo un problema durante la instalaciĂłn:\n"
-"\n"
-"%s"
+msgid "Portugal"
+msgstr "Portugal"
 
-#: ../rpmdrake_.c:1012
-msgid "Please wait, reading packages database..."
-msgstr "Por favor espere, leyendo la base de datos de paquetes..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
+msgstr "Polonia"
 
-#: ../rpmdrake_.c:1053
-msgid "Please wait, removing packages..."
-msgstr "Por favor espere, quitando paquetes..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
+msgstr "Noruega"
 
-#: ../rpmdrake_.c:1056
-msgid "Problem during removal"
-msgstr "Problema durante la eliminaciĂłn"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
+msgstr "PaĂ­ses Bajos"
 
-#: ../rpmdrake_.c:1057
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Hubo un problema durante la eliminaciĂłn de paquetes:\n"
-"\n"
-"%s"
+msgid "Korea"
+msgstr "Corea"
 
-#: ../rpmdrake_.c:1089
-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
+#, c-format
+msgid "Japan"
+msgstr "JapĂłn"
 
-#: ../rpmdrake_.c:1094
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"ÂĄBienvenido a MandrakeUpdate!\n"
-"\n"
-"Esta herramienta lo ayudarĂĄ a elegir las actualizaciones que desea instalar "
-"en su computadora."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Italy"
+msgstr "Italia"
 
-#: ../rpmdrake_.c:1099
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
-msgstr ""
-"ÂĄBienvenido a la herramienta de instalaciĂłn de software!\n"
-"\n"
-"Su sistema Mandrake Linux viene con varios miles de paquetes de software en\n"
-"CDROM o DVD. Esta herramienta lo ayudarĂĄ a elegir el software que desea\n"
-"instalar en su computadora."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Israel"
+msgstr "Israel"
 
-#: data/rpmdrake-remove.desktop.in.h:1
-msgid "Remove Software"
-msgstr "Quitar software"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Grecia"
 
-#: data/rpmdrake-sources.desktop.in.h:1
-msgid "Software Sources Manager"
-msgstr "Administrador de las fuentes de software"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "France"
+msgstr "Francia"
 
-#: data/rpmdrake.desktop.in.h:1
-msgid "Install Software"
-msgstr "Instalar software"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "Finlandia"
 
-#~ 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.pm:1
+#, c-format
+msgid "Spain"
+msgstr "EspaĂąa"
 
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-#~ "ÂżDesea continuar?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
+msgstr "Dinamarca"
 
-#~ 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 ""
-#~ "ÂĄBienvenido al editor de fuentes de paquetes!\n"
-#~ "\n"
-#~ "Esta herramienta lo ayudarĂĄ a configurar las fuentes de paquetes que "
-#~ "desea\n"
-#~ "utilizar en su computadora. Luego, las mismas estarĂĄn disponibles para\n"
-#~ "instalar paquetes de software nuevos o realizar actualizaciones."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr "Alemania"
 
-#~ 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 "Czech Republic"
+msgstr "RepĂşblica Checa"
 
-#~ 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 ""
-#~ "Hubo un error descargando la lista de sitios de rĂŠplica:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "Tal vez no estĂĄ disponible la red, o el sitio web de MandrakeSoft.\n"
-#~ "Por favor, intente nuevamente mĂĄs tarde."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
-#~ 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 "Canada"
+msgstr "CanadĂĄ"
 
-#~ msgid ""
-#~ "The list of updates is void. This means that either there is\n"
-#~ "no available update for the packages installed on your computer,\n"
-#~ "or you already installed all of them."
-#~ msgstr ""
-#~ "La lista de actualizaciones estĂĄ vacĂ­a. Esto significa que, o bien no "
-#~ "hay\n"
-#~ "actualizaciones disponibles para los paquetes instalados en su "
-#~ "computadora,\n"
-#~ "o bien ya los instalĂł a todos."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
+msgstr "Brasil"
 
-#~ msgid ""
-#~ "Warning: it seems that you are attempting to add so much\n"
-#~ "packages that your filesystem may run out of free diskspace,\n"
-#~ "during or after package installation ; this is particularly\n"
-#~ "dangerous and should be considered with care.\n"
-#~ "\n"
-#~ "Do you really want to install all the selected packages?"
-#~ msgstr ""
-#~ "AtenciĂłn: parece que estĂĄ intentando aĂąadir tantos\n"
-#~ "paquetes que su sistema de archivos puede quedarse sin espacio libre en "
-#~ "el disco duro,\n"
-#~ "durante o despues de la instalaciĂłn de los paquetes; esto es "
-#~ "particularmente\n"
-#~ "peligroso y deberĂ­a ser considerado con cuidado.\n"
-#~ "\n"
-#~ "ÂżRealmente quiere instalar los paquetes seleccionados?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Belgium"
+msgstr "BĂŠlgica"
 
-#~ msgid ""
-#~ "The following packages have to be removed for others to be upgraded:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "Se tienen que quitar los paquetes siguientes para poder actualizar "
-#~ "otros:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "ÂżDesea continuar?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Australia"
+msgstr "Australia"
 
-#~ msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#~ msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
+msgstr "Austria"
 
-#~ 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
+#, c-format
+msgid "Info..."
+msgstr "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 ""
-#~ "TambiĂŠn puede elegir manualmente su sitio de rĂŠplica: para esto,\n"
-#~ "lance el Administrador de fuentes de software, y luego aĂąada una\n"
-#~ "fuente de 'Actualizaciones de seguridad'.\n"
-#~ "\n"
-#~ "Luego, vuelva a iniciar MandrakeUpdate."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
+msgstr "No"
 
-#~ 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 ""
-#~ "Hubo un error mientras se agregaba el soporte de actualizaciones con "
-#~ "urpmi.\n"
-#~ "\n"
-#~ "Puede ser debido a un sitio de rĂŠplica malo o no disponible por el "
-#~ "momento,\n"
-#~ "o si su versiĂłn de Mandrake Linux (%s) todavĂ­a no estĂĄ soportada, o ya "
-#~ "no\n"
-#~ "estĂĄ soportada, por las Actualizaciones Oficiales de Mandrake Linux.\n"
-#~ "\n"
-#~ "ÂżDesea intentar con otro sitio de rĂŠplica?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "SĂ­"
+
+#: data/rpmdrake.desktop.in.h:1
+msgid "Install Software"
+msgstr "Instalar software"
+
+#: data/rpmdrake-remove.desktop.in.h:1
+msgid "Remove Software"
+msgstr "Quitar software"
+
+#: data/rpmdrake-sources.desktop.in.h:1
+msgid "Software Sources Manager"
+msgstr "Administrador de las fuentes de software"
+
+#~ 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--*-*-*-*-*,*"
diff --git a/po/es.pom b/po/es.pom
index 457ccebf..fa0f5448 100644
--- a/po/es.pom
+++ b/po/es.pom
@@ -4,169 +4,175 @@ msgstr "Servidor"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Servidor, Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Computadora de Red (cliente)"
+msgid "Office Workstation"
+msgstr "EstaciĂłn de trabajo de Oficina"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "Servidor NFS, servidor SMB, servidor proxy, servidor SSH"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Programas de Oficina: procesadores de palabras (kword, abiword), plantillas "
+"de cĂĄlculo (kspread, gnumeric), visualizadores PDF, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Oficina"
+msgid "Workstation"
+msgstr "EstaciĂłn de trabajo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "EstaciĂłn de trabajo GNOME"
+msgid "Game station"
+msgstr "EstaciĂłn de Juegos"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Herramientas para su Palm Pilot o su Visor"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Programas de entretenimiento: arcade, tableros, estrategia, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "EstaciĂłn de trabajo"
+msgid "Multimedia station"
+msgstr "EstaciĂłn Multimedios"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Servidor, Cortafuegos/Router"
+msgid "Sound and video playing/editing programs"
+msgstr "Programas de reproducciĂłn/ediciĂłn de sonido y vĂ­deo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr "Servidor de InformaciĂłn de Red y de Nombres de Dominio"
+msgid "Internet station"
+msgstr "EstaciĂłn Internet"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
 msgstr ""
-"Programas de Oficina: procesadores de palabras (kword, abiword), plantillas "
-"de cĂĄlculo (kspread, gnumeric), visualizadores PDF, etc"
+"Conjunto de herramientas para leer y enviar correo y noticiar (pine, mutt, "
+"tin...) y para navegar por la Web"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "Herramientas de audio: reproductores mp3 o midi, mezcladores, etc"
+msgid "Network Computer (client)"
+msgstr "Computadora de Red (cliente)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Linux Standard Base. Soporte de aplicaciones de terceros"
+msgid "Clients for different protocols including ssh"
+msgstr "Clientes para los distintos protocolos incluyendo a ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Libros y COMOs sobre Linux y Software Libre"
+msgid "Configuration"
+msgstr "ConfiguraciĂłn"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "EstaciĂłn de trabajo KDE"
+msgid "Tools to ease the configuration of your computer"
+msgstr "Herramientas para facilitar la configuraciĂłn de su computadora"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgid "Scientific Workstation"
+msgstr "EstaciĂłn de trabajo CientĂ­fica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Multimedios - VĂ­deo"
+msgid "Scientific applications such as gnuplot"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr ""
-"Conjunto de herramientas para correo, noticias, web, transferencia de "
-"archivos, y chat"
+msgid "Console Tools"
+msgstr "Herramientas para la consola"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Servidor, Bases de Datos"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Editores, shells, manipulaciĂłn de archivos, terminales"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "Servidor de base de datos PostgreSQL o MySQL"
+msgid "KDE Workstation"
+msgstr "EstaciĂłn de trabajo KDE"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Herramientas para facilitar la configuraciĂłn de su computadora"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"El K Desktop Environment, el entorno grĂĄfico bĂĄsico con una colecciĂłn de "
+"herramientas que lo acompaĂąan"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "Multimedios - Sonido"
+msgid "Graphical Environment"
+msgstr "Entorno grĂĄfico"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "DocumentaciĂłn"
+msgid "Gnome Workstation"
+msgstr "EstaciĂłn de trabajo GNOME"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Herramientas para la consola"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+"Entorno grĂĄfico con un conjunto de herramientas de escritorio y aplicaciones "
+"amigables"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr "Servidor de correo Postfix, servidor de noticias Inn"
+msgid "Other Graphical Desktops"
+msgstr "Otros entornos grĂĄficos"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "EstaciĂłn Internet"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "EstaciĂłn Multimedios"
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+msgid "Development"
+msgstr "Desarrollo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "ConfiguraciĂłn"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "Bibliotecas de desarrollo C y C++, programas y archivos *.h"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "MĂĄs escritorios grĂĄficos (Gnome, IceWM)"
+msgid "Documentation"
+msgstr "DocumentaciĂłn"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
-"El K Desktop Environment, el entorno grĂĄfico bĂĄsico con una colecciĂłn de "
-"herramientas que lo acompaĂąan"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Libros y COMOs sobre Linux y Software Libre"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Entorno grĂĄfico"
+msgid "LSB"
+msgstr "LSB"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Linux Standard Base. Soporte de aplicaciones de terceros"
+
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-msgid "Development"
-msgstr "Desarrollo"
+#: ../../share/compssUsers:999
+msgid "Web/FTP"
+msgstr "Servidor, Web/FTP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -175,23 +181,33 @@ msgstr "Apache y Pro-ftpd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "Herramientas para crear y grabar CDs"
+msgid "Mail/Groupware/News"
+msgstr "Servidor, Correo/Groupware/Noticias"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "EstaciĂłn de trabajo de Oficina"
+msgid "Postfix mail server, Inn news server"
+msgstr "Servidor de correo Postfix, servidor de noticias Inn"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgid "Database"
+msgstr "Servidor, Bases de Datos"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Programas grĂĄficos, tales como El Gimp"
+msgid "PostgreSQL or MySQL database server"
+msgstr "Servidor de base de datos PostgreSQL o MySQL"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Firewall/Router"
+msgstr "Servidor, Cortafuegos/Router"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Internet gateway"
+msgstr "Pasarela de acceso a Internet"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -200,8 +216,8 @@ msgstr "DNS/NIS"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "Bibliotecas de desarrollo C y C++, programas y archivos *.h"
+msgid "Domain Name and Network Information Server"
+msgstr "Servidor de InformaciĂłn de Red y de Nombres de Dominio"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -210,18 +226,20 @@ msgstr "Computadora servidor de red"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "Servidor, Correo/Groupware/Noticias"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "Servidor NFS, servidor SMB, servidor proxy, servidor SSH"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "EstaciĂłn de Juegos"
+msgid "Office"
+msgstr "Oficina"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Reproductores y editores de vĂ­deo"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr ""
+"Conjunto de herramientas para correo, noticias, web, transferencia de "
+"archivos, y chat"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -230,79 +248,66 @@ msgstr "Multimedios - GrĂĄficos"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Programas de entretenimiento: arcade, tableros, estrategia, etc"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
-"Conjunto de herramientas para leer y enviar correo y noticiar (pine, mutt, "
-"tin...) y para navegar por la Web"
+msgid "Graphics programs such as The Gimp"
+msgstr "Programas grĂĄficos, tales como El Gimp"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "Finanzas personales"
+msgid "Multimedia - Sound"
+msgstr "Multimedios - Sonido"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
-"Entorno grĂĄfico con un conjunto de herramientas de escritorio y aplicaciones "
-"amigables"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "Herramientas de audio: reproductores mp3 o midi, mezcladores, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Clientes para los distintos protocolos incluyendo a ssh"
+msgid "Multimedia - Video"
+msgstr "Multimedios - VĂ­deo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
+msgid "Video players and editors"
+msgstr "Reproductores y editores de vĂ­deo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Pasarela de acceso a Internet"
+msgid "Multimedia - CD Burning"
+msgstr "Multimedios - GrabaciĂłn de CD"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Programas de reproducciĂłn/ediciĂłn de sonido y vĂ­deo"
+msgid "Tools to create and burn CD's"
+msgstr "Herramientas para crear y grabar CDs"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Otros entornos grĂĄficos"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "MĂĄs escritorios grĂĄficos (Gnome, IceWM)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Editores, shells, manipulaciĂłn de archivos, terminales"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "Programas para administrar sus finanzas, tales como gnucash"
+msgid "Personal Information Management"
+msgstr "AdministraciĂłn de la informaciĂłn personal"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "AdministraciĂłn de la informaciĂłn personal"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Herramientas para su Palm Pilot o su Visor"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multimedios - GrabaciĂłn de CD"
+msgid "Personal Finance"
+msgstr "Finanzas personales"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "EstaciĂłn de trabajo CientĂ­fica"
+msgid "Programs to manage your finances, such as gnucash"
+msgstr "Programas para administrar sus finanzas, tales como gnucash"
 
diff --git a/po/et.po b/po/et.po
index 6717413c..b78e2bf1 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2003-01-22 13:20+0100\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\n"
 "PO-Revision-Date: 2002-12-12 16:57+0200\n"
 "Last-Translator: Marek Laane <bald@online.ee>\n"
 "Language-Team: Estonian <kde-et@linux.ee>\n"
@@ -15,450 +15,590 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../edit-urpm-sources.pl_.c:39
-msgid "Unable to create medium."
-msgstr "Andmekandja loomine ebaĂľnnestus."
-
-#: ../edit-urpm-sources.pl_.c:40
-msgid "Unable to update medium; it will be automatically disabled."
-msgstr "Andmekandja uuendamine ebaĂľnnestus; sellest loobutakse automaatselt."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:51
-msgid "Add a source"
-msgstr "Lisa allikas"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to the software installation tool!\n"
+"\n"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
+msgstr ""
+"Tarkvara paigaldamine\n"
+"\n"
+"Mandrake Linuxi CDROM vĂľi DVD sisaldavad tuhandeid tarkvarapakette.\n"
+"Selle tÜÜriista abil saate valida, milliseid soovite oma arvutile paigaldada."
 
-#: ../edit-urpm-sources.pl_.c:52
-msgid "Local files"
-msgstr "Kohalikud failid"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Mandrake uuendused\n"
+"\n"
+"Selle tÜÜriista abil saate oma Mandrake Linuxit uuendada."
 
-#: ../edit-urpm-sources.pl_.c:52
-msgid "Path:"
-msgstr "Otsingutee:"
+#: ../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 ""
+"Tarkvara eemaldamine\n"
+"\n"
+"Selle tÜÜriista abil saate valida eemaldatava tarkvara."
 
-#: ../edit-urpm-sources.pl_.c:53
-msgid "FTP server"
-msgstr "FTP server"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"Tekkis probleem järgmiste pakettide eemaldamisel:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:53 ../edit-urpm-sources.pl_.c:54
-#: ../edit-urpm-sources.pl_.c:56 ../edit-urpm-sources.pl_.c:179
-msgid "URL:"
-msgstr "URL:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during removal"
+msgstr "Probleem eemaldamisel"
 
-#: ../edit-urpm-sources.pl_.c:54
-msgid "HTTP server"
-msgstr "HTTP server"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages..."
+msgstr "Palun oodake, eemaldan pakette..."
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Path or mount point:"
-msgstr "Otsingutee vĂľi haakepunkt:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
+msgstr "Palun oodake, loen pakettide andmebaasi..."
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Removable device"
-msgstr "Eemaldatav seade"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Paigaldusel tekkis probleem:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:56 ../rpmdrake_.c:548
-msgid "Security updates"
-msgstr "Turvaparandused"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during installation"
+msgstr "Probleem paigaldusel"
 
-#: ../edit-urpm-sources.pl_.c:67
-msgid "Browse..."
-msgstr "Sirvi.."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
+msgstr "KĂľik on juba paigaldatud (kas see pidigi nii olema?)."
 
-#: ../edit-urpm-sources.pl_.c:69
-msgid "Choose a mirror..."
-msgstr "Valige peegel..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed."
+msgstr "KĂľik on juba paigaldatud."
 
-#: ../edit-urpm-sources.pl_.c:89
-msgid "Login:"
-msgstr "Kasutajanimi:"
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "KĂľik soovitud paketid said edukalt paigaldatud."
 
-#: ../edit-urpm-sources.pl_.c:89 ../edit-urpm-sources.pl_.c:223
-msgid "Password:"
-msgstr "Parool:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr "KĂľik paigaldati edukalt"
 
-#: ../edit-urpm-sources.pl_.c:94
-msgid "Name:"
-msgstr "Nimi:"
+#: ../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 ""
+"Paigaldus on lĂľpetatud; %s\n"
+"\n"
+"MĂľned seadetefailid 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_.c:96 ../edit-urpm-sources.pl_.c:180
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Suhteline tee synthesis/hdlist juurde:"
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "kĂľik paigaldati edukalt"
 
-#: ../edit-urpm-sources.pl_.c:104
-msgid "You need to fill up at least the two first entries."
-msgstr "Täitke vähemalt 2 esimest välja."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"some packages failed to install\n"
+"correctly"
+msgstr ""
+"MĂľnda paketti ei Ăľnnestunud\n"
+"korrektselt paigaldada"
 
-#: ../edit-urpm-sources.pl_.c:117
-msgid "Adding a source:"
-msgstr "Allika lisamine:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages to allow others to be upgraded..."
+msgstr "Palun oodake, eemaldan pakette, et uuendus oleks vĂľimalik..."
 
-#: ../edit-urpm-sources.pl_.c:118
-msgid "Type of source:"
-msgstr "Andmekandja tßßp:"
+#: ../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."
 
-#: ../edit-urpm-sources.pl_.c:122 ../edit-urpm-sources.pl_.c:194
-#: ../edit-urpm-sources.pl_.c:227 ../rpmdrake.pm_.c:97 ../rpmdrake.pm_.c:136
-#: ../rpmdrake.pm_.c:319 ../rpmdrake_.c:353 ../rpmdrake_.c:365
-#: ../rpmdrake_.c:369 ../rpmdrake_.c:916 ../rpmdrake_.c:950
-msgid "Ok"
-msgstr "Olgu"
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation failed"
+msgstr "Paigaldus ebaĂľnnestus "
 
-#: ../edit-urpm-sources.pl_.c:137 ../edit-urpm-sources.pl_.c:188
-#: ../edit-urpm-sources.pl_.c:194 ../edit-urpm-sources.pl_.c:234
-#: ../rpmdrake.pm_.c:319 ../rpmdrake.pm_.c:352 ../rpmdrake_.c:353
-#: ../rpmdrake_.c:950
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
 msgid "Cancel"
 msgstr "Katkesta"
 
-#: ../edit-urpm-sources.pl_.c:144
-msgid "Please wait, adding medium..."
-msgstr "Palun oodake, lisan andmekandja..."
-
-#: ../edit-urpm-sources.pl_.c:162
-msgid "Please wait, removing medium..."
-msgstr "Palun oodake, eemaldan andmekandja..."
-
-#: ../edit-urpm-sources.pl_.c:173
-msgid "Edit a source"
-msgstr "Allika muutmine"
-
-#: ../edit-urpm-sources.pl_.c:177
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Editing source \"%s\":"
-msgstr "Allika \"%s\" muutmine:"
-
-#: ../edit-urpm-sources.pl_.c:183
-msgid "Save changes"
-msgstr "Salvesta muutused"
+msgid "Ok"
+msgstr "Olgu"
 
-#: ../edit-urpm-sources.pl_.c:192
-msgid "You need to insert the medium to continue"
-msgstr "Jätkamiseks tuleb sisestada andmekandja"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Palun sisestage andmekandja nimega \"%s\" seadmesse [%s]"
 
-#: ../edit-urpm-sources.pl_.c:193
-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
+#, c-format
+msgid "Change medium"
+msgstr "Muuda andmekandjat"
 
-#: ../edit-urpm-sources.pl_.c:198
-msgid "Please wait, updating medium..."
-msgstr "Palun oodake, uuendan andmekandjat..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
+msgstr "Ei ole vþimalik pakette kätte saada, vabandan."
 
-#: ../edit-urpm-sources.pl_.c:209
-msgid "Configure proxies"
-msgstr "Vahendajate seadistamine"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages."
+msgstr "Ei saa pakette kätte."
 
-#: ../edit-urpm-sources.pl_.c:215
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+#: ../rpmdrake:1
+#, c-format
+msgid "A required program is missing (grpmi). Check your installation."
 msgstr ""
-"Kui vajate vahendajat, sisestage masina nimi ja vĂľimalusel port (sĂźntaks: "
-"<vahendajamasin[:port]>):"
-
-#: ../edit-urpm-sources.pl_.c:217
-msgid "Proxy hostname:"
-msgstr "Vahendaja masinanimi:"
-
-#: ../edit-urpm-sources.pl_.c:219
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "Vahendaja autentimiseks oleks tulus määrata kasutajanimi ja parool:"
-
-#: ../edit-urpm-sources.pl_.c:221
-msgid "User:"
-msgstr "Kasutajanimi:"
-
-#: ../edit-urpm-sources.pl_.c:247
-msgid "Configure sources"
-msgstr "Allikate seadistamine"
-
-#: ../edit-urpm-sources.pl_.c:254
-msgid "Enabled?"
-msgstr "Kas lubada?"
+"Vajalik rakendus (grpmi) puudub Teie sĂźsteemist. Palun vaadake, milles viga."
 
-#: ../edit-urpm-sources.pl_.c:255
-msgid "Source"
-msgstr "Allikas"
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
+msgstr "Rakendus puudub"
 
-#: ../edit-urpm-sources.pl_.c:276 ../rpmdrake_.c:730
-msgid "Remove"
-msgstr "Eemalda"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
+msgstr "Uuri..."
 
-#: ../edit-urpm-sources.pl_.c:278
-msgid "Edit"
-msgstr "Muuda"
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation finished"
+msgstr "Paigaldus lĂľpetatud"
 
-#: ../edit-urpm-sources.pl_.c:280
-msgid "Add..."
-msgstr "Lisa..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
+msgstr "Ära tee midagi"
 
-#: ../edit-urpm-sources.pl_.c:282
-msgid "Update..."
-msgstr "Uuenda..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
+msgstr ".%s kasutamine pĂľhifailina"
 
-#: ../edit-urpm-sources.pl_.c:283
-msgid "Proxy..."
-msgstr "Vahendaja..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Remove .%s"
+msgstr "Eemalda .%s"
 
-#: ../edit-urpm-sources.pl_.c:286
-msgid "Save and quit"
-msgstr "Salvesta ja välju"
+#: ../rpmdrake:1
+#, c-format
+msgid "changes:"
+msgstr "muutused:"
 
-#: ../edit-urpm-sources.pl_.c:287 ../rpmdrake_.c:733
-msgid "Quit"
-msgstr "Välju"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr "%s uurimine"
 
-#: ../rpmdrake.pm_.c:93
-msgid "Yes"
-msgstr "Jah"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, finding available packages..."
+msgstr "Palun oodake, otsin kättesaadavaid pakette..."
 
-#: ../rpmdrake.pm_.c:95
-msgid "No"
-msgstr "Ei"
+#: ../rpmdrake:1
+#, c-format
+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 ""
 
-#: ../rpmdrake.pm_.c:127
-msgid "Info..."
-msgstr "Info..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
+msgstr "Viga uuenduste andmekandja lisamisel."
 
-#: ../rpmdrake.pm_.c:180
-msgid "Austria"
-msgstr "Austria"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
+msgstr "Palun oodake, vĂľtan Ăźhendust uuenduste saidiga."
 
-#: ../rpmdrake.pm_.c:181
-msgid "Australia"
-msgstr "Austraalia"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Sources Manager, and then add a `Security\n"
+"updates' source.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
 
-#: ../rpmdrake.pm_.c:182
-msgid "Belgium"
-msgstr "Belgia"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Kuidas valida peeglit käsitsi"
 
-#: ../rpmdrake.pm_.c:183
-msgid "Brazil"
-msgstr "Brasiilia"
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
+msgstr "Paketiinfo uuendamisel tekkis viga, ei saa jätkata."
 
-#: ../rpmdrake.pm_.c:184
-msgid "Canada"
-msgstr "Kanada"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
+msgstr "Viga andmekandja uuendamisel"
 
-#: ../rpmdrake.pm_.c:185
-msgid "Costa Rica"
-msgstr "Costa Rica"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
+msgstr "Palun oodake, uuendan pakettide infot."
 
-#: ../rpmdrake.pm_.c:186
-msgid "Czech Republic"
-msgstr "TĹĄehhi Vabariik"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
 
-#: ../rpmdrake.pm_.c:187
-msgid "Germany"
-msgstr "Saksamaa"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Installation"
+msgstr "Pakettide paigaldamine"
 
-#: ../rpmdrake.pm_.c:188
-msgid "Danmark"
-msgstr "Taani"
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, c-format
+msgid "Mandrake Update"
+msgstr "Mandrake uuendused"
 
-#: ../rpmdrake.pm_.c:189 ../rpmdrake.pm_.c:193
-msgid "Greece"
-msgstr "Kreeka"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
+msgstr "Pakettide eemaldamine"
 
-#: ../rpmdrake.pm_.c:190
-msgid "Spain"
-msgstr "Hispaania"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Välju"
 
-#: ../rpmdrake.pm_.c:191
-msgid "Finland"
-msgstr "Soome"
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "Paigalda"
 
-#: ../rpmdrake.pm_.c:192
-msgid "France"
-msgstr "Prantsusmaa"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "Eemalda"
 
-#: ../rpmdrake.pm_.c:194
-msgid "Israel"
-msgstr "Iisrael"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search"
+msgstr "Otsi"
 
-#: ../rpmdrake.pm_.c:195
-msgid "Italy"
-msgstr "Itaalia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "Leia:"
 
-#: ../rpmdrake.pm_.c:196
-msgid "Japan"
-msgstr "Jaapan"
+#: ../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 ""
 
-#: ../rpmdrake.pm_.c:197
-msgid "Korea"
-msgstr "Korea"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "MĂľned paketid tuleb eemaldada"
 
-#: ../rpmdrake.pm_.c:198
-msgid "Netherlands"
-msgstr "Holland"
+#: ../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 ""
 
-#: ../rpmdrake.pm_.c:199
-msgid "Norway"
-msgstr "Norra"
+#: ../rpmdrake:1
+#, c-format
+msgid "Too many packages are selected"
+msgstr "Valitud on liiga palju pakette"
 
-#: ../rpmdrake.pm_.c:200
-msgid "Poland"
-msgstr "Poola"
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
+msgstr "Maks. info"
 
-#: ../rpmdrake.pm_.c:201
-msgid "Portugal"
-msgstr "Portugal"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal information"
+msgstr "Tavainfo"
 
-#: ../rpmdrake.pm_.c:202
-msgid "Russia"
-msgstr "Venemaa"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update source(s)"
+msgstr "Allika(te) uuendamine"
 
-#: ../rpmdrake.pm_.c:203
-msgid "Sweden"
-msgstr "Rootsi"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reload the packages list"
+msgstr "Pakettide nimekirja taaslaadimine"
 
-#: ../rpmdrake.pm_.c:204
-msgid "Taiwan"
-msgstr "Taiwan"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
+msgstr "Valiku lähtestamine"
 
-#: ../rpmdrake.pm_.c:205
-msgid "United Kingdom"
-msgstr "Suurbritannia"
+#: ../rpmdrake:1
+#, c-format
+msgid "in files"
+msgstr "failides"
 
-#: ../rpmdrake.pm_.c:206
-msgid "China"
-msgstr "Hiina"
+#: ../rpmdrake:1
+#, c-format
+msgid "in descriptions"
+msgstr "kirjeldustes"
 
-#: ../rpmdrake.pm_.c:207 ../rpmdrake.pm_.c:208 ../rpmdrake.pm_.c:209
-#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:261
-msgid "United States"
-msgstr "USA"
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
+msgstr "nimedes"
 
-#: ../rpmdrake.pm_.c:274
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr "Palun oodake, peeglite aadresse laetakse..."
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
+msgstr "uuenduse saadavuse järgi"
 
-#: ../rpmdrake.pm_.c:280
-msgid "Error during download"
-msgstr "Viga allalaadimisel"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
+msgstr "andmekandja asukoha järgi"
 
-#: ../rpmdrake.pm_.c:289
-msgid "No mirror"
-msgstr "Peeglit ei leitud"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
+msgstr "valikustaatuse järgi"
 
-#: ../rpmdrake.pm_.c:307
-msgid "Please choose the desired mirror."
-msgstr "Palun valige peegel."
+#: ../rpmdrake:1
+#, c-format
+msgid "by size"
+msgstr "suuruse järgi"
 
-#: ../rpmdrake.pm_.c:339 ../rpmdrake_.c:627
-msgid "Update source(s)"
-msgstr "Allika(te) uuendamine"
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
+msgstr "grupi järgi"
 
-#: ../rpmdrake.pm_.c:343
-msgid "Select the source(s) you wish to update:"
-msgstr "Valige allikas (allikad), mida soovite uuendada:"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages,"
+msgstr "KĂľik paketid,"
 
-#: ../rpmdrake.pm_.c:347
-msgid "Update"
-msgstr "Uuenda"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
+msgstr "Kþik paketid, tähestikuliselt"
 
-#: ../rpmdrake.pm_.c:357
-msgid "Please wait, updating media..."
-msgstr "Palun oodake, uuendan andmekandjat..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
+msgstr "Mandrake valikud"
 
-#: ../rpmdrake_.c:99
-msgid "Other"
-msgstr "Muu"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal updates"
+msgstr "Uuendused"
 
-#: ../rpmdrake_.c:121 ../rpmdrake_.c:135 ../rpmdrake_.c:227 ../rpmdrake_.c:298
-msgid "(none)"
-msgstr "(puudub)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Bugfixes updates"
+msgstr "Turvaparandused/uuendused"
 
-#: ../rpmdrake_.c:141 ../rpmdrake_.c:482 ../rpmdrake_.c:483
-msgid "(Not available)"
-msgstr "(kättesaamatu)"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
+msgstr "Turvaparandused"
 
-#: ../rpmdrake_.c:151 ../rpmdrake_.c:208
-msgid "Search results"
-msgstr "Otsingu tulemused"
+#: ../rpmdrake:1
+#, c-format
+msgid "Description: "
+msgstr "Kirjeldus: "
 
-#: ../rpmdrake_.c:151
-msgid "Search results (none)"
-msgstr "Otsingu tulemus (ei leitud)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Summary: "
+msgstr "KokkuvĂľte: "
 
-#: ../rpmdrake_.c:161 ../rpmdrake_.c:172
-msgid "Please wait, searching..."
-msgstr "Palun oodake, otsin..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "Tähtsus: "
 
-#: ../rpmdrake_.c:175
-msgid "Stop"
-msgstr "Peata"
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-msgid "Addable"
-msgstr "Lisatavad"
+#: ../rpmdrake:1
+#, c-format
+msgid "Size: "
+msgstr "Suurus: "
 
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-msgid "Upgradable"
-msgstr "Uuendatavad"
+#: ../rpmdrake:1
+#, c-format
+msgid "Version: "
+msgstr "Versioon: "
 
-#: ../rpmdrake_.c:211
-msgid "Not selected"
-msgstr "Valimata"
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "Nimi: "
 
-#: ../rpmdrake_.c:211
-msgid "Selected"
-msgstr "Valitud"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "Uuendamise pĂľhjus:"
 
-#: ../rpmdrake_.c:240
-msgid "rpmdrake"
-msgstr "rpmdrake"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
+msgstr "Praegu paigaldatud versioon:"
 
-#: ../rpmdrake_.c:258 ../rpmdrake_.c:360 ../rpmdrake_.c:362
-msgid "More information on package..."
-msgstr "Rohkem infot paketi kohta..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Source: "
+msgstr "Allikas:"
 
-#: ../rpmdrake_.c:259
-msgid "One of the following packages is needed:"
-msgstr "Vajalik on ßks järgmistest pakettidest:"
+#: ../rpmdrake:1
+#, c-format
+msgid "(Not available)"
+msgstr "(kättesaamatu)"
 
-#: ../rpmdrake_.c:259
-msgid "Please choose"
-msgstr "Palun valige"
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
+msgstr "Muutuste logi:\n"
 
-#: ../rpmdrake_.c:275
-msgid "unknown package "
-msgstr "tundmatu pakett "
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "Failid:\n"
 
-#: ../rpmdrake_.c:285
-msgid "Please wait, listing packages..."
-msgstr "Palun oodake, koostan nimekirja..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected size: %d MB"
+msgstr "Valitud pakettide maht: %d MB"
 
-#: ../rpmdrake_.c:300
-msgid "No update"
-msgstr "Uuendusi ei ole"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Valitud: %d MB / Vaba kettapinda %d MB"
 
-#: ../rpmdrake_.c:353 ../rpmdrake_.c:354
-msgid "More infos"
-msgstr "Rohkem infot"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
+msgstr ""
+"Sþltuvuste tþttu ei saa järgmisi pakette valida:\n"
+"\n"
 
-#: ../rpmdrake_.c:355
-msgid "Information on packages"
-msgstr "Info pakettide kohta"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+msgstr ""
+"Kahjuks ei saa järgmisi pakette valida:\n"
+"\n"
 
-#: ../rpmdrake_.c:376
-msgid "Some additional packages need to be removed"
-msgstr "Et kþik tÜÜtaks, on vaja lisaks eemaldada mþned paketid"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "Mþned paketid jäävad paigaldamata"
 
-#: ../rpmdrake_.c:377
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
 "\n"
 msgstr ""
-"Kþigi sþltuvuste rahuldamiseks eemaldatakse ka järgmised paketid:\n"
+"Sþltuvuste rahuldamiseks tuleb paigaldada ka järgmised paketid:\n"
 "\n"
 
-#: ../rpmdrake_.c:383 ../rpmdrake_.c:391
+#: ../rpmdrake:1
+#, c-format
+msgid "Additional packages needed"
+msgstr "Vajalikud lisapaketid"
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "MĂľned paketid ei ole eemaldatavad"
 
-#: ../rpmdrake_.c:384
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -466,413 +606,563 @@ msgstr ""
 "Vabandan, aga nende pakettide eemaldamine vĂľib halvata Teie sĂźsteemi:\n"
 "\n"
 
-#: ../rpmdrake_.c:392 ../rpmdrake_.c:451
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
 "\n"
 msgstr ""
-"Sþltuvuste tþttu ei saa järgmisi pakette valida:\n"
+"Kþigi sþltuvuste rahuldamiseks eemaldatakse ka järgmised paketid:\n"
 "\n"
 
-#: ../rpmdrake_.c:421
-msgid "Additional packages needed"
-msgstr "Vajalikud lisapaketid"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr "Et kþik tÜÜtaks, on vaja lisaks eemaldada mþned paketid"
 
-#: ../rpmdrake_.c:422
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
-msgstr ""
-"Sþltuvuste rahuldamiseks tuleb paigaldada ka järgmised paketid:\n"
-"\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
+msgstr "Rohkem infot paketi kohta..."
 
-#: ../rpmdrake_.c:435
-msgid "Some packages can't be installed"
-msgstr "Mþned paketid jäävad paigaldamata"
+#: ../rpmdrake:1
+#, c-format
+msgid "Information on packages"
+msgstr "Info pakettide kohta"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
+msgstr "Rohkem infot"
 
-#: ../rpmdrake_.c:436
+#: ../rpmdrake:1
+#, c-format
+msgid "Addable"
+msgstr "Lisatavad"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Upgradable"
+msgstr "Uuendatavad"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
+"The list of updates is void. This 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 ""
-"Kahjuks ei saa järgmisi pakette valida:\n"
-"\n"
 
-#: ../rpmdrake_.c:450 ../rpmdrake_.c:684
-msgid "Some packages need to be removed"
-msgstr "MĂľned paketid tuleb eemaldada"
+#: ../rpmdrake:1
+#, c-format
+msgid "No update"
+msgstr "Uuendusi ei ole"
 
-#: ../rpmdrake_.c:472
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Valitud: %d MB / Vaba kettapinda %d MB"
+msgid "(none)"
+msgstr "(puudub)"
 
-#: ../rpmdrake_.c:474
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "Valitud pakettide maht: %d MB"
+msgid "Please wait, listing packages..."
+msgstr "Palun oodake, koostan nimekirja..."
 
-#: ../rpmdrake_.c:482
-msgid "Files:\n"
-msgstr "Failid:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "unknown package "
+msgstr "tundmatu pakett "
 
-#: ../rpmdrake_.c:483
-msgid "Changelog:\n"
-msgstr "Muutuste logi:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Vajalik on ßks järgmistest pakettidest:"
 
-#: ../rpmdrake_.c:486
-msgid "Source: "
-msgstr "Allikas:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please choose"
+msgstr "Palun valige"
 
-#: ../rpmdrake_.c:487
-msgid "Currently installed version: "
-msgstr "Praegu paigaldatud versioon:"
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:491
-msgid "Reason for update: "
-msgstr "Uuendamise pĂľhjus:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Not selected"
+msgstr "Valimata"
 
-#: ../rpmdrake_.c:493
-msgid "Name: "
-msgstr "Nimi: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected"
+msgstr "Valitud"
 
-#: ../rpmdrake_.c:494
-msgid "Version: "
-msgstr "Versioon: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results"
+msgstr "Otsingu tulemused"
 
-#: ../rpmdrake_.c:495
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Stop"
+msgstr "Peata"
 
-#: ../rpmdrake_.c:495
-msgid "Size: "
-msgstr "Suurus: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, searching..."
+msgstr "Palun oodake, otsin..."
 
-#: ../rpmdrake_.c:497
-msgid "Importance: "
-msgstr "Tähtsus: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
+msgstr "Otsingu tulemus (ei leitud)"
 
-#: ../rpmdrake_.c:498
-msgid "Summary: "
-msgstr "KokkuvĂľte: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Muu"
 
-#: ../rpmdrake_.c:499
-msgid "Description: "
-msgstr "Kirjeldus: "
+#: ../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_.c:548
-msgid "Bugfixes updates"
-msgstr "Turvaparandused/uuendused"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Salvesta ja välju"
 
-#: ../rpmdrake_.c:548
-msgid "Normal updates"
-msgstr "Uuendused"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy..."
+msgstr "Vahendaja..."
 
-#: ../rpmdrake_.c:567
-msgid "Mandrake choices"
-msgstr "Mandrake valikud"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
+msgstr "Uuenda..."
 
-#: ../rpmdrake_.c:568
-msgid "All packages, alphabetical"
-msgstr "Kþik paketid, tähestikuliselt"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "Lisa..."
 
-#: ../rpmdrake_.c:569
-msgid "All packages,"
-msgstr "KĂľik paketid,"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "Muuda"
 
-#: ../rpmdrake_.c:592
-msgid "by group"
-msgstr "grupi järgi"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Source"
+msgstr "Allikas"
 
-#: ../rpmdrake_.c:592
-msgid "by size"
-msgstr "suuruse järgi"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
+msgstr "Kas lubada?"
 
-#: ../rpmdrake_.c:593
-msgid "by selection state"
-msgstr "valikustaatuse järgi"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure sources"
+msgstr "Allikate seadistamine"
 
-#: ../rpmdrake_.c:594
-msgid "by source repository"
-msgstr "andmekandja asukoha järgi"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "Parool:"
 
-#: ../rpmdrake_.c:594
-msgid "by update availability"
-msgstr "uuenduse saadavuse järgi"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
+msgstr "Kasutajanimi:"
 
-#: ../rpmdrake_.c:615
-msgid "in descriptions"
-msgstr "kirjeldustes"
+#: ../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:"
 
-#: ../rpmdrake_.c:615
-msgid "in files"
-msgstr "failides"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "Vahendaja masinanimi:"
 
-#: ../rpmdrake_.c:615
-msgid "in names"
-msgstr "nimedes"
+#: ../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_.c:626
-msgid "Reload the packages list"
-msgstr "Pakettide nimekirja taaslaadimine"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "Vahendajate seadistamine"
 
-#: ../rpmdrake_.c:626
-msgid "Reset the selection"
-msgstr "Valiku lähtestamine"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr "Palun oodake, uuendan andmekandjat..."
 
-#: ../rpmdrake_.c:652
-msgid "Maximum information"
-msgstr "Maks. info"
+#: ../edit-urpm-sources.pl: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."
 
-#: ../rpmdrake_.c:652
-msgid "Normal information"
-msgstr "Tavainfo"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
+msgstr "Jätkamiseks tuleb sisestada andmekandja"
 
-#: ../rpmdrake_.c:674
-msgid "Too many packages are selected"
-msgstr "Valitud on liiga palju pakette"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save changes"
+msgstr "Salvesta muutused"
 
-#: ../rpmdrake_.c:720
-msgid "Find:"
-msgstr "Leia:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Suhteline tee synthesis/hdlist juurde:"
 
-#: ../rpmdrake_.c:725
-msgid "Search"
-msgstr "Otsi"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake_.c:731
-msgid "Install"
-msgstr "Paigalda"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Editing source \"%s\":"
+msgstr "Allika \"%s\" muutmine:"
 
-#: ../rpmdrake_.c:738 data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrake Update"
-msgstr "Mandrake uuendused"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit a source"
+msgstr "Allika muutmine"
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Installation"
-msgstr "Pakettide paigaldamine"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr "Palun oodake, eemaldan andmekandja..."
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Removal"
-msgstr "Pakettide eemaldamine"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, adding medium..."
+msgstr "Palun oodake, lisan andmekandja..."
 
-#: ../rpmdrake_.c:779
-msgid "Please wait, contacting mirror to update packages information."
-msgstr "Palun oodake, uuendan pakettide infot."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of source:"
+msgstr "Andmekandja tßßp:"
 
-#: ../rpmdrake_.c:781
-msgid "Error updating medium"
-msgstr "Viga andmekandja uuendamisel"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Adding a source:"
+msgstr "Allika lisamine:"
 
-#: ../rpmdrake_.c:782
-msgid "There was an unrecoverable error while updating packages information."
-msgstr "Paketiinfo uuendamisel tekkis viga, ei saa jätkata."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
 
-#: ../rpmdrake_.c:787
-msgid "How to choose manually your mirror"
-msgstr "Kuidas valida peeglit käsitsi"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to fill up at least the two first entries."
+msgstr "Täitke vähemalt 2 esimest välja."
 
-#: ../rpmdrake_.c:795
-msgid "Please wait, contacting mirror to initialize updates packages."
-msgstr "Palun oodake, vĂľtan Ăźhendust uuenduste saidiga."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "Nimi:"
 
-#: ../rpmdrake_.c:798
-msgid "Error adding update medium"
-msgstr "Viga uuenduste andmekandja lisamisel."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
+msgstr "Kasutajanimi:"
 
-#: ../rpmdrake_.c:829
-msgid "Please wait, finding available packages..."
-msgstr "Palun oodake, otsin kättesaadavaid pakette..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Valige peegel..."
 
-#: ../rpmdrake_.c:861
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "%s uurimine"
+msgid "Browse..."
+msgstr "Sirvi.."
 
-#: ../rpmdrake_.c:880
-msgid "changes:"
-msgstr "muutused:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Otsingutee vĂľi haakepunkt:"
 
-#: ../rpmdrake_.c:884
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Eemalda .%s"
+msgid "Removable device"
+msgstr "Eemaldatav seade"
 
-#: ../rpmdrake_.c:886
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr ".%s kasutamine pĂľhifailina"
+msgid "HTTP server"
+msgstr "HTTP server"
 
-#: ../rpmdrake_.c:888
-msgid "Do nothing"
-msgstr "Ära tee midagi"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "FTP server"
 
-#: ../rpmdrake_.c:900
-msgid "Installation finished"
-msgstr "Paigaldus lĂľpetatud"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path:"
+msgstr "Otsingutee:"
 
-#: ../rpmdrake_.c:910
-msgid "Inspect..."
-msgstr "Uuri..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "Kohalikud failid"
 
-#: ../rpmdrake_.c:925
-msgid "Program missing"
-msgstr "Rakendus puudub"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add a source"
+msgstr "Lisa allikas"
 
-#: ../rpmdrake_.c:926
-msgid "A required program is missing (grpmi). Check your installation."
-msgstr ""
-"Vajalik rakendus (grpmi) puudub Teie sĂźsteemist. Palun vaadake, milles viga."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
+msgstr "Andmekandja uuendamine ebaĂľnnestus; sellest loobutakse automaatselt."
 
-#: ../rpmdrake_.c:940
-msgid "Unable to get source packages."
-msgstr "Ei saa pakette kätte."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "Andmekandja loomine ebaĂľnnestus."
 
-#: ../rpmdrake_.c:941
-msgid "Unable to get source packages, sorry."
-msgstr "Ei ole vþimalik pakette kätte saada, vabandan."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, updating media..."
+msgstr "Palun oodake, uuendan andmekandjat..."
 
-#: ../rpmdrake_.c:948
-msgid "Change medium"
-msgstr "Muuda andmekandjat"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
+msgstr "Uuenda"
 
-#: ../rpmdrake_.c:949
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Palun sisestage andmekandja nimega \"%s\" seadmesse [%s]"
+msgid "Select the source(s) you wish to update:"
+msgstr "Valige allikas (allikad), mida soovite uuendada:"
 
-#: ../rpmdrake_.c:957
-msgid "Installation failed"
-msgstr "Paigaldus ebaĂľnnestus "
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please choose the desired mirror."
+msgstr "Palun valige peegel."
 
-#: ../rpmdrake_.c:958
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
-"Paigaldus ebaĂľnnestus, osa faile on puudu.\n"
-"VĂľimalik, et peate allikate andmebaasi uuendama."
 
-#: ../rpmdrake_.c:961
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr "Palun oodake, eemaldan pakette, et uuendus oleks vĂľimalik..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
+msgstr "Peeglit ei leitud"
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"There was an error downloading the mirrors list:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
-"Paigaldus on lĂľpetatud; %s\n"
-"\n"
-"MĂľned seadetefailid loodi kui '.rpmnew' vĂľi '.rpmsave'. Te\n"
-"vþiksite mþnda neist nßßd uurida, et vþtta ette järgmisi samme:"
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "Viga allalaadimisel"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "Palun oodake, peeglite aadresse laetakse..."
+
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"some packages failed to install\n"
-"correctly"
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
-"MĂľnda paketti ei Ăľnnestunud\n"
-"korrektselt paigaldada"
 
-#: ../rpmdrake_.c:983
-msgid "everything was installed correctly"
-msgstr "kĂľik paigaldati edukalt"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United States"
+msgstr "USA"
 
-#: ../rpmdrake_.c:985
-msgid "Everything installed successfully"
-msgstr "KĂľik paigaldati edukalt"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
+msgstr "Hiina"
 
-#: ../rpmdrake_.c:986
-msgid "All requested packages were installed successfully."
-msgstr "KĂľik soovitud paketid said edukalt paigaldatud."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr "Suurbritannia"
 
-#: ../rpmdrake_.c:989
-msgid "Everything already installed."
-msgstr "KĂľik on juba paigaldatud."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "Taiwan"
 
-#: ../rpmdrake_.c:990
-msgid "Everything already installed (is this supposed to happen at all?)."
-msgstr "KĂľik on juba paigaldatud (kas see pidigi nii olema?)."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "Rootsi"
 
-#: ../rpmdrake_.c:997
-msgid "Problem during installation"
-msgstr "Probleem paigaldusel"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
+msgstr "Venemaa"
 
-#: ../rpmdrake_.c:998
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Paigaldusel tekkis probleem:\n"
-"\n"
-"%s"
+msgid "Portugal"
+msgstr "Portugal"
 
-#: ../rpmdrake_.c:1012
-msgid "Please wait, reading packages database..."
-msgstr "Palun oodake, loen pakettide andmebaasi..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
+msgstr "Poola"
 
-#: ../rpmdrake_.c:1053
-msgid "Please wait, removing packages..."
-msgstr "Palun oodake, eemaldan pakette..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
+msgstr "Norra"
 
-#: ../rpmdrake_.c:1056
-msgid "Problem during removal"
-msgstr "Probleem eemaldamisel"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
+msgstr "Holland"
 
-#: ../rpmdrake_.c:1057
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Tekkis probleem järgmiste pakettide eemaldamisel:\n"
-"\n"
-"%s"
+msgid "Korea"
+msgstr "Korea"
 
-#: ../rpmdrake_.c:1089
-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 "Japan"
+msgstr "Jaapan"
 
-#: ../rpmdrake_.c:1094
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"Mandrake uuendused\n"
-"\n"
-"Selle tÜÜriista abil saate oma Mandrake Linuxit uuendada."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Italy"
+msgstr "Itaalia"
 
-#: ../rpmdrake_.c:1099
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
-msgstr ""
-"Tarkvara paigaldamine\n"
-"\n"
-"Mandrake Linuxi CDROM vĂľi DVD sisaldavad tuhandeid tarkvarapakette.\n"
-"Selle tÜÜriista abil saate valida, milliseid soovite oma arvutile paigaldada."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Israel"
+msgstr "Iisrael"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Kreeka"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "France"
+msgstr "Prantsusmaa"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "Soome"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "Hispaania"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
+msgstr "Taani"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr "Saksamaa"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
+msgstr "TĹĄehhi Vabariik"
+
+#: ../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 "Brasiilia"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Belgium"
+msgstr "Belgia"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Australia"
+msgstr "Austraalia"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
+msgstr "Austria"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Info..."
+msgstr "Info..."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
+msgstr "Ei"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Jah"
+
+#: data/rpmdrake.desktop.in.h:1
+msgid "Install Software"
+msgstr "Tarkvara paigaldamine"
 
 #: data/rpmdrake-remove.desktop.in.h:1
 msgid "Remove Software"
@@ -881,7 +1171,3 @@ msgstr "Tarkvara eemaldamine"
 #: data/rpmdrake-sources.desktop.in.h:1
 msgid "Software Sources Manager"
 msgstr "Tarkvaraallikate haldur"
-
-#: data/rpmdrake.desktop.in.h:1
-msgid "Install Software"
-msgstr "Tarkvara paigaldamine"
diff --git a/po/et.pom b/po/et.pom
index ad3ab28b..5045ead5 100644
--- a/po/et.pom
+++ b/po/et.pom
@@ -4,167 +4,172 @@ msgstr "Server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Server, Veeb/FTP"
+msgid "Office Workstation"
+msgstr "Kontori tÜÜjaam"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "VĂľrguarvuti (klient)"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Kontoriprogrammid: tekstitÜÜtlus (kword, abiword), tabeltÜÜtlus (kspread, "
+"gnumeric), PDF vaatajad jne"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS, SMB, SSH server, vahendaja (proxy)"
+msgid "Workstation"
+msgstr "TÜÜjaam"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Kontor"
+msgid "Game station"
+msgstr "Mänguvahend"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Gnome tÜÜjaam"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Meelelahutus: pþnevus-, laua-, strateegiamängud jne"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Suhtlus Palmi vĂľi Visoriga"
+msgid "Multimedia station"
+msgstr "Multimeedia tÜÜjaam"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "TÜÜjaam"
+msgid "Sound and video playing/editing programs"
+msgstr "Heli ja video mängimine ja redigeerimine"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Tulemßßr/marsruuter"
+msgid "Internet station"
+msgstr "Interneti tÜÜjaam"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
 msgstr ""
+"Komplekt rakendusi meili ja uudiste lugemiseks (pine, mutt, tin...) ning "
+"veebi lehitsemiseks"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
-msgstr ""
-"Kontoriprogrammid: tekstitÜÜtlus (kword, abiword), tabelarvutus (kspread, "
-"gnumeric), PDF eelvaade jne"
+msgid "Network Computer (client)"
+msgstr "VĂľrguarvuti (klient)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "Audio-värgid: mp3 ja midi, mikserid jms"
+msgid "Clients for different protocols including ssh"
+msgstr "Mitme protokolli, sealhulgas ssh kliendid"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr ""
+msgid "Configuration"
+msgstr "Seadistamine"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Raamatud ja Howto-d Linux ja vabavara kohta"
+msgid "Tools to ease the configuration of your computer"
+msgstr "Vahendid sĂźsteemi lihtsamaks administreerimiseks"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "KDE tÜÜjaam"
+msgid "Scientific Workstation"
+msgstr "TeadustÜÜjaam"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm jt"
+msgid "Scientific applications such as gnuplot"
+msgstr "Teaduserakendused, näiteks gnuplot"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Multimeedia - Video"
+msgid "Console Tools"
+msgstr "Konsoolivahendid"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr "Meili, uudiste, veebi, jututamise ja failiĂźlekande programmid"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Redaktorid, shellid, terminalid, failihaldus"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Server, Andmebaasid"
+msgid "KDE Workstation"
+msgstr "KDE tÜÜjaam"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
 msgstr ""
+"K tÜÜlaua keskkond: graafiline tÜÜkeskkond ja rida seonduvaid rakendusi"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Vahendid lihtsamaks sĂźsteemi administreerimiseks"
+msgid "Graphical Environment"
+msgstr "Graafiline keskkond"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "Multimeedia - Heli"
+msgid "Gnome Workstation"
+msgstr "Gnome tÜÜjaam"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dokumentatsioon"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr "Graafiline tÜÜkeskkond koos kasutajasþbralike rakendustega"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Konsooliprogrammid"
+msgid "Other Graphical Desktops"
+msgstr "Muud graafilised tÜÜlauad"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr ""
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, WindowMaker, Enlightenment, Fvwm jt"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Interneti tÜÜjaam"
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+msgid "Development"
+msgstr "Arendus"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Multimeedia tÜÜjaam"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C ja C++ arendusteegid, rakendused ja include-failid"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Configuration"
-msgstr "LAN sätted"
+msgid "Documentation"
+msgstr "Dokumentatsioon"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Veel graafilisi tÜÜlaudu (Gnome, IceWM)"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Raamatud ja Howto-d Linuxi ja vabavara kohta"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
-"K Desktop Environment, graafiline tÜÜkeskkond ja rida seonduvaid rakendusi"
+msgid "LSB"
+msgstr "LSB"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Graafiline keskkond"
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Linux Standard Base. Vþþraste rakenduste toetus"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-msgid "Development"
-msgstr "Arendus"
+msgid "Web/FTP"
+msgstr "Veeb/FTP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -173,119 +178,113 @@ msgstr "Apache ja Pro-ftpd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "Vahendid CD-de kirjutamiseks"
+msgid "Mail/Groupware/News"
+msgstr "Meil/grupitÜÜ/uudised"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Kontori tÜÜjaam"
+msgid "Postfix mail server, Inn news server"
+msgstr "Postfix meiliserver, uudisteserver Inn"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm jne"
+msgid "Database"
+msgstr "Andmebaasid"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Graafikaprogrammid nagu Gimp"
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL vĂľi MySQL andmebaasiserver"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "DNS/NIS "
-msgstr "DNS/NIS"
+msgid "Firewall/Router"
+msgstr "Tulemßßr/marsruuter"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C ja C++ arendusteegid, programmid ja päisefailid"
+msgid "Internet gateway"
+msgstr "Internetiasjad"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Network Computer server"
-msgstr "Failiserver"
+msgid "DNS/NIS "
+msgstr "DNS/NIS "
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "Server, Meil/grupitÜÜ/uudised"
+msgid "Domain Name and Network Information Server"
+msgstr "Nimeserver ja NIS"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Mänguvahend"
+msgid "Network Computer server"
+msgstr "VĂľrguserver"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Video esitamine ja redigeerimine"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS, SMB, SSH server, vahendaja (proxy)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Graphics"
-msgstr "Multimeedia - Graafika"
+msgid "Office"
+msgstr "Kontor"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Meelelahutus: arcade, boards, strategy jne"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr "Meili, uudiste, veebi, jututamise ja failiĂźlekande vahendid"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr "Komplekt programme meili ja uudiste lugemiseks ning veebi brausimiseks"
+msgid "Multimedia - Graphics"
+msgstr "Multimeedia - Graafika"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "Isiklikud finantsid"
+msgid "Graphics programs such as The Gimp"
+msgstr "Graafikarakendused, näiteks Gimp"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr "Graafiline tÜÜkeskkond koos kasutajasþbralike rakendustega"
+msgid "Multimedia - Sound"
+msgstr "Multimeedia - Heli"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Mitmete protokollide, sealhulgas ssh kliendid"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "Helivahendid: mp3- ja midi-mängijad, mikserid jms"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "LSB"
-msgstr ""
+msgid "Multimedia - Video"
+msgstr "Multimeedia - Video"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Internet gateway"
-msgstr "InternetiĂźhendus"
+msgid "Video players and editors"
+msgstr "Videode mängimine ja redigeerimine"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Heli ja video esitamine ja redigeerimine"
+msgid "Multimedia - CD Burning"
+msgstr "Multimeedia - CD kirjutamine"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Muud graafilised tÜÜlauad"
+msgid "Tools to create and burn CD's"
+msgstr "Vahendid CD-de kirjutamiseks"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Editorid, shellid, terminalid, failihaldus"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Veel graafilisi tÜÜlaudu (Gnome, IceWM)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "Isiklike finantside haldusvahendid"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, WindowMaker, Enlightenment, Fvwm jne"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -294,11 +293,16 @@ msgstr "Isikliku info haldamine"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multimeedia - CD kirjutamine"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Suhtlus Palm Piloti vĂľi Visoriga"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "TeadustÜÜjaam"
+msgid "Personal Finance"
+msgstr "Isiklikud rahaasjad"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Programs to manage your finances, such as gnucash"
+msgstr "Isiklike rahaasjade rakendused, näiteks gnucash"
 
diff --git a/po/eu.po b/po/eu.po
index 21903f90..740917d8 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2003-01-19 16:57+0100\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\n"
 "PO-Revision-Date: 2002-09-23 10:19+0200\n"
 "Last-Translator: IĂąigo Salvador Azurmendi <xalba@euskalnet.net>\n"
 "Language-Team: Euskara <linux-eu@chanae.alphanet.ch>\n"
@@ -15,1044 +15,1231 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../edit-urpm-sources.pl_.c:39
-msgid "Unable to create medium."
-msgstr "Ezin da euskarria sortu."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Jarraitu nahi dezaket?"
 
-#: ../edit-urpm-sources.pl_.c:40
-msgid "Unable to update medium; it will be automatically disabled."
-msgstr "Ezin da euskarria eguneratu, automatikoki ezgaituko da."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to the software installation tool!\n"
+"\n"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
+msgstr ""
+"Ongi etorri software instalazio tresnara!\n"
+"\n"
+"Zure Mandrake Linux sistema zenbait milaka software pakete dakartza CDROM\n"
+"eta DVD-n. Tresna honek zure konputagailuan zein software instalatu nahi "
+"duzun\n"
+"aukeratzen lagunduko dizu."
 
-#: ../edit-urpm-sources.pl_.c:51
-#, fuzzy
-msgid "Add a source"
-msgstr "Sorburua gehitzen:"
+#: ../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 ""
+"Ongi etorri MandrakeUpdatera!\n"
+"\n"
+"Tresna honek zure konputagailuan instalatu nahi dituzun eguneratzeak "
+"aukeratzen\n"
+"lagunduko dizu."
 
-#: ../edit-urpm-sources.pl_.c:52
-msgid "Local files"
-msgstr "Bertako fitxategiak"
+#: ../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."
 
-#: ../edit-urpm-sources.pl_.c:52
-msgid "Path:"
-msgstr "bidea:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"Arazo bat izan da instalatzerakoan:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:53
-msgid "FTP server"
-msgstr "FTP zerbitzaria"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during removal"
+msgstr "Arazoa instalatzerakoan"
 
-#: ../edit-urpm-sources.pl_.c:53 ../edit-urpm-sources.pl_.c:54
-#: ../edit-urpm-sources.pl_.c:56 ../edit-urpm-sources.pl_.c:175
-msgid "URL:"
-msgstr "URLa:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages..."
+msgstr "Itxaoin mesedez, paketeak ezabatzen..."
 
-#: ../edit-urpm-sources.pl_.c:54
-msgid "HTTP server"
-msgstr "HTTP zerbitzaria"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
+msgstr "Itxoin mesedez, paketeen datubasea irakurtzen..."
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Path or mount point:"
-msgstr "bidea edo muntatze-puntua:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Arazo bat izan da instalatzerakoan:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Removable device"
-msgstr "Gailu aldagarriak"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during installation"
+msgstr "Arazoa instalatzerakoan"
 
-#: ../edit-urpm-sources.pl_.c:56 ../rpmdrake_.c:548
-msgid "Security updates"
-msgstr "Segurtasunaren eguneratzeak"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
+msgstr "Guztia dagoeneko instalatuta (hau gertatu daiteke?)"
 
-#: ../edit-urpm-sources.pl_.c:67
-msgid "Browse..."
-msgstr "Aztertu..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed."
+msgstr "Guztia instalatuta dago."
 
-#: ../edit-urpm-sources.pl_.c:69
-msgid "Choose a mirror..."
-msgstr "Aukeratu ispilua..."
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "Eskatutako pakete guztiak ondo instalatu dira."
 
-#: ../edit-urpm-sources.pl_.c:89
-msgid "Login:"
-msgstr "Sarrera:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr "Guztia ondo instalatu da."
 
-#: ../edit-urpm-sources.pl_.c:89 ../edit-urpm-sources.pl_.c:215
-msgid "Password:"
-msgstr "Pasahitza:"
+#: ../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 ""
+"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_.c:94
-msgid "Name:"
-msgstr "Izena:"
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "guztia ondo instalatu da"
 
-#: ../edit-urpm-sources.pl_.c:96 ../edit-urpm-sources.pl_.c:176
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Bide erlatiboa synthesis/hdlist-ekiko:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"some packages failed to install\n"
+"correctly"
+msgstr ""
+"Zenbait pakete ezin dira ondo\n"
+"instalatu"
 
-#: ../edit-urpm-sources.pl_.c:104
-msgid "You need to fill up at least the two first entries."
-msgstr "Gutxienez lehenengo bi sarrerak bete behar dituzu."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages to allow others to be upgraded..."
+msgstr ""
+"Itxoin mesedez, paketeak ezabatzen beste batzu eguneratu ahal daitezen..."
 
-#: ../edit-urpm-sources.pl_.c:116
-msgid "Adding a source:"
-msgstr "Sorburua gehitzen:"
+#: ../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."
 
-#: ../edit-urpm-sources.pl_.c:117
-msgid "Type of source:"
-msgstr "Sorburu-mota:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation failed"
+msgstr "Instalazioak huts egin du"
 
-#: ../edit-urpm-sources.pl_.c:121 ../edit-urpm-sources.pl_.c:187
-#: ../edit-urpm-sources.pl_.c:219 ../rpmdrake.pm_.c:97 ../rpmdrake.pm_.c:136
-#: ../rpmdrake.pm_.c:319 ../rpmdrake_.c:353 ../rpmdrake_.c:365
-#: ../rpmdrake_.c:369 ../rpmdrake_.c:916 ../rpmdrake_.c:950
+#: ../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"
 
-#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:180
-#: ../edit-urpm-sources.pl_.c:187 ../edit-urpm-sources.pl_.c:220
-#: ../rpmdrake.pm_.c:319 ../rpmdrake.pm_.c:352 ../rpmdrake_.c:353
-#: ../rpmdrake_.c:950
-msgid "Cancel"
-msgstr "Utzi"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Mesedez sartu \"%s\" izeneko euskarria [%s] gailuan"
 
-#: ../edit-urpm-sources.pl_.c:140
-msgid "Please wait, adding medium..."
-msgstr "Itxoin mesedez, euskarria gehitzen..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr "Aldatu euskarria"
 
-#: ../edit-urpm-sources.pl_.c:158
-msgid "Please wait, removing medium..."
-msgstr "Itxoin mesedez, euskarria ezabatzen..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
+msgstr "Barkatu, ezin dira sorburuko paketeak jaso."
 
-#: ../edit-urpm-sources.pl_.c:169
-msgid "Edit a source"
-msgstr "Editatu sorburua"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages."
+msgstr "Ezin dira sorburuko paketeak jaso."
 
-#: ../edit-urpm-sources.pl_.c:173
+#: ../rpmdrake:1
 #, c-format
-msgid "Editing source \"%s\":"
-msgstr "\"%s\" sorburua editatzen:"
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr "Behar den programa bat falta da (grpmi). Egiaztatu zure instalazioa."
 
-#: ../edit-urpm-sources.pl_.c:179
-msgid "Save changes"
-msgstr "Aldaketak gorde"
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
+msgstr "Programa falta da"
 
-#: ../edit-urpm-sources.pl_.c:185
-msgid "You need to insert the medium to continue"
-msgstr "Jarraitzeko euskarria sartu behar duzu"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
+msgstr "Ikertu..."
 
-#: ../edit-urpm-sources.pl_.c:186
-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:1
+#, c-format
+msgid "Installation finished"
+msgstr "Instalazioa amaitu da"
 
-#: ../edit-urpm-sources.pl_.c:191
-msgid "Please wait, updating medium..."
-msgstr "Itxoin mesedez, euskarria eguneratzen..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
+msgstr "Ez egin ezer"
 
-#: ../edit-urpm-sources.pl_.c:202
-msgid "Configure proxies"
-msgstr "Proxyak konfiguratu"
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
+msgstr "Erabili %s fitxategi nagusi gisa"
 
-#: ../edit-urpm-sources.pl_.c:207
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
-msgstr ""
-"Proxy bat behar baduzu, sartu ostalari-izena eta, behar bazenu, portua "
-"(sintaksia <proxyostalaria[:portua]>):"
+#: ../rpmdrake:1
+#, c-format
+msgid "Remove .%s"
+msgstr "Ezabatu .%s"
 
-#: ../edit-urpm-sources.pl_.c:209
-msgid "Proxy hostname:"
-msgstr "Proxy ostalari-izena:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "changes:"
+msgstr "Aldaketak gorde"
 
-#: ../edit-urpm-sources.pl_.c:211
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "erabiltzaile/pasahitza zehaztu dezakezu proxy autentifikaziorako:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr "%s ikertzen"
 
-#: ../edit-urpm-sources.pl_.c:213
-msgid "User:"
-msgstr "Erabiltzailea:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, finding available packages..."
+msgstr "Itxoin mesedez, eskuratu daitezkeen paketeak bilatzen..."
 
-#: ../edit-urpm-sources.pl_.c:235
-msgid "Configure sources"
-msgstr "Sorburuak konfiguratu"
+#: ../rpmdrake:1
+#, c-format
+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 ""
+"Okerra jazo da urpmi bitartez eguneratze euskarria gehitzerakoan.\n"
+"\n"
+"Hondatutako edo aldi batez eskuraezin dagoen ispilu baten ondorioa izan "
+"daiteke,\n"
+"edo zure Mandrake Linux bertsioari (%s) ez dio oraindik / dagoeneko Mandrake "
+"Linux\n"
+"Eguneratze Ofizialak euskarri ematen.\n"
+"\n"
+"Beste ispilu batekin froga egin nahi duzu?"
 
-#: ../edit-urpm-sources.pl_.c:242
-msgid "Enabled?"
-msgstr "Gaitu?"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
+msgstr "Okerra eguneratze euskarria gehitzerakoan"
 
-#: ../edit-urpm-sources.pl_.c:243
-msgid "Source"
-msgstr "Sorburua"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
+msgstr ""
+"Itxoin mesedez, ispiluarekin kontaktatzen eguneratze paketeak hasieratzeko."
 
-#: ../edit-urpm-sources.pl_.c:264 ../rpmdrake_.c:730
-msgid "Remove"
-msgstr "Ezabatu"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Sources Manager, and then add a `Security\n"
+"updates' source.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"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"
 
-#: ../edit-urpm-sources.pl_.c:266
-msgid "Edit"
-msgstr "Editatu"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Nola hautatu eskuz zure ispilua"
 
-#: ../edit-urpm-sources.pl_.c:268
-msgid "Add..."
-msgstr "Gehitu..."
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
+msgstr "Oker zuzenezina gertatu da paketeen informazioa eguneratzekoan."
 
-#: ../edit-urpm-sources.pl_.c:270
-msgid "Update..."
-msgstr "Eguneratu..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
+msgstr "Okerra euskarria eguneratzen"
 
-#: ../edit-urpm-sources.pl_.c:271
-msgid "Proxy..."
-msgstr "Proxy..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
+msgstr ""
+"Itxoin mesedez, ispiluarekin kontaktatzen paketeen informazioa eguneratzeko."
 
-#: ../edit-urpm-sources.pl_.c:274
-msgid "Save and quit"
-msgstr "Gorde eta irten"
+#: ../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?"
 
-#: ../edit-urpm-sources.pl_.c:275 ../rpmdrake_.c:733
-msgid "Quit"
-msgstr "Irten"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Installation"
+msgstr "Software Paketeen instalazioa"
 
-#: ../rpmdrake.pm_.c:93
-msgid "Yes"
-msgstr "Bai"
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, c-format
+msgid "Mandrake Update"
+msgstr "Mandrake Eguneratu"
 
-#: ../rpmdrake.pm_.c:95
-msgid "No"
-msgstr "Ez"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
+msgstr "Software Paketeen Ezabaketa"
 
-#: ../rpmdrake.pm_.c:127
-msgid "Info..."
-msgstr "Info..."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Irten"
 
-#: ../rpmdrake.pm_.c:180
-msgid "Austria"
-msgstr "Austria"
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "Instalatu"
 
-#: ../rpmdrake.pm_.c:181
-msgid "Australia"
-msgstr "Australia"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "Ezabatu"
 
-#: ../rpmdrake.pm_.c:182
-msgid "Belgium"
-msgstr "Belgika"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search"
+msgstr "Bilatu"
 
-#: ../rpmdrake.pm_.c:183
-msgid "Brazil"
-msgstr "Brasil"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "Aurkitu:"
 
-#: ../rpmdrake.pm_.c:184
-msgid "Canada"
-msgstr "Kanada"
+#: ../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?"
 
-#: ../rpmdrake.pm_.c:185
-msgid "Costa Rica"
-msgstr "Costa Rica"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "Zenbait pakete ezabatu egin behar dira"
 
-#: ../rpmdrake.pm_.c:186
-msgid "Czech Republic"
-msgstr "Txekiar Errepublika"
+#: ../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?"
 
-#: ../rpmdrake.pm_.c:187
-msgid "Germany"
-msgstr "Alemania"
+#: ../rpmdrake:1
+#, c-format
+msgid "Too many packages are selected"
+msgstr "Pakete gehiegi dago hautatuta"
 
-#: ../rpmdrake.pm_.c:188
-msgid "Danmark"
-msgstr "Danimarka"
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
+msgstr "Informazio zabalenak"
 
-#: ../rpmdrake.pm_.c:189 ../rpmdrake.pm_.c:193
-msgid "Greece"
-msgstr "Grezia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal information"
+msgstr "Informazio arruntak"
 
-#: ../rpmdrake.pm_.c:190
-msgid "Spain"
-msgstr "Espainia"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update source(s)"
+msgstr "Eguneratu sorburua(k)"
 
-#: ../rpmdrake.pm_.c:191
-msgid "Finland"
-msgstr "Finlandia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reload the packages list"
+msgstr "Birzamatu paketeen zerrenda"
 
-#: ../rpmdrake.pm_.c:192
-msgid "France"
-msgstr "Frantzia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
+msgstr "Hautua berrezarri"
 
-#: ../rpmdrake.pm_.c:194
-msgid "Israel"
-msgstr "Israel"
+#: ../rpmdrake:1
+#, c-format
+msgid "in files"
+msgstr "fitxategitan"
 
-#: ../rpmdrake.pm_.c:195
-msgid "Italy"
-msgstr "Italia"
+#: ../rpmdrake:1
+#, c-format
+msgid "in descriptions"
+msgstr "deskribapenetan"
 
-#: ../rpmdrake.pm_.c:196
-msgid "Japan"
-msgstr "Japonia"
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
+msgstr "izenetan"
 
-#: ../rpmdrake.pm_.c:197
-msgid "Korea"
-msgstr "Korea"
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
+msgstr "eguneratze eskuragarritasun arabera"
 
-#: ../rpmdrake.pm_.c:198
-msgid "Netherlands"
-msgstr "Herbeherak"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
+msgstr "sorburu gordailuaren arabera"
 
-#: ../rpmdrake.pm_.c:199
-msgid "Norway"
-msgstr "Norvegia"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
+msgstr "hautapenaren arabera"
 
-#: ../rpmdrake.pm_.c:200
-msgid "Poland"
-msgstr "Polonia"
+#: ../rpmdrake:1
+#, c-format
+msgid "by size"
+msgstr "neurri arabera"
 
-#: ../rpmdrake.pm_.c:201
-msgid "Portugal"
-msgstr "Portugal"
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
+msgstr "talde arabera"
 
-#: ../rpmdrake.pm_.c:202
-msgid "Russia"
-msgstr "Errusia"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages,"
+msgstr "Pakete guztiak,"
 
-#: ../rpmdrake.pm_.c:203
-msgid "Sweden"
-msgstr "Suedia"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
+msgstr "Pakete guztiak, alfabetikoki"
 
-#: ../rpmdrake.pm_.c:204
-msgid "Taiwan"
-msgstr "Taiwan"
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
+msgstr "Mandrake aukerak"
 
-#: ../rpmdrake.pm_.c:205
-msgid "United Kingdom"
-msgstr "Erresuma Batua"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal updates"
+msgstr "Eguneratze arruntak"
 
-#: ../rpmdrake.pm_.c:206
-msgid "China"
-msgstr "Txina"
+#: ../rpmdrake:1
+#, c-format
+msgid "Bugfixes updates"
+msgstr "Akatsak konpontzeko eguneratzeak"
 
-#: ../rpmdrake.pm_.c:207 ../rpmdrake.pm_.c:208 ../rpmdrake.pm_.c:209
-#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:261
-msgid "United States"
-msgstr "Estatu Batuak"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
+msgstr "Segurtasunaren eguneratzeak"
 
-#: ../rpmdrake.pm_.c:274
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr "Itxoin mesedez, ispiluen helbideak eskuratzen MandrakeSoft webgunetik."
+#: ../rpmdrake:1
+#, c-format
+msgid "Description: "
+msgstr "Deskribapena: "
 
-#: ../rpmdrake.pm_.c:280
-msgid "Error during download"
-msgstr "Okerra jaisterakoan"
+#: ../rpmdrake:1
+#, c-format
+msgid "Summary: "
+msgstr "Laburpena: "
 
-#: ../rpmdrake.pm_.c:289
-msgid "No mirror"
-msgstr "Ispilurik ez"
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "Garrantzia: "
 
-#: ../rpmdrake.pm_.c:307
-msgid "Please choose the desired mirror."
-msgstr "Mesedez hautatu nahi duzun ispilua."
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake.pm_.c:339 ../rpmdrake_.c:627
-msgid "Update source(s)"
-msgstr "Eguneratu sorburua(k)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Size: "
+msgstr "Neurria: "
 
-#: ../rpmdrake.pm_.c:343
-msgid "Select the source(s) you wish to update:"
-msgstr "Hautatu eguneratu nahi dituzun sorburuak:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Version: "
+msgstr "Bertsioa: "
 
-#: ../rpmdrake.pm_.c:347
-msgid "Update"
-msgstr "Eguneratu"
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "Izena: "
 
-#: ../rpmdrake.pm_.c:358
-msgid "Please wait, updating media..."
-msgstr "Itxoin mesedez, euskarria eguneratzen..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "Eguneratzeko arrazoia: "
 
-#: ../rpmdrake_.c:99
-msgid "Other"
-msgstr "Beste bat"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
+msgstr "Orain instalatutako bertsioa: "
 
-#: ../rpmdrake_.c:121 ../rpmdrake_.c:135 ../rpmdrake_.c:227 ../rpmdrake_.c:298
-msgid "(none)"
-msgstr "(bat ere ez)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Source: "
+msgstr "Sorburua: "
 
-#: ../rpmdrake_.c:141 ../rpmdrake_.c:482 ../rpmdrake_.c:483
+#: ../rpmdrake:1
+#, c-format
 msgid "(Not available)"
 msgstr "(Ez dago eskuragarri)"
 
-#: ../rpmdrake_.c:151 ../rpmdrake_.c:208
-msgid "Search results"
-msgstr "Bilaketaren emaitzak"
-
-#: ../rpmdrake_.c:151
-msgid "Search results (none)"
-msgstr "Bilaketaren emaitzak (batere ez)"
-
-#: ../rpmdrake_.c:161 ../rpmdrake_.c:172
-msgid "Please wait, searching..."
-msgstr "Itxoin mesedez, bilatzen..."
-
-#: ../rpmdrake_.c:175
-msgid "Stop"
-msgstr "Gelditu"
-
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-msgid "Addable"
-msgstr "Gehigarria"
-
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-msgid "Upgradable"
-msgstr "Eguneragarria"
-
-#: ../rpmdrake_.c:211
-msgid "Not selected"
-msgstr "Hautatu gabe"
-
-#: ../rpmdrake_.c:211
-msgid "Selected"
-msgstr "Hautatuta"
-
-#: ../rpmdrake_.c:240
-msgid "rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake_.c:258 ../rpmdrake_.c:360 ../rpmdrake_.c:362
-msgid "More information on package..."
-msgstr "Paketeari buruzko informazio gehiago..."
-
-#: ../rpmdrake_.c:259
-msgid "One of the following packages is needed:"
-msgstr "Ondorengo paketeetako bat behar da:"
-
-#: ../rpmdrake_.c:259
-msgid "Please choose"
-msgstr "Hautatu mesedez"
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
+msgstr "Aldakketa-Erregistroa:\n"
 
-#: ../rpmdrake_.c:275
-msgid "unknown package "
-msgstr "pakete ezezaguna"
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "Fitxategiak:\n"
 
-#: ../rpmdrake_.c:285
-msgid "Please wait, listing packages..."
-msgstr "Itxoin, paketeak zerrendatzen..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected size: %d MB"
+msgstr "Aukeratutakoen neurria: %d MB"
 
-#: ../rpmdrake_.c:300
-msgid "No update"
-msgstr "Eguneratzerik ez"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Aukeratutakoak: %d MB / Diskoan leku askea: %d MB"
 
-#: ../rpmdrake_.c:353 ../rpmdrake_.c:354
-msgid "More infos"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
 msgstr ""
+"Dituzten menpekotasunengatik, ondorengo paketeak aukeratik kendu\n"
+"behar dira:\n"
+"\n"
 
-#: ../rpmdrake_.c:355
-#, fuzzy
-msgid "Information on packages"
-msgstr "Paketeari buruzko informazio gehiago..."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+msgstr ""
+"Barkatu, ondorengo paketeak ezin dira hautatu:\n"
+"\n"
 
-#: ../rpmdrake_.c:376
-msgid "Some additional packages need to be removed"
-msgstr "Pakete osagarri batzu kendu behar dira"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "Pakete batzu ezin dira instalatu"
 
-#: ../rpmdrake_.c:377
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
 "\n"
 msgstr ""
-"Dituzten menpekotasunengatik, ondorengo paketeak ere kendu behar\n"
-"dira:\n"
+"Menpekotasunak asetzeko, ondorengo paketeak ere instalatu\n"
+"behar dira:\n"
 "\n"
 
-#: ../rpmdrake_.c:383 ../rpmdrake_.c:391
+#: ../rpmdrake:1
+#, c-format
+msgid "Additional packages needed"
+msgstr "Pakete osagarriak behar dira"
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "Pakete batzu ezin dira ezabatu"
 
-#: ../rpmdrake_.c:384
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake_.c:392 ../rpmdrake_.c:451
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
 "\n"
 msgstr ""
-"Dituzten menpekotasunengatik, ondorengo paketeak aukeratik kendu\n"
-"behar dira:\n"
+"Dituzten menpekotasunengatik, ondorengo paketeak ere kendu behar\n"
+"dira:\n"
 "\n"
 
-#: ../rpmdrake_.c:421
-msgid "Additional packages needed"
-msgstr "Pakete osagarriak behar dira"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr "Pakete osagarri batzu kendu behar dira"
 
-#: ../rpmdrake_.c:422
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
+msgstr "Paketeari buruzko informazio gehiago..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Information on packages"
+msgstr "Paketeari buruzko informazio gehiago..."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
 msgstr ""
-"Menpekotasunak asetzeko, ondorengo paketeak ere instalatu\n"
-"behar dira:\n"
-"\n"
 
-#: ../rpmdrake_.c:435
-msgid "Some packages can't be installed"
-msgstr "Pakete batzu ezin dira instalatu"
+#: ../rpmdrake:1
+#, c-format
+msgid "Addable"
+msgstr "Gehigarria"
 
-#: ../rpmdrake_.c:436
+#: ../rpmdrake:1
+#, c-format
+msgid "Upgradable"
+msgstr "Eguneragarria"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
+"The list of updates is void. This 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 ""
-"Barkatu, ondorengo paketeak ezin dira hautatu:\n"
-"\n"
+"Eguneratze zerrenda hutsik dago. Honek esan nahi du ez dagoela\n"
+"zure konputagailuan instalatutako paketeentzako eguneratzerik, edo\n"
+"guztiak instalatuta dauzkazula dagoeneko."
 
-#: ../rpmdrake_.c:450 ../rpmdrake_.c:684
-msgid "Some packages need to be removed"
-msgstr "Zenbait pakete ezabatu egin behar dira"
+#: ../rpmdrake:1
+#, c-format
+msgid "No update"
+msgstr "Eguneratzerik ez"
 
-#: ../rpmdrake_.c:472
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Aukeratutakoak: %d MB / Diskoan leku askea: %d MB"
+msgid "(none)"
+msgstr "(bat ere ez)"
 
-#: ../rpmdrake_.c:474
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "Aukeratutakoen neurria: %d MB"
+msgid "Please wait, listing packages..."
+msgstr "Itxoin, paketeak zerrendatzen..."
 
-#: ../rpmdrake_.c:482
-msgid "Files:\n"
-msgstr "Fitxategiak:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "unknown package "
+msgstr "pakete ezezaguna"
 
-#: ../rpmdrake_.c:483
-msgid "Changelog:\n"
-msgstr "Aldakketa-Erregistroa:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Ondorengo paketeetako bat behar da:"
 
-#: ../rpmdrake_.c:486
-msgid "Source: "
-msgstr "Sorburua: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please choose"
+msgstr "Hautatu mesedez"
 
-#: ../rpmdrake_.c:487
-msgid "Currently installed version: "
-msgstr "Orain instalatutako bertsioa: "
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:491
-msgid "Reason for update: "
-msgstr "Eguneratzeko arrazoia: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Not selected"
+msgstr "Hautatu gabe"
 
-#: ../rpmdrake_.c:493
-msgid "Name: "
-msgstr "Izena: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected"
+msgstr "Hautatuta"
 
-#: ../rpmdrake_.c:494
-msgid "Version: "
-msgstr "Bertsioa: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results"
+msgstr "Bilaketaren emaitzak"
 
-#: ../rpmdrake_.c:495
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Stop"
+msgstr "Gelditu"
 
-#: ../rpmdrake_.c:495
-msgid "Size: "
-msgstr "Neurria: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, searching..."
+msgstr "Itxoin mesedez, bilatzen..."
 
-#: ../rpmdrake_.c:497
-msgid "Importance: "
-msgstr "Garrantzia: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
+msgstr "Bilaketaren emaitzak (batere ez)"
 
-#: ../rpmdrake_.c:498
-msgid "Summary: "
-msgstr "Laburpena: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Beste bat"
 
-#: ../rpmdrake_.c:499
-msgid "Description: "
-msgstr "Deskribapena: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"Welcome to the packages source editor!\n"
+"\n"
+"This tool will help you configure the packages sources you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"Ongi etorri paketeen sorburu editorera!\n"
+"\n"
+"Tresna honek, zure konputagailuan erabili nahi dituzun paketeen sorburuak\n"
+"konfiguratzen lagunduko dizu. Gero haiek erabili ahal izango dituzu "
+"software\n"
+"berria instalatzeko edo eguneratzeak gauzatzeko.."
 
-#: ../rpmdrake_.c:548
-msgid "Bugfixes updates"
-msgstr "Akatsak konpontzeko eguneratzeak"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Gorde eta irten"
 
-#: ../rpmdrake_.c:548
-msgid "Normal updates"
-msgstr "Eguneratze arruntak"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy..."
+msgstr "Proxy..."
 
-#: ../rpmdrake_.c:567
-msgid "Mandrake choices"
-msgstr "Mandrake aukerak"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
+msgstr "Eguneratu..."
 
-#: ../rpmdrake_.c:568
-msgid "All packages, alphabetical"
-msgstr "Pakete guztiak, alfabetikoki"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "Gehitu..."
 
-#: ../rpmdrake_.c:569
-msgid "All packages,"
-msgstr "Pakete guztiak,"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "Editatu"
 
-#: ../rpmdrake_.c:592
-msgid "by group"
-msgstr "talde arabera"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Source"
+msgstr "Sorburua"
 
-#: ../rpmdrake_.c:592
-msgid "by size"
-msgstr "neurri arabera"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
+msgstr "Gaitu?"
 
-#: ../rpmdrake_.c:593
-msgid "by selection state"
-msgstr "hautapenaren arabera"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure sources"
+msgstr "Sorburuak konfiguratu"
 
-#: ../rpmdrake_.c:594
-msgid "by source repository"
-msgstr "sorburu gordailuaren arabera"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "Pasahitza:"
 
-#: ../rpmdrake_.c:594
-msgid "by update availability"
-msgstr "eguneratze eskuragarritasun arabera"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
+msgstr "Erabiltzailea:"
 
-#: ../rpmdrake_.c:615
-msgid "in descriptions"
-msgstr "deskribapenetan"
+#: ../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:"
 
-#: ../rpmdrake_.c:615
-msgid "in files"
-msgstr "fitxategitan"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "Proxy ostalari-izena:"
 
-#: ../rpmdrake_.c:615
-msgid "in names"
-msgstr "izenetan"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"Proxy bat behar baduzu, sartu ostalari-izena eta, behar bazenu, portua "
+"(sintaksia <proxyostalaria[:portua]>):"
 
-#: ../rpmdrake_.c:626
-msgid "Reload the packages list"
-msgstr "Birzamatu paketeen zerrenda"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "Proxyak konfiguratu"
 
-#: ../rpmdrake_.c:626
-msgid "Reset the selection"
-msgstr "Hautua berrezarri"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr "Itxoin mesedez, euskarria eguneratzen..."
 
-#: ../rpmdrake_.c:652
-msgid "Maximum information"
-msgstr "Informazio zabalenak"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "Aldaketak gorde daitezen, euskarria unitatean sartu behar duzu."
 
-#: ../rpmdrake_.c:652
-msgid "Normal information"
-msgstr "Informazio arruntak"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
+msgstr "Jarraitzeko euskarria sartu behar duzu"
 
-#: ../rpmdrake_.c:674
-msgid "Too many packages are selected"
-msgstr "Pakete gehiegi dago hautatuta"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save changes"
+msgstr "Aldaketak gorde"
 
-#: ../rpmdrake_.c:720
-msgid "Find:"
-msgstr "Aurkitu:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Bide erlatiboa synthesis/hdlist-ekiko:"
 
-#: ../rpmdrake_.c:725
-msgid "Search"
-msgstr "Bilatu"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URLa:"
 
-#: ../rpmdrake_.c:731
-msgid "Install"
-msgstr "Instalatu"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Editing source \"%s\":"
+msgstr "\"%s\" sorburua editatzen:"
 
-#: ../rpmdrake_.c:738 data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrake Update"
-msgstr "Mandrake Eguneratu"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit a source"
+msgstr "Editatu sorburua"
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Installation"
-msgstr "Software Paketeen instalazioa"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr "Itxoin mesedez, euskarria ezabatzen..."
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Removal"
-msgstr "Software Paketeen Ezabaketa"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, adding medium..."
+msgstr "Itxoin mesedez, euskarria gehitzen..."
 
-#: ../rpmdrake_.c:779
-msgid "Please wait, contacting mirror to update packages information."
-msgstr ""
-"Itxoin mesedez, ispiluarekin kontaktatzen paketeen informazioa eguneratzeko."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of source:"
+msgstr "Sorburu-mota:"
 
-#: ../rpmdrake_.c:781
-msgid "Error updating medium"
-msgstr "Okerra euskarria eguneratzen"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Adding a source:"
+msgstr "Sorburua gehitzen:"
 
-#: ../rpmdrake_.c:782
-msgid "There was an unrecoverable error while updating packages information."
-msgstr "Oker zuzenezina gertatu da paketeen informazioa eguneratzekoan."
+#: ../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 ""
+"Izen hori duen euskarri bat dago, ziur zaude\n"
+"ordezkatu nahi duzula?"
 
-#: ../rpmdrake_.c:787
-msgid "How to choose manually your mirror"
-msgstr "Nola hautatu eskuz zure ispilua"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to fill up at least the two first entries."
+msgstr "Gutxienez lehenengo bi sarrerak bete behar dituzu."
 
-#: ../rpmdrake_.c:795
-msgid "Please wait, contacting mirror to initialize updates packages."
-msgstr ""
-"Itxoin mesedez, ispiluarekin kontaktatzen eguneratze paketeak hasieratzeko."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "Izena:"
 
-#: ../rpmdrake_.c:798
-msgid "Error adding update medium"
-msgstr "Okerra eguneratze euskarria gehitzerakoan"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
+msgstr "Sarrera:"
 
-#: ../rpmdrake_.c:829
-msgid "Please wait, finding available packages..."
-msgstr "Itxoin mesedez, eskuratu daitezkeen paketeak bilatzen..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Aukeratu ispilua..."
 
-#: ../rpmdrake_.c:861
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "%s ikertzen"
+msgid "Browse..."
+msgstr "Aztertu..."
 
-#: ../rpmdrake_.c:880
-#, fuzzy
-msgid "changes:"
-msgstr "Aldaketak gorde"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "bidea edo muntatze-puntua:"
 
-#: ../rpmdrake_.c:884
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Ezabatu .%s"
+msgid "Removable device"
+msgstr "Gailu aldagarriak"
 
-#: ../rpmdrake_.c:886
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Erabili %s fitxategi nagusi gisa"
+msgid "HTTP server"
+msgstr "HTTP zerbitzaria"
 
-#: ../rpmdrake_.c:888
-msgid "Do nothing"
-msgstr "Ez egin ezer"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "FTP zerbitzaria"
 
-#: ../rpmdrake_.c:900
-msgid "Installation finished"
-msgstr "Instalazioa amaitu da"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path:"
+msgstr "bidea:"
 
-#: ../rpmdrake_.c:910
-msgid "Inspect..."
-msgstr "Ikertu..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "Bertako fitxategiak"
 
-#: ../rpmdrake_.c:925
-msgid "Program missing"
-msgstr "Programa falta da"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a source"
+msgstr "Sorburua gehitzen:"
 
-#: ../rpmdrake_.c:926
-msgid "A required program is missing (grpmi). Check your installation."
-msgstr "Behar den programa bat falta da (grpmi). Egiaztatu zure instalazioa."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
+msgstr "Ezin da euskarria eguneratu, automatikoki ezgaituko da."
 
-#: ../rpmdrake_.c:940
-msgid "Unable to get source packages."
-msgstr "Ezin dira sorburuko paketeak jaso."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "Ezin da euskarria sortu."
 
-#: ../rpmdrake_.c:941
-msgid "Unable to get source packages, sorry."
-msgstr "Barkatu, ezin dira sorburuko paketeak jaso."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, updating media..."
+msgstr "Itxoin mesedez, euskarria eguneratzen..."
 
-#: ../rpmdrake_.c:948
-msgid "Change medium"
-msgstr "Aldatu euskarria"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
+msgstr "Eguneratu"
 
-#: ../rpmdrake_.c:949
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Mesedez sartu \"%s\" izeneko euskarria [%s] gailuan"
+msgid "Select the source(s) you wish to update:"
+msgstr "Hautatu eguneratu nahi dituzun sorburuak:"
 
-#: ../rpmdrake_.c:957
-msgid "Installation failed"
-msgstr "Instalazioak huts egin du"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please choose the desired mirror."
+msgstr "Mesedez hautatu nahi duzun ispilua."
 
-#: ../rpmdrake_.c:958
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
-"Instalazioak hutsegin du, zenbait fitxategi falta dira.\n"
-"Zure sorburuen datubasea eguneratu nahia izan dezakezu."
+"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_.c:961
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr ""
-"Itxoin mesedez, paketeak ezabatzen beste batzu eguneratu ahal daitezen..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
+msgstr "Ispilurik ez"
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"There was an error downloading the mirrors list:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
-"Instalazioa amaitu da; %s.\n"
+"Okerra jazo da ispilu zerrenda jaisterakoan:\n"
 "\n"
-"Zenbait konfigurazio fitxategi `.rpmnew' edo `.rpmsave' bezala\n"
-"gorde dira, orain aztertu ditzakezu behar diren ekintzak burutzeko:"
+"%s\n"
+"Sarea, edo MandrakeSoft webgunea ez daude eskuragarri seguraski.\n"
+"Mesedez saiatu berriro beranduago."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "Okerra jaisterakoan"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "Itxoin mesedez, ispiluen helbideak eskuratzen MandrakeSoft webgunetik."
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"some packages failed to install\n"
-"correctly"
+"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 ""
-"Zenbait pakete ezin dira ondo\n"
-"instalatu"
+"MandrakeSoft webgunearekin arremanetan jarri behar dut ispilu zerrenda "
+"jasotzeko.\n"
+"Mesedez ziurtatu zure sarea martxan dagoen.\n"
+"\n"
+"Jarraitu dezaket?"
 
-#: ../rpmdrake_.c:983
-msgid "everything was installed correctly"
-msgstr "guztia ondo instalatu da"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United States"
+msgstr "Estatu Batuak"
 
-#: ../rpmdrake_.c:985
-msgid "Everything installed successfully"
-msgstr "Guztia ondo instalatu da."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
+msgstr "Txina"
 
-#: ../rpmdrake_.c:986
-msgid "All requested packages were installed successfully."
-msgstr "Eskatutako pakete guztiak ondo instalatu dira."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr "Erresuma Batua"
 
-#: ../rpmdrake_.c:989
-msgid "Everything already installed."
-msgstr "Guztia instalatuta dago."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "Taiwan"
 
-#: ../rpmdrake_.c:990
-msgid "Everything already installed (is this supposed to happen at all?)."
-msgstr "Guztia dagoeneko instalatuta (hau gertatu daiteke?)"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "Suedia"
 
-#: ../rpmdrake_.c:997
-msgid "Problem during installation"
-msgstr "Arazoa instalatzerakoan"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
+msgstr "Errusia"
 
-#: ../rpmdrake_.c:998
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Arazo bat izan da instalatzerakoan:\n"
-"\n"
-"%s"
+msgid "Portugal"
+msgstr "Portugal"
 
-#: ../rpmdrake_.c:1012
-msgid "Please wait, reading packages database..."
-msgstr "Itxoin mesedez, paketeen datubasea irakurtzen..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
+msgstr "Polonia"
 
-#: ../rpmdrake_.c:1053
-msgid "Please wait, removing packages..."
-msgstr "Itxaoin mesedez, paketeak ezabatzen..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
+msgstr "Norvegia"
 
-#: ../rpmdrake_.c:1056
-#, fuzzy
-msgid "Problem during removal"
-msgstr "Arazoa instalatzerakoan"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
+msgstr "Herbeherak"
 
-#: ../rpmdrake_.c:1057
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Arazo bat izan da instalatzerakoan:\n"
-"\n"
-"%s"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Korea"
+msgstr "Korea"
 
-#: ../rpmdrake_.c:1089
-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
+#, c-format
+msgid "Japan"
+msgstr "Japonia"
 
-#: ../rpmdrake_.c:1094
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"Ongi etorri MandrakeUpdatera!\n"
-"\n"
-"Tresna honek zure konputagailuan instalatu nahi dituzun eguneratzeak "
-"aukeratzen\n"
-"lagunduko dizu."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Italy"
+msgstr "Italia"
 
-#: ../rpmdrake_.c:1099
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
-msgstr ""
-"Ongi etorri software instalazio tresnara!\n"
-"\n"
-"Zure Mandrake Linux sistema zenbait milaka software pakete dakartza CDROM\n"
-"eta DVD-n. Tresna honek zure konputagailuan zein software instalatu nahi "
-"duzun\n"
-"aukeratzen lagunduko dizu."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Israel"
+msgstr "Israel"
 
-#: data/rpmdrake-remove.desktop.in.h:1
-msgid "Remove Software"
-msgstr "Softwarea Ezabatu"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Grezia"
 
-#: data/rpmdrake-sources.desktop.in.h:1
-msgid "Software Sources Manager"
-msgstr "Software Sorburu Kudeatzailea"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "France"
+msgstr "Frantzia"
 
-#: data/rpmdrake.desktop.in.h:1
-msgid "Install Software"
-msgstr "Instalatu Softwarea"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "Finlandia"
 
-#~ 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.pm:1
+#, c-format
+msgid "Spain"
+msgstr "Espainia"
 
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-#~ "Jarraitu nahi dezaket?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
+msgstr "Danimarka"
 
-#~ 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.."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr "Alemania"
 
-#~ 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 "Czech Republic"
+msgstr "Txekiar Errepublika"
 
-#~ msgid ""
-#~ "There was an error downloading the mirrors list:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "The network, or MandrakeSoft website, are maybe unavailable.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "Okerra jazo da ispilu zerrenda jaisterakoan:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "Sarea, edo MandrakeSoft webgunea ez daude eskuragarri seguraski.\n"
-#~ "Mesedez saiatu berriro beranduago."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
-#~ 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 "Canada"
+msgstr "Kanada"
 
-#~ msgid ""
-#~ "The list of updates is void. This 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.pm:1
+#, c-format
+msgid "Brazil"
+msgstr "Brasil"
 
-#~ msgid ""
-#~ "Warning: it seems that you are attempting to add so much\n"
-#~ "packages that your filesystem may run out of free diskspace,\n"
-#~ "during or after package installation ; this is particularly\n"
-#~ "dangerous and should be considered with care.\n"
-#~ "\n"
-#~ "Do you really want to install all the selected packages?"
-#~ msgstr ""
-#~ "Adi: dirudienez hainbeste pakete gehitu nahian zabiltza,\n"
-#~ "zure fitxategi-sistema leku hutsik gabe gelditu daitekeela,\n"
-#~ "paketeak instalatzerakoan edo instalatu ondoren; egoera hau nahiko\n"
-#~ "larria da eta kontuz hausnartu beharko litzateke.\n"
-#~ "\n"
-#~ "Hautatutako pakete guztiak instalatu nahi dituzu?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Belgium"
+msgstr "Belgika"
 
-#~ 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?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Australia"
+msgstr "Australia"
 
-#~ msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#~ msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
+msgstr "Austria"
 
-#~ 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
+#, c-format
+msgid "Info..."
+msgstr "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.pm:1
+#, c-format
+msgid "No"
+msgstr "Ez"
 
-#~ 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 ""
-#~ "Okerra jazo da urpmi bitartez eguneratze euskarria gehitzerakoan.\n"
-#~ "\n"
-#~ "Hondatutako edo aldi batez eskuraezin dagoen ispilu baten ondorioa izan "
-#~ "daiteke,\n"
-#~ "edo zure Mandrake Linux bertsioari (%s) ez dio oraindik / dagoeneko "
-#~ "Mandrake Linux\n"
-#~ "Eguneratze Ofizialak euskarri ematen.\n"
-#~ "\n"
-#~ "Beste ispilu batekin froga egin nahi duzu?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Bai"
+
+#: data/rpmdrake.desktop.in.h:1
+msgid "Install Software"
+msgstr "Instalatu Softwarea"
+
+#: data/rpmdrake-remove.desktop.in.h:1
+msgid "Remove Software"
+msgstr "Softwarea Ezabatu"
+
+#: data/rpmdrake-sources.desktop.in.h:1
+msgid "Software Sources Manager"
+msgstr "Software Sorburu Kudeatzailea"
+
+#~ 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--*-*-*-*-*,*"
diff --git a/po/eu.pom b/po/eu.pom
index 7ec01fa5..4c9ef711 100644
--- a/po/eu.pom
+++ b/po/eu.pom
@@ -4,168 +4,175 @@ msgstr "Zerbitzaria"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Sare-ordenagailua (bezeroa)"
+msgid "Office Workstation"
+msgstr "Bulegoko lan-estazioa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS zerbitzaria, SMB zerbitzaria, Proxy zerbitzaria, ssh zerbitzaria"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Bulego-lanetako programak: testu-prozesadoreak (kword, abiword), kalkulu-"
+"orriak (kspread, gnumeric), pdf ikustaileak, etab."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Office"
+msgid "Workstation"
+msgstr "Lan-estazioa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Gnome-ren lan-estazioa"
+msgid "Game station"
+msgstr "Joko-estazioa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Palm Pilot edo Visor-erako tresnak"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr ""
+"Denbora-pasako programak: makina-jokoak, taula-jokoak, estrategiakoak, etab."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Lan-estazioa"
+msgid "Multimedia station"
+msgstr "Multimediako estazioa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Suebakia/Bidatzailea"
+msgid "Sound and video playing/editing programs"
+msgstr "Soinua eta bideoa jotzeko/editatzeko programak"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr "Domeinu-izenen eta sareko informazioaren zerbitzaria"
+msgid "Internet station"
+msgstr "Interneteko estazioa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
 msgstr ""
-"Bulego-lanetako programak: testu-prozesadoreak (kword, abiword), kalkulu-"
-"orriak (kspread, gnumeric), pdf ikustaileak, etab."
+"Posta eta berriak irakurtzeko eta bidaltzeko (pine, mutt, tin..) eta web-a "
+"arakatzeko tresnak"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "Audio tresnak: mp3 edo midi erreproduzigailuak, nahastaileak, etab."
+msgid "Network Computer (client)"
+msgstr "Sare-ordenagailua (bezeroa)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Linux Standard Base. Beste batzuren aplikazioen euskarria"
+msgid "Clients for different protocols including ssh"
+msgstr "Hainbat protokolotako bezeroak, ssh-renak barne"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Linux eta Software libreari buruzko liburuak eta azalpenak"
+msgid "Configuration"
+msgstr "Konfigurazioa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "KDE lan-estazioa"
+msgid "Tools to ease the configuration of your computer"
+msgstr "Zure ordenagailuaren konfigurazioa errazteko tresnak"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etab."
+msgid "Scientific Workstation"
+msgstr "Lan-estazio zientifikoa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Multimedia - Bideoa"
+msgid "Scientific applications such as gnuplot"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr ""
-"Posta, berriak, web-a, fitxategi-transferentzia eta berriketa kudeatzeko "
-"tresnak"
+msgid "Console Tools"
+msgstr "Kontsola-tresnak"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Datu-basea"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Editoreak, shell-ak, fitxategi-tresnak, terminalak"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL edo MySQL datu-baseen zerbitzaria"
+msgid "KDE Workstation"
+msgstr "KDE lan-estazioa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Zure ordenagailuaren konfigurazioa errazteko tresnak"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"KDE, K Desktop Environment, hainbat tresna duen oinarrizko ingurune grafikoa."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "Multimedia - Soinua"
+msgid "Graphical Environment"
+msgstr "Ingurune grafikoa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dokumentazioa"
+msgid "Gnome Workstation"
+msgstr "Gnome-ren lan-estazioa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Kontsola-tresnak"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+"Aplikazio-multzo eta mahaigaineko tresna lagungarri eta atseginak dituen "
+"ingurune grafikoa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr "Postfix posta-zerbitzaria, Inn berri-zerbitzaria"
+msgid "Other Graphical Desktops"
+msgstr "Beste mahaigain grafiko batzuk"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Interneteko estazioa"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etab."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Multimediako estazioa"
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+msgid "Development"
+msgstr "Garapena"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Konfigurazioa"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C eta C++ garapen-liburutegiak, programak eta fitxategiak"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Mahaigain grafiko gehiago (Gnome, IceWM)"
+msgid "Documentation"
+msgstr "Dokumentazioa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
-"KDE, K Desktop Environment, hainbat tresna duen oinarrizko ingurune grafikoa."
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Linux eta Software libreari buruzko liburuak eta azalpenak"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Ingurune grafikoa"
+msgid "LSB"
+msgstr "LSB"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Linux Standard Base. Beste batzuren aplikazioen euskarria"
+
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-msgid "Development"
-msgstr "Garapena"
+#: ../../share/compssUsers:999
+msgid "Web/FTP"
+msgstr "Web/FTP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -174,122 +181,115 @@ msgstr "Apache, Pro-ftpd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "CDak sortzeko eta grabatzeko tresnak"
+msgid "Mail/Groupware/News"
+msgstr "Posta/Groupware/Berriak"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Bulegoko lan-estazioa"
+msgid "Postfix mail server, Inn news server"
+msgstr "Postfix posta-zerbitzaria, Inn berri-zerbitzaria"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etab."
+msgid "Database"
+msgstr "Datu-basea"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "The Gimp bezalako programa grafikoak"
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL edo MySQL datu-baseen zerbitzaria"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "DNS/NIS "
-msgstr "DNS/NIS "
+msgid "Firewall/Router"
+msgstr "Suebakia/Bidatzailea"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C eta C++ garapen-liburutegiak, programak eta fitxategiak"
+msgid "Internet gateway"
+msgstr "Interneteko atebidea"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Sare-zerbitzaria"
+msgid "DNS/NIS "
+msgstr "DNS/NIS "
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "Posta/Groupware/Berriak"
+msgid "Domain Name and Network Information Server"
+msgstr "Domeinu-izenen eta sareko informazioaren zerbitzaria"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Joko-estazioa"
+msgid "Network Computer server"
+msgstr "Sare-zerbitzaria"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Bideo-erreproduzigailuak eta editoreak"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS zerbitzaria, SMB zerbitzaria, Proxy zerbitzaria, ssh zerbitzaria"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Graphics"
-msgstr "Multimedia - Grafikoak"
+msgid "Office"
+msgstr "Office"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
 msgstr ""
-"Denbora-pasako programak: makina-jokoak, taula-jokoak, estrategiakoak, etab."
+"Posta, berriak, web-a, fitxategi-transferentzia eta berriketa kudeatzeko "
+"tresnak"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
-"Posta eta berriak irakurtzeko eta bidaltzeko (pine, mutt, tin..) eta web-a "
-"arakatzeko tresnak"
+msgid "Multimedia - Graphics"
+msgstr "Multimedia - Grafikoak"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "Finantza pertsonalak"
+msgid "Graphics programs such as The Gimp"
+msgstr "The Gimp bezalako programa grafikoak"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
-"Aplikazio-multzo eta mahaigaineko tresna lagungarri eta atseginak dituen "
-"ingurune grafikoa"
+msgid "Multimedia - Sound"
+msgstr "Multimedia - Soinua"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Hainbat protokolotako bezeroak, ssh-renak barne"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "Audio tresnak: mp3 edo midi erreproduzigailuak, nahastaileak, etab."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
+msgid "Multimedia - Video"
+msgstr "Multimedia - Bideoa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Interneteko atebidea"
+msgid "Video players and editors"
+msgstr "Bideo-erreproduzigailuak eta editoreak"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Soinua eta bideoa jotzeko/editatzeko programak"
+msgid "Multimedia - CD Burning"
+msgstr "Multimedia - CD grabatzea"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Beste mahaigain grafiko batzuk"
+msgid "Tools to create and burn CD's"
+msgstr "CDak sortzeko eta grabatzeko tresnak"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Editoreak, shell-ak, fitxategi-tresnak, terminalak"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Mahaigain grafiko gehiago (Gnome, IceWM)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "Zure finantzak kudeatzeko programak, hala nola gnucash"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etab."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -298,11 +298,16 @@ msgstr "Informazio pertsonalaren kudeaketa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multimedia - CD grabatzea"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Palm Pilot edo Visor-erako tresnak"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Lan-estazio zientifikoa"
+msgid "Personal Finance"
+msgstr "Finantza pertsonalak"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Programs to manage your finances, such as gnucash"
+msgstr "Zure finantzak kudeatzeko programak, hala nola gnucash"
 
diff --git a/po/fi.po b/po/fi.po
index 8d753f0f..b262ba0d 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-fi - MDK Release 9.1\n"
-"POT-Creation-Date: 2003-01-22 13:20+0100\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\n"
 "PO-Revision-Date: 2003-01-21 22:09+0200\n"
 "Last-Translator: Thomas Backlund <tmb@iki.fi>\n"
 "Language-Team: Finnish <cooker-i18n@linux-mandrake.com>\n"
@@ -21,452 +21,624 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
 
-#: ../edit-urpm-sources.pl_.c:39
-msgid "Unable to create medium."
-msgstr "Median luonti epäonnistui."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Sopiiko että jatketaan?"
 
-#: ../edit-urpm-sources.pl_.c:40
-msgid "Unable to update medium; it will be automatically disabled."
-msgstr "Median päivittäminen epäonnistui, poistetaan käytÜstä automaattisesti."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to the software installation tool!\n"
+"\n"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
+msgstr ""
+"Tervetuloa Ohjelmisto Asennus ohjelmaan!\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."
 
-#: ../edit-urpm-sources.pl_.c:51
-msgid "Add a source"
-msgstr "Lisätään lähde"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Tervetuloa Mandrake Päivitys ohjelmaan!\n"
+"\n"
+"Tämä ohjelma auttaa sinua valitsemaan päivityksiä joita haluat\n"
+"asentaa tietokoneestasi."
 
-#: ../edit-urpm-sources.pl_.c:52
-msgid "Local files"
-msgstr "Paikalliset tiedostot"
+#: ../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."
 
-#: ../edit-urpm-sources.pl_.c:52
-msgid "Path:"
-msgstr "Polku: "
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"Sattui ongelmia poiston aikana:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:53
-msgid "FTP server"
-msgstr "FTP palvelin"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during removal"
+msgstr "Ongelmia poiston aikana"
 
-#: ../edit-urpm-sources.pl_.c:53 ../edit-urpm-sources.pl_.c:54
-#: ../edit-urpm-sources.pl_.c:56 ../edit-urpm-sources.pl_.c:179
-msgid "URL:"
-msgstr "URL: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages..."
+msgstr "Odota, paketteja poistetaan ..."
 
-#: ../edit-urpm-sources.pl_.c:54
-msgid "HTTP server"
-msgstr "HTTP palvelin"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
+msgstr "Odota, paketti-tietokanta luetaan ..."
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Path or mount point:"
-msgstr "polku tai liitoskohta: "
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Sattui ongelmia asennuksen aikana\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Removable device"
-msgstr "Siirrettävä laite"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during installation"
+msgstr "Ongelmia asennuksen aikana"
 
-#: ../edit-urpm-sources.pl_.c:56 ../rpmdrake_.c:548
-msgid "Security updates"
-msgstr "Tietoturva Päivitykset"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
+msgstr "Kaikki on jo asennettu. (pitäisikÜ tämä ollenkaan tapahtua?)"
 
-#: ../edit-urpm-sources.pl_.c:67
-msgid "Browse..."
-msgstr "Selaa..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed."
+msgstr "Kaikki on jo asennettu."
 
-#: ../edit-urpm-sources.pl_.c:69
-msgid "Choose a mirror..."
-msgstr "Valitse peilipalvelin ..."
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "Kaikki haluamasi paketteja asennettiin onnistuneesti"
 
-#: ../edit-urpm-sources.pl_.c:89
-msgid "Login:"
-msgstr "Käyttäjätunnus:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr "Kaikki asennettiin onnistuneesti"
 
-#: ../edit-urpm-sources.pl_.c:89 ../edit-urpm-sources.pl_.c:223
-msgid "Password:"
-msgstr "Salasana:"
+#: ../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:"
 
-#: ../edit-urpm-sources.pl_.c:94
-msgid "Name:"
-msgstr "Nimi:"
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "Kaikki asennettiin oikein"
 
-#: ../edit-urpm-sources.pl_.c:96 ../edit-urpm-sources.pl_.c:180
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Relatiivinen polku tiedostoon synthesis tai hdlist : "
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"some packages failed to install\n"
+"correctly"
+msgstr ""
+"Joitakin paketteja ei asentunut\n"
+"oikein."
 
-#: ../edit-urpm-sources.pl_.c:104
-msgid "You need to fill up at least the two first entries."
-msgstr "Sinun pitää täyttää ainakin kaksi ensimmäiset kohdat."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages to allow others to be upgraded..."
+msgstr "Odota, poistetaan paketteja jotta muita voidaan päivittää..."
 
-#: ../edit-urpm-sources.pl_.c:117
-msgid "Adding a source:"
-msgstr "Lisätään lähde"
+#: ../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 paketteja puuttuu.\n"
+"Sinun kannattaisi päivittää lähdetietokantasi."
 
-#: ../edit-urpm-sources.pl_.c:118
-msgid "Type of source:"
-msgstr "Lähteen tyyppi:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation failed"
+msgstr "Asennus epäonnistui"
 
-#: ../edit-urpm-sources.pl_.c:122 ../edit-urpm-sources.pl_.c:194
-#: ../edit-urpm-sources.pl_.c:227 ../rpmdrake.pm_.c:97 ../rpmdrake.pm_.c:136
-#: ../rpmdrake.pm_.c:319 ../rpmdrake_.c:353 ../rpmdrake_.c:365
-#: ../rpmdrake_.c:369 ../rpmdrake_.c:916 ../rpmdrake_.c:950
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
+msgstr "Peruuta"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../edit-urpm-sources.pl_.c:137 ../edit-urpm-sources.pl_.c:188
-#: ../edit-urpm-sources.pl_.c:194 ../edit-urpm-sources.pl_.c:234
-#: ../rpmdrake.pm_.c:319 ../rpmdrake.pm_.c:352 ../rpmdrake_.c:353
-#: ../rpmdrake_.c:950
-msgid "Cancel"
-msgstr "Peruuta"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Ole hyvä ja asenna mediaa nimellä \"%s\" laitteessa [%s]"
 
-#: ../edit-urpm-sources.pl_.c:144
-msgid "Please wait, adding medium..."
-msgstr "Odota, media lisätään ..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr "Muuta mediaa"
 
-#: ../edit-urpm-sources.pl_.c:162
-msgid "Please wait, removing medium..."
-msgstr "Odota, media poistetaan ..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
+msgstr "Lähdepakettien hakeminen epäonnistui, valitan."
 
-#: ../edit-urpm-sources.pl_.c:173
-msgid "Edit a source"
-msgstr "Muokkaa lähteitä"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages."
+msgstr "Lähdepakettien hakeminen epäonnistui."
 
-#: ../edit-urpm-sources.pl_.c:177
+#: ../rpmdrake:1
 #, c-format
-msgid "Editing source \"%s\":"
-msgstr "Muokataan lähde \"%s\":"
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr "Vaadittu ohjelma puuttuu (grpmi). Tarkista asennuksesi."
 
-#: ../edit-urpm-sources.pl_.c:183
-msgid "Save changes"
-msgstr "Tallenna muutokset"
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
+msgstr "Ohjelma puuttuu"
 
-#: ../edit-urpm-sources.pl_.c:192
-msgid "You need to insert the medium to continue"
-msgstr "Sinun pitää asettaa mediaa jatkaaksesi"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
+msgstr "Tarkista..."
 
-#: ../edit-urpm-sources.pl_.c:193
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "Tallentaaksesi muutokset, sinun pitää asettaa mediaa asemaan."
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation finished"
+msgstr "Asennus on valmis"
 
-#: ../edit-urpm-sources.pl_.c:198
-msgid "Please wait, updating medium..."
-msgstr "Odota, päivitetään mediaa ..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
+msgstr "Jätä tekemättä"
 
-#: ../edit-urpm-sources.pl_.c:209
-msgid "Configure proxies"
-msgstr "Määrittele välityspalvelin"
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
+msgstr "Käytä %s päätiedostona"
 
-#: ../edit-urpm-sources.pl_.c:215
-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]>):"
+#: ../rpmdrake:1
+#, c-format
+msgid "Remove .%s"
+msgstr "Poista %s"
 
-#: ../edit-urpm-sources.pl_.c:217
-msgid "Proxy hostname:"
-msgstr "Välityspalvelimen nimi:"
+#: ../rpmdrake:1
+#, c-format
+msgid "changes:"
+msgstr "muutokset:"
 
-#: ../edit-urpm-sources.pl_.c:219
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr ""
-"Voit haluttaessa antaa tunnus/salasanaa välityspalvelimen tunnistukseen:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr "Tarkistan %s"
 
-#: ../edit-urpm-sources.pl_.c:221
-msgid "User:"
-msgstr "Käyttäjä:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, finding available packages..."
+msgstr "Odota, etsitään saatavilla olevia paketteja"
 
-#: ../edit-urpm-sources.pl_.c:247
-msgid "Configure sources"
-msgstr "Määrittele lähteet"
+#: ../rpmdrake:1
+#, c-format
+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?"
 
-#: ../edit-urpm-sources.pl_.c:254
-msgid "Enabled?"
-msgstr "KäytÜssä?"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
+msgstr "Virhe lisättäessä päivitysmediaa"
 
-#: ../edit-urpm-sources.pl_.c:255
-msgid "Source"
-msgstr "Lähde"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
+msgstr "Odota, yhdistetään peilipalvelimelle pakettitietojen alustamiseksi."
 
-#: ../edit-urpm-sources.pl_.c:276 ../rpmdrake_.c:730
-msgid "Remove"
-msgstr "Poista"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Sources Manager, and then add a `Security\n"
+"updates' source.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"Voit myÜs lisätä haluamasi 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.."
 
-#: ../edit-urpm-sources.pl_.c:278
-msgid "Edit"
-msgstr "Muokkaa"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Miten manuaalisesti valitset peilipalvelinta"
 
-#: ../edit-urpm-sources.pl_.c:280
-msgid "Add..."
-msgstr "Lisää..."
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
+msgstr "Sattui ylipääsemätÜn virhe päivittäessä pakkauksien tietoja."
 
-#: ../edit-urpm-sources.pl_.c:282
-msgid "Update..."
-msgstr "Päivitä ..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
+msgstr "Virhe median päivityksessä"
 
-#: ../edit-urpm-sources.pl_.c:283
-msgid "Proxy..."
-msgstr "Välityspalvelin ..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
+msgstr "Odota, yhdistetään peilipalvelimelle pakettitietojen päivittämiseksi."
 
-#: ../edit-urpm-sources.pl_.c:286
-msgid "Save and quit"
-msgstr "Tallenna ja lopeta"
+#: ../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 ""
+"Tarvitsen ottaa yhteyden peilipalvelimelle, saadaakseni viimeisimmät\n"
+"päivityspaketit. Varmista että verkkoyhteytesi on avattu.\n"
+"\n"
+"Sopiiko että jatkan?"
 
-#: ../edit-urpm-sources.pl_.c:287 ../rpmdrake_.c:733
-msgid "Quit"
-msgstr "Poistu"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Installation"
+msgstr "Ohjelmistopakettien Asentaminen"
 
-#: ../rpmdrake.pm_.c:93
-msgid "Yes"
-msgstr "Kyllä"
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, c-format
+msgid "Mandrake Update"
+msgstr "Mandrake Päivitys"
 
-#: ../rpmdrake.pm_.c:95
-msgid "No"
-msgstr "Ei"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
+msgstr "Ohjelmistopakettien Poistaminen"
 
-#: ../rpmdrake.pm_.c:127
-msgid "Info..."
-msgstr "Tietoja..."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Poistu"
 
-#: ../rpmdrake.pm_.c:180
-msgid "Austria"
-msgstr "Itävalta"
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "Asenna"
 
-#: ../rpmdrake.pm_.c:181
-msgid "Australia"
-msgstr "Australia"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "Poista"
 
-#: ../rpmdrake.pm_.c:182
-msgid "Belgium"
-msgstr "Belgia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search"
+msgstr "Etsi"
 
-#: ../rpmdrake.pm_.c:183
-msgid "Brazil"
-msgstr "Brasilia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "LÜydä:"
 
-#: ../rpmdrake.pm_.c:184
-msgid "Canada"
-msgstr "Kanada"
+#: ../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?"
 
-#: ../rpmdrake.pm_.c:185
-msgid "Costa Rica"
-msgstr "Costa Rica"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "Joitakin paketteja pitää poistaa "
 
-#: ../rpmdrake.pm_.c:186
-msgid "Czech Republic"
-msgstr "Tsekki"
+#: ../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 ""
+"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"
+"\n"
+"Oletko varma että haluat asentaa kaikki valitsemasi paketteja?"
 
-#: ../rpmdrake.pm_.c:187
-msgid "Germany"
-msgstr "Saksa"
+#: ../rpmdrake:1
+#, c-format
+msgid "Too many packages are selected"
+msgstr "Liian paljon paketteja valittu"
 
-#: ../rpmdrake.pm_.c:188
-msgid "Danmark"
-msgstr "Tanska"
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
+msgstr "Mahdollisimman paljon tietoa"
 
-#: ../rpmdrake.pm_.c:189 ../rpmdrake.pm_.c:193
-msgid "Greece"
-msgstr "Kreikka"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal information"
+msgstr "Tavallista tietoa"
 
-#: ../rpmdrake.pm_.c:190
-msgid "Spain"
-msgstr "Espanaja"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update source(s)"
+msgstr "Päivitä lähteet"
 
-#: ../rpmdrake.pm_.c:191
-msgid "Finland"
-msgstr "Suomi"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reload the packages list"
+msgstr "Lataa listan paketeista uudelleen"
 
-#: ../rpmdrake.pm_.c:192
-msgid "France"
-msgstr "Ranska"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
+msgstr "Palauta valinnat"
 
-#: ../rpmdrake.pm_.c:194
-msgid "Israel"
-msgstr "Israel"
+#: ../rpmdrake:1
+#, c-format
+msgid "in files"
+msgstr "tiedostoissa"
 
-#: ../rpmdrake.pm_.c:195
-msgid "Italy"
-msgstr "Italia"
+#: ../rpmdrake:1
+#, c-format
+msgid "in descriptions"
+msgstr "kuvauksissa"
 
-#: ../rpmdrake.pm_.c:196
-msgid "Japan"
-msgstr "Japani"
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
+msgstr "nimeissä"
 
-#: ../rpmdrake.pm_.c:197
-msgid "Korea"
-msgstr "Korea"
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
+msgstr "päivityksien mukaan"
 
-#: ../rpmdrake.pm_.c:198
-msgid "Netherlands"
-msgstr "Alankomaat"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
+msgstr "lähteiden mukaan"
 
-#: ../rpmdrake.pm_.c:199
-msgid "Norway"
-msgstr "Norja"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
+msgstr "valinnan mukaan"
 
-#: ../rpmdrake.pm_.c:200
-msgid "Poland"
-msgstr "Puola"
+#: ../rpmdrake:1
+#, c-format
+msgid "by size"
+msgstr "koon mukaan"
 
-#: ../rpmdrake.pm_.c:201
-msgid "Portugal"
-msgstr "Portugali"
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
+msgstr "ryhmän mukaan"
 
-#: ../rpmdrake.pm_.c:202
-msgid "Russia"
-msgstr "Venäjä"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages,"
+msgstr "Kaikki paketit,"
 
-#: ../rpmdrake.pm_.c:203
-msgid "Sweden"
-msgstr "Ruotsi"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
+msgstr "Kaikki paketit, aakkosjärjestyksessä"
 
-#: ../rpmdrake.pm_.c:204
-msgid "Taiwan"
-msgstr "Taiwan"
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
+msgstr "Mandrake valinnat"
 
-#: ../rpmdrake.pm_.c:205
-msgid "United Kingdom"
-msgstr "Iso-Britannia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal updates"
+msgstr "Tavalliset päivitykset"
 
-#: ../rpmdrake.pm_.c:206
-msgid "China"
-msgstr "Kiina"
+#: ../rpmdrake:1
+#, c-format
+msgid "Bugfixes updates"
+msgstr "Virhekorjaukset / turvapäivitykset"
 
-#: ../rpmdrake.pm_.c:207 ../rpmdrake.pm_.c:208 ../rpmdrake.pm_.c:209
-#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:261
-msgid "United States"
-msgstr "Yhdysvallat"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
+msgstr "Tietoturva Päivitykset"
 
-#: ../rpmdrake.pm_.c:274
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
-"Odota, haetaan lista peilipalvelimista MandrakeSoft:in webbisivustosta."
+#: ../rpmdrake:1
+#, c-format
+msgid "Description: "
+msgstr "Kuvaus: "
 
-#: ../rpmdrake.pm_.c:280
-msgid "Error during download"
-msgstr "Virhe haun aikana"
+#: ../rpmdrake:1
+#, c-format
+msgid "Summary: "
+msgstr "Yhteenveto: "
 
-#: ../rpmdrake.pm_.c:289
-msgid "No mirror"
-msgstr "Ei peilipalvelinta"
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "Tärkeys: "
 
-#: ../rpmdrake.pm_.c:307
-msgid "Please choose the desired mirror."
-msgstr "Ole hyvä ja valitse haluttu peilipalvelin."
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s Kt"
 
-#: ../rpmdrake.pm_.c:339 ../rpmdrake_.c:627
-msgid "Update source(s)"
-msgstr "Päivitä lähteet"
+#: ../rpmdrake:1
+#, c-format
+msgid "Size: "
+msgstr "Koko: "
 
-#: ../rpmdrake.pm_.c:343
-msgid "Select the source(s) you wish to update:"
-msgstr "Valitse lähteet, jota haluat päivittää:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Version: "
+msgstr "Versio: "
 
-#: ../rpmdrake.pm_.c:347
-msgid "Update"
-msgstr "Päivitä"
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "Nimi: "
 
-#: ../rpmdrake.pm_.c:357
-msgid "Please wait, updating media..."
-msgstr "Odota, päivitetään media(t)..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "Syy päivitykseen: "
 
-#: ../rpmdrake_.c:99
-msgid "Other"
-msgstr "Muu"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
+msgstr "Asennettu versio"
 
-#: ../rpmdrake_.c:121 ../rpmdrake_.c:135 ../rpmdrake_.c:227 ../rpmdrake_.c:298
-msgid "(none)"
-msgstr "(tyhjä)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Source: "
+msgstr "Lähde:"
 
-#: ../rpmdrake_.c:141 ../rpmdrake_.c:482 ../rpmdrake_.c:483
+#: ../rpmdrake:1
+#, c-format
 msgid "(Not available)"
 msgstr "(Ei käytettävissä)"
 
-#: ../rpmdrake_.c:151 ../rpmdrake_.c:208
-msgid "Search results"
-msgstr "Haun tulokset"
-
-#: ../rpmdrake_.c:151
-msgid "Search results (none)"
-msgstr "Haun tulokset (ei mitään)"
-
-#: ../rpmdrake_.c:161 ../rpmdrake_.c:172
-msgid "Please wait, searching..."
-msgstr "Odota, etsitään ..."
-
-#: ../rpmdrake_.c:175
-msgid "Stop"
-msgstr "Pysäytä"
-
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-msgid "Addable"
-msgstr "Lisättävissä"
-
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-msgid "Upgradable"
-msgstr "Päivitettävissä"
-
-#: ../rpmdrake_.c:211
-msgid "Not selected"
-msgstr "Ei valittu"
-
-#: ../rpmdrake_.c:211
-msgid "Selected"
-msgstr "Valittu"
-
-#: ../rpmdrake_.c:240
-msgid "rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake_.c:258 ../rpmdrake_.c:360 ../rpmdrake_.c:362
-msgid "More information on package..."
-msgstr "Lisätietoa paketista ..."
-
-#: ../rpmdrake_.c:259
-msgid "One of the following packages is needed:"
-msgstr "Yksi seuraavista paketista tarvitaan:"
-
-#: ../rpmdrake_.c:259
-msgid "Please choose"
-msgstr "Ole hyvä ja valitse"
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
+msgstr "Muutosloki: \n"
 
-#: ../rpmdrake_.c:275
-msgid "unknown package "
-msgstr "tuntematon paketti "
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "Tiedostot: \n"
 
-#: ../rpmdrake_.c:285
-msgid "Please wait, listing packages..."
-msgstr "Odota, listaan paketteja..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected size: %d MB"
+msgstr "Valittu koko %d Mt"
 
-#: ../rpmdrake_.c:300
-msgid "No update"
-msgstr "Ei päivitystä"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Valitut: %d Mt / Vapaa levytilaa: %d Mt."
 
-#: ../rpmdrake_.c:353 ../rpmdrake_.c:354
-msgid "More infos"
-msgstr "Lisää tietoa"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
+msgstr ""
+"Riippuvuuksien takia, seuraavat paketit joudutaan\n"
+"poistaa valinnasta nyt:\n"
+"\n"
 
-#: ../rpmdrake_.c:355
-msgid "Information on packages"
-msgstr "Lisätietoa paketista."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+msgstr ""
+"Valitan, seuraavat paketit ei voida valita\n"
+"\n"
 
-#: ../rpmdrake_.c:376
-msgid "Some additional packages need to be removed"
-msgstr "Joitakin paketteja pitää poistaa tämän lisäksi"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "Jotkut paketit ei voida asentaa"
 
-#: ../rpmdrake_.c:377
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
 "\n"
 msgstr ""
-"Riippuvuuksien takia, myĂśs seuraavat paketit joudutaan poistaa:\n"
+"Riippuvuuksien täyttämiseksi, myÜs seuraavat paketit\n"
+"pitää asentaa:\n"
 "\n"
 
-#: ../rpmdrake_.c:383 ../rpmdrake_.c:391
+#: ../rpmdrake:1
+#, c-format
+msgid "Additional packages needed"
+msgstr "Lisäpaketit vaaditaan"
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "Jotakin paketteja ei voida poistaa"
 
-#: ../rpmdrake_.c:384
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -474,580 +646,600 @@ msgstr ""
 "Näiden pakettien poisto rikkoisi järjestelmäsi, valitan:\n"
 "\n"
 
-#: ../rpmdrake_.c:392 ../rpmdrake_.c:451
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
 "\n"
 msgstr ""
-"Riippuvuuksien takia, seuraavat paketit joudutaan\n"
-"poistaa valinnasta nyt:\n"
+"Riippuvuuksien takia, myĂśs seuraavat paketit joudutaan poistaa:\n"
 "\n"
 
-#: ../rpmdrake_.c:421
-msgid "Additional packages needed"
-msgstr "Lisäpaketit vaaditaan"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr "Joitakin paketteja pitää poistaa tämän lisäksi"
 
-#: ../rpmdrake_.c:422
-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 "More information on package..."
+msgstr "Lisätietoa paketista ..."
 
-#: ../rpmdrake_.c:435
-msgid "Some packages can't be installed"
-msgstr "Jotkut paketit ei voida asentaa"
+#: ../rpmdrake:1
+#, c-format
+msgid "Information on packages"
+msgstr "Lisätietoa paketista."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
+msgstr "Lisää tietoa"
 
-#: ../rpmdrake_.c:436
+#: ../rpmdrake:1
+#, c-format
+msgid "Addable"
+msgstr "Lisättävissä"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Upgradable"
+msgstr "Päivitettävissä"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
+"The list of updates is void. This 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 ""
-"Valitan, seuraavat paketit ei voida valita\n"
-"\n"
+"Päivityslista on tyhjä. Tämä tarkoittaa joko ettei\n"
+"päivityksiä lÜydy, tai olet jo asentanut kaikki.\n"
+" "
 
-#: ../rpmdrake_.c:450 ../rpmdrake_.c:684
-msgid "Some packages need to be removed"
-msgstr "Joitakin paketteja pitää poistaa "
+#: ../rpmdrake:1
+#, c-format
+msgid "No update"
+msgstr "Ei päivitystä"
 
-#: ../rpmdrake_.c:472
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Valitut: %d Mt / Vapaa levytilaa: %d Mt."
+msgid "(none)"
+msgstr "(tyhjä)"
 
-#: ../rpmdrake_.c:474
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "Valittu koko %d Mt"
+msgid "Please wait, listing packages..."
+msgstr "Odota, listaan paketteja..."
 
-#: ../rpmdrake_.c:482
-msgid "Files:\n"
-msgstr "Tiedostot: \n"
+#: ../rpmdrake:1
+#, c-format
+msgid "unknown package "
+msgstr "tuntematon paketti "
 
-#: ../rpmdrake_.c:483
-msgid "Changelog:\n"
-msgstr "Muutosloki: \n"
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Yksi seuraavista paketista tarvitaan:"
 
-#: ../rpmdrake_.c:486
-msgid "Source: "
-msgstr "Lähde:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please choose"
+msgstr "Ole hyvä ja valitse"
 
-#: ../rpmdrake_.c:487
-msgid "Currently installed version: "
-msgstr "Asennettu versio"
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:491
-msgid "Reason for update: "
-msgstr "Syy päivitykseen: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Not selected"
+msgstr "Ei valittu"
 
-#: ../rpmdrake_.c:493
-msgid "Name: "
-msgstr "Nimi: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected"
+msgstr "Valittu"
 
-#: ../rpmdrake_.c:494
-msgid "Version: "
-msgstr "Versio: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results"
+msgstr "Haun tulokset"
 
-#: ../rpmdrake_.c:495
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s Kt"
+msgid "Stop"
+msgstr "Pysäytä"
 
-#: ../rpmdrake_.c:495
-msgid "Size: "
-msgstr "Koko: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, searching..."
+msgstr "Odota, etsitään ..."
 
-#: ../rpmdrake_.c:497
-msgid "Importance: "
-msgstr "Tärkeys: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
+msgstr "Haun tulokset (ei mitään)"
 
-#: ../rpmdrake_.c:498
-msgid "Summary: "
-msgstr "Yhteenveto: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Muu"
 
-#: ../rpmdrake_.c:499
-msgid "Description: "
-msgstr "Kuvaus: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"Welcome to the packages source editor!\n"
+"\n"
+"This tool will help you configure the packages sources you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"Tervetuloa pakettien lähteiden hallintaan!\n"
+"\n"
+"Tämä tyÜkalu auttaa sinua asettamaan pakettien lähteet jotka haluat\n"
+"käyttää tietokoneessasi. Sen jälkeen ne ovat käytettävissä jos haluat\n"
+"asentaa uusia paketteja tai päivittää olemassaolevat.."
 
-#: ../rpmdrake_.c:548
-msgid "Bugfixes updates"
-msgstr "Virhekorjaukset / turvapäivitykset"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Tallenna ja lopeta"
 
-#: ../rpmdrake_.c:548
-msgid "Normal updates"
-msgstr "Tavalliset päivitykset"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy..."
+msgstr "Välityspalvelin ..."
 
-#: ../rpmdrake_.c:567
-msgid "Mandrake choices"
-msgstr "Mandrake valinnat"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
+msgstr "Päivitä ..."
 
-#: ../rpmdrake_.c:568
-msgid "All packages, alphabetical"
-msgstr "Kaikki paketit, aakkosjärjestyksessä"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "Lisää..."
 
-#: ../rpmdrake_.c:569
-msgid "All packages,"
-msgstr "Kaikki paketit,"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "Muokkaa"
 
-#: ../rpmdrake_.c:592
-msgid "by group"
-msgstr "ryhmän mukaan"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Source"
+msgstr "Lähde"
 
-#: ../rpmdrake_.c:592
-msgid "by size"
-msgstr "koon mukaan"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
+msgstr "KäytÜssä?"
 
-#: ../rpmdrake_.c:593
-msgid "by selection state"
-msgstr "valinnan mukaan"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure sources"
+msgstr "Määrittele lähteet"
 
-#: ../rpmdrake_.c:594
-msgid "by source repository"
-msgstr "lähteiden mukaan"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "Salasana:"
 
-#: ../rpmdrake_.c:594
-msgid "by update availability"
-msgstr "päivityksien mukaan"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
+msgstr "Käyttäjä:"
 
-#: ../rpmdrake_.c:615
-msgid "in descriptions"
-msgstr "kuvauksissa"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+"Voit haluttaessa antaa tunnus/salasanaa välityspalvelimen tunnistukseen:"
 
-#: ../rpmdrake_.c:615
-msgid "in files"
-msgstr "tiedostoissa"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "Välityspalvelimen nimi:"
 
-#: ../rpmdrake_.c:615
-msgid "in names"
-msgstr "nimeissä"
+#: ../edit-urpm-sources.pl: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]>):"
 
-#: ../rpmdrake_.c:626
-msgid "Reload the packages list"
-msgstr "Lataa listan paketeista uudelleen"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "Määrittele välityspalvelin"
 
-#: ../rpmdrake_.c:626
-msgid "Reset the selection"
-msgstr "Palauta valinnat"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr "Odota, päivitetään mediaa ..."
 
-#: ../rpmdrake_.c:652
-msgid "Maximum information"
-msgstr "Mahdollisimman paljon tietoa"
+#: ../edit-urpm-sources.pl: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."
 
-#: ../rpmdrake_.c:652
-msgid "Normal information"
-msgstr "Tavallista tietoa"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
+msgstr "Sinun pitää asettaa mediaa jatkaaksesi"
 
-#: ../rpmdrake_.c:674
-msgid "Too many packages are selected"
-msgstr "Liian paljon paketteja valittu"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save changes"
+msgstr "Tallenna muutokset"
 
-#: ../rpmdrake_.c:720
-msgid "Find:"
-msgstr "LÜydä:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Relatiivinen polku tiedostoon synthesis tai hdlist : "
 
-#: ../rpmdrake_.c:725
-msgid "Search"
-msgstr "Etsi"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL: "
 
-#: ../rpmdrake_.c:731
-msgid "Install"
-msgstr "Asenna"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Editing source \"%s\":"
+msgstr "Muokataan lähde \"%s\":"
 
-#: ../rpmdrake_.c:738 data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrake Update"
-msgstr "Mandrake Päivitys"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit a source"
+msgstr "Muokkaa lähteitä"
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Installation"
-msgstr "Ohjelmistopakettien Asentaminen"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr "Odota, media poistetaan ..."
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Removal"
-msgstr "Ohjelmistopakettien Poistaminen"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, adding medium..."
+msgstr "Odota, media lisätään ..."
 
-#: ../rpmdrake_.c:779
-msgid "Please wait, contacting mirror to update packages information."
-msgstr "Odota, yhdistetään peilipalvelimelle pakettitietojen päivittämiseksi."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of source:"
+msgstr "Lähteen tyyppi:"
 
-#: ../rpmdrake_.c:781
-msgid "Error updating medium"
-msgstr "Virhe median päivityksessä"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Adding a source:"
+msgstr "Lisätään lähde"
 
-#: ../rpmdrake_.c:782
-msgid "There was an unrecoverable error while updating packages information."
-msgstr "Sattui ylipääsemätÜn virhe päivittäessä pakkauksien tietoja."
+#: ../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 ""
+"Tuon niminen media on jo olemassa,\n"
+"Oletko varma että haluat korvata sen?"
 
-#: ../rpmdrake_.c:787
-msgid "How to choose manually your mirror"
-msgstr "Miten manuaalisesti valitset peilipalvelinta"
+#: ../edit-urpm-sources.pl: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."
 
-#: ../rpmdrake_.c:795
-msgid "Please wait, contacting mirror to initialize updates packages."
-msgstr "Odota, yhdistetään peilipalvelimelle pakettitietojen alustamiseksi."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "Nimi:"
 
-#: ../rpmdrake_.c:798
-msgid "Error adding update medium"
-msgstr "Virhe lisättäessä päivitysmediaa"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
+msgstr "Käyttäjätunnus:"
 
-#: ../rpmdrake_.c:829
-msgid "Please wait, finding available packages..."
-msgstr "Odota, etsitään saatavilla olevia paketteja"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Valitse peilipalvelin ..."
 
-#: ../rpmdrake_.c:861
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Tarkistan %s"
+msgid "Browse..."
+msgstr "Selaa..."
 
-#: ../rpmdrake_.c:880
-msgid "changes:"
-msgstr "muutokset:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "polku tai liitoskohta: "
 
-#: ../rpmdrake_.c:884
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Poista %s"
+msgid "Removable device"
+msgstr "Siirrettävä laite"
 
-#: ../rpmdrake_.c:886
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Käytä %s päätiedostona"
+msgid "HTTP server"
+msgstr "HTTP palvelin"
 
-#: ../rpmdrake_.c:888
-msgid "Do nothing"
-msgstr "Jätä tekemättä"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "FTP palvelin"
 
-#: ../rpmdrake_.c:900
-msgid "Installation finished"
-msgstr "Asennus on valmis"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path:"
+msgstr "Polku: "
 
-#: ../rpmdrake_.c:910
-msgid "Inspect..."
-msgstr "Tarkista..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "Paikalliset tiedostot"
 
-#: ../rpmdrake_.c:925
-msgid "Program missing"
-msgstr "Ohjelma puuttuu"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add a source"
+msgstr "Lisätään lähde"
 
-#: ../rpmdrake_.c:926
-msgid "A required program is missing (grpmi). Check your installation."
-msgstr "Vaadittu ohjelma puuttuu (grpmi). Tarkista asennuksesi."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
+msgstr "Median päivittäminen epäonnistui, poistetaan käytÜstä automaattisesti."
 
-#: ../rpmdrake_.c:940
-msgid "Unable to get source packages."
-msgstr "Lähdepakettien hakeminen epäonnistui."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "Median luonti epäonnistui."
 
-#: ../rpmdrake_.c:941
-msgid "Unable to get source packages, sorry."
-msgstr "Lähdepakettien hakeminen epäonnistui, valitan."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, updating media..."
+msgstr "Odota, päivitetään media(t)..."
 
-#: ../rpmdrake_.c:948
-msgid "Change medium"
-msgstr "Muuta mediaa"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
+msgstr "Päivitä"
 
-#: ../rpmdrake_.c:949
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Ole hyvä ja asenna mediaa nimellä \"%s\" laitteessa [%s]"
+msgid "Select the source(s) you wish to update:"
+msgstr "Valitse lähteet, jota haluat päivittää:"
 
-#: ../rpmdrake_.c:957
-msgid "Installation failed"
-msgstr "Asennus epäonnistui"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please choose the desired mirror."
+msgstr "Ole hyvä ja valitse haluttu peilipalvelin."
 
-#: ../rpmdrake_.c:958
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
-"Asennus epäonnistui, joitakin paketteja puuttuu.\n"
-"Sinun kannattaisi päivittää lähdetietokantasi."
+"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ä."
 
-#: ../rpmdrake_.c:961
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr "Odota, poistetaan paketteja jotta muita voidaan päivittää..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
+msgstr "Ei peilipalvelinta"
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"There was an error downloading the mirrors list:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
-"Asennus on valmis, %s.\n"
+"Sattui virhe haettaessa lista peilipalvelimista\n"
 "\n"
-"Jotkut asetustiedostot tallennettin liitteellä '.rpmnew' tai '.rpmsave',\n"
-"voit tarkistaa ne ja tehdä tarvittavat muutokset:"
+"%s\n"
+"Verkkoyhteytesi, tai MandrakeSoft:in webbisivustoa ei ole saatavilla.\n"
+"Yritä myÜhemmin uudelleen."
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "Virhe haun aikana"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
+"Odota, haetaan lista peilipalvelimista MandrakeSoft:in webbisivustosta."
+
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"some packages failed to install\n"
-"correctly"
+"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 ""
-"Joitakin paketteja ei asentunut\n"
-"oikein."
+"Tarvitsen ottaa yhteyttä MandrakeSoft:in webbisivustoon saadakseni\n"
+"listan peilipalvelimista. Varmistä että verkkoyhteyteytesi on avattu.\n"
+"\n"
+"Sopiiko että jatkan?"
 
-#: ../rpmdrake_.c:983
-msgid "everything was installed correctly"
-msgstr "Kaikki asennettiin oikein"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United States"
+msgstr "Yhdysvallat"
 
-#: ../rpmdrake_.c:985
-msgid "Everything installed successfully"
-msgstr "Kaikki asennettiin onnistuneesti"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
+msgstr "Kiina"
 
-#: ../rpmdrake_.c:986
-msgid "All requested packages were installed successfully."
-msgstr "Kaikki haluamasi paketteja asennettiin onnistuneesti"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr "Iso-Britannia"
 
-#: ../rpmdrake_.c:989
-msgid "Everything already installed."
-msgstr "Kaikki on jo asennettu."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "Taiwan"
 
-#: ../rpmdrake_.c:990
-msgid "Everything already installed (is this supposed to happen at all?)."
-msgstr "Kaikki on jo asennettu. (pitäisikÜ tämä ollenkaan tapahtua?)"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "Ruotsi"
 
-#: ../rpmdrake_.c:997
-msgid "Problem during installation"
-msgstr "Ongelmia asennuksen aikana"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
+msgstr "Venäjä"
 
-#: ../rpmdrake_.c:998
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Sattui ongelmia asennuksen aikana\n"
-"\n"
-"%s"
+msgid "Portugal"
+msgstr "Portugali"
 
-#: ../rpmdrake_.c:1012
-msgid "Please wait, reading packages database..."
-msgstr "Odota, paketti-tietokanta luetaan ..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
+msgstr "Puola"
 
-#: ../rpmdrake_.c:1053
-msgid "Please wait, removing packages..."
-msgstr "Odota, paketteja poistetaan ..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
+msgstr "Norja"
 
-#: ../rpmdrake_.c:1056
-msgid "Problem during removal"
-msgstr "Ongelmia poiston aikana"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
+msgstr "Alankomaat"
 
-#: ../rpmdrake_.c:1057
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Sattui ongelmia poiston aikana:\n"
-"\n"
-"%s"
+msgid "Korea"
+msgstr "Korea"
 
-#: ../rpmdrake_.c:1089
-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."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Japan"
+msgstr "Japani"
 
-#: ../rpmdrake_.c:1094
-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."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Italy"
+msgstr "Italia"
 
-#: ../rpmdrake_.c:1099
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
-msgstr ""
-"Tervetuloa Ohjelmisto Asennus ohjelmaan!\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."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Israel"
+msgstr "Israel"
 
-#: data/rpmdrake-remove.desktop.in.h:1
-msgid "Remove Software"
-msgstr "Poista Ohjelmia"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Kreikka"
 
-#: data/rpmdrake-sources.desktop.in.h:1
-msgid "Software Sources Manager"
-msgstr "Ohjelmisto Lähteiden Hallinta"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "France"
+msgstr "Ranska"
 
-#: data/rpmdrake.desktop.in.h:1
-msgid "Install Software"
-msgstr "Asenna Ohjelmia"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "Suomi"
 
-#~ 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?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "Espanaja"
 
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-#~ "Sopiiko että jatketaan?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
+msgstr "Tanska"
 
-#~ 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 jotka haluat\n"
-#~ "käyttää tietokoneessasi. Sen jälkeen ne ovat käytettävissä jos haluat\n"
-#~ "asentaa uusia paketteja tai päivittää olemassaolevat.."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr "Saksa"
 
-#~ 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?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
+msgstr "Tsekki"
 
-#~ 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 ""
-#~ "Sattui virhe haettaessa lista peilipalvelimista\n"
-#~ "\n"
-#~ "%s\n"
-#~ "Verkkoyhteytesi, tai MandrakeSoft:in webbisivustoa ei ole saatavilla.\n"
-#~ "Yritä myÜhemmin uudelleen."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
-#~ 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 ""
-#~ "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ä."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Canada"
+msgstr "Kanada"
 
-#~ msgid ""
-#~ "The list of updates is void. This 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"
-#~ " "
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
+msgstr "Brasilia"
 
-#~ msgid ""
-#~ "Warning: it seems that you are attempting to add so much\n"
-#~ "packages that your filesystem may run out of free diskspace,\n"
-#~ "during or after package installation ; this is particularly\n"
-#~ "dangerous and should be considered with care.\n"
-#~ "\n"
-#~ "Do you really want to install all the selected packages?"
-#~ msgstr ""
-#~ "Varoitus: näyttää siltä että yrität asentaa niin paljon\n"
-#~ "paketteja että tiedostojärjestelmäsi voi saada tilanpuutetta,\n"
-#~ "joko asennuksen aikana, tai sen jälkeen; tämä on vaarallista\n"
-#~ "ja pitäisi harkita kunnolla.\n"
-#~ "\n"
-#~ "Oletko varma että haluat asentaa kaikki valitsemasi paketteja?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Belgium"
+msgstr "Belgia"
 
-#~ 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?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Australia"
+msgstr "Australia"
 
-#~ msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#~ msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
+msgstr "Itävalta"
 
-#~ 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 ""
-#~ "Tarvitsen ottaa yhteyden peilipalvelimelle, saadaakseni viimeisimmät\n"
-#~ "päivityspaketit. Varmista että verkkoyhteytesi on avattu.\n"
-#~ "\n"
-#~ "Sopiiko että jatkan?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Info..."
+msgstr "Tietoja..."
 
-#~ 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.."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
+msgstr "Ei"
 
-#~ 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?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Kyllä"
+
+#: data/rpmdrake.desktop.in.h:1
+msgid "Install Software"
+msgstr "Asenna Ohjelmia"
+
+#: data/rpmdrake-remove.desktop.in.h:1
+msgid "Remove Software"
+msgstr "Poista Ohjelmia"
+
+#: data/rpmdrake-sources.desktop.in.h:1
+msgid "Software Sources Manager"
+msgstr "Ohjelmisto Lähteiden Hallinta"
+
+#~ 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--*-*-*-*-*,*"
diff --git a/po/fi.pom b/po/fi.pom
index f2899599..af2f3c95 100644
--- a/po/fi.pom
+++ b/po/fi.pom
@@ -4,168 +4,175 @@ msgstr "Palvelin"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Verkkopääte (asiakas)"
+msgid "Office Workstation"
+msgstr "ToimistotyĂśasema"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS-, SMB-, SSH- ja välityspalvelin"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Office-ohjelmistot: tekstinkäsittely (kword, abiword), taulukkolaskenta "
+"(kspread,gnumeric), pdf-lukijat jne"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Toimistosovellukset"
+msgid "Workstation"
+msgstr "TyĂśasema"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Gnome-tyĂśasema"
+msgid "Game station"
+msgstr "Pelikone"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "TyÜkalut Palm Pilotin tai Visorin liittämiseksi"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Pelit: tasohyppely, korttipelit, strategia, jne"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "TyĂśasema"
+msgid "Multimedia station"
+msgstr "Multimedia-asema"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Palomuuri / Reititys"
+msgid "Sound and video playing/editing programs"
+msgstr "Äänen sekä videon soitto- ja editointiohjelmat"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr "Nimipalvelin (DNS) ja tietoverkon informaatiopalvelin (NIS)"
+msgid "Internet station"
+msgstr "Internet-asema"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
 msgstr ""
-"Office-ohjelmistot: tekstinkäsittely (kword, abiword), taulukkolaskenta "
-"(kspread,gnumeric), pdf-lukijat jne"
+"Valikoima tyÜkaluja sähkÜpostin ja nyytisten lukemiseen (pine, mutt, tin...) "
+"sekä internetissä surffailuun"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "Äänenkäsittely: mp3, midi, mikserit, jne"
+msgid "Network Computer (client)"
+msgstr "Verkkopääte (asiakas)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Linux Standardi Perusta - Kolmannen osapuolen ohjelmistojen tuki"
+msgid "Clients for different protocols including ssh"
+msgstr "Asiakasohjelmat eri protokollille (ssh jne)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Kirjoja ja ohjeita Linuxista sekä vapaan lähdekoodin ohjelmista"
+msgid "Configuration"
+msgstr "AsetustyĂśkalut"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "KDE-tyĂśasema"
+msgid "Tools to ease the configuration of your computer"
+msgstr "TyĂśkalut, jotka helpottavat tietokoneesi asetusten muokkaamista"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, jne"
+msgid "Scientific Workstation"
+msgstr "Tieteellinen tyĂśasema"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Multimedia - Video"
+msgid "Scientific applications such as gnuplot"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr ""
-"Kokoelma tyÜkaluja sähkÜpostiin, nyytisiin, webiin, tiedostonsiirtoon ja "
-"jutusteluun"
+msgid "Console Tools"
+msgstr "KomentorivityĂśkalut"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Tietokanta"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Editorit, komentotulkit, tiedostotyÜkalut, päätteet"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL tai MySQL tietokantapalvelin"
+msgid "KDE Workstation"
+msgstr "KDE-tyĂśasema"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "TyĂśkalut, jotka helpottavat tietokoneesi asetusten muokkaamista"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"K-tyÜpÜytäympäristÜ. Graafinen perusympäristÜ ja sen mukana tulevat tyÜkalut"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "Multimedia - Ääni"
+msgid "Graphical Environment"
+msgstr "Graafinen ympäristÜ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dokumentaatio"
+msgid "Gnome Workstation"
+msgstr "Gnome-tyĂśasema"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "KomentorivityĂśkalut"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+"Graafinen ympäristÜ käyttäjäystävällisellä ohjelmistolla ja tyÜkaluilla."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr "Postfix-postipalvelin, Inn-uutispalvelin"
+msgid "Other Graphical Desktops"
+msgstr "Muut graafiset käyttÜympäristÜt"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Internet-asema"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, jne"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Multimedia-asema"
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+msgid "Development"
+msgstr "KehitysympäristÜ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "AsetustyĂśkalut"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C ja C++ ohjelmointityĂśkalut, kirjastot ja include-tiedostot"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Lisää graafisia tyÜpÜytiä (Gnome, IceWM)"
+msgid "Documentation"
+msgstr "Dokumentaatio"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
-"K-tyÜpÜytäympäristÜ. Graafinen perusympäristÜ ja sen mukana tulevat tyÜkalut"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Kirjoja ja ohjeita Linuxista sekä vapaan lähdekoodin ohjelmista"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Graafinen ympäristÜ"
+msgid "LSB"
+msgstr "LSB"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
+msgid "Linux Standard Base. Third party applications support"
+msgstr ""
+"Linux Standard Base (Linux Standardi Perusta)\n"
+" - Kolmannen osapuolen ohjelmistojen tuki"
+
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-msgid "Development"
-msgstr "KehitysympäristÜ"
+#: ../../share/compssUsers:999
+msgid "Web/FTP"
+msgstr "Web/FTP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -174,23 +181,33 @@ msgstr "Apache WWW-palvelin ja Pro-ftpd FTP-palvelin"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "TyĂśkalut CD:iden luomiseen ja polttamiseen"
+msgid "Mail/Groupware/News"
+msgstr "SähkÜposti/Groupware/Uutiset"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "ToimistotyĂśasema"
+msgid "Postfix mail server, Inn news server"
+msgstr "Postfix-postipalvelin, Inn-uutispalvelin"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, jne"
+msgid "Database"
+msgstr "Tietokanta"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Grafiikkaohjelmistot, kuten Gimp"
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL tai MySQL tietokantapalvelin"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Firewall/Router"
+msgstr "Palomuuri / Reititys"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Internet gateway"
+msgstr "Internetyhdyskäytävä"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -199,8 +216,8 @@ msgstr "DNS/NIS "
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C ja C++ ohjelmointityĂśkalut, kirjastot ja include-tiedostot"
+msgid "Domain Name and Network Information Server"
+msgstr "Nimipalvelin (DNS) ja tietoverkon informaatiopalvelin (NIS)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -209,18 +226,20 @@ msgstr "Verkkotietokone (palvelin)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "SähkÜposti/Groupware/Uutiset"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS-, SMB-, SSH- ja välityspalvelin"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Pelikone"
+msgid "Office"
+msgstr "Toimistosovellukset"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Videon katselu ja editointi"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr ""
+"Kokoelma tyÜkaluja sähkÜpostiin, nyytisiin, webiin, tiedostonsiirtoon ja "
+"jutusteluun"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -229,78 +248,66 @@ msgstr "Multimedia - Grafiikka"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Pelit: tasohyppely, korttipelit, strategia, jne"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
-"Valikoima tyÜkaluja sähkÜpostin ja nyytisten lukemiseen (pine, mutt, tin...) "
-"sekä internetissä surffailuun"
+msgid "Graphics programs such as The Gimp"
+msgstr "Grafiikkaohjelmistot, kuten Gimp"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "HenkilĂśkohtainen kirjanpito"
+msgid "Multimedia - Sound"
+msgstr "Multimedia - Ääni"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
-"Graafinen ympäristÜ käyttäjäystävällisellä ohjelmistolla ja tyÜkaluilla."
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "Äänenkäsittely: mp3, midi, mikserit, jne"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Asiakasohjelmat eri protokollille (ssh jne)"
+msgid "Multimedia - Video"
+msgstr "Multimedia - Video"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
+msgid "Video players and editors"
+msgstr "Videon katselu ja editointi"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Internetyhdyskäytävä"
+msgid "Multimedia - CD Burning"
+msgstr "Multimedia - CD:n poltto"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Äänen sekä videon soitto- ja editointiohjelmat"
+msgid "Tools to create and burn CD's"
+msgstr "TyĂśkalut CD:iden luomiseen ja polttamiseen"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Muut graafiset käyttÜympäristÜt"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Lisää graafisia tyÜpÜytiä (Gnome, IceWM)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Editorit, komentotulkit, tiedostotyĂśkalut, terminaalit"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, jne"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "Tilinpito-ohjelmia, kuten gnucash"
+msgid "Personal Information Management"
+msgstr "HenkilĂśkohteisen tiedon hallinta"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "HenkilĂśkohteisen tiedon hallinta"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "TyÜkalut Palm Pilotin tai Visorin liittämiseksi"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multimedia - CD:n poltto"
+msgid "Personal Finance"
+msgstr "HenkilĂśkohtainen kirjanpito"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Tieteellinen tyĂśasema"
+msgid "Programs to manage your finances, such as gnucash"
+msgstr "Ohjelmia henkilĂśkohtaisen finanssin hallintaan, kuten gnucash"
 
diff --git a/po/fr.po b/po/fr.po
index fd002228..a672c746 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,468 +10,646 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2003-01-19 16:57+0100\n"
-"PO-Revision-Date: 2002-12-24 10:32+0400\n"
-"Last-Translator: Guy CLOTILDE <guy.clotilde@wanadoo.fr>\n"
-"Language-Team: French <cooker-i18n@linux-mandrake.com>\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\n"
+"PO-Revision-Date: 2003-02-21 00:25+0100\n"
+"Last-Translator: David BAUDENS <baudens@mandrakesoft.com>\n"
+"Language-Team: French\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl_.c:39
-msgid "Unable to create medium."
-msgstr "Impossible de créer le médium."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Ętes-vous d'accord pour continuer ?"
 
-#: ../edit-urpm-sources.pl_.c:40
-msgid "Unable to update medium; it will be automatically disabled."
-msgstr "Impossible de mettre ŕ jour le médium ; il sera ignoré."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to the software installation tool!\n"
+"\n"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
+msgstr ""
+"Bienvenue dans l'outil d'installation de logiciels !\n"
+"\n"
+"Votre systčme Mandrake Linux est fourni avec plusieurs milliers\n"
+"de paquetages logiciels sur CDROM ou DVD. Cet outil va vous aider\n"
+"ŕ choisir quels logiciels vous désirez installer sur votre\n"
+"ordinateur."
 
-#: ../edit-urpm-sources.pl_.c:51
-msgid "Add a source"
-msgstr "Ajouter une source :"
+#: ../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 ""
+"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_.c:52
-msgid "Local files"
-msgstr "Fichiers locaux"
+#: ../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 ""
+"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."
 
-#: ../edit-urpm-sources.pl_.c:52
-msgid "Path:"
-msgstr "Chemin : "
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"Un problčme est survenu pendant la désinstallation de:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:53
-msgid "FTP server"
-msgstr "Serveur FTP"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during removal"
+msgstr "Un problčme est survenu pendant la désinstallation"
 
-#: ../edit-urpm-sources.pl_.c:53 ../edit-urpm-sources.pl_.c:54
-#: ../edit-urpm-sources.pl_.c:56 ../edit-urpm-sources.pl_.c:175
-msgid "URL:"
-msgstr "URL :"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages..."
+msgstr "Veuillez patienter, suppression des paquetages..."
 
-#: ../edit-urpm-sources.pl_.c:54
-msgid "HTTP server"
-msgstr "Serveur HTTP"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
+msgstr "Veuillez patienter, lecture de la base de donnée des paquetages..."
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Path or mount point:"
-msgstr "Chemin ou point de montage :"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Un problčme est survenu pendant l'installation :\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Removable device"
-msgstr "Périphérique amovible"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during installation"
+msgstr "Un problčme est survenu pendant l'installation"
 
-#: ../edit-urpm-sources.pl_.c:56 ../rpmdrake_.c:548
-msgid "Security updates"
-msgstr "Mises ŕ jour de sécurité"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
+msgstr "Tout a déjŕ été installé (est-ce que c'est vraiment censé arriver ?)."
 
-#: ../edit-urpm-sources.pl_.c:67
-msgid "Browse..."
-msgstr "Parcourir..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed."
+msgstr "Tout a déjŕ été installé."
 
-#: ../edit-urpm-sources.pl_.c:69
-msgid "Choose a mirror..."
-msgstr "Choisissez votre miroir..."
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "Tous les paquetages demandés ont été installés correctement."
 
-#: ../edit-urpm-sources.pl_.c:89
-msgid "Login:"
-msgstr "Login :"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr "Tout a été installé correctement"
 
-#: ../edit-urpm-sources.pl_.c:89 ../edit-urpm-sources.pl_.c:215
-msgid "Password:"
-msgstr "Mot de passe :"
+#: ../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'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 :"
 
-#: ../edit-urpm-sources.pl_.c:94
-msgid "Name:"
-msgstr "Nom :"
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "tout a été installé correctement"
 
-#: ../edit-urpm-sources.pl_.c:96 ../edit-urpm-sources.pl_.c:176
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Chemin relatif vers hdlist/synthesis :"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"some packages failed to install\n"
+"correctly"
+msgstr ""
+"certains paquetages n'ont pas été installés\n"
+"correctement"
 
-#: ../edit-urpm-sources.pl_.c:104
-msgid "You need to fill up at least the two first entries."
-msgstr "Vous devez remplir au moins les deux premiers champs."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages to allow others to be upgraded..."
+msgstr ""
+"Veuillez patienter, suppression de paquetages afin de pouvoir installer les "
+"autres..."
 
-#: ../edit-urpm-sources.pl_.c:116
-msgid "Adding a source:"
-msgstr "Ajout d'une source :"
+#: ../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."
 
-#: ../edit-urpm-sources.pl_.c:117
-msgid "Type of source:"
-msgstr "Type de source :"
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation failed"
+msgstr "L'installation a échoué"
 
-#: ../edit-urpm-sources.pl_.c:121 ../edit-urpm-sources.pl_.c:187
-#: ../edit-urpm-sources.pl_.c:219 ../rpmdrake.pm_.c:97 ../rpmdrake.pm_.c:136
-#: ../rpmdrake.pm_.c:319 ../rpmdrake_.c:353 ../rpmdrake_.c:365
-#: ../rpmdrake_.c:369 ../rpmdrake_.c:916 ../rpmdrake_.c:950
+#: ../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"
 
-#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:180
-#: ../edit-urpm-sources.pl_.c:187 ../edit-urpm-sources.pl_.c:220
-#: ../rpmdrake.pm_.c:319 ../rpmdrake.pm_.c:352 ../rpmdrake_.c:353
-#: ../rpmdrake_.c:950
-msgid "Cancel"
-msgstr "Annuler"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Veuillez insérer le médium nommé \"%s\" dans le périphérique [%s]"
 
-#: ../edit-urpm-sources.pl_.c:140
-msgid "Please wait, adding medium..."
-msgstr "Veuillez patienter, ajout du médium..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr "Changement de médium"
 
-#: ../edit-urpm-sources.pl_.c:158
-msgid "Please wait, removing medium..."
-msgstr "Veuillez patienter, suppression du médium..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
+msgstr "Impossible d'obtenir les paquetages sources, désolé."
 
-#: ../edit-urpm-sources.pl_.c:169
-msgid "Edit a source"
-msgstr "Éditer une source"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages."
+msgstr "Impossible d'obtenir les paquetages sources."
 
-#: ../edit-urpm-sources.pl_.c:173
+#: ../rpmdrake:1
 #, c-format
-msgid "Editing source \"%s\":"
-msgstr "Édition de la source Ť %s ť :"
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr ""
+"Un programme indispensable (grpmi) est manquant. Vérifiez votre\n"
+"installation."
 
-#: ../edit-urpm-sources.pl_.c:179
-msgid "Save changes"
-msgstr "Sauvegarder"
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
+msgstr "Un programme manque"
 
-#: ../edit-urpm-sources.pl_.c:185
-msgid "You need to insert the medium to continue"
-msgstr "Vous devez insérer le médium (CD...) pour continuer"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
+msgstr "Examiner..."
 
-#: ../edit-urpm-sources.pl_.c:186
-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:1
+#, c-format
+msgid "Installation finished"
+msgstr "L'installation est terminée"
 
-#: ../edit-urpm-sources.pl_.c:191
-msgid "Please wait, updating medium..."
-msgstr "Veuillez patienter, mise ŕ jour du médium..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
+msgstr "Ne rien faire"
 
-#: ../edit-urpm-sources.pl_.c:202
-msgid "Configure proxies"
-msgstr "Configurer les serveurs mandataires (proxy)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
+msgstr "Utiliser le .%s"
 
-#: ../edit-urpm-sources.pl_.c:207
+#: ../rpmdrake:1
+#, c-format
+msgid "Remove .%s"
+msgstr "Supprimer le .%s"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "changes:"
+msgstr "changements :"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr "Examen de %s"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, finding available packages..."
+msgstr "Veuillez patienter, recherche des paquetages disponibles..."
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+"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 ""
-"Si vous avez besoin d'utiliser un proxy (serveur mandataire),\n"
-"veuillez entrer le nom de la machine et un port optionnel\n"
-"(la syntaxe est : <nommachine[:port]>) :"
+"Une erreur est survenue pendant l'ajout du médium de mise ŕ jour par urpmi.\n"
+"\n"
+"Cela peut ętre dű ŕ un miroir temporairement indisponible, ou bien si\n"
+"votre version de Mandrake Linux (%s) n'est pas encore supportée (ou plus\n"
+"du tout supportée) par les Mises ŕ jour Officielles Mandrake Linux.\n"
+"\n"
+"Voulez-vous essayer avec un autre miroir ?"
 
-#: ../edit-urpm-sources.pl_.c:209
-msgid "Proxy hostname:"
-msgstr "Nom du serveur mandataire"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
+msgstr "Erreur pendant l'ajout du médium de mise ŕ jour"
 
-#: ../edit-urpm-sources.pl_.c:211
-msgid "You may specify a user/password for the proxy authentication:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
 msgstr ""
-"Vous pouvez aussi utiliser un nom d'utilisateur/mot de passe pour la "
-"connexion au serveur mandataire :"
-
-#: ../edit-urpm-sources.pl_.c:213
-msgid "User:"
-msgstr "Nom d'utilisateur :"
+"Veuillez patienter, connexion au miroir afin de trouver les mises ŕ jour."
 
-#: ../edit-urpm-sources.pl_.c:235
-msgid "Configure sources"
-msgstr "Configurer les sources"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Sources Manager, and then add a `Security\n"
+"updates' source.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"Vous pouvez aussi choisir votre mirroir manuellement : pour ce\n"
+"faire, lancez le Gestionnaire de Sources Logicielles, puis\n"
+"ajoutez une `Mise ŕ jour de sécurité'.\n"
+"\n"
+"Puis, redémarrez MandrakeUpdate."
 
-#: ../edit-urpm-sources.pl_.c:242
-msgid "Enabled?"
-msgstr "Activée ?"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Comment choisir manuellement votre mirroir"
 
-#: ../edit-urpm-sources.pl_.c:243
-msgid "Source"
-msgstr "Source"
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
+msgstr ""
+"Une erreur fatale est survenue pendant la mise ŕ jour des informations sur "
+"les paquetages."
 
-#: ../edit-urpm-sources.pl_.c:264 ../rpmdrake_.c:730
-msgid "Remove"
-msgstr "Supprimer"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
+msgstr "Erreur pendant la mise ŕ jour du médium"
 
-#: ../edit-urpm-sources.pl_.c:266
-msgid "Edit"
-msgstr "Éditer"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
+msgstr ""
+"Veuillez patienter, connexion au miroir afin de mettre ŕ jour les "
+"informations sur les paquetages."
 
-#: ../edit-urpm-sources.pl_.c:268
-msgid "Add..."
-msgstr "Ajouter..."
+#: ../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 ""
+"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 ?"
 
-#: ../edit-urpm-sources.pl_.c:270
-msgid "Update..."
-msgstr "Mettre ŕ jour..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Installation"
+msgstr "Installation de Paquetages Logiciels"
 
-#: ../edit-urpm-sources.pl_.c:271
-msgid "Proxy..."
-msgstr "Mandataire..."
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, c-format
+msgid "Mandrake Update"
+msgstr "Mandrake Update"
 
-#: ../edit-urpm-sources.pl_.c:274
-msgid "Save and quit"
-msgstr "Sauver et quitter"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
+msgstr "Suppression de Paquetages Logiciels"
 
-#: ../edit-urpm-sources.pl_.c:275 ../rpmdrake_.c:733
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
 msgid "Quit"
 msgstr "Quitter"
 
-#: ../rpmdrake.pm_.c:93
-msgid "Yes"
-msgstr "Oui"
-
-#: ../rpmdrake.pm_.c:95
-msgid "No"
-msgstr "Non"
-
-#: ../rpmdrake.pm_.c:127
-msgid "Info..."
-msgstr "Info..."
-
-#: ../rpmdrake.pm_.c:180
-msgid "Austria"
-msgstr "Autriche"
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "Installer"
 
-#: ../rpmdrake.pm_.c:181
-msgid "Australia"
-msgstr "Australie"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "Supprimer"
 
-#: ../rpmdrake.pm_.c:182
-msgid "Belgium"
-msgstr "Belgique"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search"
+msgstr "Chercher"
 
-#: ../rpmdrake.pm_.c:183
-msgid "Brazil"
-msgstr "Brésil"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "Rechercher :"
 
-#: ../rpmdrake.pm_.c:184
-msgid "Canada"
-msgstr "Canada"
+#: ../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 ?"
 
-#: ../rpmdrake.pm_.c:185
-msgid "Costa Rica"
-msgstr "Costa Rica"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "Certains paquetages doivent ętre enlevés"
 
-#: ../rpmdrake.pm_.c:186
-msgid "Czech Republic"
-msgstr "République Tchčque"
+#: ../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 ?"
 
-#: ../rpmdrake.pm_.c:187
-msgid "Germany"
-msgstr "Allemagne"
+#: ../rpmdrake:1
+#, c-format
+msgid "Too many packages are selected"
+msgstr "Trop de paquetages sont sélectionnés"
 
-#: ../rpmdrake.pm_.c:188
-msgid "Danmark"
-msgstr "Danemark"
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
+msgstr "Informations maximales"
 
-#: ../rpmdrake.pm_.c:189 ../rpmdrake.pm_.c:193
-msgid "Greece"
-msgstr "Grčce"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal information"
+msgstr "Informations normales"
 
-#: ../rpmdrake.pm_.c:190
-msgid "Spain"
-msgstr "Espagne"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update source(s)"
+msgstr "Mise ŕ jour de source(s)"
 
-#: ../rpmdrake.pm_.c:191
-msgid "Finland"
-msgstr "Finlande"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reload the packages list"
+msgstr "Rafraîchir la liste des paquetages"
 
-#: ../rpmdrake.pm_.c:192
-msgid "France"
-msgstr "France"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
+msgstr "Remettre ŕ zéro la sélection"
 
-#: ../rpmdrake.pm_.c:194
-msgid "Israel"
-msgstr "Israël"
+#: ../rpmdrake:1
+#, c-format
+msgid "in files"
+msgstr "parmi les fichiers"
 
-#: ../rpmdrake.pm_.c:195
-msgid "Italy"
-msgstr "Italie"
+#: ../rpmdrake:1
+#, c-format
+msgid "in descriptions"
+msgstr "parmi les descriptions"
 
-#: ../rpmdrake.pm_.c:196
-msgid "Japan"
-msgstr "Japon"
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
+msgstr "parmi les noms"
 
-#: ../rpmdrake.pm_.c:197
-msgid "Korea"
-msgstr "Corée"
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
+msgstr "nouveaux ou mis ŕ jour"
 
-#: ../rpmdrake.pm_.c:198
-msgid "Netherlands"
-msgstr "Pays-Bas"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
+msgstr "par source"
 
-#: ../rpmdrake.pm_.c:199
-msgid "Norway"
-msgstr "Norvčge"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
+msgstr "sélectionnés ou non"
 
-#: ../rpmdrake.pm_.c:200
-msgid "Poland"
-msgstr "Pologne"
+#: ../rpmdrake:1
+#, c-format
+msgid "by size"
+msgstr "par taille"
 
-#: ../rpmdrake.pm_.c:201
-msgid "Portugal"
-msgstr "Portugal"
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
+msgstr "par groupe"
 
-#: ../rpmdrake.pm_.c:202
-msgid "Russia"
-msgstr "Russie"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages,"
+msgstr "Tous les paquetages,"
 
-#: ../rpmdrake.pm_.c:203
-msgid "Sweden"
-msgstr "Sučde"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
+msgstr "Tous les paquetages, classement alphabétique"
 
-#: ../rpmdrake.pm_.c:204
-msgid "Taiwan"
-msgstr "Taďwan"
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
+msgstr "Choix Mandrake"
 
-#: ../rpmdrake.pm_.c:205
-msgid "United Kingdom"
-msgstr "Royaume-Uni"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal updates"
+msgstr "Mises ŕ jour normales"
 
-#: ../rpmdrake.pm_.c:206
-msgid "China"
-msgstr "Chine"
+#: ../rpmdrake:1
+#, c-format
+msgid "Bugfixes updates"
+msgstr "Corrections de bogues"
 
-#: ../rpmdrake.pm_.c:207 ../rpmdrake.pm_.c:208 ../rpmdrake.pm_.c:209
-#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:261
-msgid "United States"
-msgstr "États-Unis"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
+msgstr "Mises ŕ jour de sécurité"
 
-#: ../rpmdrake.pm_.c:274
-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
+#, c-format
+msgid "Description: "
+msgstr "Description : "
 
-#: ../rpmdrake.pm_.c:280
-msgid "Error during download"
-msgstr "Erreur pendant le téléchargement"
+#: ../rpmdrake:1
+#, c-format
+msgid "Summary: "
+msgstr "Intitulé : "
 
-#: ../rpmdrake.pm_.c:289
-msgid "No mirror"
-msgstr "Pas de miroir"
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "Importance : "
 
-#: ../rpmdrake.pm_.c:307
-msgid "Please choose the desired mirror."
-msgstr "Veuillez choisir le miroir."
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s Ko"
 
-#: ../rpmdrake.pm_.c:339 ../rpmdrake_.c:627
-msgid "Update source(s)"
-msgstr "Mise ŕ jour de source(s)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Size: "
+msgstr "Taille : "
 
-#: ../rpmdrake.pm_.c:343
-msgid "Select the source(s) you wish to update:"
-msgstr "Veuillez choisir les sources que vous voulez mettre ŕ jour :"
+#: ../rpmdrake:1
+#, c-format
+msgid "Version: "
+msgstr "Version : "
 
-#: ../rpmdrake.pm_.c:347
-msgid "Update"
-msgstr "Mettre ŕ jour"
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "Nom : "
 
-#: ../rpmdrake.pm_.c:358
-msgid "Please wait, updating media..."
-msgstr "Veuillez patienter, mise ŕ jour des média..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "Raison de la mise ŕ jour : "
 
-#: ../rpmdrake_.c:99
-msgid "Other"
-msgstr "Autre"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
+msgstr "Version actuellement installée : "
 
-#: ../rpmdrake_.c:121 ../rpmdrake_.c:135 ../rpmdrake_.c:227 ../rpmdrake_.c:298
-msgid "(none)"
-msgstr "(aucun)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Source: "
+msgstr "Source : "
 
-#: ../rpmdrake_.c:141 ../rpmdrake_.c:482 ../rpmdrake_.c:483
+#: ../rpmdrake:1
+#, c-format
 msgid "(Not available)"
 msgstr "(Non disponible)"
 
-#: ../rpmdrake_.c:151 ../rpmdrake_.c:208
-msgid "Search results"
-msgstr "Résultats de la recherche"
-
-#: ../rpmdrake_.c:151
-msgid "Search results (none)"
-msgstr "Résultats de la recherche (aucun)"
-
-#: ../rpmdrake_.c:161 ../rpmdrake_.c:172
-msgid "Please wait, searching..."
-msgstr "Veuillez patienter, recherche en cours..."
-
-#: ../rpmdrake_.c:175
-msgid "Stop"
-msgstr "Arręter"
-
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-msgid "Addable"
-msgstr "Nouveaux"
-
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-msgid "Upgradable"
-msgstr "Mises ŕ jour"
-
-#: ../rpmdrake_.c:211
-msgid "Not selected"
-msgstr "Non sélectionnés"
-
-#: ../rpmdrake_.c:211
-msgid "Selected"
-msgstr "Sélectionnés"
-
-#: ../rpmdrake_.c:240
-msgid "rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake_.c:258 ../rpmdrake_.c:360 ../rpmdrake_.c:362
-msgid "More information on package..."
-msgstr "Plus d'informations sur le paquetage..."
-
-#: ../rpmdrake_.c:259
-msgid "One of the following packages is needed:"
-msgstr "L'un des paquetages suivants est nécessaire :"
-
-#: ../rpmdrake_.c:259
-msgid "Please choose"
-msgstr "Veuillez choisir"
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
+msgstr "Changelog :\n"
 
-#: ../rpmdrake_.c:275
-msgid "unknown package "
-msgstr "paquetage inconnu "
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "Fichiers :\n"
 
-#: ../rpmdrake_.c:285
-msgid "Please wait, listing packages..."
-msgstr "Veuillez patienter, énumération des paquetages..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected size: %d MB"
+msgstr "Taille sélectionnée : %d Mo"
 
-#: ../rpmdrake_.c:300
-msgid "No update"
-msgstr "Pas de mise ŕ jour"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Sélectionnés : %d Mo / Place libre sur disque : %d Mo"
 
-#: ../rpmdrake_.c:353 ../rpmdrake_.c:354
-msgid "More infos"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
 msgstr ""
+"Pour satisfaire les dépendances, le(s) paquetage(s) suivant(s)\n"
+"doivent ętre déselectionnés :\n"
+"\n"
 
-#: ../rpmdrake_.c:355
-#, fuzzy
-msgid "Information on packages"
-msgstr "Plus d'informations sur le paquetage..."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+msgstr ""
+"Désolé, le(s) paquetage(s) suivant(s) ne peuvent pas ętre sélectionnés :\n"
+"\n"
 
-#: ../rpmdrake_.c:376
-msgid "Some additional packages need to be removed"
-msgstr "Des paquetages supplémentaires doivent ętre supprimés"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "Certains paquetages ne peuvent pas ętre installés"
 
-#: ../rpmdrake_.c:377
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
 "\n"
 msgstr ""
-"Pour satisfaire les dépendances, le(s) paquetage(s) supplémentaire(s) suivant"
-"(s)\n"
-"doivent aussi ętre supprimés :\n"
+"Pour satisfaire les dépendances, le(s) paquetage(s) suivant(s)\n"
+"doivent aussi ętre installés :\n"
 "\n"
 
-#: ../rpmdrake_.c:383 ../rpmdrake_.c:391
+#: ../rpmdrake:1
+#, c-format
+msgid "Additional packages needed"
+msgstr "Des paquetages supplémentaires sont nécessaires"
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "Des paquetages ne peuvent pas ętre enlevés"
 
-#: ../rpmdrake_.c:384
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -479,428 +657,599 @@ msgstr ""
 "Le fait d'enlever ce paquetage rendrait instable votre systčme, désolé:\n"
 "\n"
 
-#: ../rpmdrake_.c:392 ../rpmdrake_.c:451
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"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) suivant(s)\n"
-"doivent ętre déselectionnés :\n"
+"Pour satisfaire les dépendances, le(s) paquetage(s) supplémentaire(s) suivant"
+"(s)\n"
+"doivent aussi ętre supprimés :\n"
 "\n"
 
-#: ../rpmdrake_.c:421
-msgid "Additional packages needed"
-msgstr "Des paquetages supplémentaires sont nécessaires"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr "Des paquetages supplémentaires doivent ętre supprimés"
 
-#: ../rpmdrake_.c:422
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
-msgstr ""
-"Pour satisfaire les dépendances, le(s) paquetage(s) suivant(s)\n"
-"doivent aussi ętre installés :\n"
-"\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
+msgstr "Plus d'informations sur le paquetage..."
 
-#: ../rpmdrake_.c:435
-msgid "Some packages can't be installed"
-msgstr "Certains paquetages ne peuvent pas ętre installés"
+#: ../rpmdrake:1
+#, c-format
+msgid "Information on packages"
+msgstr "Informations sur les paquetages"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
+msgstr "Plus d'infos"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Addable"
+msgstr "Nouveaux"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Upgradable"
+msgstr "Mises ŕ jour"
 
-#: ../rpmdrake_.c:436
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
+"The list of updates is void. This 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 ""
-"Désolé, le(s) paquetage(s) suivant(s) ne peuvent pas ętre sélectionnés :\n"
-"\n"
+"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_.c:450 ../rpmdrake_.c:684
-msgid "Some packages need to be removed"
-msgstr "Certains paquetages doivent ętre enlevés"
+#: ../rpmdrake:1
+#, c-format
+msgid "No update"
+msgstr "Pas de mise ŕ jour"
 
-#: ../rpmdrake_.c:472
+#: ../rpmdrake: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 "(none)"
+msgstr "(aucun)"
 
-#: ../rpmdrake_.c:474
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "Taille sélectionnée : %d Mo"
+msgid "Please wait, listing packages..."
+msgstr "Veuillez patienter, énumération des paquetages..."
 
-#: ../rpmdrake_.c:482
-msgid "Files:\n"
-msgstr "Fichiers :\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "unknown package "
+msgstr "paquetage inconnu "
 
-#: ../rpmdrake_.c:483
-msgid "Changelog:\n"
-msgstr "Changelog :\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "L'un des paquetages suivants est nécessaire :"
 
-#: ../rpmdrake_.c:486
-msgid "Source: "
-msgstr "Source : "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please choose"
+msgstr "Veuillez choisir"
 
-#: ../rpmdrake_.c:487
-msgid "Currently installed version: "
-msgstr "Version actuellement installée : "
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:491
-msgid "Reason for update: "
-msgstr "Raison de la mise ŕ jour : "
+#: ../rpmdrake:1
+#, c-format
+msgid "Not selected"
+msgstr "Non sélectionnés"
 
-#: ../rpmdrake_.c:493
-msgid "Name: "
-msgstr "Nom : "
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected"
+msgstr "Sélectionnés"
 
-#: ../rpmdrake_.c:494
-msgid "Version: "
-msgstr "Version : "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results"
+msgstr "Résultats de la recherche"
 
-#: ../rpmdrake_.c:495
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s Ko"
+msgid "Stop"
+msgstr "Arręter"
 
-#: ../rpmdrake_.c:495
-msgid "Size: "
-msgstr "Taille : "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, searching..."
+msgstr "Veuillez patienter, recherche en cours..."
 
-#: ../rpmdrake_.c:497
-msgid "Importance: "
-msgstr "Importance : "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
+msgstr "Résultats de la recherche (aucun)"
 
-#: ../rpmdrake_.c:498
-msgid "Summary: "
-msgstr "Intitulé : "
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Autre"
 
-#: ../rpmdrake_.c:499
-msgid "Description: "
-msgstr "Description : "
+#: ../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 ""
+"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."
 
-#: ../rpmdrake_.c:548
-msgid "Bugfixes updates"
-msgstr "Corrections de bogues"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Sauver et quitter"
 
-#: ../rpmdrake_.c:548
-msgid "Normal updates"
-msgstr "Mises ŕ jour normales"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy..."
+msgstr "Mandataire..."
 
-#: ../rpmdrake_.c:567
-msgid "Mandrake choices"
-msgstr "Choix Mandrake"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
+msgstr "Mettre ŕ jour..."
 
-#: ../rpmdrake_.c:568
-msgid "All packages, alphabetical"
-msgstr "Tous les paquetages, classement alphabétique"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "Ajouter..."
 
-#: ../rpmdrake_.c:569
-msgid "All packages,"
-msgstr "Tous les paquetages,"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "Éditer"
 
-#: ../rpmdrake_.c:592
-msgid "by group"
-msgstr "par groupe"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Source"
+msgstr "Source"
 
-#: ../rpmdrake_.c:592
-msgid "by size"
-msgstr "par taille"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
+msgstr "Activée ?"
 
-#: ../rpmdrake_.c:593
-msgid "by selection state"
-msgstr "sélectionnés ou non"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure sources"
+msgstr "Configurer les sources"
 
-#: ../rpmdrake_.c:594
-msgid "by source repository"
-msgstr "par source"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "Mot de passe :"
 
-#: ../rpmdrake_.c:594
-msgid "by update availability"
-msgstr "nouveaux ou mis ŕ jour"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
+msgstr "Nom d'utilisateur :"
 
-#: ../rpmdrake_.c:615
-msgid "in descriptions"
-msgstr "parmi les descriptions"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+"Vous pouvez aussi utiliser un nom d'utilisateur/mot de passe pour\n"
+"la connexion au serveur mandataire :"
 
-#: ../rpmdrake_.c:615
-msgid "in files"
-msgstr "parmi les fichiers"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "Nom du serveur mandataire"
 
-#: ../rpmdrake_.c:615
-msgid "in names"
-msgstr "parmi les noms"
+#: ../edit-urpm-sources.pl: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),\n"
+"veuillez entrer le nom de la machine et un port optionnel\n"
+"(la syntaxe est : <nommachine[:port]>) :"
 
-#: ../rpmdrake_.c:626
-msgid "Reload the packages list"
-msgstr "Rafraîchir la liste des paquetages"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "Configurer les serveurs mandataires (proxy)"
 
-#: ../rpmdrake_.c:626
-msgid "Reset the selection"
-msgstr "Remettre ŕ zéro la sélection"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr "Veuillez patienter, mise ŕ jour du médium..."
 
-#: ../rpmdrake_.c:652
-msgid "Maximum information"
-msgstr "Informations maximales"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr ""
+"Afin de sauvegarder les changements, vous devez insérer le médium dans le "
+"lecteur."
 
-#: ../rpmdrake_.c:652
-msgid "Normal information"
-msgstr "Informations normales"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
+msgstr "Vous devez insérer le médium pour continuer"
 
-#: ../rpmdrake_.c:674
-msgid "Too many packages are selected"
-msgstr "Trop de paquetages sont sélectionnés"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save changes"
+msgstr "Sauvegarder"
 
-#: ../rpmdrake_.c:720
-msgid "Find:"
-msgstr "Rechercher :"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Chemin relatif vers hdlist/synthesis :"
 
-#: ../rpmdrake_.c:725
-msgid "Search"
-msgstr "Chercher"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL :"
 
-#: ../rpmdrake_.c:731
-msgid "Install"
-msgstr "Installer"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Editing source \"%s\":"
+msgstr "Édition de la source \"%s\" :"
 
-#: ../rpmdrake_.c:738 data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrake Update"
-msgstr "Mandrake Update"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit a source"
+msgstr "Éditer une source"
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Installation"
-msgstr "Installation de Paquetages Logiciels"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr "Veuillez patienter, suppression du médium..."
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Removal"
-msgstr "Suppression de Paquetages Logiciels"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, adding medium..."
+msgstr "Veuillez patienter, ajout du médium..."
 
-#: ../rpmdrake_.c:779
-msgid "Please wait, contacting mirror to update packages information."
-msgstr ""
-"Veuillez patienter, connexion au miroir afin de mettre ŕ jour les "
-"informations sur les paquetages."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of source:"
+msgstr "Type de source :"
 
-#: ../rpmdrake_.c:781
-msgid "Error updating medium"
-msgstr "Erreur pendant la mise ŕ jour du médium"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Adding a source:"
+msgstr "Ajout d'une source :"
 
-#: ../rpmdrake_.c:782
-msgid "There was an unrecoverable error while updating packages information."
+#: ../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 ""
-"Une erreur fatale est survenue pendant la mise ŕ jour des informations sur "
-"les paquetages."
+"Il existe déjŕ un médium du męme nom,\n"
+"voulez-vous vraiment le remplacer ?"
 
-#: ../rpmdrake_.c:787
-msgid "How to choose manually your mirror"
-msgstr "Comment choisir manuellement votre mirroir"
+#: ../edit-urpm-sources.pl: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."
 
-#: ../rpmdrake_.c:795
-msgid "Please wait, contacting mirror to initialize updates packages."
-msgstr ""
-"Veuillez patienter, connexion au miroir afin de trouver les mises ŕ jour."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "Nom :"
 
-#: ../rpmdrake_.c:798
-msgid "Error adding update medium"
-msgstr "Erreur pendant l'ajout du médium de mise ŕ jour"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
+msgstr "Login :"
 
-#: ../rpmdrake_.c:829
-msgid "Please wait, finding available packages..."
-msgstr "Veuillez patienter, recherche des paquetages disponibles..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Choisissez votre miroir..."
 
-#: ../rpmdrake_.c:861
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Examen de %s"
+msgid "Browse..."
+msgstr "Parcourir..."
 
-#: ../rpmdrake_.c:880
-msgid "changes:"
-msgstr "changements:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Chemin ou point de montage :"
 
-#: ../rpmdrake_.c:884
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Supprimer le .%s"
+msgid "Removable device"
+msgstr "Périphérique amovible"
 
-#: ../rpmdrake_.c:886
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Utiliser le .%s"
+msgid "HTTP server"
+msgstr "Serveur HTTP"
 
-#: ../rpmdrake_.c:888
-msgid "Do nothing"
-msgstr "Ne rien faire"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "Serveur FTP"
 
-#: ../rpmdrake_.c:900
-msgid "Installation finished"
-msgstr "L'installation est terminée"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path:"
+msgstr "Chemin : "
 
-#: ../rpmdrake_.c:910
-msgid "Inspect..."
-msgstr "Examiner..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "Fichiers locaux"
 
-#: ../rpmdrake_.c:925
-msgid "Program missing"
-msgstr "Un programme manque"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add a source"
+msgstr "Ajout d'une source :"
 
-#: ../rpmdrake_.c:926
-msgid "A required program is missing (grpmi). Check your installation."
-msgstr ""
-"Un programme indispensable (grpmi) est manquant. Vérifiez votre\n"
-"installation."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
+msgstr "Impossible de mettre ŕ jour le médium ; il sera ignoré."
 
-#: ../rpmdrake_.c:940
-msgid "Unable to get source packages."
-msgstr "Impossible d'obtenir les paquetages sources."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "Impossible de créer le médium."
 
-#: ../rpmdrake_.c:941
-msgid "Unable to get source packages, sorry."
-msgstr "Impossible d'obtenir les paquetages sources, désolé."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, updating media..."
+msgstr "Veuillez patienter, mise ŕ jour des média..."
 
-#: ../rpmdrake_.c:948
-msgid "Change medium"
-msgstr "Changement de médium"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
+msgstr "Mettre ŕ jour"
 
-#: ../rpmdrake_.c:949
+#: ../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 "Select the source(s) you wish to update:"
+msgstr "Veuillez choisir les sources que vous voulez mettre ŕ jour :"
 
-#: ../rpmdrake_.c:957
-msgid "Installation failed"
-msgstr "L'installation a échoué"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please choose the desired mirror."
+msgstr "Veuillez choisir le miroir."
 
-#: ../rpmdrake_.c:958
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
-"L'installation a échoué, certains fichiers sont introuvables.\n"
-"Vous pouvez mettre ŕ jour vos sources."
+"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_.c:961
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr ""
-"Veuillez patienter, suppression de paquetages afin de pouvoir installer les "
-"autres..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
+msgstr "Pas de miroir"
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"There was an error downloading the mirrors list:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
-"L'installation est terminée ; %s.\n"
+"Une erreur est survenue pendant le téléchargement de la liste des miroirs :\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 :"
+"%s\n"
+"Le réseau, ou bien le site web de MandrakeSoft, sont peut-ętre "
+"indisponibles.\n"
+"Veuillez réessayer ultérieurement."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "Erreur pendant le téléchargement"
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
+"Veuillez patienter, téléchargement de la liste des miroirs ŕ partir du site "
+"web de MandrakeSoft."
+
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"some packages failed to install\n"
-"correctly"
+"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 ""
-"certains paquetages n'ont pas été installés\n"
-"correctement"
+"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 ?"
 
-#: ../rpmdrake_.c:983
-msgid "everything was installed correctly"
-msgstr "tout a été installé correctement"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United States"
+msgstr "États-Unis"
 
-#: ../rpmdrake_.c:985
-msgid "Everything installed successfully"
-msgstr "Tout a été installé correctement"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
+msgstr "Chine"
 
-#: ../rpmdrake_.c:986
-msgid "All requested packages were installed successfully."
-msgstr "Tous les paquetages demandés ont été installés correctement."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr "Royaume-Uni"
 
-#: ../rpmdrake_.c:989
-msgid "Everything already installed."
-msgstr "Tout a déjŕ été installé."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "Taďwan"
 
-#: ../rpmdrake_.c:990
-msgid "Everything already installed (is this supposed to happen at all?)."
-msgstr "Tout a déjŕ été installé (est-ce que c'est vraiment censé arriver ?)."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "Sučde"
 
-#: ../rpmdrake_.c:997
-msgid "Problem during installation"
-msgstr "Un problčme est survenu pendant l'installation"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
+msgstr "Russie"
 
-#: ../rpmdrake_.c:998
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Un problčme est survenu pendant l'installation :\n"
-"\n"
-"%s"
+msgid "Portugal"
+msgstr "Portugal"
 
-#: ../rpmdrake_.c:1012
-msgid "Please wait, reading packages database..."
-msgstr "Veuillez patienter, lecture de la base de donnée des paquetages..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
+msgstr "Pologne"
 
-#: ../rpmdrake_.c:1053
-msgid "Please wait, removing packages..."
-msgstr "Veuillez patienter, suppression des paquetages..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
+msgstr "Norvčge"
 
-#: ../rpmdrake_.c:1056
-msgid "Problem during removal"
-msgstr "Un problčme est survenu pendant la désintallation"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
+msgstr "Pays-Bas"
 
-#: ../rpmdrake_.c:1057
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Un problčme est survenu pendant la désinstallation de :\n"
-"\n"
-"%s"
+msgid "Korea"
+msgstr "Corée"
 
-#: ../rpmdrake_.c:1089
-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
+#, c-format
+msgid "Japan"
+msgstr "Japon"
 
-#: ../rpmdrake_.c:1094
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"Bienvenue dans MandrakeUpdate !\n"
-"\n"
-"Cet outil va vous aider ŕ choisir les mises ŕ jour que vous\n"
-"souhaiter installer sur votre ordinateur."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Italy"
+msgstr "Italie"
 
-#: ../rpmdrake_.c:1099
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
-msgstr ""
-"Bienvenue dans l'outil d'installation de logiciels !\n"
-"\n"
-"Votre systčme Mandrake Linux est fourni avec plusieurs milliers\n"
-"de paquetages logiciels sur CDROM ou DVD. Cet outil va vous aider\n"
-"ŕ choisir quels logiciels vous désirez installer sur votre\n"
-"ordinateur."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Israel"
+msgstr "Israël"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Grčce"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "France"
+msgstr "France"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "Finlande"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "Espagne"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
+msgstr "Danemark"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr "Allemagne"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
+msgstr "République Tchčque"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Costa Rica"
+msgstr "Costa Rica"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Canada"
+msgstr "Canada"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
+msgstr "Brésil"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Belgium"
+msgstr "Belgique"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Australia"
+msgstr "Australie"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
+msgstr "Autriche"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Info..."
+msgstr "Info..."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
+msgstr "Non"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Oui"
+
+#: data/rpmdrake.desktop.in.h:1
+msgid "Install Software"
+msgstr "Installer des Logiciels"
 
 #: data/rpmdrake-remove.desktop.in.h:1
 msgid "Remove Software"
@@ -910,6 +1259,15 @@ msgstr "Supprimer des Logiciels"
 msgid "Software Sources Manager"
 msgstr "Gestionnaire de Sources Logicielles"
 
-#: data/rpmdrake.desktop.in.h:1
-msgid "Install Software"
-msgstr "Installer des Logiciels"
+#~ 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--*-*-*-*-*,*"
+
+#, fuzzy
+#~ msgid "Update sources"
+#~ msgstr "Mise ŕ jour de source(s)"
+
+#~ msgid "Software Management"
+#~ msgstr "Gestionnaire de Logiciels"
diff --git a/po/fr.pom b/po/fr.pom
index 3f00860e..52c2c212 100644
--- a/po/fr.pom
+++ b/po/fr.pom
@@ -4,169 +4,177 @@ msgstr "Serveur"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Ordinateur réseau (client)"
+msgid "Office Workstation"
+msgstr "Machine de bureau"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "Serveur NFS, serveur SMB, serveur Proxy (mandataire), serveur SSH"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Programmes pour la bureautique : traitements de texte (kword, abiword), "
+"tableurs (kspread, gnumeric), visualiseur pdf, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Bureautique"
+msgid "Workstation"
+msgstr "Station de travail"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Station de travail Gnome"
+msgid "Game station"
+msgstr "Jeux"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Outils pour votre Palm Pilot ou votre Visor"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr ""
+"Programmes de divertissement : jeux d'arcade, de plateaux, de stratégie, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Station de travail"
+msgid "Multimedia station"
+msgstr "Multimédia"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Pare Feu/Routeur"
+msgid "Sound and video playing/editing programs"
+msgstr "Programmes pour jouer/éditer du son et de la vidéo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr "Serveur de Nom (DNS) et Serveur d'Information (NIS)"
+msgid "Internet station"
+msgstr "Internet"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
 msgstr ""
-"Programmes pour la bureautique : traitements de texte (kword, abiword), "
-"tableurs (kspread, gnumeric), visualiseur pdf, etc"
+"Ensemble d'outils pour lire ou envoyer des courriers électronique (pine, "
+"mutt), des news (tin), et pour naviguer sur l'internet"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "Outils audio : lecteurs mp3 ou midi, mixeurs, etc"
+msgid "Network Computer (client)"
+msgstr "Ordinateur réseau (client)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Ť Linux Standard Base ť. Support des programmes tiers"
+msgid "Clients for different protocols including ssh"
+msgstr "Clients pour différents protocoles, dont ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Livres et Howto's sur Linux et le Logiciel Libre"
+msgid "Configuration"
+msgstr "Configuration"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "Station de travail KDE"
+msgid "Tools to ease the configuration of your computer"
+msgstr "Outils pour faciliter la configuration de votre ordinateur"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgid "Scientific Workstation"
+msgstr "Applications scientifiques"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Multimédia - Vidéo"
+msgid "Scientific applications such as gnuplot"
+msgstr "Applications scientifiques telles que gnuplot"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr ""
-"Utilitaires pour le courrier électronique, les news, le web, le transfert de "
-"fichiers, les discussions en ligne"
+msgid "Console Tools"
+msgstr "Utilitaires console"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Base de Données"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Éditeurs, interpréteurs, outils fichiers, terminaux"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "Serveurs de bases de données PostgreSQL ou MySQL"
+msgid "KDE Workstation"
+msgstr "Station de travail KDE"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Outils pour faciliter la configuration de votre ordinateur"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"Le K Desktop Environement, l'environnement de bureau de base avec sa "
+"collection d'outils"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "Multimédia - Son"
+msgid "Graphical Environment"
+msgstr "Environnement graphique"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Documentation"
+msgid "Gnome Workstation"
+msgstr "Station de travail Gnome"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Utilitaires console"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+"Un environnement de bureau avec un ensemble d'applications et d'outils "
+"intuitifs"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr "Serveur de courrier Postfix, serveur de news Inn"
+msgid "Other Graphical Desktops"
+msgstr "Autres Environnements de Bureau"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Internet"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Multimédia"
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+msgid "Development"
+msgstr "Développement"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Configuration"
+msgid "C and C++ development libraries, programs and include files"
+msgstr ""
+"Bibliothčques de développement C et C++, programmes et fichiers d'en-tęte"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Plus d'Environnements de Bureau (Gnome, IceWM)"
+msgid "Documentation"
+msgstr "Documentation"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
-"Le K Desktop Environement, l'environnement de bureau de base avec sa "
-"collection d'outils"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Livres et Howto's sur Linux et le Logiciel Libre"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Environnement graphique"
+msgid "LSB"
+msgstr "LSB"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Ť Linux Standard Base ť. Support des programmes tiers"
+
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-msgid "Development"
-msgstr "Développement"
+#: ../../share/compssUsers:999
+msgid "Web/FTP"
+msgstr "Web/FTP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -175,123 +183,115 @@ msgstr "Apache et Pro-ftpd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "Outils pour créer et graver des CD"
+msgid "Mail/Groupware/News"
+msgstr "E-mail/Groupware/News"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Machine de bureau"
+msgid "Postfix mail server, Inn news server"
+msgstr "Serveur de courrier Postfix, serveur de news Inn"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgid "Database"
+msgstr "Base de Données"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Programmes de graphisme comme Le Gimp"
+msgid "PostgreSQL or MySQL database server"
+msgstr "Serveurs de bases de données PostgreSQL ou MySQL"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "DNS/NIS "
-msgstr "DNS/NIS"
+msgid "Firewall/Router"
+msgstr "Pare Feu/Routeur"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr ""
-"Bibliothčques de développement C et C++, programmes et fichiers d'en-tęte"
+msgid "Internet gateway"
+msgstr "Passerelle internet"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Serveur réseau"
+msgid "DNS/NIS "
+msgstr "DNS/NIS"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "E-mail/Groupware/News"
+msgid "Domain Name and Network Information Server"
+msgstr "Serveur de Nom (DNS) et Serveur d'Information (NIS)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Jeux"
+msgid "Network Computer server"
+msgstr "Serveur réseau"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Lecteurs et éditeurs vidéo"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "Serveur NFS, serveur SMB, serveur Proxy (mandataire), serveur SSH"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Graphics"
-msgstr "Multimédia - Graphisme"
+msgid "Office"
+msgstr "Bureautique"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
 msgstr ""
-"Programmes de divertissement : jeux d'arcade, de plateaux, de stratégie, etc"
+"Utilitaires pour le courrier électronique, les news, le web, le transfert de "
+"fichiers, les discussions en ligne"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
-"Ensemble d'outils pour lire ou envoyer des courriers électronique (pine, "
-"mutt), des news (tin), et pour naviguer sur l'internet"
+msgid "Multimedia - Graphics"
+msgstr "Multimédia - Graphisme"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "Gestion Financičre"
+msgid "Graphics programs such as The Gimp"
+msgstr "Programmes de graphisme comme Le Gimp"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
-"Un environnement de bureau avec un ensemble d'applications et d'outils "
-"intuitifs"
+msgid "Multimedia - Sound"
+msgstr "Multimédia - Son"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Clients pour différents protocoles, dont ssh"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "Outils audio : lecteurs mp3 ou midi, mixeurs, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
+msgid "Multimedia - Video"
+msgstr "Multimédia - Vidéo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Passerelle internet"
+msgid "Video players and editors"
+msgstr "Lecteurs et éditeurs vidéo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Programmes pour jouer/éditer du son et de la vidéo"
+msgid "Multimedia - CD Burning"
+msgstr "Multimédia - Gravure de CD"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Autres Environnements de Bureau"
+msgid "Tools to create and burn CD's"
+msgstr "Outils pour créer et graver des CD"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Éditeurs, interpréteurs, outils fichiers, terminaux"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Plus d'Environnements de Bureau (Gnome, IceWM)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "Programmes pour gérer votre finance, comme gnucash"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -300,11 +300,16 @@ msgstr "Gestionnaire d'Informations Personnelles"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multimédia - Gravure de CD"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Outils pour votre Palm Pilot ou votre Visor"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Applications scientifiques"
+msgid "Personal Finance"
+msgstr "Gestion Financičre"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Programs to manage your finances, such as gnucash"
+msgstr "Programmes pour gérer votre finance, comme gnucash"
 
diff --git a/po/ga.po b/po/ga.po
index 31983f6b..edbcbe20 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2003-01-19 16:57+0100\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\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,896 +13,1145 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: ../edit-urpm-sources.pl_.c:39
-msgid "Unable to create medium."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:40
-msgid "Unable to update medium; it will be automatically disabled."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to the software installation tool!\n"
+"\n"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:51
-#, fuzzy
-msgid "Add a source"
+#: ../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 ""
-"Fan tamall\n"
-"Ag scrios pacáistí"
 
-#: ../edit-urpm-sources.pl_.c:52
-msgid "Local files"
-msgstr "Comhaid Áitiúl"
-
-#: ../edit-urpm-sources.pl_.c:52
-msgid "Path:"
-msgstr "Slí:"
+#: ../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_.c:53
-msgid "FTP server"
-msgstr "Freastalaí FTP:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:53 ../edit-urpm-sources.pl_.c:54
-#: ../edit-urpm-sources.pl_.c:56 ../edit-urpm-sources.pl_.c:175
-msgid "URL:"
-msgstr "URL:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during removal"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:54
-msgid "HTTP server"
-msgstr "Freastalaí HTTP:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, removing packages..."
+msgstr ""
+"Fan tamall\n"
+"Ag scrios pacáistí"
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Path or mount point:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, reading packages database..."
 msgstr ""
+"Fan tamall\n"
+"Ag scrios pacáistí"
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Removable device"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:56 ../rpmdrake_.c:548
-msgid "Security updates"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during installation"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:67
-msgid "Browse..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:69
-msgid "Choose a mirror..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:89
-msgid "Login:"
-msgstr "Logann:"
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:89 ../edit-urpm-sources.pl_.c:215
-msgid "Password:"
-msgstr "Pasfhocal:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:94
-msgid "Name:"
-msgstr "Ainm:"
+#: ../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 ""
 
-#: ../edit-urpm-sources.pl_.c:96 ../edit-urpm-sources.pl_.c:176
-msgid "Relative path to synthesis/hdlist:"
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:104
-msgid "You need to fill up at least the two first entries."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"some packages failed to install\n"
+"correctly"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:116
-#, fuzzy
-msgid "Adding a source:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, removing packages to allow others to be upgraded..."
 msgstr ""
 "Fan tamall\n"
 "Ag scrios pacáistí"
 
-#: ../edit-urpm-sources.pl_.c:117
-msgid "Type of source:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:121 ../edit-urpm-sources.pl_.c:187
-#: ../edit-urpm-sources.pl_.c:219 ../rpmdrake.pm_.c:97 ../rpmdrake.pm_.c:136
-#: ../rpmdrake.pm_.c:319 ../rpmdrake_.c:353 ../rpmdrake_.c:365
-#: ../rpmdrake_.c:369 ../rpmdrake_.c:916 ../rpmdrake_.c:950
-msgid "Ok"
-msgstr "Ceart go Leor"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Installation failed"
+msgstr "Ag Feistiú"
 
-#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:180
-#: ../edit-urpm-sources.pl_.c:187 ../edit-urpm-sources.pl_.c:220
-#: ../rpmdrake.pm_.c:319 ../rpmdrake.pm_.c:352 ../rpmdrake_.c:353
-#: ../rpmdrake_.c:950
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
 msgid "Cancel"
 msgstr "Cealaigh"
 
-#: ../edit-urpm-sources.pl_.c:140
-#, fuzzy
-msgid "Please wait, adding medium..."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "Ceart go Leor"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
-"Fan tamall\n"
-"Checking dependencies"
 
-#: ../edit-urpm-sources.pl_.c:158
-#, fuzzy
-msgid "Please wait, removing medium..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
 msgstr ""
-"Fan tamall\n"
-"Checking dependencies"
 
-#: ../edit-urpm-sources.pl_.c:169
-msgid "Edit a source"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:173
+#: ../rpmdrake:1
 #, c-format
-msgid "Editing source \"%s\":"
+msgid "Unable to get source packages."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:179
-#, fuzzy
-msgid "Save changes"
-msgstr "Pacáistí"
+#: ../rpmdrake:1
+#, c-format
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:185
-msgid "You need to insert the medium to continue"
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:186
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:191
-#, fuzzy
-msgid "Please wait, updating medium..."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Installation finished"
+msgstr "Ag Feistiú"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
 msgstr ""
-"Fan tamall\n"
-"Checking dependencies"
 
-#: ../edit-urpm-sources.pl_.c:202
-msgid "Configure proxies"
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:207
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+#: ../rpmdrake:1
+#, c-format
+msgid "Remove .%s"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:209
-msgid "Proxy hostname:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "changes:"
+msgstr "Pacáistí"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:211
-msgid "You may specify a user/password for the proxy authentication:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, finding available packages..."
 msgstr ""
+"Fan tamall\n"
+"Ag scrios pacáistí"
 
-#: ../edit-urpm-sources.pl_.c:213
-msgid "User:"
+#: ../rpmdrake:1
+#, c-format
+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 ""
 
-#: ../edit-urpm-sources.pl_.c:235
-msgid "Configure sources"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:242
-msgid "Enabled?"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:243
-msgid "Source"
-msgstr "Bún"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Sources Manager, and then add a `Security\n"
+"updates' source.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:264 ../rpmdrake_.c:730
-msgid "Remove"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:266
-msgid "Edit"
-msgstr "Eagar"
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:268
-msgid "Add..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:270
-msgid "Update..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:271
-#, fuzzy
-msgid "Proxy..."
-msgstr "Earraidh..."
+#: ../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 ""
 
-#: ../edit-urpm-sources.pl_.c:274
-msgid "Save and quit"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Software Packages Installation"
+msgstr "Bainisteoir Bog-Earraí"
+
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, c-format
+msgid "Mandrake Update"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:275 ../rpmdrake_.c:733
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Software Packages Removal"
+msgstr "Bainisteoir Bog-Earraí"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
 msgid "Quit"
 msgstr "Éirigh"
 
-#: ../rpmdrake.pm_.c:93
-msgid "Yes"
-msgstr ""
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "Ag Feistiú:"
 
-#: ../rpmdrake.pm_.c:95
-msgid "No"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:127
-msgid "Info..."
-msgstr ""
+#: ../rpmdrake:1
+#, c-format
+msgid "Search"
+msgstr "Cuardaigh"
 
-#: ../rpmdrake.pm_.c:180
-msgid "Austria"
-msgstr ""
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "Faigh:"
 
-#: ../rpmdrake.pm_.c:181
-msgid "Australia"
+#: ../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 ""
 
-#: ../rpmdrake.pm_.c:182
-msgid "Belgium"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:183
-msgid "Brazil"
+#: ../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 ""
 
-#: ../rpmdrake.pm_.c:184
-msgid "Canada"
+#: ../rpmdrake:1
+#, c-format
+msgid "Too many packages are selected"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:185
-msgid "Costa Rica"
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:186
-msgid "Czech Republic"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal information"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:187
-msgid "Germany"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update source(s)"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:188
-msgid "Danmark"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reload the packages list"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:189 ../rpmdrake.pm_.c:193
-msgid "Greece"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:190
-msgid "Spain"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "in files"
+msgstr "Áit"
 
-#: ../rpmdrake.pm_.c:191
-#, fuzzy
-msgid "Finland"
-msgstr "Faigh:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "in descriptions"
+msgstr "Cuntasaí"
 
-#: ../rpmdrake.pm_.c:192
-#, fuzzy
-msgid "France"
-msgstr "Cealaigh"
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
+msgstr ""
 
-#: ../rpmdrake.pm_.c:194
-#, fuzzy
-msgid "Israel"
-msgstr "Ag Feistiú"
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
+msgstr ""
 
-#: ../rpmdrake.pm_.c:195
-#, fuzzy
-msgid "Italy"
-msgstr "Ag Feistiú"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
+msgstr ""
 
-#: ../rpmdrake.pm_.c:196
-msgid "Japan"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:197
-msgid "Korea"
+#: ../rpmdrake:1
+#, c-format
+msgid "by size"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:198
-msgid "Netherlands"
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:199
-msgid "Norway"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "All packages,"
 msgstr ""
+"Fan tamall\n"
+"Ag scrios pacáistí"
 
-#: ../rpmdrake.pm_.c:200
-msgid "Poland"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:201
-#, fuzzy
-msgid "Portugal"
-msgstr "Port:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
+msgstr ""
 
-#: ../rpmdrake.pm_.c:202
-msgid "Russia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal updates"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:203
-msgid "Sweden"
+#: ../rpmdrake:1
+#, c-format
+msgid "Bugfixes updates"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:204
-msgid "Taiwan"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:205
-msgid "United Kingdom"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Description: "
+msgstr "Cuntasaí"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Summary: "
+msgstr "Coimriú"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
 msgstr ""
 
-#: ../rpmdrake.pm_.c:206
-msgid "China"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "%s KB"
+msgstr "%.1f KB"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Size: "
+msgstr "Meid: "
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Version: "
+msgstr "Leagan:"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "Ainm: "
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
 msgstr ""
 
-#: ../rpmdrake.pm_.c:207 ../rpmdrake.pm_.c:208 ../rpmdrake.pm_.c:209
-#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:261
-msgid "United States"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
 msgstr ""
 
-#: ../rpmdrake.pm_.c:274
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+#: ../rpmdrake:1
+#, c-format
+msgid "Source: "
+msgstr "Bún: "
+
+#: ../rpmdrake:1
+#, c-format
+msgid "(Not available)"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:280
-msgid "Error during download"
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:289
-#, fuzzy
-msgid "No mirror"
-msgstr "Gan earraidh"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Files:\n"
+msgstr "/_Comhad"
 
-#: ../rpmdrake.pm_.c:307
-msgid "Please choose the desired mirror."
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected size: %d MB"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:339 ../rpmdrake_.c:627
-msgid "Update source(s)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:343
-msgid "Select the source(s) you wish to update:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:347
-#, fuzzy
-msgid "Update"
-msgstr "slí"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+msgstr ""
 
-#: ../rpmdrake.pm_.c:358
-#, fuzzy
-msgid "Please wait, updating media..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be installed"
 msgstr ""
-"Fan tamall\n"
-"Checking dependencies"
 
-#: ../rpmdrake_.c:99
-msgid "Other"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
 msgstr ""
 
-#: ../rpmdrake_.c:121 ../rpmdrake_.c:135 ../rpmdrake_.c:227 ../rpmdrake_.c:298
-msgid "(none)"
-msgstr "(ar bith)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Additional packages needed"
+msgstr ""
 
-#: ../rpmdrake_.c:141 ../rpmdrake_.c:482 ../rpmdrake_.c:483
-msgid "(Not available)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be removed"
 msgstr ""
 
-#: ../rpmdrake_.c:151 ../rpmdrake_.c:208
-#, fuzzy
-msgid "Search results"
-msgstr "Cuardaigh"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
 
-#: ../rpmdrake_.c:151
-#, fuzzy
-msgid "Search results (none)"
-msgstr "Cuardaigh"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
 
-#: ../rpmdrake_.c:161 ../rpmdrake_.c:172
-#, fuzzy
-msgid "Please wait, searching..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Some additional packages need to be removed"
 msgstr ""
-"Fan tamall\n"
-"Ag scrios pacáistí"
 
-#: ../rpmdrake_.c:175
-msgid "Stop"
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
 msgstr ""
 
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-#, fuzzy
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Information on packages"
+msgstr "Gan aithne"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
+msgstr ""
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
 msgid "Addable"
 msgstr "Ag Feistiú"
 
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
+#: ../rpmdrake:1
+#, c-format
 msgid "Upgradable"
 msgstr ""
 
-#: ../rpmdrake_.c:211
-#, fuzzy
-msgid "Not selected"
-msgstr "Tóg gach rud"
+#: ../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_.c:211
-#, fuzzy
-msgid "Selected"
-msgstr "Tóg gach rud"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "No update"
+msgstr "slí"
 
-#: ../rpmdrake_.c:240
-msgid "rpmdrake"
-msgstr "rpmdrake"
+#: ../rpmdrake:1
+#, c-format
+msgid "(none)"
+msgstr "(ar bith)"
 
-#: ../rpmdrake_.c:258 ../rpmdrake_.c:360 ../rpmdrake_.c:362
-msgid "More information on package..."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, listing packages..."
 msgstr ""
+"Fan tamall\n"
+"Ag scrios pacáistí"
 
-#: ../rpmdrake_.c:259
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "Gan aithne"
+
+#: ../rpmdrake:1
+#, c-format
 msgid "One of the following packages is needed:"
 msgstr ""
 
-#: ../rpmdrake_.c:259
-#, fuzzy
+#: ../rpmdrake:1
+#, fuzzy, c-format
 msgid "Please choose"
 msgstr "Cinntigh, le do thoil"
 
-#: ../rpmdrake_.c:275
-#, fuzzy
-msgid "unknown package "
-msgstr "Gan aithne"
-
-#: ../rpmdrake_.c:285
-#, fuzzy
-msgid "Please wait, listing packages..."
-msgstr ""
-"Fan tamall\n"
-"Ag scrios pacáistí"
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:300
-#, fuzzy
-msgid "No update"
-msgstr "slí"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Not selected"
+msgstr "Tóg gach rud"
 
-#: ../rpmdrake_.c:353 ../rpmdrake_.c:354
-msgid "More infos"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Selected"
+msgstr "Tóg gach rud"
 
-#: ../rpmdrake_.c:355
-#, fuzzy
-msgid "Information on packages"
-msgstr "Gan aithne"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Search results"
+msgstr "Cuardaigh"
 
-#: ../rpmdrake_.c:376
-msgid "Some additional packages need to be removed"
+#: ../rpmdrake:1
+#, c-format
+msgid "Stop"
 msgstr ""
 
-#: ../rpmdrake_.c:377
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, searching..."
 msgstr ""
+"Fan tamall\n"
+"Ag scrios pacáistí"
 
-#: ../rpmdrake_.c:383 ../rpmdrake_.c:391
-msgid "Some packages can't be removed"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Search results (none)"
+msgstr "Cuardaigh"
 
-#: ../rpmdrake_.c:384
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
 msgstr ""
 
-#: ../rpmdrake_.c:392 ../rpmdrake_.c:451
+#: ../edit-urpm-sources.pl:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"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_.c:421
-msgid "Additional packages needed"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
 msgstr ""
 
-#: ../rpmdrake_.c:422
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Proxy..."
+msgstr "Earraidh..."
 
-#: ../rpmdrake_.c:435
-msgid "Some packages can't be installed"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
 msgstr ""
 
-#: ../rpmdrake_.c:436
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
 msgstr ""
 
-#: ../rpmdrake_.c:450 ../rpmdrake_.c:684
-msgid "Some packages need to be removed"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "Eagar"
 
-#: ../rpmdrake_.c:472
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
+msgid "Source"
+msgstr "Bún"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
 msgstr ""
 
-#: ../rpmdrake_.c:474
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected size: %d MB"
+msgid "Configure sources"
 msgstr ""
 
-#: ../rpmdrake_.c:482
-#, fuzzy
-msgid "Files:\n"
-msgstr "/_Comhad"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "Pasfhocal:"
 
-#: ../rpmdrake_.c:483
-msgid "Changelog:\n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
 msgstr ""
 
-#: ../rpmdrake_.c:486
-msgid "Source: "
-msgstr "Bún: "
-
-#: ../rpmdrake_.c:487
-msgid "Currently installed version: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 
-#: ../rpmdrake_.c:491
-msgid "Reason for update: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
 msgstr ""
 
-#: ../rpmdrake_.c:493
-msgid "Name: "
-msgstr "Ainm: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
 
-#: ../rpmdrake_.c:494
-#, fuzzy
-msgid "Version: "
-msgstr "Leagan:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr ""
 
-#: ../rpmdrake_.c:495
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "%s KB"
-msgstr "%.1f KB"
-
-#: ../rpmdrake_.c:495
-msgid "Size: "
-msgstr "Meid: "
+msgid "Please wait, updating medium..."
+msgstr ""
+"Fan tamall\n"
+"Checking dependencies"
 
-#: ../rpmdrake_.c:497
-msgid "Importance: "
+#: ../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_.c:498
-#, fuzzy
-msgid "Summary: "
-msgstr "Coimriú"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
+msgstr ""
 
-#: ../rpmdrake_.c:499
-#, fuzzy
-msgid "Description: "
-msgstr "Cuntasaí"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Save changes"
+msgstr "Pacáistí"
 
-#: ../rpmdrake_.c:548
-msgid "Bugfixes updates"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
 msgstr ""
 
-#: ../rpmdrake_.c:548
-msgid "Normal updates"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake_.c:567
-msgid "Mandrake choices"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Editing source \"%s\":"
 msgstr ""
 
-#: ../rpmdrake_.c:568
-msgid "All packages, alphabetical"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit a source"
 msgstr ""
 
-#: ../rpmdrake_.c:569
-#, fuzzy
-msgid "All packages,"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, removing medium..."
 msgstr ""
 "Fan tamall\n"
-"Ag scrios pacáistí"
+"Checking dependencies"
 
-#: ../rpmdrake_.c:592
-msgid "by group"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, adding medium..."
 msgstr ""
+"Fan tamall\n"
+"Checking dependencies"
 
-#: ../rpmdrake_.c:592
-msgid "by size"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of source:"
 msgstr ""
 
-#: ../rpmdrake_.c:593
-msgid "by selection state"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Adding a source:"
 msgstr ""
+"Fan tamall\n"
+"Ag scrios pacáistí"
 
-#: ../rpmdrake_.c:594
-msgid "by source repository"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 msgstr ""
 
-#: ../rpmdrake_.c:594
-msgid "by update availability"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to fill up at least the two first entries."
 msgstr ""
 
-#: ../rpmdrake_.c:615
-#, fuzzy
-msgid "in descriptions"
-msgstr "Cuntasaí"
-
-#: ../rpmdrake_.c:615
-#, fuzzy
-msgid "in files"
-msgstr "Áit"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "Ainm:"
 
-#: ../rpmdrake_.c:615
-msgid "in names"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
+msgstr "Logann:"
 
-#: ../rpmdrake_.c:626
-msgid "Reload the packages list"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
 msgstr ""
 
-#: ../rpmdrake_.c:626
-msgid "Reset the selection"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Browse..."
 msgstr ""
 
-#: ../rpmdrake_.c:652
-msgid "Maximum information"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
 msgstr ""
 
-#: ../rpmdrake_.c:652
-msgid "Normal information"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Removable device"
 msgstr ""
 
-#: ../rpmdrake_.c:674
-msgid "Too many packages are selected"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "HTTP server"
+msgstr "Freastalaí HTTP:"
 
-#: ../rpmdrake_.c:720
-msgid "Find:"
-msgstr "Faigh:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "Freastalaí FTP:"
 
-#: ../rpmdrake_.c:725
-msgid "Search"
-msgstr "Cuardaigh"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path:"
+msgstr "Slí:"
 
-#: ../rpmdrake_.c:731
-msgid "Install"
-msgstr "Ag Feistiú:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "Comhaid Áitiúl"
 
-#: ../rpmdrake_.c:738 data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrake Update"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a source"
 msgstr ""
+"Fan tamall\n"
+"Ag scrios pacáistí"
 
-#: ../rpmdrake_.c:738
-#, fuzzy
-msgid "Software Packages Installation"
-msgstr "Bainisteoir Bog-Earraí"
-
-#: ../rpmdrake_.c:738
-#, fuzzy
-msgid "Software Packages Removal"
-msgstr "Bainisteoir Bog-Earraí"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
+msgstr ""
 
-#: ../rpmdrake_.c:779
-msgid "Please wait, contacting mirror to update packages information."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to create medium."
 msgstr ""
 
-#: ../rpmdrake_.c:781
-msgid "Error updating medium"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Please wait, updating media..."
 msgstr ""
+"Fan tamall\n"
+"Checking dependencies"
 
-#: ../rpmdrake_.c:782
-msgid "There was an unrecoverable error while updating packages information."
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update"
+msgstr "slí"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Select the source(s) you wish to update:"
 msgstr ""
 
-#: ../rpmdrake_.c:787
-msgid "How to choose manually your mirror"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please choose the desired mirror."
 msgstr ""
 
-#: ../rpmdrake_.c:795
-msgid "Please wait, contacting mirror to initialize updates packages."
+#: ../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_.c:798
-msgid "Error adding update medium"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "No mirror"
+msgstr "Gan earraidh"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid ""
+"There was an error downloading the mirrors list:\n"
+"\n"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
 
-#: ../rpmdrake_.c:829
-#, fuzzy
-msgid "Please wait, finding available packages..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
 msgstr ""
-"Fan tamall\n"
-"Ag scrios pacáistí"
 
-#: ../rpmdrake_.c:861
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Inspecting %s"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
 
-#: ../rpmdrake_.c:880
-#, fuzzy
-msgid "changes:"
-msgstr "Pacáistí"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
 
-#: ../rpmdrake_.c:884
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Remove .%s"
+msgid "United States"
 msgstr ""
 
-#: ../rpmdrake_.c:886
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Use .%s as main file"
+msgid "China"
 msgstr ""
 
-#: ../rpmdrake_.c:888
-msgid "Do nothing"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
 msgstr ""
 
-#: ../rpmdrake_.c:900
-#, fuzzy
-msgid "Installation finished"
-msgstr "Ag Feistiú"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr ""
 
-#: ../rpmdrake_.c:910
-msgid "Inspect..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
 msgstr ""
 
-#: ../rpmdrake_.c:925
-msgid "Program missing"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
 msgstr ""
 
-#: ../rpmdrake_.c:926
-msgid "A required program is missing (grpmi). Check your installation."
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Portugal"
+msgstr "Port:"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
 msgstr ""
 
-#: ../rpmdrake_.c:940
-msgid "Unable to get source packages."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
 msgstr ""
 
-#: ../rpmdrake_.c:941
-msgid "Unable to get source packages, sorry."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
 msgstr ""
 
-#: ../rpmdrake_.c:948
-msgid "Change medium"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Korea"
 msgstr ""
 
-#: ../rpmdrake_.c:949
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+msgid "Japan"
 msgstr ""
 
-#: ../rpmdrake_.c:957
-#, fuzzy
-msgid "Installation failed"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Italy"
 msgstr "Ag Feistiú"
 
-#: ../rpmdrake_.c:958
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-
-#: ../rpmdrake_.c:961
-#, fuzzy
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr ""
-"Fan tamall\n"
-"Ag scrios pacáistí"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Israel"
+msgstr "Ag Feistiú"
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm: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 "Greece"
 msgstr ""
 
-#: ../rpmdrake_.c:982
-msgid ""
-"some packages failed to install\n"
-"correctly"
-msgstr ""
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "France"
+msgstr "Cealaigh"
 
-#: ../rpmdrake_.c:983
-msgid "everything was installed correctly"
-msgstr ""
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Finland"
+msgstr "Faigh:"
 
-#: ../rpmdrake_.c:985
-msgid "Everything installed successfully"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
 msgstr ""
 
-#: ../rpmdrake_.c:986
-msgid "All requested packages were installed successfully."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
 msgstr ""
 
-#: ../rpmdrake_.c:989
-msgid "Everything already installed."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
 msgstr ""
 
-#: ../rpmdrake_.c:990
-msgid "Everything already installed (is this supposed to happen at all?)."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
 msgstr ""
 
-#: ../rpmdrake_.c:997
-msgid "Problem during installation"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Costa Rica"
 msgstr ""
 
-#: ../rpmdrake_.c:998
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
+msgid "Canada"
 msgstr ""
 
-#: ../rpmdrake_.c:1012
-#, fuzzy
-msgid "Please wait, reading packages database..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
 msgstr ""
-"Fan tamall\n"
-"Ag scrios pacáistí"
 
-#: ../rpmdrake_.c:1053
-#, fuzzy
-msgid "Please wait, removing packages..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Belgium"
 msgstr ""
-"Fan tamall\n"
-"Ag scrios pacáistí"
 
-#: ../rpmdrake_.c:1056
-msgid "Problem during removal"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Australia"
 msgstr ""
 
-#: ../rpmdrake_.c:1057
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
+msgid "Austria"
 msgstr ""
 
-#: ../rpmdrake_.c:1089
-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."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Info..."
 msgstr ""
 
-#: ../rpmdrake_.c:1094
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
 msgstr ""
 
-#: ../rpmdrake_.c:1099
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
 msgstr ""
 
+#: data/rpmdrake.desktop.in.h:1
+#, fuzzy
+msgid "Install Software"
+msgstr "Feist gach rud"
+
 #: data/rpmdrake-remove.desktop.in.h:1
 msgid "Remove Software"
 msgstr ""
@@ -911,11 +1160,6 @@ msgstr ""
 msgid "Software Sources Manager"
 msgstr ""
 
-#: data/rpmdrake.desktop.in.h:1
-#, fuzzy
-msgid "Install Software"
-msgstr "Feist gach rud"
-
 #~ msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
 #~ msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
 
diff --git a/po/ga.pom b/po/ga.pom
index 07f1b311..2dcf43ab 100644
--- a/po/ga.pom
+++ b/po/ga.pom
@@ -4,169 +4,172 @@ msgstr "Freastalaí"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Greasan/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Network Computer (client)"
-msgstr "Printéir Gréasán (lpd)"
+msgid "Office Workstation"
+msgstr "Stáisiún Oibre"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Oifig"
+msgid "Workstation"
+msgstr "Stáisiún Oibre"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Stáisiún Gnome"
+msgid "Game station"
+msgstr "Stáisiún Cluichí"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
+msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Stáisiún Oibre"
+#, fuzzy
+msgid "Multimedia station"
+msgstr "Stáisiún Ilmheánach"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
+msgid "Sound and video playing/editing programs"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr ""
+msgid "Internet station"
+msgstr "Stáisiún Idirlíon"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr ""
+#, fuzzy
+msgid "Network Computer (client)"
+msgstr "Printéir Gréasán (lpd)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
+msgid "Clients for different protocols including ssh"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr ""
+msgid "Configuration"
+msgstr "cumraíocht"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "Stáisiún KDE"
+#, fuzzy
+msgid "Tools to ease the configuration of your computer"
+msgstr "An bhfuil tú ag iarraidh an cumraíocht a thrial?"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr ""
+#, fuzzy
+msgid "Scientific Workstation"
+msgstr "Stáisiún Oibre"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Multimedia - Video"
-msgstr "Ilmheánach"
+msgid "Scientific applications such as gnuplot"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgid "Console Tools"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Database"
+msgid "Editors, shells, file tools, terminals"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr ""
+msgid "KDE Workstation"
+msgstr "Stáisiún KDE"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Tools to ease the configuration of your computer"
-msgstr "An bhfuil tú ag iarraidh an cumraíocht a thrial?"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Multimedia - Sound"
-msgstr "Ilmheánach"
+msgid "Graphical Environment"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Documentation"
-msgstr "Áit"
+msgid "Gnome Workstation"
+msgstr "Stáisiún Gnome"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Console Tools"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
+msgid "Other Graphical Desktops"
+msgstr "Deasc Graphaicí Eile"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Stáisiún Idirlíon"
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+msgid "Development"
+msgstr "Forbairt"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Multimedia station"
-msgstr "Stáisiún Ilmheánach"
+msgid "C and C++ development libraries, programs and include files"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "cumraíocht"
+#, fuzzy
+msgid "Documentation"
+msgstr "Áit"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
+msgid "Books and Howto's on Linux and Free Software"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
+msgid "LSB"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
+msgid "Linux Standard Base. Third party applications support"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-msgid "Development"
-msgstr "Forbairt"
+msgid "Web/FTP"
+msgstr "Greasan/FTP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -175,22 +178,32 @@ msgstr "Apache, Pro-ftpd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
+msgid "Mail/Groupware/News"
+msgstr "Post/Nuacht/Groupware"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Postfix mail server, Inn news server"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Stáisiún Oibre"
+msgid "Database"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgid "PostgreSQL or MySQL database server"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
+msgid "Firewall/Router"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Internet gateway"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
@@ -200,7 +213,7 @@ msgstr "DNS/NIS "
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
+msgid "Domain Name and Network Information Server"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
@@ -211,17 +224,17 @@ msgstr "Cláréadan Gréasán"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "Post/Nuacht/Groupware"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Stáisiún Cluichí"
+msgid "Office"
+msgstr "Oifig"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
@@ -232,77 +245,69 @@ msgstr "Ilmheánach"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
+msgid "Graphics programs such as The Gimp"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
+#, fuzzy
+msgid "Multimedia - Sound"
+msgstr "Ilmheánach"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
+#, fuzzy
+msgid "Multimedia - Video"
+msgstr "Ilmheánach"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
+msgid "Video players and editors"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "LSB"
-msgstr ""
+#, fuzzy
+msgid "Multimedia - CD Burning"
+msgstr "Ilmheánach"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet gateway"
+msgid "Tools to create and burn CD's"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
+msgid "More Graphical Desktops (Gnome, IceWM)"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Deasc Graphaicí Eile"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
+msgid "Personal Information Management"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
+msgid "Tools for your Palm Pilot or your Visor"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
+msgid "Personal Finance"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Multimedia - CD Burning"
-msgstr "Ilmheánach"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Scientific Workstation"
-msgstr "Stáisiún Oibre"
+msgid "Programs to manage your finances, such as gnucash"
+msgstr ""
 
diff --git a/po/gl.po b/po/gl.po
index b917ed5a..f8255233 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2003-01-19 16:57+0100\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\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,872 +13,1123 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl_.c:39
-msgid "Unable to create medium."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:40
-msgid "Unable to update medium; it will be automatically disabled."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to the software installation tool!\n"
+"\n"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:51
-#, fuzzy
-msgid "Add a source"
-msgstr "Medio"
+#: ../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 ""
 
-#: ../edit-urpm-sources.pl_.c:52
-#, fuzzy
-msgid "Local files"
-msgstr "Etiqueta"
+#: ../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_.c:52
-msgid "Path:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:53
-msgid "FTP server"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during removal"
+msgstr "Preparando para a instalación"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, removing packages..."
+msgstr "Agarde, por favor"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:53 ../edit-urpm-sources.pl_.c:54
-#: ../edit-urpm-sources.pl_.c:56 ../edit-urpm-sources.pl_.c:175
-msgid "URL:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:54
-msgid "HTTP server"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during installation"
+msgstr "Preparando para a instalación"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Path or mount point:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Removable device"
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:56 ../rpmdrake_.c:548
-msgid "Security updates"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:67
-msgid "Browse..."
+#: ../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 ""
 
-#: ../edit-urpm-sources.pl_.c:69
-msgid "Choose a mirror..."
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:89
-msgid "Login:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"some packages failed to install\n"
+"correctly"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:89 ../edit-urpm-sources.pl_.c:215
-msgid "Password:"
-msgstr "Contrasinal:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages to allow others to be upgraded..."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:94
-msgid "Name:"
-msgstr "Nome:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:96 ../edit-urpm-sources.pl_.c:176
-msgid "Relative path to synthesis/hdlist:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Installation failed"
+msgstr "Instalando "
+
+#: ../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
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:104
-msgid "You need to fill up at least the two first entries."
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:116
-#, fuzzy
-msgid "Adding a source:"
-msgstr "Medio"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:117
-msgid "Type of source:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:121 ../edit-urpm-sources.pl_.c:187
-#: ../edit-urpm-sources.pl_.c:219 ../rpmdrake.pm_.c:97 ../rpmdrake.pm_.c:136
-#: ../rpmdrake.pm_.c:319 ../rpmdrake_.c:353 ../rpmdrake_.c:365
-#: ../rpmdrake_.c:369 ../rpmdrake_.c:916 ../rpmdrake_.c:950
-msgid "Ok"
-msgstr "Aceptar"
+#: ../rpmdrake:1
+#, c-format
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:180
-#: ../edit-urpm-sources.pl_.c:187 ../edit-urpm-sources.pl_.c:220
-#: ../rpmdrake.pm_.c:319 ../rpmdrake.pm_.c:352 ../rpmdrake_.c:353
-#: ../rpmdrake_.c:950
-msgid "Cancel"
-msgstr "Cancelar"
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:140
-#, fuzzy
-msgid "Please wait, adding medium..."
-msgstr "Agarde, por favor"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:158
-msgid "Please wait, removing medium..."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Installation finished"
+msgstr "Instalando "
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:169
-#, fuzzy
-msgid "Edit a source"
-msgstr "Medio"
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:173
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "Medio"
+msgid "Remove .%s"
+msgstr "Quitar"
 
-#: ../edit-urpm-sources.pl_.c:179
-#, fuzzy
-msgid "Save changes"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "changes:"
 msgstr "Paquetes"
 
-#: ../edit-urpm-sources.pl_.c:185
-msgid "You need to insert the medium to continue"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:186
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, finding available packages..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:191
-#, fuzzy
-msgid "Please wait, updating medium..."
-msgstr "Agarde, por favor"
-
-#: ../edit-urpm-sources.pl_.c:202
-#, fuzzy
-msgid "Configure proxies"
-msgstr "Engadir usuario"
-
-#: ../edit-urpm-sources.pl_.c:207
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+"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 ""
 
-#: ../edit-urpm-sources.pl_.c:209
-msgid "Proxy hostname:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:211
-msgid "You may specify a user/password for the proxy authentication:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:213
-msgid "User:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Sources Manager, and then add a `Security\n"
+"updates' source.\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:235
-#, fuzzy
-msgid "Configure sources"
-msgstr "Engadir usuario"
-
-#: ../edit-urpm-sources.pl_.c:242
-msgid "Enabled?"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:243
-#, fuzzy
-msgid "Source"
-msgstr "Forzar"
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:264 ../rpmdrake_.c:730
-#, fuzzy
-msgid "Remove"
-msgstr "Quitar"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:266
-msgid "Edit"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:268
-msgid "Add..."
+#: ../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 ""
 
-#: ../edit-urpm-sources.pl_.c:270
-msgid "Update..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Installation"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:271
-#, fuzzy
-msgid "Proxy..."
-msgstr "Erro..."
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, c-format
+msgid "Mandrake Update"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:274
-msgid "Save and quit"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:275 ../rpmdrake_.c:733
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
 msgid "Quit"
 msgstr "Saír"
 
-#: ../rpmdrake.pm_.c:93
-msgid "Yes"
-msgstr ""
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "Instalar"
 
-#: ../rpmdrake.pm_.c:95
-msgid "No"
-msgstr ""
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Remove"
+msgstr "Quitar"
 
-#: ../rpmdrake.pm_.c:127
-msgid "Info..."
-msgstr ""
+#: ../rpmdrake:1
+#, c-format
+msgid "Search"
+msgstr "Buscar"
 
-#: ../rpmdrake.pm_.c:180
-msgid "Austria"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:181
-msgid "Australia"
+#: ../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 ""
 
-#: ../rpmdrake.pm_.c:182
-msgid "Belgium"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:183
-msgid "Brazil"
+#: ../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 ""
 
-#: ../rpmdrake.pm_.c:184
-msgid "Canada"
+#: ../rpmdrake:1
+#, c-format
+msgid "Too many packages are selected"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:185
-msgid "Costa Rica"
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:186
-msgid "Czech Republic"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Normal information"
+msgstr "Actualización de Linux-Mandrake"
+
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update source(s)"
+msgstr "Medio"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Reload the packages list"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:187
-msgid "Germany"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:188
-msgid "Danmark"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "in files"
+msgstr "Etiqueta"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "in descriptions"
+msgstr "Descripcións"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:189 ../rpmdrake.pm_.c:193
-msgid "Greece"
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:190
-msgid "Spain"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:191
-msgid "Finland"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:192
-#, fuzzy
-msgid "France"
-msgstr "Cancelar"
+#: ../rpmdrake:1
+#, c-format
+msgid "by size"
+msgstr ""
 
-#: ../rpmdrake.pm_.c:194
-#, fuzzy
-msgid "Israel"
-msgstr "Instalando"
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
+msgstr ""
 
-#: ../rpmdrake.pm_.c:195
-#, fuzzy
-msgid "Italy"
-msgstr "Instalando"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "All packages,"
+msgstr "Desinstalando"
 
-#: ../rpmdrake.pm_.c:196
-msgid "Japan"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:197
-msgid "Korea"
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:198
-msgid "Netherlands"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal updates"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:199
-msgid "Norway"
+#: ../rpmdrake:1
+#, c-format
+msgid "Bugfixes updates"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:200
-msgid "Poland"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:201
-msgid "Portugal"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Description: "
+msgstr "Descripcións"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Summary: "
+msgstr "Resume"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
 msgstr ""
 
-#: ../rpmdrake.pm_.c:202
-msgid "Russia"
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:203
-msgid "Sweden"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Size: "
+msgstr "Tamańo"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Version: "
 msgstr ""
 
-#: ../rpmdrake.pm_.c:204
-msgid "Taiwan"
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "Nome: "
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
 msgstr ""
 
-#: ../rpmdrake.pm_.c:205
-msgid "United Kingdom"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
 msgstr ""
 
-#: ../rpmdrake.pm_.c:206
-msgid "China"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Source: "
+msgstr "Forzar"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "(Not available)"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:207 ../rpmdrake.pm_.c:208 ../rpmdrake.pm_.c:209
-#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:261
-msgid "United States"
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:274
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:280
-msgid "Error during download"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected size: %d MB"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:289
-msgid "No mirror"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:307
-msgid "Please choose the desired mirror."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:339 ../rpmdrake_.c:627
-#, fuzzy
-msgid "Update source(s)"
-msgstr "Medio"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+msgstr ""
 
-#: ../rpmdrake.pm_.c:343
-msgid "Select the source(s) you wish to update:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be installed"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:347
-#, fuzzy
-msgid "Update"
-msgstr "Actualización de Linux-Mandrake"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
+msgstr ""
 
-#: ../rpmdrake.pm_.c:358
-#, fuzzy
-msgid "Please wait, updating media..."
-msgstr "Agarde, por favor"
+#: ../rpmdrake:1
+#, c-format
+msgid "Additional packages needed"
+msgstr ""
 
-#: ../rpmdrake_.c:99
-msgid "Other"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be removed"
 msgstr ""
 
-#: ../rpmdrake_.c:121 ../rpmdrake_.c:135 ../rpmdrake_.c:227 ../rpmdrake_.c:298
-msgid "(none)"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
 msgstr ""
 
-#: ../rpmdrake_.c:141 ../rpmdrake_.c:482 ../rpmdrake_.c:483
-msgid "(Not available)"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
 msgstr ""
 
-#: ../rpmdrake_.c:151 ../rpmdrake_.c:208
-#, fuzzy
-msgid "Search results"
-msgstr "Buscar"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr ""
 
-#: ../rpmdrake_.c:151
-#, fuzzy
-msgid "Search results (none)"
-msgstr "Buscar"
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
+msgstr ""
 
-#: ../rpmdrake_.c:161 ../rpmdrake_.c:172
-#, fuzzy
-msgid "Please wait, searching..."
-msgstr "Agarde, por favor"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Information on packages"
+msgstr "Non se pode abri-lo paquete"
 
-#: ../rpmdrake_.c:175
-msgid "Stop"
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
 msgstr ""
 
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-#, fuzzy
+#: ../rpmdrake:1
+#, fuzzy, c-format
 msgid "Addable"
 msgstr "Instalar sistema"
 
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
+#: ../rpmdrake:1
+#, c-format
 msgid "Upgradable"
 msgstr ""
 
-#: ../rpmdrake_.c:211
-#, fuzzy
-msgid "Not selected"
+#: ../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 ""
-"Des-seleccionar\n"
-"Todos"
 
-#: ../rpmdrake_.c:211
-#, fuzzy
-msgid "Selected"
+#: ../rpmdrake:1
+#, c-format
+msgid "No update"
 msgstr ""
-"Seleccionar\n"
-"Todos"
 
-#: ../rpmdrake_.c:240
-msgid "rpmdrake"
-msgstr "rpmdrake"
+#: ../rpmdrake:1
+#, c-format
+msgid "(none)"
+msgstr ""
 
-#: ../rpmdrake_.c:258 ../rpmdrake_.c:360 ../rpmdrake_.c:362
-msgid "More information on package..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, listing packages..."
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "unknown package "
 msgstr ""
 
-#: ../rpmdrake_.c:259
+#: ../rpmdrake:1
+#, c-format
 msgid "One of the following packages is needed:"
 msgstr ""
 
-#: ../rpmdrake_.c:259
-#, fuzzy
+#: ../rpmdrake:1
+#, fuzzy, c-format
 msgid "Please choose"
 msgstr "Agarde, por favor"
 
-#: ../rpmdrake_.c:275
-msgid "unknown package "
-msgstr ""
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:285
-msgid "Please wait, listing packages..."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Not selected"
 msgstr ""
+"Des-seleccionar\n"
+"Todos"
 
-#: ../rpmdrake_.c:300
-msgid "No update"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Selected"
 msgstr ""
+"Seleccionar\n"
+"Todos"
 
-#: ../rpmdrake_.c:353 ../rpmdrake_.c:354
-msgid "More infos"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Search results"
+msgstr "Buscar"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Stop"
 msgstr ""
 
-#: ../rpmdrake_.c:355
-#, fuzzy
-msgid "Information on packages"
-msgstr "Non se pode abri-lo paquete"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, searching..."
+msgstr "Agarde, por favor"
 
-#: ../rpmdrake_.c:376
-msgid "Some additional packages need to be removed"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Search results (none)"
+msgstr "Buscar"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
 msgstr ""
 
-#: ../rpmdrake_.c:377
+#: ../edit-urpm-sources.pl:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"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_.c:383 ../rpmdrake_.c:391
-msgid "Some packages can't be removed"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
 msgstr ""
 
-#: ../rpmdrake_.c:384
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Proxy..."
+msgstr "Erro..."
 
-#: ../rpmdrake_.c:392 ../rpmdrake_.c:451
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
 msgstr ""
 
-#: ../rpmdrake_.c:421
-msgid "Additional packages needed"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
 msgstr ""
 
-#: ../rpmdrake_.c:422
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
 msgstr ""
 
-#: ../rpmdrake_.c:435
-msgid "Some packages can't be installed"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Source"
+msgstr "Forzar"
 
-#: ../rpmdrake_.c:436
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
 msgstr ""
 
-#: ../rpmdrake_.c:450 ../rpmdrake_.c:684
-msgid "Some packages need to be removed"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure sources"
+msgstr "Engadir usuario"
 
-#: ../rpmdrake_.c:472
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
+msgid "Password:"
+msgstr "Contrasinal:"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
 msgstr ""
 
-#: ../rpmdrake_.c:474
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected size: %d MB"
+msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 
-#: ../rpmdrake_.c:482
-msgid "Files:\n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
 msgstr ""
 
-#: ../rpmdrake_.c:483
-msgid "Changelog:\n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
 msgstr ""
 
-#: ../rpmdrake_.c:486
-#, fuzzy
-msgid "Source: "
-msgstr "Forzar"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure proxies"
+msgstr "Engadir usuario"
 
-#: ../rpmdrake_.c:487
-msgid "Currently installed version: "
+#: ../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 ""
+"In order to save the changes, you need to insert the medium in the drive."
 msgstr ""
 
-#: ../rpmdrake_.c:491
-msgid "Reason for update: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
 msgstr ""
 
-#: ../rpmdrake_.c:493
-msgid "Name: "
-msgstr "Nome: "
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Save changes"
+msgstr "Paquetes"
 
-#: ../rpmdrake_.c:494
-msgid "Version: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
 msgstr ""
 
-#: ../rpmdrake_.c:495
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "%s KB"
+msgid "URL:"
 msgstr ""
 
-#: ../rpmdrake_.c:495
-#, fuzzy
-msgid "Size: "
-msgstr "Tamańo"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing source \"%s\":"
+msgstr "Medio"
 
-#: ../rpmdrake_.c:497
-msgid "Importance: "
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Edit a source"
+msgstr "Medio"
 
-#: ../rpmdrake_.c:498
-#, fuzzy
-msgid "Summary: "
-msgstr "Resume"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr ""
 
-#: ../rpmdrake_.c:499
-#, fuzzy
-msgid "Description: "
-msgstr "Descripcións"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, adding medium..."
+msgstr "Agarde, por favor"
 
-#: ../rpmdrake_.c:548
-msgid "Bugfixes updates"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of source:"
 msgstr ""
 
-#: ../rpmdrake_.c:548
-msgid "Normal updates"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Adding a source:"
+msgstr "Medio"
 
-#: ../rpmdrake_.c:567
-msgid "Mandrake choices"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 msgstr ""
 
-#: ../rpmdrake_.c:568
-msgid "All packages, alphabetical"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to fill up at least the two first entries."
 msgstr ""
 
-#: ../rpmdrake_.c:569
-#, fuzzy
-msgid "All packages,"
-msgstr "Desinstalando"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "Nome:"
 
-#: ../rpmdrake_.c:592
-msgid "by group"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
 msgstr ""
 
-#: ../rpmdrake_.c:592
-msgid "by size"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
 msgstr ""
 
-#: ../rpmdrake_.c:593
-msgid "by selection state"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Browse..."
 msgstr ""
 
-#: ../rpmdrake_.c:594
-msgid "by source repository"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
 msgstr ""
 
-#: ../rpmdrake_.c:594
-msgid "by update availability"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Removable device"
 msgstr ""
 
-#: ../rpmdrake_.c:615
-#, fuzzy
-msgid "in descriptions"
-msgstr "Descripcións"
-
-#: ../rpmdrake_.c:615
-#, fuzzy
-msgid "in files"
-msgstr "Etiqueta"
-
-#: ../rpmdrake_.c:615
-msgid "in names"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "HTTP server"
 msgstr ""
 
-#: ../rpmdrake_.c:626
-msgid "Reload the packages list"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
 msgstr ""
 
-#: ../rpmdrake_.c:626
-msgid "Reset the selection"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path:"
 msgstr ""
 
-#: ../rpmdrake_.c:652
-msgid "Maximum information"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Local files"
+msgstr "Etiqueta"
 
-#: ../rpmdrake_.c:652
-#, fuzzy
-msgid "Normal information"
-msgstr "Actualización de Linux-Mandrake"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a source"
+msgstr "Medio"
 
-#: ../rpmdrake_.c:674
-msgid "Too many packages are selected"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
 msgstr ""
 
-#: ../rpmdrake_.c:720
-msgid "Find:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to create medium."
 msgstr ""
 
-#: ../rpmdrake_.c:725
-msgid "Search"
-msgstr "Buscar"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Please wait, updating media..."
+msgstr "Agarde, por favor"
 
-#: ../rpmdrake_.c:731
-msgid "Install"
-msgstr "Instalar"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update"
+msgstr "Actualización de Linux-Mandrake"
 
-#: ../rpmdrake_.c:738 data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrake Update"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Select the source(s) you wish to update:"
 msgstr ""
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Installation"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please choose the desired mirror."
 msgstr ""
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Removal"
+#: ../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_.c:779
-msgid "Please wait, contacting mirror to update packages information."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
 msgstr ""
 
-#: ../rpmdrake_.c:781
-msgid "Error updating medium"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid ""
+"There was an error downloading the mirrors list:\n"
+"\n"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
 
-#: ../rpmdrake_.c:782
-msgid "There was an unrecoverable error while updating packages information."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
 msgstr ""
 
-#: ../rpmdrake_.c:787
-msgid "How to choose manually your mirror"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
 
-#: ../rpmdrake_.c:795
-msgid "Please wait, contacting mirror to initialize updates packages."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake_.c:798
-msgid "Error adding update medium"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United States"
 msgstr ""
 
-#: ../rpmdrake_.c:829
-msgid "Please wait, finding available packages..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
 msgstr ""
 
-#: ../rpmdrake_.c:861
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Inspecting %s"
+msgid "United Kingdom"
 msgstr ""
 
-#: ../rpmdrake_.c:880
-#, fuzzy
-msgid "changes:"
-msgstr "Paquetes"
-
-#: ../rpmdrake_.c:884
-#, fuzzy, c-format
-msgid "Remove .%s"
-msgstr "Quitar"
-
-#: ../rpmdrake_.c:886
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Use .%s as main file"
+msgid "Taiwan"
 msgstr ""
 
-#: ../rpmdrake_.c:888
-msgid "Do nothing"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
 msgstr ""
 
-#: ../rpmdrake_.c:900
-#, fuzzy
-msgid "Installation finished"
-msgstr "Instalando "
-
-#: ../rpmdrake_.c:910
-msgid "Inspect..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
 msgstr ""
 
-#: ../rpmdrake_.c:925
-msgid "Program missing"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Portugal"
 msgstr ""
 
-#: ../rpmdrake_.c:926
-msgid "A required program is missing (grpmi). Check your installation."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
 msgstr ""
 
-#: ../rpmdrake_.c:940
-msgid "Unable to get source packages."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
 msgstr ""
 
-#: ../rpmdrake_.c:941
-msgid "Unable to get source packages, sorry."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
 msgstr ""
 
-#: ../rpmdrake_.c:948
-msgid "Change medium"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Korea"
 msgstr ""
 
-#: ../rpmdrake_.c:949
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+msgid "Japan"
 msgstr ""
 
-#: ../rpmdrake_.c:957
-#, fuzzy
-msgid "Installation failed"
-msgstr "Instalando "
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Italy"
+msgstr "Instalando"
 
-#: ../rpmdrake_.c:958
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Israel"
+msgstr "Instalando"
 
-#: ../rpmdrake_.c:961
-msgid "Please wait, removing packages to allow others to be upgraded..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
 msgstr ""
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "France"
+msgstr "Cancelar"
+
+#: ../rpmdrake.pm: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 "Finland"
 msgstr ""
 
-#: ../rpmdrake_.c:982
-msgid ""
-"some packages failed to install\n"
-"correctly"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
 msgstr ""
 
-#: ../rpmdrake_.c:983
-msgid "everything was installed correctly"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
 msgstr ""
 
-#: ../rpmdrake_.c:985
-msgid "Everything installed successfully"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
 msgstr ""
 
-#: ../rpmdrake_.c:986
-msgid "All requested packages were installed successfully."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
 msgstr ""
 
-#: ../rpmdrake_.c:989
-msgid "Everything already installed."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Costa Rica"
 msgstr ""
 
-#: ../rpmdrake_.c:990
-msgid "Everything already installed (is this supposed to happen at all?)."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Canada"
 msgstr ""
 
-#: ../rpmdrake_.c:997
-#, fuzzy
-msgid "Problem during installation"
-msgstr "Preparando para a instalación"
-
-#: ../rpmdrake_.c:998
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
+msgid "Brazil"
 msgstr ""
 
-#: ../rpmdrake_.c:1012
-msgid "Please wait, reading packages database..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Belgium"
 msgstr ""
 
-#: ../rpmdrake_.c:1053
-#, fuzzy
-msgid "Please wait, removing packages..."
-msgstr "Agarde, por favor"
-
-#: ../rpmdrake_.c:1056
-#, fuzzy
-msgid "Problem during removal"
-msgstr "Preparando para a instalación"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Australia"
+msgstr ""
 
-#: ../rpmdrake_.c:1057
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
+msgid "Austria"
 msgstr ""
 
-#: ../rpmdrake_.c:1089
-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."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Info..."
 msgstr ""
 
-#: ../rpmdrake_.c:1094
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
 msgstr ""
 
-#: ../rpmdrake_.c:1099
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
 msgstr ""
 
+#: data/rpmdrake.desktop.in.h:1
+#, fuzzy
+msgid "Install Software"
+msgstr "Instalar"
+
 #: data/rpmdrake-remove.desktop.in.h:1
 msgid "Remove Software"
 msgstr ""
@@ -887,11 +1138,6 @@ msgstr ""
 msgid "Software Sources Manager"
 msgstr ""
 
-#: data/rpmdrake.desktop.in.h:1
-#, fuzzy
-msgid "Install Software"
-msgstr "Instalar"
-
 #, fuzzy
 #~ msgid "Update sources"
 #~ msgstr "Medio"
diff --git a/po/gl.pom b/po/gl.pom
index 1602f54f..a3f70ff3 100644
--- a/po/gl.pom
+++ b/po/gl.pom
@@ -4,170 +4,177 @@ msgstr "Servidor"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Ordenador de rede (cliente)"
+msgid "Office Workstation"
+msgstr "Estación de traballo de oficina"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
 msgstr ""
+"Programas de oficina: procesadores de texto (kword, abiword), follas de "
+"cálculo (kspread, gnumeric), visualizadores de pdf, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Office"
+msgid "Workstation"
+msgstr "Estación de traballo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Estación de traballo Gnome"
+msgid "Game station"
+msgstr "Estación de xogos"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Ferramentas para o seu Palm Pilot ou o seu Visor"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Programas de divertimentos: arcade, taboleiros, estratexia, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Estación de traballo"
+msgid "Multimedia station"
+msgstr "Estación multimedia"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Firewall/Encamińador"
+msgid "Sound and video playing/editing programs"
+msgstr "Programas de reproducción/edición de son e vídeo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr ""
+msgid "Internet station"
+msgstr "Estación Internet"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
 msgstr ""
-"Programas de oficina: procesadores de texto (kword, abiword), follas de "
-"cálculo (kspread, gnumeric), visualizadores de pdf, etc"
+"Conxunto de ferramentas para ler e enviar correo e novas (pine, mutt, tin..) "
+"e para navegar na Web"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "Ferramentas de audio: reproductores de mp3 ou midi, mesturadores, etc"
+msgid "Network Computer (client)"
+msgstr "Ordenador de rede (cliente)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
+msgid "Clients for different protocols including ssh"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Libros e howtos sobre Linux e o software libre"
+msgid "Configuration"
+msgstr "Configuración"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "Estación de traballo KDE"
+#, fuzzy
+msgid "Tools to ease the configuration of your computer"
+msgstr "żDesexa probar a configuración?"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgid "Scientific Workstation"
+msgstr "Estación de traballo científica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Multimedia - Vídeo"
+msgid "Scientific applications such as gnuplot"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr ""
-"Conxunto de ferramentas para correo, novas, web, transferencia de ficheiros "
-"e chat"
+msgid "Console Tools"
+msgstr "Ferramentas de consola"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Bases de datos"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Editores, shells, ferramentas de ficheiro, terminais"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
+msgid "KDE Workstation"
+msgstr "Estación de traballo KDE"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
 msgstr ""
+"O ambiente de escritorio KDE, o ambiente gráfico básico cunha colección de "
+"ferramentas que o acompańan"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Tools to ease the configuration of your computer"
-msgstr "żDesexa probar a configuración?"
+msgid "Graphical Environment"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "Multimedia - Son"
+msgid "Gnome Workstation"
+msgstr "Estación de traballo Gnome"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Documentación"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+"Un ambiente gráfico cun conxunto de aplicacións amigables e ferramentas de "
+"escritorio"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Ferramentas de consola"
+msgid "Other Graphical Desktops"
+msgstr "Outros escritorios gráficos"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr ""
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Estación Internet"
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+msgid "Development"
+msgstr "Desenvolvemento"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Estación multimedia"
+msgid "C and C++ development libraries, programs and include files"
+msgstr ""
+"Bibliotecas de desenvolvemento en C e C++, programas e ficheiros include"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Configuración"
+msgid "Documentation"
+msgstr "Documentación"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Máis escritorios gráficos (Gnome, IceWM)"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Libros e howtos sobre Linux e o software libre"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
+msgid "LSB"
 msgstr ""
-"O ambiente de escritorio KDE, o ambiente gráfico básico cunha colección de "
-"ferramentas que o acompańan"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
+msgid "Linux Standard Base. Third party applications support"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-msgid "Development"
-msgstr "Desenvolvemento"
+msgid "Web/FTP"
+msgstr "Web/FTP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -176,23 +183,34 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "Ferramentas para crear e gravar CDs"
+msgid "Mail/Groupware/News"
+msgstr "Correo/Groupware/Novas"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Estación de traballo de oficina"
+msgid "Postfix mail server, Inn news server"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgid "Database"
+msgstr "Bases de datos"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Programas gráficos como o Gimp"
+msgid "PostgreSQL or MySQL database server"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Firewall/Router"
+msgstr "Firewall/Encamińador"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+#, fuzzy
+msgid "Internet gateway"
+msgstr "Acceso á Internet"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -201,9 +219,8 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
+msgid "Domain Name and Network Information Server"
 msgstr ""
-"Bibliotecas de desenvolvemento en C e C++, programas e ficheiros include"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -212,18 +229,20 @@ msgstr "Servidor de ordenadores de rede"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "Correo/Groupware/Novas"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Estación de xogos"
+msgid "Office"
+msgstr "Office"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Reproductores e editores de vídeo"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr ""
+"Conxunto de ferramentas para correo, novas, web, transferencia de ficheiros "
+"e chat"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -232,80 +251,66 @@ msgstr "Multimedia - Gráficos"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Programas de divertimentos: arcade, taboleiros, estratexia, etc"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
-"Conxunto de ferramentas para ler e enviar correo e novas (pine, mutt, tin..) "
-"e para navegar na Web"
+msgid "Graphics programs such as The Gimp"
+msgstr "Programas gráficos como o Gimp"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "Finanzas persoais"
+msgid "Multimedia - Sound"
+msgstr "Multimedia - Son"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
-"Un ambiente gráfico cun conxunto de aplicacións amigables e ferramentas de "
-"escritorio"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "Ferramentas de audio: reproductores de mp3 ou midi, mesturadores, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr ""
+msgid "Multimedia - Video"
+msgstr "Multimedia - Vídeo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "LSB"
-msgstr ""
+msgid "Video players and editors"
+msgstr "Reproductores e editores de vídeo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Internet gateway"
-msgstr "Acceso á Internet"
+msgid "Multimedia - CD Burning"
+msgstr "Multimedia - Gravación de CD"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Programas de reproducción/edición de son e vídeo"
+msgid "Tools to create and burn CD's"
+msgstr "Ferramentas para crear e gravar CDs"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Outros escritorios gráficos"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Máis escritorios gráficos (Gnome, IceWM)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Editores, shells, ferramentas de ficheiro, terminais"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "Programas para xestionar as súas finanzas, como o gnucash"
+msgid "Personal Information Management"
+msgstr "Xestión de información persoal"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "Xestión de información persoal"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Ferramentas para o seu Palm Pilot ou o seu Visor"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multimedia - Gravación de CD"
+msgid "Personal Finance"
+msgstr "Finanzas persoais"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Estación de traballo científica"
+msgid "Programs to manage your finances, such as gnucash"
+msgstr "Programas para xestionar as súas finanzas, como o gnucash"
 
diff --git a/po/he.po b/po/he.po
index 19fedc3a..8e898db8 100644
--- a/po/he.po
+++ b/po/he.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: merged_file\n"
-"POT-Creation-Date: 2003-02-12 14:24+0100\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\n"
 "PO-Revision-Date: 2003-02-16 10:38+0200\n"
 "Last-Translator: lev polvoi <lev@israsrv.net.il>\n"
 "Language-Team: Hebrew <en@li.org>\n"
@@ -17,844 +17,1134 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
 
-#: ../edit-urpm-sources.pl_.c:43
-msgid "Unable to create medium."
-msgstr "אי-הצלחה ביצירת מדיה."
-
-#: ../edit-urpm-sources.pl_.c:44
-msgid "Unable to update medium; it will be automatically disabled."
-msgstr "אי-הצלחה בעדכון מדיה, זה יתבטל אוטומטית."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:54
-msgid "Add a source"
-msgstr "הוסף מקור"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to the software installation tool!\n"
+"\n"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Local files"
-msgstr "קבצים מקומיים"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Path:"
-msgstr "נתיב:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to the software removal tool!\n"
+"\n"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:56
-msgid "FTP server"
-msgstr "׊רת FTP"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:56 ../edit-urpm-sources.pl_.c:57
-#: ../edit-urpm-sources.pl_.c:59 ../edit-urpm-sources.pl_.c:187
-msgid "URL:"
-msgstr "כתובת:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during removal"
+msgstr "בעיה בזמן ההסרה"
 
-#: ../edit-urpm-sources.pl_.c:57
-msgid "HTTP server"
-msgstr "׊רת HTTP"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages..."
+msgstr "אנא חכה, מוחק חבילות..."
 
-#: ../edit-urpm-sources.pl_.c:58
-msgid "Path or mount point:"
-msgstr "נתיב או נקודת טעינה (mount) : "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
+msgstr "אנא חכה, קורה את מסד הנתונים של החבילות"
 
-#: ../edit-urpm-sources.pl_.c:58
-msgid "Removable device"
-msgstr "התקן בעל יכולת הסרה"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr "הייתה בעיה בזמן ההתקנה %s"
 
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:550
-msgid "Security updates"
-msgstr "עדכוני אבטחה"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during installation"
+msgstr "בעיה בזמן ההתקנה"
 
-#: ../edit-urpm-sources.pl_.c:70
-msgid "Browse..."
-msgstr "דפדף..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
+msgstr "הכל כבר מותקן (זה אמור לקרות בכלל?)"
 
-#: ../edit-urpm-sources.pl_.c:72
-msgid "Choose a mirror..."
-msgstr "בחר שרת..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed."
+msgstr "הכל כבר מותקן."
 
-#: ../edit-urpm-sources.pl_.c:92
-msgid "Login:"
-msgstr "שם מישתמש:"
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "כל החבילות המבוקשות הותקנו בהצלחה."
 
-#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:231
-msgid "Password:"
-msgstr "סיסמה:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr "הכל הותקן בהצלחה."
 
-#: ../edit-urpm-sources.pl_.c:97
-msgid "Name:"
-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 ""
 
-#: ../edit-urpm-sources.pl_.c:99 ../edit-urpm-sources.pl_.c:188
-msgid "Relative path to synthesis/hdlist:"
-msgstr "נתיב בשביל למשוך את hdlist:"
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "הכל הותקן נכון."
 
-#: ../edit-urpm-sources.pl_.c:107
-msgid "You need to fill up at least the two first entries."
-msgstr "אתה צריך למלא לפחות את שני הכניסות הראשונות."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"some packages failed to install\n"
+"correctly"
+msgstr "כמה חבילות לא הותקנו בצורה נכונה"
 
-#: ../edit-urpm-sources.pl_.c:120
-msgid "Adding a source:"
-msgstr "הוספת מקור: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages to allow others to be upgraded..."
+msgstr "אנא חכה, מסיר חבילות בכדי לאפשר לאחרות להשתדרג..."
 
-#: ../edit-urpm-sources.pl_.c:121
-msgid "Type of source:"
-msgstr "סוג מקור:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
+msgstr ""
+"התקנה נכשלה, כמה קבצים חסרים .אתה עשוי לרצות לעדכן את מנהל המקורות שלך."
 
-#: ../edit-urpm-sources.pl_.c:125 ../edit-urpm-sources.pl_.c:202
-#: ../edit-urpm-sources.pl_.c:235 ../rpmdrake.pm_.c:100 ../rpmdrake.pm_.c:139
-#: ../rpmdrake.pm_.c:322 ../rpmdrake_.c:355 ../rpmdrake_.c:367
-#: ../rpmdrake_.c:371 ../rpmdrake_.c:918 ../rpmdrake_.c:953
-msgid "Ok"
-msgstr "אישור"
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation failed"
+msgstr "התקנה נכשלה"
 
-#: ../edit-urpm-sources.pl_.c:140 ../edit-urpm-sources.pl_.c:196
-#: ../edit-urpm-sources.pl_.c:202 ../edit-urpm-sources.pl_.c:242
-#: ../rpmdrake.pm_.c:322 ../rpmdrake.pm_.c:355 ../rpmdrake_.c:355
-#: ../rpmdrake_.c:953
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
 msgid "Cancel"
 msgstr "בטל"
 
-#: ../edit-urpm-sources.pl_.c:147
-msgid "Please wait, adding medium..."
-msgstr "אנא חכה, מוסיף מדיה..."
-
-#: ../edit-urpm-sources.pl_.c:168
-msgid "Please wait, removing medium..."
-msgstr "אנא חכה, מוציא מדיה..."
-
-#: ../edit-urpm-sources.pl_.c:181
-msgid "Edit a source"
-msgstr "ערוך מקור"
-
-#: ../edit-urpm-sources.pl_.c:185
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Editing source \"%s\":"
-msgstr "עורך מקור \"%s\":"
-
-#: ../edit-urpm-sources.pl_.c:191
-msgid "Save changes"
-msgstr "שמור שינויים"
-
-#: ../edit-urpm-sources.pl_.c:200
-msgid "You need to insert the medium to continue"
-msgstr "אתה צריך להכניס את המדיה בכדי להמשיך."
-
-#: ../edit-urpm-sources.pl_.c:201
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "בכדי לשמור את השינויים, אתה צריך להכניס את המדיה אל הכונן."
-
-#: ../edit-urpm-sources.pl_.c:206
-msgid "Please wait, updating medium..."
-msgstr "אנא חכה, מעדכן מדיות"
-
-#: ../edit-urpm-sources.pl_.c:217
-msgid "Configure proxies"
-msgstr "ערוך proxyים"
+msgid "Ok"
+msgstr "אישור"
 
-#: ../edit-urpm-sources.pl_.c:223
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
-
-#: ../edit-urpm-sources.pl_.c:225
-msgid "Proxy hostname:"
-msgstr "Proxy hostname:"
 
-#: ../edit-urpm-sources.pl_.c:227
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "אתה יכול לספק סיסמה/שם מישתמש בשביל שרת הפרוקסי"
-
-#: ../edit-urpm-sources.pl_.c:229
-msgid "User:"
-msgstr "משתמש: "
-
-#: ../edit-urpm-sources.pl_.c:255
-msgid "Configure sources"
-msgstr "ערוך מקורות"
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr "החלף מדיה"
 
-#: ../edit-urpm-sources.pl_.c:262
-msgid "Enabled?"
-msgstr "מופעל?"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
+msgstr ""
+"לא מצליח להשיג חבילות מקור, מצטער(אני לא עובד עליכם, אני באמת לא מוצא... אני "
+"נשבע!!!)"
 
-#: ../edit-urpm-sources.pl_.c:263
-msgid "Source"
-msgstr "מקור"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages."
+msgstr "אי-הצלחה בהשגת חבילות מקור"
 
-#: ../edit-urpm-sources.pl_.c:286 ../rpmdrake_.c:732
-msgid "Remove"
-msgstr "הסר"
+#: ../rpmdrake:1
+#, c-format
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr "תוכנה נדרשת (grpmi) חסרה. בדוק את ההתקנה שלך."
 
-#: ../edit-urpm-sources.pl_.c:288
-msgid "Edit"
-msgstr "ערוך"
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
+msgstr "תוכנה חסרה."
 
-#: ../edit-urpm-sources.pl_.c:290
-msgid "Add..."
-msgstr "הוסף..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
+msgstr "בוחן ...."
 
-#: ../edit-urpm-sources.pl_.c:292
-msgid "Update..."
-msgstr "עדכון..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation finished"
+msgstr "התקנה נגמרה"
 
-#: ../edit-urpm-sources.pl_.c:293
-msgid "Proxy..."
-msgstr "Proxy..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
+msgstr "אל תעשה כלום"
 
-#: ../edit-urpm-sources.pl_.c:296
-msgid "Save and quit"
-msgstr "שמור וצא"
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:297 ../rpmdrake_.c:735
-msgid "Quit"
-msgstr "׌א"
+#: ../rpmdrake:1
+#, c-format
+msgid "Remove .%s"
+msgstr "הסר .%s"
 
-#: ../rpmdrake.pm_.c:96
-msgid "Yes"
-msgstr "כן"
+#: ../rpmdrake:1
+#, c-format
+msgid "changes:"
+msgstr "שינויים:"
 
-#: ../rpmdrake.pm_.c:98
-msgid "No"
-msgstr "לא"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr "בוחן %s"
 
-#: ../rpmdrake.pm_.c:130
-msgid "Info..."
-msgstr "מידע..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, finding available packages..."
+msgstr "אנא חכה, מוצא חבילות ברות השגה..."
 
-#: ../rpmdrake.pm_.c:183
-msgid "Austria"
-msgstr "אוסטריה"
+#: ../rpmdrake:1
+#, c-format
+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 ""
 
-#: ../rpmdrake.pm_.c:184
-msgid "Australia"
-msgstr "אוסטרליה"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
+msgstr "טעות בהוספת מדית עדכון"
 
-#: ../rpmdrake.pm_.c:185
-msgid "Belgium"
-msgstr "בלגיה"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
+msgstr "אנא המתן ,יוצר קשר אם אתרי המראה בשביל להתחיל את תהליך העידכון"
 
-#: ../rpmdrake.pm_.c:186
-msgid "Brazil"
-msgstr "ברזיל"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Sources Manager, and then add a `Security\n"
+"updates' source.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
 
-#: ../rpmdrake.pm_.c:187
-msgid "Canada"
-msgstr "קנדה"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "איך לבחור ידינית את השרת שלך?"
 
-#: ../rpmdrake.pm_.c:188
-msgid "Costa Rica"
-msgstr "קוסטה-ריקו"
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
+msgstr "הייתה טעות ללא אפשרות תיקון בזמן עדכון את מידע החבילות."
 
-#: ../rpmdrake.pm_.c:189
-msgid "Czech Republic"
-msgstr "הרפובליקה הצ'כית"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
+msgstr "טעות בעדכון מדיה"
 
-#: ../rpmdrake.pm_.c:190
-msgid "Germany"
-msgstr "גרמניה"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
+msgstr "אנא חכה, מתחבר לשרת על מנת לעדכן את מידע החבילות."
 
-#: ../rpmdrake.pm_.c:191
-msgid "Danmark"
-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 ""
 
-#: ../rpmdrake.pm_.c:192 ../rpmdrake.pm_.c:196
-msgid "Greece"
-msgstr "יוון"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Installation"
+msgstr "התקנת חבילות תוכנה"
 
-#: ../rpmdrake.pm_.c:193
-msgid "Spain"
-msgstr "ספרד"
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, c-format
+msgid "Mandrake Update"
+msgstr "Mandrake עדכון"
 
-#: ../rpmdrake.pm_.c:194
-msgid "Finland"
-msgstr "פינלנד"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
+msgstr "הסרת חבילות תוכנה"
 
-#: ../rpmdrake.pm_.c:195
-msgid "France"
-msgstr "׌רפת"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "׌א"
 
-#: ../rpmdrake.pm_.c:197
-msgid "Israel"
-msgstr "ישראל"
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "התקנה"
 
-#: ../rpmdrake.pm_.c:198
-msgid "Italy"
-msgstr "איטליה"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "הסר"
 
-#: ../rpmdrake.pm_.c:199
-msgid "Japan"
-msgstr "יפן"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search"
+msgstr "חיפוש"
 
-#: ../rpmdrake.pm_.c:200
-msgid "Korea"
-msgstr "קוריאה"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "חיפוש:"
 
-#: ../rpmdrake.pm_.c:201
-msgid "Netherlands"
-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 ""
 
-#: ../rpmdrake.pm_.c:202
-msgid "Norway"
-msgstr "נורווגיה"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "כמה חבילות צריכות להמחק"
 
-#: ../rpmdrake.pm_.c:203
-msgid "Poland"
+#: ../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 ""
 
-#: ../rpmdrake.pm_.c:204
-msgid "Portugal"
-msgstr "פורטוגל"
-
-#: ../rpmdrake.pm_.c:205
-msgid "Russia"
-msgstr "רוסיה"
+#: ../rpmdrake:1
+#, c-format
+msgid "Too many packages are selected"
+msgstr "יותר מידי חבילות נבחרו"
 
-#: ../rpmdrake.pm_.c:206
-msgid "Sweden"
-msgstr "שוודיה"
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
+msgstr "מידע מקסימלי"
 
-#: ../rpmdrake.pm_.c:207
-msgid "Taiwan"
-msgstr "טיוואן"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal information"
+msgstr "מידע נורמלי"
 
-#: ../rpmdrake.pm_.c:208
-msgid "United Kingdom"
-msgstr "בריטניה"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update source(s)"
+msgstr "עדכן מקור/ות"
 
-#: ../rpmdrake.pm_.c:209
-msgid "China"
-msgstr "סין"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reload the packages list"
+msgstr "טען מחדש את רשימת החבילות."
 
-#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:211 ../rpmdrake.pm_.c:212
-#: ../rpmdrake.pm_.c:213 ../rpmdrake.pm_.c:264
-msgid "United States"
-msgstr "ארה\"ב"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
+msgstr "נקה את הבחירה"
 
-#: ../rpmdrake.pm_.c:277
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr "אנא חכה, מוריד כתובות שרתים מאתר MandrakeSoft"
+#: ../rpmdrake:1
+#, c-format
+msgid "in files"
+msgstr "בקבצים"
 
-#: ../rpmdrake.pm_.c:283
-msgid "Error during download"
-msgstr "טעות בזמן ההורדה"
+#: ../rpmdrake:1
+#, c-format
+msgid "in descriptions"
+msgstr "בתיאורים"
 
-#: ../rpmdrake.pm_.c:292
-msgid "No mirror"
-msgstr "אין שרת."
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
+msgstr "בשמות"
 
-#: ../rpmdrake.pm_.c:310
-msgid "Please choose the desired mirror."
-msgstr "אנא בחר את השרת אליו ברצונך להתחבר."
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
+msgstr "על פי נגישות עדכון"
 
-#: ../rpmdrake.pm_.c:342 ../rpmdrake_.c:629
-msgid "Update source(s)"
-msgstr "עדכן מקור/ות"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
+msgstr ""
 
-#: ../rpmdrake.pm_.c:346
-msgid "Select the source(s) you wish to update:"
-msgstr "אנא בחר את המקורות אותם אתה רוצה לעדכן"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
+msgstr "על פי מצב בחירה"
 
-#: ../rpmdrake.pm_.c:350
-msgid "Update"
-msgstr "עדכון"
+#: ../rpmdrake:1
+#, c-format
+msgid "by size"
+msgstr "על פי גודל"
 
-#: ../rpmdrake.pm_.c:360
-msgid "Please wait, updating media..."
-msgstr "אנא חכה, מעדכן מדיה..."
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
+msgstr "על פי קבוצה"
 
-#: ../rpmdrake_.c:101
-msgid "Other"
-msgstr "אחר"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages,"
+msgstr "כל החבילות,"
 
-#: ../rpmdrake_.c:123 ../rpmdrake_.c:137 ../rpmdrake_.c:229 ../rpmdrake_.c:300
-msgid "(none)"
-msgstr "(אינן)"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
+msgstr "כל החבילות, אלפבתי"
 
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:484 ../rpmdrake_.c:485
-msgid "(Not available)"
-msgstr "(לא-זמין)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
+msgstr "Mandrake בחירות "
 
-#: ../rpmdrake_.c:153 ../rpmdrake_.c:210
-msgid "Search results"
-msgstr "תוצאות חיפוש"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal updates"
+msgstr "עדכונים נורמליים"
 
-#: ../rpmdrake_.c:153
-msgid "Search results (none)"
-msgstr "תוצאות חיפוש (כלום)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Bugfixes updates"
+msgstr "תיקוני באגים"
 
-#: ../rpmdrake_.c:163 ../rpmdrake_.c:174
-msgid "Please wait, searching..."
-msgstr "אנא חכה, מחפש..."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
+msgstr "עדכוני אבטחה"
 
-#: ../rpmdrake_.c:177
-msgid "Stop"
-msgstr "עצור"
+#: ../rpmdrake:1
+#, c-format
+msgid "Description: "
+msgstr "תיאור: "
 
-#: ../rpmdrake_.c:211 ../rpmdrake_.c:321
-msgid "Addable"
-msgstr "בעלות יכולות הוספה"
+#: ../rpmdrake:1
+#, c-format
+msgid "Summary: "
+msgstr "סיכום"
 
-#: ../rpmdrake_.c:211 ../rpmdrake_.c:321
-msgid "Upgradable"
-msgstr "בעלות יכולת שדרוג"
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "חשיבות : "
 
-#: ../rpmdrake_.c:213
-msgid "Not selected"
-msgstr "לא בחורות"
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake_.c:213
-msgid "Selected"
-msgstr "בחורות."
+#: ../rpmdrake:1
+#, c-format
+msgid "Size: "
+msgstr "גודל : "
 
-#: ../rpmdrake_.c:242
-msgid "rpmdrake"
-msgstr "rpmdrake"
+#: ../rpmdrake:1
+#, c-format
+msgid "Version: "
+msgstr "גרסה: "
 
-#: ../rpmdrake_.c:260 ../rpmdrake_.c:362 ../rpmdrake_.c:364
-msgid "More information on package..."
-msgstr "עוד מידע על החבילות..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "׊ם: "
 
-#: ../rpmdrake_.c:261
-msgid "One of the following packages is needed:"
-msgstr "אחת החבילות הבאות דרושה:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "סיבת עדכון: "
 
-#: ../rpmdrake_.c:261
-msgid "Please choose"
-msgstr "אנא בחר"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
+msgstr "גרסה מותקנת נוכחית: "
 
-#: ../rpmdrake_.c:277
-msgid "unknown package "
-msgstr "חבילות לא מוכרות "
+#: ../rpmdrake:1
+#, c-format
+msgid "Source: "
+msgstr "מקור: "
 
-#: ../rpmdrake_.c:287
-msgid "Please wait, listing packages..."
-msgstr "אנא חכה, מכין רשימת חבילות..."
+#: ../rpmdrake:1
+#, c-format
+msgid "(Not available)"
+msgstr "(לא-זמין)"
 
-#: ../rpmdrake_.c:302
-msgid "No update"
-msgstr "אל תעדכן"
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
+msgstr "Changelog:\n"
 
-#: ../rpmdrake_.c:355 ../rpmdrake_.c:356
-msgid "More infos"
-msgstr "עוד מידע"
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "קבצים:\n"
 
-#: ../rpmdrake_.c:357
-msgid "Information on packages"
-msgstr "מידע על החבילות"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected size: %d MB"
+msgstr "גודל נבחר: %d MB"
 
-#: ../rpmdrake_.c:378
-msgid "Some additional packages need to be removed"
-msgstr "כמה חבילות נוספות צריכות להמחק"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "גודל נבחר : %d MB /מקום פנוי : %d MB"
 
-#: ../rpmdrake_.c:379
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
 msgstr ""
-"החבילות הבאות צריכות להמחק בגלל התלויות שלהן:\n"
+"החבילות הבאות חייבות לא להבחר בגלל התלויות שלהן.\n"
+"\n"
 "\n"
 
-#: ../rpmdrake_.c:385 ../rpmdrake_.c:393
-msgid "Some packages can't be removed"
-msgstr "כמה חבילות אינן יכולות להמחק"
-
-#: ../rpmdrake_.c:386
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Removing these packages would break your system, sorry:\n"
+"Sorry, the following package(s) can't be selected:\n"
 "\n"
 msgstr ""
-"הסרת החבילות הבאות, תהרוס לך את המערכת.מצטער: \n"
+"מצטער, החבילה/ות הבאות לא יכול/ות להבחר:\n"
 "\n"
 
-#: ../rpmdrake_.c:394 ../rpmdrake_.c:453
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "חלק המחבילות לא הותקנו"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
 "\n"
 msgstr ""
-"החבילות הבאות חייבות לא להבחר בגלל התלויות שלהן.\n"
+"בכדי לספק את התלויות, החבילות הבאות יותקנו גם הן \n"
 "\n"
 "\n"
 
-#: ../rpmdrake_.c:423
+#: ../rpmdrake:1
+#, c-format
 msgid "Additional packages needed"
 msgstr "חבילות נוספות נדרשות"
 
-#: ../rpmdrake_.c:424
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be removed"
+msgstr "כמה חבילות אינן יכולות להמחק"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
+"Removing these packages would break your system, sorry:\n"
 "\n"
 msgstr ""
-"בכדי לספק את התלויות, החבילות הבאות יותקנו גם הן \n"
-"\n"
+"הסרת החבילות הבאות, תהרוס לך את המערכת.מצטער: \n"
 "\n"
 
-#: ../rpmdrake_.c:437
-msgid "Some packages can't be installed"
-msgstr "חלק המחבילות לא הותקנו"
-
-#: ../rpmdrake_.c:438
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
 "\n"
 msgstr ""
-"מצטער, החבילה/ות הבאות לא יכול/ות להבחר:\n"
+"החבילות הבאות צריכות להמחק בגלל התלויות שלהן:\n"
 "\n"
 
-#: ../rpmdrake_.c:452 ../rpmdrake_.c:686
-msgid "Some packages need to be removed"
-msgstr "כמה חבילות צריכות להמחק"
-
-#: ../rpmdrake_.c:474
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "גודל נבחר : %d MB /מקום פנוי : %d MB"
+msgid "Some additional packages need to be removed"
+msgstr "כמה חבילות נוספות צריכות להמחק"
 
-#: ../rpmdrake_.c:476
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "גודל נבחר: %d MB"
-
-#: ../rpmdrake_.c:484
-msgid "Files:\n"
-msgstr "קבצים:\n"
+msgid "More information on package..."
+msgstr "עוד מידע על החבילות..."
 
-#: ../rpmdrake_.c:485
-msgid "Changelog:\n"
-msgstr "Changelog:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "Information on packages"
+msgstr "מידע על החבילות"
 
-#: ../rpmdrake_.c:488
-msgid "Source: "
-msgstr "מקור: "
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
+msgstr "עוד מידע"
 
-#: ../rpmdrake_.c:489
-msgid "Currently installed version: "
-msgstr "גרסה מותקנת נוכחית: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Addable"
+msgstr "בעלות יכולות הוספה"
 
-#: ../rpmdrake_.c:493
-msgid "Reason for update: "
-msgstr "סיבת עדכון: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Upgradable"
+msgstr "בעלות יכולת שדרוג"
 
-#: ../rpmdrake_.c:495
-msgid "Name: "
-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_.c:496
-msgid "Version: "
-msgstr "גרסה: "
+#: ../rpmdrake:1
+#, c-format
+msgid "No update"
+msgstr "אל תעדכן"
 
-#: ../rpmdrake_.c:497
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "(none)"
+msgstr "(אינן)"
 
-#: ../rpmdrake_.c:497
-msgid "Size: "
-msgstr "גודל : "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, listing packages..."
+msgstr "אנא חכה, מכין רשימת חבילות..."
 
-#: ../rpmdrake_.c:499
-msgid "Importance: "
-msgstr "חשיבות : "
+#: ../rpmdrake:1
+#, c-format
+msgid "unknown package "
+msgstr "חבילות לא מוכרות "
 
-#: ../rpmdrake_.c:500
-msgid "Summary: "
-msgstr "סיכום"
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "אחת החבילות הבאות דרושה:"
 
-#: ../rpmdrake_.c:501
-msgid "Description: "
-msgstr "תיאור: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please choose"
+msgstr "אנא בחר"
 
-#: ../rpmdrake_.c:550
-msgid "Bugfixes updates"
-msgstr "תיקוני באגים"
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:550
-msgid "Normal updates"
-msgstr "עדכונים נורמליים"
+#: ../rpmdrake:1
+#, c-format
+msgid "Not selected"
+msgstr "לא בחורות"
 
-#: ../rpmdrake_.c:569
-msgid "Mandrake choices"
-msgstr "Mandrake בחירות "
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected"
+msgstr "בחורות."
 
-#: ../rpmdrake_.c:570
-msgid "All packages, alphabetical"
-msgstr "כל החבילות, אלפבתי"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results"
+msgstr "תוצאות חיפוש"
 
-#: ../rpmdrake_.c:571
-msgid "All packages,"
-msgstr "כל החבילות,"
+#: ../rpmdrake:1
+#, c-format
+msgid "Stop"
+msgstr "עצור"
 
-#: ../rpmdrake_.c:594
-msgid "by group"
-msgstr "על פי קבוצה"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, searching..."
+msgstr "אנא חכה, מחפש..."
 
-#: ../rpmdrake_.c:594
-msgid "by size"
-msgstr "על פי גודל"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
+msgstr "תוצאות חיפוש (כלום)"
 
-#: ../rpmdrake_.c:595
-msgid "by selection state"
-msgstr "על פי מצב בחירה"
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "אחר"
 
-#: ../rpmdrake_.c:596
-msgid "by source repository"
+#: ../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_.c:596
-msgid "by update availability"
-msgstr "על פי נגישות עדכון"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "שמור וצא"
 
-#: ../rpmdrake_.c:617
-msgid "in descriptions"
-msgstr "בתיאורים"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy..."
+msgstr "Proxy..."
 
-#: ../rpmdrake_.c:617
-msgid "in files"
-msgstr "בקבצים"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
+msgstr "עדכון..."
 
-#: ../rpmdrake_.c:617
-msgid "in names"
-msgstr "בשמות"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "הוסף..."
 
-#: ../rpmdrake_.c:628
-msgid "Reload the packages list"
-msgstr "טען מחדש את רשימת החבילות."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "ערוך"
 
-#: ../rpmdrake_.c:628
-msgid "Reset the selection"
-msgstr "נקה את הבחירה"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Source"
+msgstr "מקור"
 
-#: ../rpmdrake_.c:654
-msgid "Maximum information"
-msgstr "מידע מקסימלי"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
+msgstr "מופעל?"
 
-#: ../rpmdrake_.c:654
-msgid "Normal information"
-msgstr "מידע נורמלי"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure sources"
+msgstr "ערוך מקורות"
 
-#: ../rpmdrake_.c:676
-msgid "Too many packages are selected"
-msgstr "יותר מידי חבילות נבחרו"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "סיסמה:"
 
-#: ../rpmdrake_.c:722
-msgid "Find:"
-msgstr "חיפוש:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
+msgstr "משתמש: "
 
-#: ../rpmdrake_.c:727
-msgid "Search"
-msgstr "חיפוש"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "אתה יכול לספק סיסמה/שם מישתמש בשביל שרת הפרוקסי"
 
-#: ../rpmdrake_.c:733
-msgid "Install"
-msgstr "התקנה"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "Proxy hostname:"
 
-#: ../rpmdrake_.c:740 data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrake Update"
-msgstr "Mandrake עדכון"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
 
-#: ../rpmdrake_.c:740
-msgid "Software Packages Installation"
-msgstr "התקנת חבילות תוכנה"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "ערוך proxyים"
 
-#: ../rpmdrake_.c:740
-msgid "Software Packages Removal"
-msgstr "הסרת חבילות תוכנה"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr "אנא חכה, מעדכן מדיות"
 
-#: ../rpmdrake_.c:781
-msgid "Please wait, contacting mirror to update packages information."
-msgstr "אנא חכה, מתחבר לשרת על מנת לעדכן את מידע החבילות."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "בכדי לשמור את השינויים, אתה צריך להכניס את המדיה אל הכונן."
 
-#: ../rpmdrake_.c:783
-msgid "Error updating medium"
-msgstr "טעות בעדכון מדיה"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
+msgstr "אתה צריך להכניס את המדיה בכדי להמשיך."
 
-#: ../rpmdrake_.c:784
-msgid "There was an unrecoverable error while updating packages information."
-msgstr "הייתה טעות ללא אפשרות תיקון בזמן עדכון את מידע החבילות."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save changes"
+msgstr "שמור שינויים"
 
-#: ../rpmdrake_.c:789
-msgid "How to choose manually your mirror"
-msgstr "איך לבחור ידינית את השרת שלך?"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "נתיב בשביל למשוך את hdlist:"
 
-#: ../rpmdrake_.c:797
-msgid "Please wait, contacting mirror to initialize updates packages."
-msgstr "אנא המתן ,יוצר קשר אם אתרי המראה בשביל להתחיל את תהליך העידכון"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "כתובת:"
 
-#: ../rpmdrake_.c:800
-msgid "Error adding update medium"
-msgstr "טעות בהוספת מדית עדכון"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Editing source \"%s\":"
+msgstr "עורך מקור \"%s\":"
 
-#: ../rpmdrake_.c:831
-msgid "Please wait, finding available packages..."
-msgstr "אנא חכה, מוצא חבילות ברות השגה..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit a source"
+msgstr "ערוך מקור"
 
-#: ../rpmdrake_.c:863
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "בוחן %s"
+msgid "Please wait, removing medium..."
+msgstr "אנא חכה, מוציא מדיה..."
 
-#: ../rpmdrake_.c:882
-msgid "changes:"
-msgstr "שינויים:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, adding medium..."
+msgstr "אנא חכה, מוסיף מדיה..."
 
-#: ../rpmdrake_.c:886
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove .%s"
-msgstr "הסר .%s"
+msgid "Type of source:"
+msgstr "סוג מקור:"
 
-#: ../rpmdrake_.c:888
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Use .%s as main file"
+msgid "Adding a source:"
+msgstr "הוספת מקור: "
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 msgstr ""
 
-#: ../rpmdrake_.c:890
-msgid "Do nothing"
-msgstr "אל תעשה כלום"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to fill up at least the two first entries."
+msgstr "אתה צריך למלא לפחות את שני הכניסות הראשונות."
 
-#: ../rpmdrake_.c:902
-msgid "Installation finished"
-msgstr "התקנה נגמרה"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "׊ם:"
 
-#: ../rpmdrake_.c:912
-msgid "Inspect..."
-msgstr "בוחן ...."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
+msgstr "שם מישתמש:"
 
-#: ../rpmdrake_.c:927
-msgid "Program missing"
-msgstr "תוכנה חסרה."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "בחר שרת..."
 
-#: ../rpmdrake_.c:928
-msgid "A required program is missing (grpmi). Check your installation."
-msgstr "תוכנה נדרשת (grpmi) חסרה. בדוק את ההתקנה שלך."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Browse..."
+msgstr "דפדף..."
 
-#: ../rpmdrake_.c:942
-msgid "Unable to get source packages."
-msgstr "אי-הצלחה בהשגת חבילות מקור"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "נתיב או נקודת טעינה (mount) : "
 
-#: ../rpmdrake_.c:943
-msgid "Unable to get source packages, sorry."
-msgstr ""
-"לא מצליח להשיג חבילות מקור, מצטער(אני לא עובד עליכם, אני באמת לא מוצא... אני "
-"נשבע!!!)"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Removable device"
+msgstr "התקן בעל יכולת הסרה"
 
-#: ../rpmdrake_.c:951
-msgid "Change medium"
-msgstr "החלף מדיה"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "HTTP server"
+msgstr "׊רת HTTP"
 
-#: ../rpmdrake_.c:952
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr ""
+msgid "FTP server"
+msgstr "׊רת FTP"
 
-#: ../rpmdrake_.c:960
-msgid "Installation failed"
-msgstr "התקנה נכשלה"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path:"
+msgstr "נתיב:"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "קבצים מקומיים"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add a source"
+msgstr "הוסף מקור"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
+msgstr "אי-הצלחה בעדכון מדיה, זה יתבטל אוטומטית."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "אי-הצלחה ביצירת מדיה."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, updating media..."
+msgstr "אנא חכה, מעדכן מדיה..."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
+msgstr "עדכון"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Select the source(s) you wish to update:"
+msgstr "אנא בחר את המקורות אותם אתה רוצה לעדכן"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please choose the desired mirror."
+msgstr "אנא בחר את השרת אליו ברצונך להתחבר."
 
-#: ../rpmdrake_.c:961
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
-"התקנה נכשלה, כמה קבצים חסרים .אתה עשוי לרצות לעדכן את מנהל המקורות שלך."
 
-#: ../rpmdrake_.c:964
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr "אנא חכה, מסיר חבילות בכדי לאפשר לאחרות להשתדרג..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
+msgstr "אין שרת."
 
-#: ../rpmdrake_.c:985
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"There was an error downloading the mirrors list:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
 
-#: ../rpmdrake_.c:985
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "טעות בזמן ההורדה"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "אנא חכה, מוריד כתובות שרתים מאתר MandrakeSoft"
+
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"some packages failed to install\n"
-"correctly"
-msgstr "כמה חבילות לא הותקנו בצורה נכונה"
+"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_.c:986
-msgid "everything was installed correctly"
-msgstr "הכל הותקן נכון."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United States"
+msgstr "ארה\"ב"
 
-#: ../rpmdrake_.c:988
-msgid "Everything installed successfully"
-msgstr "הכל הותקן בהצלחה."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
+msgstr "סין"
 
-#: ../rpmdrake_.c:989
-msgid "All requested packages were installed successfully."
-msgstr "כל החבילות המבוקשות הותקנו בהצלחה."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr "בריטניה"
 
-#: ../rpmdrake_.c:992
-msgid "Everything already installed."
-msgstr "הכל כבר מותקן."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "טיוואן"
 
-#: ../rpmdrake_.c:993
-msgid "Everything already installed (is this supposed to happen at all?)."
-msgstr "הכל כבר מותקן (זה אמור לקרות בכלל?)"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "שוודיה"
 
-#: ../rpmdrake_.c:1000
-msgid "Problem during installation"
-msgstr "בעיה בזמן ההתקנה"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
+msgstr "רוסיה"
 
-#: ../rpmdrake_.c:1001
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr "הייתה בעיה בזמן ההתקנה %s"
+msgid "Portugal"
+msgstr "פורטוגל"
 
-#: ../rpmdrake_.c:1015
-msgid "Please wait, reading packages database..."
-msgstr "אנא חכה, קורה את מסד הנתונים של החבילות"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
+msgstr ""
 
-#: ../rpmdrake_.c:1056
-msgid "Please wait, removing packages..."
-msgstr "אנא חכה, מוחק חבילות..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
+msgstr "נורווגיה"
 
-#: ../rpmdrake_.c:1059
-msgid "Problem during removal"
-msgstr "בעיה בזמן ההסרה"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
+msgstr "הולנד"
 
-#: ../rpmdrake_.c:1060
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
+msgid "Korea"
+msgstr "קוריאה"
 
-#: ../rpmdrake_.c:1092
-msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
-msgstr ""
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Japan"
+msgstr "יפן"
 
-#: ../rpmdrake_.c:1097
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Italy"
+msgstr "איטליה"
 
-#: ../rpmdrake_.c:1102
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
-msgstr ""
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Israel"
+msgstr "ישראל"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "יוון"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "France"
+msgstr "׌רפת"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "פינלנד"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "ספרד"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
+msgstr "דנמרק"
+
+#: ../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.pm:1
+#, c-format
+msgid "Australia"
+msgstr "אוסטרליה"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
+msgstr "אוסטריה"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Info..."
+msgstr "מידע..."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
+msgstr "לא"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "כן"
+
+#: data/rpmdrake.desktop.in.h:1
+msgid "Install Software"
+msgstr "התקן תוכנה"
 
 #: data/rpmdrake-remove.desktop.in.h:1
 msgid "Remove Software"
@@ -863,7 +1153,3 @@ msgstr "הסר תוכנה"
 #: data/rpmdrake-sources.desktop.in.h:1
 msgid "Software Sources Manager"
 msgstr "מנהל מקורות של תוכנות"
-
-#: data/rpmdrake.desktop.in.h:1
-msgid "Install Software"
-msgstr "התקן תוכנה"
diff --git a/po/he.pom b/po/he.pom
index 36ca2c42..605337fd 100644
--- a/po/he.pom
+++ b/po/he.pom
@@ -1,6 +1,6 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 msgid "Server"
-msgstr ""
+msgstr "׊רת"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -81,6 +81,11 @@ msgstr "תחנת עבודה מדעית"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
+msgid "Scientific applications such as gnuplot"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Console Tools"
 msgstr "כלי מסוף"
 
@@ -92,7 +97,7 @@ msgstr "עורכים, מעטפות, כלי קבצים, מסופים"
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "KDE Workstation"
-msgstr "תחנת עבודה KDE"
+msgstr "תחנת עבודה של KDE"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -132,12 +137,12 @@ msgstr "Icewm, Window Maker, Enlightenment, Fvwm, ועוד"
 #: ../../share/compssUsers:999
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 msgid "Development"
-msgstr ""
+msgstr "פיתוח"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "C and C++ development libraries, programs and include files"
-msgstr ""
+msgstr "ספריות פיתוח בC וC++, תוכנות וקבצי include"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -152,7 +157,7 @@ msgstr "ספרים ו'איך לעשות בלינוקס' ותוכנה חופשי×
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "LSB"
-msgstr ""
+msgstr "LSB"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -162,12 +167,12 @@ msgstr "בסיס לינוקס סטנדרטי. תמיכה בתוכנות מפעי
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Web/FTP"
-msgstr ""
+msgstr "Web/FTP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Apache, Pro-ftpd"
-msgstr ""
+msgstr "Apache, Pro-ftpd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -287,12 +292,12 @@ msgstr "מנהל המידע האישי"
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Tools for your Palm Pilot or your Visor"
-msgstr ""
+msgstr "כלים לPalm Pilot או לVisor שלך"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Personal Finance"
-msgstr ""
+msgstr "פיננסיה אישית"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
diff --git a/po/hr.po b/po/hr.po
index 1118f191..ecc353ef 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2003-01-19 16:57+0100\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\n"
 "PO-Revision-Date: 2002-03-07 18:34CET\n"
 "Last-Translator: Vlatko Kosturjak <kost@iname.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -14,915 +14,1135 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.5\n"
 
-#: ../edit-urpm-sources.pl_.c:39
-#, fuzzy
-msgid "Unable to create medium."
-msgstr "Ne mogu napraviti report datoteku, prekidam.\n"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:40
-msgid "Unable to update medium; it will be automatically disabled."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to the software installation tool!\n"
+"\n"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:51
-#, fuzzy
-msgid "Add a source"
+#: ../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 ""
-"Molim pričekajte\n"
-"Dodajem izvor"
 
-#: ../edit-urpm-sources.pl_.c:52
-#, fuzzy
-msgid "Local files"
-msgstr "Lokalno"
+#: ../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_.c:52
-#, fuzzy
-msgid "Path:"
-msgstr "putanja: "
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr "Dogodili su se problemi prilikom instalacije"
 
-#: ../edit-urpm-sources.pl_.c:53
-msgid "FTP server"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during removal"
+msgstr "Dogodili su se problemi prilikom instalacije"
 
-#: ../edit-urpm-sources.pl_.c:53 ../edit-urpm-sources.pl_.c:54
-#: ../edit-urpm-sources.pl_.c:56 ../edit-urpm-sources.pl_.c:175
-#, fuzzy
-msgid "URL:"
-msgstr "URL: "
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, removing packages..."
+msgstr "Molimo pričekajte dok rpm uklanja navedene pakete:"
 
-#: ../edit-urpm-sources.pl_.c:54
-msgid "HTTP server"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:55
-#, fuzzy
-msgid "Path or mount point:"
-msgstr "putanja ili mjesto za montiranje: "
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr "Dogodili su se problemi prilikom instalacije"
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Removable device"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during installation"
+msgstr "Dogodili su se problemi prilikom instalacije"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:56 ../rpmdrake_.c:548
-msgid "Security updates"
-msgstr "Sigurnosne dogradnje"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Everything already installed."
+msgstr "Paket je već instaliran"
 
-#: ../edit-urpm-sources.pl_.c:67
-msgid "Browse..."
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:69
-#, fuzzy
-msgid "Choose a mirror..."
-msgstr "Izaberite mirror:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:89
-msgid "Login:"
-msgstr "Login:"
+#: ../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 ""
 
-#: ../edit-urpm-sources.pl_.c:89 ../edit-urpm-sources.pl_.c:215
-msgid "Password:"
-msgstr "Lozinka:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "everything was installed correctly"
+msgstr "Paket je već instaliran"
 
-#: ../edit-urpm-sources.pl_.c:94
-msgid "Name:"
-msgstr "Ime: "
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"some packages failed to install\n"
+"correctly"
+msgstr "Paketa već instalirano"
 
-#: ../edit-urpm-sources.pl_.c:96 ../edit-urpm-sources.pl_.c:176
-#, fuzzy
-msgid "Relative path to synthesis/hdlist:"
-msgstr "relativna putanja do synthesis ili hdlist: "
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, removing packages to allow others to be upgraded..."
+msgstr "Molimo odaberite pakete koje želite dograditi"
 
-#: ../edit-urpm-sources.pl_.c:104
-msgid "You need to fill up at least the two first entries."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:116
-#, fuzzy
-msgid "Adding a source:"
-msgstr ""
-"Molim pričekajte\n"
-"Dodajem izvor"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Installation failed"
+msgstr "moguće instalirati"
 
-#: ../edit-urpm-sources.pl_.c:117
-msgid "Type of source:"
-msgstr "Tip izvora:"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
+msgstr "Odustani"
 
-#: ../edit-urpm-sources.pl_.c:121 ../edit-urpm-sources.pl_.c:187
-#: ../edit-urpm-sources.pl_.c:219 ../rpmdrake.pm_.c:97 ../rpmdrake.pm_.c:136
-#: ../rpmdrake.pm_.c:319 ../rpmdrake_.c:353 ../rpmdrake_.c:365
-#: ../rpmdrake_.c:369 ../rpmdrake_.c:916 ../rpmdrake_.c:950
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
 msgid "Ok"
 msgstr "U Redu"
 
-#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:180
-#: ../edit-urpm-sources.pl_.c:187 ../edit-urpm-sources.pl_.c:220
-#: ../rpmdrake.pm_.c:319 ../rpmdrake.pm_.c:352 ../rpmdrake_.c:353
-#: ../rpmdrake_.c:950
-msgid "Cancel"
-msgstr "Odustani"
-
-#: ../edit-urpm-sources.pl_.c:140
-#, fuzzy
-msgid "Please wait, adding medium..."
-msgstr "Provjeravam ovisnosti..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:158
-#, fuzzy
-msgid "Please wait, removing medium..."
-msgstr "Provjeravam ovisnosti..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:169
-#, fuzzy
-msgid "Edit a source"
-msgstr "Ažuriraj izvore"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:173
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "Ažuriraj izvore"
+msgid "Unable to get source packages."
+msgstr "Loši, nečitljivi ili nisu pronađeni paketi"
 
-#: ../edit-urpm-sources.pl_.c:179
-#, fuzzy
-msgid "Save changes"
-msgstr "Paketi"
+#: ../rpmdrake:1
+#, c-format
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:185
-msgid "You need to insert the medium to continue"
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:186
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:191
-#, fuzzy
-msgid "Please wait, updating medium..."
-msgstr "Provjeravam ovisnosti..."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Installation finished"
+msgstr "moguće instalirati"
 
-#: ../edit-urpm-sources.pl_.c:202
-#, fuzzy
-msgid "Configure proxies"
-msgstr "Podesiti izvor?"
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:207
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:209
-#, fuzzy
-msgid "Proxy hostname:"
-msgstr "Proxy korisnik:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Remove .%s"
+msgstr "Prenosivi medij"
 
-#: ../edit-urpm-sources.pl_.c:211
-msgid "You may specify a user/password for the proxy authentication:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "changes:"
+msgstr "Paketi"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:213
-#, fuzzy
-msgid "User:"
-msgstr "Korisnik:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, finding available packages..."
+msgstr "ponovno učitaj popise raspoloživih aplikacija"
 
-#: ../edit-urpm-sources.pl_.c:235
-#, fuzzy
-msgid "Configure sources"
-msgstr "Podesiti izvor?"
+#: ../rpmdrake:1
+#, c-format
+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 ""
 
-#: ../edit-urpm-sources.pl_.c:242
-msgid "Enabled?"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:243
-msgid "Source"
-msgstr "Izvor"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:264 ../rpmdrake_.c:730
-#, fuzzy
-msgid "Remove"
-msgstr "Prenosivi medij"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Sources Manager, and then add a `Security\n"
+"updates' source.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:266
-msgid "Edit"
-msgstr "Ažuriraj"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:268
-msgid "Add..."
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:270
-msgid "Update..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:271
-#, fuzzy
-msgid "Proxy..."
-msgstr "Greška..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:274
-msgid "Save and quit"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Software Packages Installation"
+msgstr "Instalacija paketa"
+
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, fuzzy, c-format
+msgid "Mandrake Update"
 msgstr ""
+"Mandrake\n"
+"Dogradnja"
 
-#: ../edit-urpm-sources.pl_.c:275 ../rpmdrake_.c:733
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Software Packages Removal"
+msgstr " Upravitelj programima "
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
 msgid "Quit"
 msgstr "Završi"
 
-#: ../rpmdrake.pm_.c:93
-msgid "Yes"
-msgstr ""
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "Instaliraj"
 
-#: ../rpmdrake.pm_.c:95
-msgid "No"
-msgstr ""
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Remove"
+msgstr "Prenosivi medij"
 
-#: ../rpmdrake.pm_.c:127
-msgid "Info..."
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Search"
+msgstr "Traži"
 
-#: ../rpmdrake.pm_.c:180
-msgid "Austria"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "Pronađi:"
+
+#: ../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 ""
 
-#: ../rpmdrake.pm_.c:181
-msgid "Australia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:182
-msgid "Belgium"
+#: ../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 ""
 
-#: ../rpmdrake.pm_.c:183
-msgid "Brazil"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Too many packages are selected"
+msgstr "Paketa već instalirano"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:184
-msgid "Canada"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Normal information"
+msgstr "normalne dogradnje"
+
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update source(s)"
+msgstr "Ažuriraj izvore"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Reload the packages list"
+msgstr "Paket %s nije potpisan"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:185
-msgid "Costa Rica"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "in files"
+msgstr "Lokalno"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "in descriptions"
+msgstr "Opisi"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:186
-msgid "Czech Republic"
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:187
-msgid "Germany"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:188
-msgid "Danmark"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:189 ../rpmdrake.pm_.c:193
-msgid "Greece"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "by size"
+msgstr "Velič. Dub."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:190
-msgid "Spain"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "All packages,"
+msgstr "0 paketa, 0 byte-ova"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:191
-#, fuzzy
-msgid "Finland"
-msgstr "Pronađi:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mandrake choices"
+msgstr "MandrakeDogradnja"
 
-#: ../rpmdrake.pm_.c:192
-#, fuzzy
-msgid "France"
-msgstr "Odustani"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Normal updates"
+msgstr "normalne dogradnje"
 
-#: ../rpmdrake.pm_.c:194
-#, fuzzy
-msgid "Israel"
-msgstr "Instalirano"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Bugfixes updates"
+msgstr "Sigurnosne dogradnje"
 
-#: ../rpmdrake.pm_.c:195
-#, fuzzy
-msgid "Italy"
-msgstr "Instalirano"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
+msgstr "Sigurnosne dogradnje"
 
-#: ../rpmdrake.pm_.c:196
-msgid "Japan"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Description: "
+msgstr "Opisi"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Summary: "
+msgstr "Sumarno: "
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
 msgstr ""
 
-#: ../rpmdrake.pm_.c:197
-msgid "Korea"
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Size: "
+msgstr "Veličina: "
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Version: "
+msgstr "Verzija: "
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "Ime: "
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
 msgstr ""
 
-#: ../rpmdrake.pm_.c:198
-msgid "Netherlands"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
 msgstr ""
 
-#: ../rpmdrake.pm_.c:199
-msgid "Norway"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Source: "
+msgstr "Izvor"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "(Not available)"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:200
-msgid "Poland"
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:201
-#, fuzzy
-msgid "Portugal"
-msgstr "Port:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Files:\n"
+msgstr "/_Datoteka"
 
-#: ../rpmdrake.pm_.c:202
-msgid "Russia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected size: %d MB"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:203
-msgid "Sweden"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:204
-msgid "Taiwan"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:205
-msgid "United Kingdom"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:206
-msgid "China"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be installed"
+msgstr "Paketa već instalirano"
 
-#: ../rpmdrake.pm_.c:207 ../rpmdrake.pm_.c:208 ../rpmdrake.pm_.c:209
-#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:261
-msgid "United States"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:274
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+#: ../rpmdrake:1
+#, c-format
+msgid "Additional packages needed"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:280
-msgid "Error during download"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be removed"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:289
-#, fuzzy
-msgid "No mirror"
-msgstr "Nema greške"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
 
-#: ../rpmdrake.pm_.c:307
-#, fuzzy
-msgid "Please choose the desired mirror."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
 msgstr ""
-"Molim pričekajte\n"
-"Dohvaćam popis mirrora"
+"U pravilu da zadovoljite sve ovisnosti,\n"
+"slijedeći paketi biti će uklonjeni:"
 
-#: ../rpmdrake.pm_.c:339 ../rpmdrake_.c:627
-#, fuzzy
-msgid "Update source(s)"
-msgstr "Ažuriraj izvore"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some additional packages need to be removed"
+msgstr ""
+"Ovi dodatni paketi su potrebni da budu instalirani u pravilu da sve radi "
+"ispravno:"
 
-#: ../rpmdrake.pm_.c:343
-#, fuzzy
-msgid "Select the source(s) you wish to update:"
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
 msgstr ""
-"Molim odaberite izvore\n"
-"koje želite dograditi:"
 
-#: ../rpmdrake.pm_.c:347
-msgid "Update"
-msgstr "Nadogradi"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Information on packages"
+msgstr "Ne mogu otvoriti paket"
 
-#: ../rpmdrake.pm_.c:358
-#, fuzzy
-msgid "Please wait, updating media..."
-msgstr "Provjeravam ovisnosti..."
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
+msgstr ""
 
-#: ../rpmdrake_.c:99
-msgid "Other"
+#: ../rpmdrake:1
+#, c-format
+msgid "Addable"
 msgstr ""
 
-#: ../rpmdrake_.c:121 ../rpmdrake_.c:135 ../rpmdrake_.c:227 ../rpmdrake_.c:298
-msgid "(none)"
-msgstr "(nema)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Upgradable"
+msgstr ""
 
-#: ../rpmdrake_.c:141 ../rpmdrake_.c:482 ../rpmdrake_.c:483
-msgid "(Not available)"
+#: ../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_.c:151 ../rpmdrake_.c:208
-#, fuzzy
-msgid "Search results"
-msgstr "Rezultati pretraživanja"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "No update"
+msgstr "normalne dogradnje"
 
-#: ../rpmdrake_.c:151
-#, fuzzy
-msgid "Search results (none)"
-msgstr "Rezultati pretraživanja"
+#: ../rpmdrake:1
+#, c-format
+msgid "(none)"
+msgstr "(nema)"
 
-#: ../rpmdrake_.c:161 ../rpmdrake_.c:172
-#, fuzzy
-msgid "Please wait, searching..."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, listing packages..."
 msgstr "Molimo pričekajte dok rpm uklanja navedene pakete:"
 
-#: ../rpmdrake_.c:175
-msgid "Stop"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "Nepoznata stranica"
 
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-msgid "Addable"
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
 msgstr ""
 
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-msgid "Upgradable"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please choose"
 msgstr ""
 
-#: ../rpmdrake_.c:211
-#, fuzzy
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
 msgid "Not selected"
 msgstr ""
 "Odznači\n"
 "sve"
 
-#: ../rpmdrake_.c:211
-#, fuzzy
+#: ../rpmdrake:1
+#, fuzzy, c-format
 msgid "Selected"
 msgstr "Izaberi sve"
 
-#: ../rpmdrake_.c:240
-msgid "rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake_.c:258 ../rpmdrake_.c:360 ../rpmdrake_.c:362
-msgid "More information on package..."
-msgstr ""
-
-#: ../rpmdrake_.c:259
-msgid "One of the following packages is needed:"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Search results"
+msgstr "Rezultati pretraživanja"
 
-#: ../rpmdrake_.c:259
-msgid "Please choose"
+#: ../rpmdrake:1
+#, c-format
+msgid "Stop"
 msgstr ""
 
-#: ../rpmdrake_.c:275
-#, fuzzy
-msgid "unknown package "
-msgstr "Nepoznata stranica"
-
-#: ../rpmdrake_.c:285
-#, fuzzy
-msgid "Please wait, listing packages..."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, searching..."
 msgstr "Molimo pričekajte dok rpm uklanja navedene pakete:"
 
-#: ../rpmdrake_.c:300
-#, fuzzy
-msgid "No update"
-msgstr "normalne dogradnje"
-
-#: ../rpmdrake_.c:353 ../rpmdrake_.c:354
-msgid "More infos"
-msgstr ""
-
-#: ../rpmdrake_.c:355
-#, fuzzy
-msgid "Information on packages"
-msgstr "Ne mogu otvoriti paket"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Search results (none)"
+msgstr "Rezultati pretraživanja"
 
-#: ../rpmdrake_.c:376
-#, fuzzy
-msgid "Some additional packages need to be removed"
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
 msgstr ""
-"Ovi dodatni paketi su potrebni da budu instalirani u pravilu da sve radi "
-"ispravno:"
 
-#: ../rpmdrake_.c:377
-#, fuzzy
+#: ../edit-urpm-sources.pl:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"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 pravilu da zadovoljite sve ovisnosti,\n"
-"slijedeći paketi biti će uklonjeni:"
 
-#: ../rpmdrake_.c:383 ../rpmdrake_.c:391
-msgid "Some packages can't be removed"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
 msgstr ""
 
-#: ../rpmdrake_.c:384
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Proxy..."
+msgstr "Greška..."
 
-#: ../rpmdrake_.c:392 ../rpmdrake_.c:451
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
 msgstr ""
 
-#: ../rpmdrake_.c:421
-msgid "Additional packages needed"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
 msgstr ""
 
-#: ../rpmdrake_.c:422
-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 "Edit"
+msgstr "Ažuriraj"
 
-#: ../rpmdrake_.c:435
-#, fuzzy
-msgid "Some packages can't be installed"
-msgstr "Paketa već instalirano"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Source"
+msgstr "Izvor"
 
-#: ../rpmdrake_.c:436
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
 msgstr ""
 
-#: ../rpmdrake_.c:450 ../rpmdrake_.c:684
-msgid "Some packages need to be removed"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure sources"
+msgstr "Podesiti izvor?"
 
-#: ../rpmdrake_.c:472
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr ""
+msgid "Password:"
+msgstr "Lozinka:"
 
-#: ../rpmdrake_.c:474
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "User:"
+msgstr "Korisnik:"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected size: %d MB"
+msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 
-#: ../rpmdrake_.c:482
-#, fuzzy
-msgid "Files:\n"
-msgstr "/_Datoteka"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Proxy hostname:"
+msgstr "Proxy korisnik:"
 
-#: ../rpmdrake_.c:483
-msgid "Changelog:\n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
 msgstr ""
 
-#: ../rpmdrake_.c:486
-#, fuzzy
-msgid "Source: "
-msgstr "Izvor"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure proxies"
+msgstr "Podesiti izvor?"
 
-#: ../rpmdrake_.c:487
-msgid "Currently installed version: "
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, updating medium..."
+msgstr "Provjeravam ovisnosti..."
 
-#: ../rpmdrake_.c:491
-msgid "Reason for 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 ""
 
-#: ../rpmdrake_.c:493
-msgid "Name: "
-msgstr "Ime: "
-
-#: ../rpmdrake_.c:494
-msgid "Version: "
-msgstr "Verzija: "
-
-#: ../rpmdrake_.c:495
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: ../rpmdrake_.c:495
-msgid "Size: "
-msgstr "Veličina: "
-
-#: ../rpmdrake_.c:497
-msgid "Importance: "
+msgid "You need to insert the medium to continue"
 msgstr ""
 
-#: ../rpmdrake_.c:498
-msgid "Summary: "
-msgstr "Sumarno: "
-
-#: ../rpmdrake_.c:499
-#, fuzzy
-msgid "Description: "
-msgstr "Opisi"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Save changes"
+msgstr "Paketi"
 
-#: ../rpmdrake_.c:548
-#, fuzzy
-msgid "Bugfixes updates"
-msgstr "Sigurnosne dogradnje"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "relativna putanja do synthesis ili hdlist: "
 
-#: ../rpmdrake_.c:548
-#, fuzzy
-msgid "Normal updates"
-msgstr "normalne dogradnje"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "URL:"
+msgstr "URL: "
 
-#: ../rpmdrake_.c:567
-#, fuzzy
-msgid "Mandrake choices"
-msgstr "MandrakeDogradnja"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing source \"%s\":"
+msgstr "Ažuriraj izvore"
 
-#: ../rpmdrake_.c:568
-msgid "All packages, alphabetical"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Edit a source"
+msgstr "Ažuriraj izvore"
 
-#: ../rpmdrake_.c:569
-#, fuzzy
-msgid "All packages,"
-msgstr "0 paketa, 0 byte-ova"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, removing medium..."
+msgstr "Provjeravam ovisnosti..."
 
-#: ../rpmdrake_.c:592
-msgid "by group"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, adding medium..."
+msgstr "Provjeravam ovisnosti..."
 
-#: ../rpmdrake_.c:592
-#, fuzzy
-msgid "by size"
-msgstr "Velič. Dub."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of source:"
+msgstr "Tip izvora:"
 
-#: ../rpmdrake_.c:593
-msgid "by selection state"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Adding a source:"
 msgstr ""
+"Molim pričekajte\n"
+"Dodajem izvor"
 
-#: ../rpmdrake_.c:594
-msgid "by source repository"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 msgstr ""
 
-#: ../rpmdrake_.c:594
-msgid "by update availability"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to fill up at least the two first entries."
 msgstr ""
 
-#: ../rpmdrake_.c:615
-#, fuzzy
-msgid "in descriptions"
-msgstr "Opisi"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "Ime: "
 
-#: ../rpmdrake_.c:615
-#, fuzzy
-msgid "in files"
-msgstr "Lokalno"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
+msgstr "Login:"
 
-#: ../rpmdrake_.c:615
-msgid "in names"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Choose a mirror..."
+msgstr "Izaberite mirror:"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Browse..."
 msgstr ""
 
-#: ../rpmdrake_.c:626
-#, fuzzy
-msgid "Reload the packages list"
-msgstr "Paket %s nije potpisan"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Path or mount point:"
+msgstr "putanja ili mjesto za montiranje: "
 
-#: ../rpmdrake_.c:626
-msgid "Reset the selection"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Removable device"
 msgstr ""
 
-#: ../rpmdrake_.c:652
-msgid "Maximum information"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "HTTP server"
 msgstr ""
 
-#: ../rpmdrake_.c:652
-#, fuzzy
-msgid "Normal information"
-msgstr "normalne dogradnje"
-
-#: ../rpmdrake_.c:674
-#, fuzzy
-msgid "Too many packages are selected"
-msgstr "Paketa već instalirano"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr ""
 
-#: ../rpmdrake_.c:720
-msgid "Find:"
-msgstr "Pronađi:"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Path:"
+msgstr "putanja: "
 
-#: ../rpmdrake_.c:725
-#, fuzzy
-msgid "Search"
-msgstr "Traži"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Local files"
+msgstr "Lokalno"
 
-#: ../rpmdrake_.c:731
-msgid "Install"
-msgstr "Instaliraj"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a source"
+msgstr ""
+"Molim pričekajte\n"
+"Dodajem izvor"
 
-#: ../rpmdrake_.c:738 data/mandrakeupdate.desktop.in.h:1
-#, fuzzy
-msgid "Mandrake Update"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
 msgstr ""
-"Mandrake\n"
-"Dogradnja"
 
-#: ../rpmdrake_.c:738
-#, fuzzy
-msgid "Software Packages Installation"
-msgstr "Instalacija paketa"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Unable to create medium."
+msgstr "Ne mogu napraviti report datoteku, prekidam.\n"
 
-#: ../rpmdrake_.c:738
-#, fuzzy
-msgid "Software Packages Removal"
-msgstr " Upravitelj programima "
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Please wait, updating media..."
+msgstr "Provjeravam ovisnosti..."
 
-#: ../rpmdrake_.c:779
-msgid "Please wait, contacting mirror to update packages information."
-msgstr ""
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
+msgstr "Nadogradi"
 
-#: ../rpmdrake_.c:781
-msgid "Error updating medium"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Select the source(s) you wish to update:"
 msgstr ""
+"Molim odaberite izvore\n"
+"koje želite dograditi:"
 
-#: ../rpmdrake_.c:782
-msgid "There was an unrecoverable error while updating packages information."
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Please choose the desired mirror."
 msgstr ""
+"Molim pričekajte\n"
+"Dohvaćam popis mirrora"
 
-#: ../rpmdrake_.c:787
-msgid "How to choose manually your mirror"
+#: ../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_.c:795
-msgid "Please wait, contacting mirror to initialize updates packages."
-msgstr ""
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "No mirror"
+msgstr "Nema greške"
 
-#: ../rpmdrake_.c:798
-msgid "Error adding update medium"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid ""
+"There was an error downloading the mirrors list:\n"
+"\n"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
 
-#: ../rpmdrake_.c:829
-#, fuzzy
-msgid "Please wait, finding available packages..."
-msgstr "ponovno učitaj popise raspoloživih aplikacija"
-
-#: ../rpmdrake_.c:861
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Inspecting %s"
+msgid "Error during download"
 msgstr ""
 
-#: ../rpmdrake_.c:880
-#, fuzzy
-msgid "changes:"
-msgstr "Paketi"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
 
-#: ../rpmdrake_.c:884
-#, fuzzy, c-format
-msgid "Remove .%s"
-msgstr "Prenosivi medij"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
 
-#: ../rpmdrake_.c:886
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Use .%s as main file"
+msgid "United States"
 msgstr ""
 
-#: ../rpmdrake_.c:888
-msgid "Do nothing"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
 msgstr ""
 
-#: ../rpmdrake_.c:900
-#, fuzzy
-msgid "Installation finished"
-msgstr "moguće instalirati"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr ""
 
-#: ../rpmdrake_.c:910
-msgid "Inspect..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
 msgstr ""
 
-#: ../rpmdrake_.c:925
-msgid "Program missing"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
 msgstr ""
 
-#: ../rpmdrake_.c:926
-msgid "A required program is missing (grpmi). Check your installation."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
 msgstr ""
 
-#: ../rpmdrake_.c:940
-#, fuzzy
-msgid "Unable to get source packages."
-msgstr "Loši, nečitljivi ili nisu pronađeni paketi"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Portugal"
+msgstr "Port:"
 
-#: ../rpmdrake_.c:941
-msgid "Unable to get source packages, sorry."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
 msgstr ""
 
-#: ../rpmdrake_.c:948
-msgid "Change medium"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
 msgstr ""
 
-#: ../rpmdrake_.c:949
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+msgid "Netherlands"
 msgstr ""
 
-#: ../rpmdrake_.c:957
-#, fuzzy
-msgid "Installation failed"
-msgstr "moguće instalirati"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Korea"
+msgstr ""
 
-#: ../rpmdrake_.c:958
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Japan"
 msgstr ""
 
-#: ../rpmdrake_.c:961
-#, fuzzy
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr "Molimo odaberite pakete koje želite dograditi"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Italy"
+msgstr "Instalirano"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Israel"
+msgstr "Instalirano"
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm: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 "Greece"
 msgstr ""
 
-#: ../rpmdrake_.c:982
-#, fuzzy
-msgid ""
-"some packages failed to install\n"
-"correctly"
-msgstr "Paketa već instalirano"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "France"
+msgstr "Odustani"
 
-#: ../rpmdrake_.c:983
-#, fuzzy
-msgid "everything was installed correctly"
-msgstr "Paket je već instaliran"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Finland"
+msgstr "Pronađi:"
 
-#: ../rpmdrake_.c:985
-msgid "Everything installed successfully"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
 msgstr ""
 
-#: ../rpmdrake_.c:986
-msgid "All requested packages were installed successfully."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
 msgstr ""
 
-#: ../rpmdrake_.c:989
-#, fuzzy
-msgid "Everything already installed."
-msgstr "Paket je već instaliran"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr ""
 
-#: ../rpmdrake_.c:990
-msgid "Everything already installed (is this supposed to happen at all?)."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
 msgstr ""
 
-#: ../rpmdrake_.c:997
-#, fuzzy
-msgid "Problem during installation"
-msgstr "Dogodili su se problemi prilikom instalacije"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Costa Rica"
+msgstr ""
 
-#: ../rpmdrake_.c:998
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr "Dogodili su se problemi prilikom instalacije"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Canada"
+msgstr ""
 
-#: ../rpmdrake_.c:1012
-msgid "Please wait, reading packages database..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
 msgstr ""
 
-#: ../rpmdrake_.c:1053
-#, fuzzy
-msgid "Please wait, removing packages..."
-msgstr "Molimo pričekajte dok rpm uklanja navedene pakete:"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Belgium"
+msgstr ""
 
-#: ../rpmdrake_.c:1056
-#, fuzzy
-msgid "Problem during removal"
-msgstr "Dogodili su se problemi prilikom instalacije"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Australia"
+msgstr ""
 
-#: ../rpmdrake_.c:1057
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr "Dogodili su se problemi prilikom instalacije"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
+msgstr ""
 
-#: ../rpmdrake_.c:1089
-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."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Info..."
 msgstr ""
 
-#: ../rpmdrake_.c:1094
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
 msgstr ""
 
-#: ../rpmdrake_.c:1099
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
 msgstr ""
 
+#: data/rpmdrake.desktop.in.h:1
+#, fuzzy
+msgid "Install Software"
+msgstr "Instaliraj sve"
+
 #: data/rpmdrake-remove.desktop.in.h:1
 msgid "Remove Software"
 msgstr ""
@@ -931,11 +1151,6 @@ msgstr ""
 msgid "Software Sources Manager"
 msgstr ""
 
-#: data/rpmdrake.desktop.in.h:1
-#, fuzzy
-msgid "Install Software"
-msgstr "Instaliraj sve"
-
 #, fuzzy
 #~ msgid "Update sources"
 #~ msgstr "Ažuriraj izvore"
diff --git a/po/hr.pom b/po/hr.pom
index dceb49df..60b50890 100644
--- a/po/hr.pom
+++ b/po/hr.pom
@@ -4,166 +4,174 @@ msgstr "Poslužitelj"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
+msgid "Office Workstation"
+msgstr "Uredska radna stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Mrežno računalo (klijent)"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Uredski programi: tekst procesori (kword, abiword), tablični kalkulatori "
+"(kspread, gnumeric), pdf preglednici, itd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS poslužitelj, SMB poslužitelj, Proxy poslužitelj, SSH poslužitelj"
+msgid "Workstation"
+msgstr "Radna stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Ured"
+msgid "Game station"
+msgstr "Igračka radna stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Gnome radna stanica"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Zabavni programi: arkade, ploče, strategije, itd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Alati za vaš Palm Pilot ili vaš Visor"
+msgid "Multimedia station"
+msgstr "Multimedijska stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Radna stanica"
+msgid "Sound and video playing/editing programs"
+msgstr "Zvučni i video svirački/uređivački programi"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Vatrozid/Ruter"
+msgid "Internet station"
+msgstr "Internet stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr "Ime Domene i Mrežni Informacijki Poslužitelj (NIS)"
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
+"Pribor alata za čitanje i slanje mail-a i news-a (pine, mutt, tin..) i za "
+"pregled Web-a"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
-msgstr ""
-"Uredski programi: tekst procesori (kword, abiword), tablični kalkulatori "
-"(kspread, gnumeric), pdf preglednici, itd"
+msgid "Network Computer (client)"
+msgstr "Mrežno računalo (klijent)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "Audio-namjenjeni alati: mp3 ili midi svirači, mikseri, itd"
+msgid "Clients for different protocols including ssh"
+msgstr "Klijenti za razne protokole uključujući ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr ""
+msgid "Configuration"
+msgstr "Postavke"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Knjige i Howto-i o Linux-u i slobodnom software-u"
+msgid "Tools to ease the configuration of your computer"
+msgstr "Alati za lako podešavanje vašeg računala"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "KDE radna stanica"
+msgid "Scientific Workstation"
+msgstr "Znanstvena radna stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, itd"
+msgid "Scientific applications such as gnuplot"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Multimedija - Video"
+msgid "Console Tools"
+msgstr "Konzolni Alati"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr "Skup alata za mail, news, web, datotečni prijenos, i razgovor"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Uređivači, ljuske, datotečni alati, terminali"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Baze"
+msgid "KDE Workstation"
+msgstr "KDE radna stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL ili MySQL poslužitelj baza"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"K Radno Okružje, osnovno grafičko okružje sa kolekcijom pripadajućih alata"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Alati za lako podešavanje vašeg računala"
+msgid "Graphical Environment"
+msgstr "Grafičko Okružje"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "Multimedija - Zvuk"
+msgid "Gnome Workstation"
+msgstr "Gnome radna stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dokumentacija"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+"Grafička okružja sa korisnički prijateljskim skupom aplikacija i alatima za "
+"radno okružje"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Konzolni Alati"
+msgid "Other Graphical Desktops"
+msgstr "Druga grafička radna okružja"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr "Postfix mail poslužitelj, Inn news poslužitelj"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, itd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Internet stanica"
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+msgid "Development"
+msgstr "Razvoj"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Multimedijska stanica"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C i C++ razvojne biblioteke, programi i uključujuće datoteke"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Postavke"
+msgid "Documentation"
+msgstr "Dokumentacija"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Više grafičkih radnih okružja (Gnome, IceWM)"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Knjige i Howto-i o Linux-u i slobodnom software-u"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
+msgid "LSB"
 msgstr ""
-"K Radno Okružje, osnovno grafičko okružje sa kolekcijom pripadajućih alata"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Grafičko Okružje"
+msgid "Linux Standard Base. Third party applications support"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-msgid "Development"
-msgstr "Razvoj"
+msgid "Web/FTP"
+msgstr "Web/FTP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -172,23 +180,33 @@ msgstr "Apache i Pro-ftpd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "Alati za pravljenje i prženje CD-a"
+msgid "Mail/Groupware/News"
+msgstr "Mail/Groupware/News"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Uredska radna stanica"
+msgid "Postfix mail server, Inn news server"
+msgstr "Postfix mail poslužitelj, Inn news poslužitelj"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, itd"
+msgid "Database"
+msgstr "Baze"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Grafički programi poput Gimp-a"
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL ili MySQL poslužitelj baza"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Firewall/Router"
+msgstr "Vatrozid/Ruter"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Internet gateway"
+msgstr "Internet gateway"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -197,8 +215,8 @@ msgstr "DNS/NIS "
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C i C++ razvojne biblioteke, programi i uključujuće datoteke"
+msgid "Domain Name and Network Information Server"
+msgstr "Ime Domene i Mrežni Informacijki Poslužitelj (NIS)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -207,18 +225,18 @@ msgstr "Mrežni računalni poslužitelj"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "Mail/Groupware/News"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS poslužitelj, SMB poslužitelj, Proxy poslužitelj, SSH poslužitelj"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Igračka radna stanica"
+msgid "Office"
+msgstr "Ured"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Video playeri i uređivači"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr "Skup alata za mail, news, web, datotečni prijenos, i razgovor"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -227,79 +245,66 @@ msgstr "Multimedija - Grafika"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Zabavni programi: arkade, ploče, strategije, itd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
-"Pribor alata za čitanje i slanje mail-a i news-a (pine, mutt, tin..) i za "
-"pregled Web-a"
+msgid "Graphics programs such as The Gimp"
+msgstr "Grafički programi poput Gimp-a"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "Osobne financije"
+msgid "Multimedia - Sound"
+msgstr "Multimedija - Zvuk"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
-"Grafička okružja sa korisnički prijateljskim skupom aplikacija i alatima za "
-"radno okružje"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "Audio-namjenjeni alati: mp3 ili midi svirači, mikseri, itd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Klijenti za razne protokole uključujući ssh"
+msgid "Multimedia - Video"
+msgstr "Multimedija - Video"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "LSB"
-msgstr ""
+msgid "Video players and editors"
+msgstr "Video playeri i uređivači"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Internet gateway"
+msgid "Multimedia - CD Burning"
+msgstr "Multimedija - CD prženje"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Zvučni i video svirački/uređivački programi"
+msgid "Tools to create and burn CD's"
+msgstr "Alati za pravljenje i prženje CD-a"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Druga grafička radna okružja"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Više grafičkih radnih okružja (Gnome, IceWM)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Uređivači, ljuske, datotečni alati, terminali"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, itd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "Programi za uređivanje vaših financija, poput gnucash-a"
+msgid "Personal Information Management"
+msgstr "Osobni informacijski menadžment"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "Osobni informacijski menadžment"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Alati za vaš Palm Pilot ili vaš Visor"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multimedija - CD prženje"
+msgid "Personal Finance"
+msgstr "Osobne financije"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Znanstvena radna stanica"
+msgid "Programs to manage your finances, such as gnucash"
+msgstr "Programi za uređivanje vaših financija, poput gnucash-a"
 
diff --git a/po/hu.po b/po/hu.po
index daded886..6d2b8c7f 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2003-02-12 14:24+0100\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\n"
 "PO-Revision-Date: 2003-02-11 20:40+0100\n"
 "Last-Translator: Arpad Biro <biro_arpad@yahoo.com>\n"
 "Language-Team: Hungarian\n"
@@ -16,1042 +16,1233 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../edit-urpm-sources.pl_.c:43
-msgid "Unable to create medium."
-msgstr "Az adatforrás létrehozása nem sikerült."
-
-#: ../edit-urpm-sources.pl_.c:44
-msgid "Unable to update medium; it will be automatically disabled."
-msgstr "Az adatforrás frissítése nem sikerült, ezért letiltásra kerül."
-
-#: ../edit-urpm-sources.pl_.c:54
-msgid "Add a source"
-msgstr "Forrás felvétele"
-
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Local files"
-msgstr "Helyi fájlok"
-
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Path:"
-msgstr "Útvonal:"
-
-#: ../edit-urpm-sources.pl_.c:56
-msgid "FTP server"
-msgstr "FTP-kiszolgáló"
-
-#: ../edit-urpm-sources.pl_.c:56 ../edit-urpm-sources.pl_.c:57
-#: ../edit-urpm-sources.pl_.c:59 ../edit-urpm-sources.pl_.c:187
-msgid "URL:"
-msgstr "URL:"
-
-#: ../edit-urpm-sources.pl_.c:57
-msgid "HTTP server"
-msgstr "HTTP-kiszolgáló"
-
-#: ../edit-urpm-sources.pl_.c:58
-msgid "Path or mount point:"
-msgstr "Útvonal vagy csatolási pont:"
-
-#: ../edit-urpm-sources.pl_.c:58
-msgid "Removable device"
-msgstr "Cserélhető eszköz"
-
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:550
-msgid "Security updates"
-msgstr "Biztonsági frissítések"
-
-#: ../edit-urpm-sources.pl_.c:70
-msgid "Browse..."
-msgstr "Böngészés..."
-
-#: ../edit-urpm-sources.pl_.c:72
-msgid "Choose a mirror..."
-msgstr "Válasszon ki egy tükröt..."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Kívánja folytatni?"
 
-#: ../edit-urpm-sources.pl_.c:92
-msgid "Login:"
-msgstr "Felhasználónév:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to the software installation tool!\n"
+"\n"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
+msgstr ""
+"Üdvözli a szoftvertelepítő.\n"
+"\n"
+"A Mandrake Linux rendszer több ezer, CD-n vagy DVD-n található\n"
+"szoftvercsomagot tartalmaz. Ezzel a programmal kiválaszthatja,\n"
+"mely szoftvercsomagokat kívánja telepíteni a gépére."
 
-#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:231
-msgid "Password:"
-msgstr "Jelszó:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Üdvözli a MandrakeUpdate (Mandrake-frissítés).\n"
+"\n"
+"Ezzel a programmal kiválaszthatja, mely frissítéseket kívánja\n"
+"telepíteni a gépére."
 
-#: ../edit-urpm-sources.pl_.c:97
-msgid "Name:"
-msgstr "Név:"
+#: ../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 ""
+"Ü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."
 
-#: ../edit-urpm-sources.pl_.c:99 ../edit-urpm-sources.pl_.c:188
-msgid "Relative path to synthesis/hdlist:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
 msgstr ""
-"A kiterjesztett függőséglista illetve fejléclista relatív elérési útja:"
+"Probléma adódott a csomagok eltávolítása közben:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:107
-msgid "You need to fill up at least the two first entries."
-msgstr "Legalább az első két bejegyzést ki kell tölteni."
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during removal"
+msgstr "Probléma adódott az eltávolítás során"
 
-#: ../edit-urpm-sources.pl_.c:120
-msgid "Adding a source:"
-msgstr "Forrás felvétele:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages..."
+msgstr "Csomagok eltávolítása folyamatban..."
 
-#: ../edit-urpm-sources.pl_.c:121
-msgid "Type of source:"
-msgstr "Az adatforrás típusa:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
+msgstr "Csomag-adatbázis olvasása..."
 
-#: ../edit-urpm-sources.pl_.c:125 ../edit-urpm-sources.pl_.c:202
-#: ../edit-urpm-sources.pl_.c:235 ../rpmdrake.pm_.c:100 ../rpmdrake.pm_.c:139
-#: ../rpmdrake.pm_.c:322 ../rpmdrake_.c:355 ../rpmdrake_.c:367
-#: ../rpmdrake_.c:371 ../rpmdrake_.c:918 ../rpmdrake_.c:953
-msgid "Ok"
-msgstr "OK"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Probléma adódott a telepítés közben:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:140 ../edit-urpm-sources.pl_.c:196
-#: ../edit-urpm-sources.pl_.c:202 ../edit-urpm-sources.pl_.c:242
-#: ../rpmdrake.pm_.c:322 ../rpmdrake.pm_.c:355 ../rpmdrake_.c:355
-#: ../rpmdrake_.c:953
-msgid "Cancel"
-msgstr "Mégsem"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during installation"
+msgstr "Probléma adódott a telepítés során"
 
-#: ../edit-urpm-sources.pl_.c:147
-msgid "Please wait, adding medium..."
-msgstr "Az adatforrás felvétele folyamatban..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
+msgstr "Már minden telepítve van (esetleg hiba történt?)."
 
-#: ../edit-urpm-sources.pl_.c:168
-msgid "Please wait, removing medium..."
-msgstr "Az adatforrás eltávolítása folyamatban..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed."
+msgstr "Már minden telepítve van."
 
-#: ../edit-urpm-sources.pl_.c:181
-msgid "Edit a source"
-msgstr "Forrás szerkesztése"
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "Az összes kért csomag telepítve lett."
 
-#: ../edit-urpm-sources.pl_.c:185
+#: ../rpmdrake:1
 #, c-format
-msgid "Editing source \"%s\":"
-msgstr "\"%s\" forrás szerkesztése:"
+msgid "Everything installed successfully"
+msgstr "Sikeresen telepítve lett minden"
 
-#: ../edit-urpm-sources.pl_.c:191
-msgid "Save changes"
-msgstr "Módosítások mentése"
+#: ../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 ""
+"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."
 
-#: ../edit-urpm-sources.pl_.c:200
-msgid "You need to insert the medium to continue"
-msgstr "A folytatáshoz be kell helyeznie az adathordozót"
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "megfelelően telepítve lett minden"
 
-#: ../edit-urpm-sources.pl_.c:201
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
+"some packages failed to install\n"
+"correctly"
 msgstr ""
-"A módosítások mentéséhez be kell helyeznie az adathordozót a meghajtóba."
-
-#: ../edit-urpm-sources.pl_.c:206
-msgid "Please wait, updating medium..."
-msgstr "Az adatforrás frissítése folyamatban..."
+"bizonyos csomagokat nem sikerült\n"
+"telepíteni"
 
-#: ../edit-urpm-sources.pl_.c:217
-msgid "Configure proxies"
-msgstr "Proxyk beállítása"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages to allow others to be upgraded..."
+msgstr ""
+"Csomagok eltávolítása annak érdekében, hogy más csomagokat frissíteni "
+"lehessen..."
 
-#: ../edit-urpm-sources.pl_.c:223
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
 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]>):"
+"A telepítés sikertelen volt, mivel bizonyos fájlok\n"
+"nem találhatók. Esetleg frissítse a forrás-adatbázist."
 
-#: ../edit-urpm-sources.pl_.c:225
-msgid "Proxy hostname:"
-msgstr "A proxy gépneve:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation failed"
+msgstr "A telepítés nem sikerült"
 
-#: ../edit-urpm-sources.pl_.c:227
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "A proxyhoz szükséges felhasználónév és jelszó:"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
+msgstr "Mégsem"
 
-#: ../edit-urpm-sources.pl_.c:229
-msgid "User:"
-msgstr "Felhasználó:"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "OK"
 
-#: ../edit-urpm-sources.pl_.c:255
-msgid "Configure sources"
-msgstr "Források beállítása"
+#: ../rpmdrake:1
+#, 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"
 
-#: ../edit-urpm-sources.pl_.c:262
-msgid "Enabled?"
-msgstr "Engedélyezve?"
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr "Adatforrás váltása"
 
-#: ../edit-urpm-sources.pl_.c:263
-msgid "Source"
-msgstr "Forrás"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
+msgstr "A forráscsomagok letöltése sikertelen."
 
-#: ../edit-urpm-sources.pl_.c:286 ../rpmdrake_.c:732
-msgid "Remove"
-msgstr "Eltávolítás"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages."
+msgstr "A forráscsomagok letöltése sikertelen."
 
-#: ../edit-urpm-sources.pl_.c:288
-msgid "Edit"
-msgstr "Módosítás"
+#: ../rpmdrake:1
+#, c-format
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr "Egy szükséges program (grpmi) nem található. Ellenőrizze a telepítést."
 
-#: ../edit-urpm-sources.pl_.c:290
-msgid "Add..."
-msgstr "Felvétel..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
+msgstr "Egy program nem található"
 
-#: ../edit-urpm-sources.pl_.c:292
-msgid "Update..."
-msgstr "Frissítés..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
+msgstr "Vizsgálat..."
 
-#: ../edit-urpm-sources.pl_.c:293
-msgid "Proxy..."
-msgstr "Proxy..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation finished"
+msgstr "A telepítés befejeződött"
 
-#: ../edit-urpm-sources.pl_.c:296
-msgid "Save and quit"
-msgstr "Mentés és kilépés"
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
+msgstr "Ne tegyen semmit"
 
-#: ../edit-urpm-sources.pl_.c:297 ../rpmdrake_.c:735
-msgid "Quit"
-msgstr "Kilépés"
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
+msgstr ".%s használata főfájlként"
 
-#: ../rpmdrake.pm_.c:96
-msgid "Yes"
-msgstr "Igen"
+#: ../rpmdrake:1
+#, c-format
+msgid "Remove .%s"
+msgstr ".%s eltávolítása"
 
-#: ../rpmdrake.pm_.c:98
-msgid "No"
-msgstr "Nem"
+#: ../rpmdrake:1
+#, c-format
+msgid "changes:"
+msgstr "módosítások:"
 
-#: ../rpmdrake.pm_.c:130
-msgid "Info..."
-msgstr "Információ..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr "%s vizsgálata"
 
-#: ../rpmdrake.pm_.c:183
-msgid "Austria"
-msgstr "Ausztria"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, finding available packages..."
+msgstr "A rendelkezésre álló csomagok lekérdezése..."
 
-#: ../rpmdrake.pm_.c:184
-msgid "Australia"
-msgstr "Ausztrália"
+#: ../rpmdrake:1
+#, c-format
+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 ""
+"Hiba történt a frissítési adatforrásnak az Urpmi programmal való\n"
+"felvétele közben.\n"
+"\n"
+"Ezt okozhatja például egy hibásan működő vagy elérhetetlen\n"
+"tükörkiszolgáló, vagy esetleg az, hogy az Ön által használt\n"
+"Mandrake Linux-verzióhoz (%s) még / már nincsen hivatalos\n"
+"frissítés.\n"
+"\n"
+"Megpróbál egy másik tükörkiszolgálót?"
 
-#: ../rpmdrake.pm_.c:185
-msgid "Belgium"
-msgstr "Belgium"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
+msgstr "Hiba a frissítési adatforrás felvétele közben"
 
-#: ../rpmdrake.pm_.c:186
-msgid "Brazil"
-msgstr "Brazília"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
+msgstr "Kapcsolódás a tükörkiszolgálóhoz; a frissítőcsomagok inicializálása..."
 
-#: ../rpmdrake.pm_.c:187
-msgid "Canada"
-msgstr "Kanada"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Sources Manager, and then add a `Security\n"
+"updates' source.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"A kívánt tükörkiszolgáló saját kezűleg is kiválasztható; ehhez\n"
+"indítsa el a szoftverforrás-kezelőt, majd vegyen fel egy \"Biztonsági\n"
+"frissítések\" forrást.\n"
+"\n"
+"Ez után indítsa el újra a MandrakeUpdate programot."
 
-#: ../rpmdrake.pm_.c:188
-msgid "Costa Rica"
-msgstr "Costa Rica"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Hogyan lehet tükörkiszolgálót választani saját kezűleg"
 
-#: ../rpmdrake.pm_.c:189
-msgid "Czech Republic"
-msgstr "Cseh Köztársaság"
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
+msgstr "Helyrehozhatatlan hiba történt a csomaginformációk frissítése közben."
 
-#: ../rpmdrake.pm_.c:190
-msgid "Germany"
-msgstr "Németország"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
+msgstr "Hiba az adatforrás frissítése közben"
 
-#: ../rpmdrake.pm_.c:191
-msgid "Danmark"
-msgstr "Dánia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
+msgstr "Kapcsolódás a tükörkiszolgálóhoz; csomaginformációk lekérdezése..."
 
-#: ../rpmdrake.pm_.c:192 ../rpmdrake.pm_.c:196
-msgid "Greece"
-msgstr "Görögország"
+#: ../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_.c:193
-msgid "Spain"
-msgstr "Spanyolország"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Installation"
+msgstr "Szoftvercsomag-telepítés"
 
-#: ../rpmdrake.pm_.c:194
-msgid "Finland"
-msgstr "Finnország"
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, c-format
+msgid "Mandrake Update"
+msgstr "Mandrake-frissítés"
 
-#: ../rpmdrake.pm_.c:195
-msgid "France"
-msgstr "Franciaország"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
+msgstr "Szoftvercsomag-eltávolítás"
 
-#: ../rpmdrake.pm_.c:197
-msgid "Israel"
-msgstr "Izrael"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Kilépés"
 
-#: ../rpmdrake.pm_.c:198
-msgid "Italy"
-msgstr "Olaszország"
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "Telepítés"
 
-#: ../rpmdrake.pm_.c:199
-msgid "Japan"
-msgstr "Japán"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "Eltávolítás"
 
-#: ../rpmdrake.pm_.c:200
-msgid "Korea"
-msgstr "Korea"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search"
+msgstr "Keresés"
 
-#: ../rpmdrake.pm_.c:201
-msgid "Netherlands"
-msgstr "Hollandia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "Keresés:"
 
-#: ../rpmdrake.pm_.c:202
-msgid "Norway"
-msgstr "Norvégia"
+#: ../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?"
 
-#: ../rpmdrake.pm_.c:203
-msgid "Poland"
-msgstr "Lengyelország"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "Bizonyos csomagokat el kell távolítani"
 
-#: ../rpmdrake.pm_.c:204
-msgid "Portugal"
-msgstr "Portugália"
+#: ../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?"
 
-#: ../rpmdrake.pm_.c:205
-msgid "Russia"
-msgstr "Oroszország"
+#: ../rpmdrake:1
+#, c-format
+msgid "Too many packages are selected"
+msgstr "Túl sok csomag van kijelölve"
 
-#: ../rpmdrake.pm_.c:206
-msgid "Sweden"
-msgstr "Svédország"
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
+msgstr "Maximális mennyiségű információ"
 
-#: ../rpmdrake.pm_.c:207
-msgid "Taiwan"
-msgstr "Tajvan"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal information"
+msgstr "Normál mennyiségű információ"
 
-#: ../rpmdrake.pm_.c:208
-msgid "United Kingdom"
-msgstr "Egyesült Királyság"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update source(s)"
+msgstr "Forrás(ok) frissítése"
 
-#: ../rpmdrake.pm_.c:209
-msgid "China"
-msgstr "Kína"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reload the packages list"
+msgstr "A csomaglista újraolvasása"
 
-#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:211 ../rpmdrake.pm_.c:212
-#: ../rpmdrake.pm_.c:213 ../rpmdrake.pm_.c:264
-msgid "United States"
-msgstr "Amerikai Egyesült Államok"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
+msgstr "A kijelölés visszaállítása"
 
-#: ../rpmdrake.pm_.c:277
-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
+#, c-format
+msgid "in files"
+msgstr "a fájlokban"
 
-#: ../rpmdrake.pm_.c:283
-msgid "Error during download"
-msgstr "Hiba a letöltés közben"
+#: ../rpmdrake:1
+#, c-format
+msgid "in descriptions"
+msgstr "a leírásokban"
 
-#: ../rpmdrake.pm_.c:292
-msgid "No mirror"
-msgstr "Tükörkiszolgáló nem található"
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
+msgstr "a nevekben"
 
-#: ../rpmdrake.pm_.c:310
-msgid "Please choose the desired mirror."
-msgstr "Válassza ki a kívánt tükörkiszolgálót."
+# it's a sort method
+# "new or update"
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
+msgstr "telepítettség alapján"
 
-#: ../rpmdrake.pm_.c:342 ../rpmdrake_.c:629
-msgid "Update source(s)"
-msgstr "Forrás(ok) frissítése"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
+msgstr "forrás alapján"
 
-#: ../rpmdrake.pm_.c:346
-msgid "Select the source(s) you wish to update:"
-msgstr "Válassza ki, mely forrás(oka)t kívánja frissíteni:"
+# it's a sort method
+# "selected or not"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
+msgstr "kijelölési állapot szerint"
 
-#: ../rpmdrake.pm_.c:350
-msgid "Update"
-msgstr "Frissítés"
+#: ../rpmdrake:1
+#, c-format
+msgid "by size"
+msgstr "méret szerint"
 
-#: ../rpmdrake.pm_.c:360
-msgid "Please wait, updating media..."
-msgstr "Az adatforrások frissítése folyamatban..."
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
+msgstr "csoport szerint"
 
-#: ../rpmdrake_.c:101
-msgid "Other"
-msgstr "Egyéb"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages,"
+msgstr "Az összes csomag,"
 
-#: ../rpmdrake_.c:123 ../rpmdrake_.c:137 ../rpmdrake_.c:229 ../rpmdrake_.c:300
-msgid "(none)"
-msgstr "(egyik sem)"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
+msgstr "Az összes csomag, ábécérendben"
 
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:484 ../rpmdrake_.c:485
-msgid "(Not available)"
-msgstr "(Nem elérhető)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
+msgstr "Mandrake-válogatás"
 
-#: ../rpmdrake_.c:153 ../rpmdrake_.c:210
-msgid "Search results"
-msgstr "Keresési eredmény"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal updates"
+msgstr "Normál frissítések"
 
-#: ../rpmdrake_.c:153
-msgid "Search results (none)"
-msgstr "Keresési eredmény (nincs)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Bugfixes updates"
+msgstr "Hibajavító frissítések"
 
-#: ../rpmdrake_.c:163 ../rpmdrake_.c:174
-msgid "Please wait, searching..."
-msgstr "Keresés..."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
+msgstr "Biztonsági frissítések"
 
-#: ../rpmdrake_.c:177
-msgid "Stop"
-msgstr "Leállítás"
+#: ../rpmdrake:1
+#, c-format
+msgid "Description: "
+msgstr "Leírás: "
 
-# "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_.c:211 ../rpmdrake_.c:321
-msgid "Addable"
-msgstr "Telepíthető"
+#: ../rpmdrake:1
+#, c-format
+msgid "Summary: "
+msgstr "Összefoglaló: "
 
-#: ../rpmdrake_.c:211 ../rpmdrake_.c:321
-msgid "Upgradable"
-msgstr "Frissíthető"
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "Fontosság: "
 
-#: ../rpmdrake_.c:213
-msgid "Not selected"
-msgstr "Nincs kijelölve"
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s KByte"
 
-#: ../rpmdrake_.c:213
-msgid "Selected"
-msgstr "Kijelölve"
+#: ../rpmdrake:1
+#, c-format
+msgid "Size: "
+msgstr "Méret: "
 
-#: ../rpmdrake_.c:242
-msgid "rpmdrake"
-msgstr "rpmdrake"
+#: ../rpmdrake:1
+#, c-format
+msgid "Version: "
+msgstr "Verzió: "
 
-#: ../rpmdrake_.c:260 ../rpmdrake_.c:362 ../rpmdrake_.c:364
-msgid "More information on package..."
-msgstr "További információ a csomagról..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "Név: "
 
-#: ../rpmdrake_.c:261
-msgid "One of the following packages is needed:"
-msgstr "Szükség van a következő csomagok valamelyikére:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "A frissítés oka: "
 
-#: ../rpmdrake_.c:261
-msgid "Please choose"
-msgstr "Válasszon"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
+msgstr "A jelenleg telepített verzió: "
 
-#: ../rpmdrake_.c:277
-msgid "unknown package "
-msgstr "ismeretlen csomag"
+#: ../rpmdrake:1
+#, c-format
+msgid "Source: "
+msgstr "Forrás: "
 
-#: ../rpmdrake_.c:287
-msgid "Please wait, listing packages..."
-msgstr "A csomagok listázása folyamatban..."
+#: ../rpmdrake:1
+#, c-format
+msgid "(Not available)"
+msgstr "(Nem elérhető)"
 
-#: ../rpmdrake_.c:302
-msgid "No update"
-msgstr "Frissítés nem található"
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
+msgstr "Változások jegyzéke:\n"
 
-#: ../rpmdrake_.c:355 ../rpmdrake_.c:356
-msgid "More infos"
-msgstr "További információ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "Fájlok:\n"
 
-#: ../rpmdrake_.c:357
-msgid "Information on packages"
-msgstr "Információ a csomagokról"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected size: %d MB"
+msgstr "Kijelölve: %d MB"
 
-#: ../rpmdrake_.c:378
-msgid "Some additional packages need to be removed"
-msgstr "Néhány további csomagot is el kell távolítani"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Kijelölve: %d MB / Üres hely a lemezen: %d MB"
 
-#: ../rpmdrake_.c:379
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"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ő csomago(ka)t is el kell távolítani:\n"
+"A függőségeik miatt a következő csomag(ok) kijelölését törölni kell:\n"
 "\n"
 
-#: ../rpmdrake_.c:385 ../rpmdrake_.c:393
-msgid "Some packages can't be removed"
-msgstr "Bizonyos csomagokat nem lehet eltávolítani"
-
-#: ../rpmdrake_.c:386
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Removing these packages would break your system, sorry:\n"
+"Sorry, the following package(s) can't be selected:\n"
 "\n"
 msgstr ""
-"Ezen csomagok eltávolítása rendszerproblémákhoz vezetne:\n"
+"A következő csomag(ok) nem választható(k):\n"
 "\n"
 
-#: ../rpmdrake_.c:394 ../rpmdrake_.c:453
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "Bizonyos csomagokat nem lehet telepíteni"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
 "\n"
 msgstr ""
-"A függőségeik miatt a következő csomag(ok) kijelölését törölni kell:\n"
+"A függőségek miatt a következő csomago(ka)t is telepíteni kell:\n"
 "\n"
 
-#: ../rpmdrake_.c:423
+#: ../rpmdrake:1
+#, c-format
 msgid "Additional packages needed"
 msgstr "Szükség van további csomagokra"
 
-#: ../rpmdrake_.c:424
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be removed"
+msgstr "Bizonyos csomagokat nem lehet eltávolítani"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
+"Removing these packages would break your system, sorry:\n"
 "\n"
 msgstr ""
-"A függőségek miatt a következő csomago(ka)t is telepíteni kell:\n"
+"Ezen csomagok eltávolítása rendszerproblémákhoz vezetne:\n"
 "\n"
 
-#: ../rpmdrake_.c:437
-msgid "Some packages can't be installed"
-msgstr "Bizonyos csomagokat nem lehet telepíteni"
-
-#: ../rpmdrake_.c:438
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
 "\n"
 msgstr ""
-"A következő csomag(ok) nem választható(k):\n"
+"A függőségeik miatt a következő csomago(ka)t is el kell távolítani:\n"
 "\n"
 
-#: ../rpmdrake_.c:452 ../rpmdrake_.c:686
-msgid "Some packages need to be removed"
-msgstr "Bizonyos csomagokat el kell távolítani"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr "Néhány további csomagot is el kell távolítani"
 
-#: ../rpmdrake_.c:474
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Kijelölve: %d MB / Üres hely a lemezen: %d MB"
+msgid "More information on package..."
+msgstr "További információ a csomagról..."
 
-#: ../rpmdrake_.c:476
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "Kijelölve: %d MB"
+msgid "Information on packages"
+msgstr "Információ a csomagokról"
 
-#: ../rpmdrake_.c:484
-msgid "Files:\n"
-msgstr "Fájlok:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
+msgstr "További információ"
 
-#: ../rpmdrake_.c:485
-msgid "Changelog:\n"
-msgstr "Változások jegyzéke:\n"
+# "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 "Addable"
+msgstr "Telepíthető"
 
-#: ../rpmdrake_.c:488
-msgid "Source: "
-msgstr "Forrás: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Upgradable"
+msgstr "Frissíthető"
 
-#: ../rpmdrake_.c:489
-msgid "Currently installed version: "
-msgstr "A jelenleg telepített verzió: "
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"The list of updates is void. This means that either there is\n"
+"no available update for the packages installed on your computer,\n"
+"or you already installed all of them."
+msgstr ""
+"A frissítési lista üres. Ez azt jelenti, hogy vagy nincsen az Ön\n"
+"gépére telepített csomagokhoz frissítés, vagy pedig már telepítve\n"
+"lett az összes."
 
-#: ../rpmdrake_.c:493
-msgid "Reason for update: "
-msgstr "A frissítés oka: "
+#: ../rpmdrake:1
+#, c-format
+msgid "No update"
+msgstr "Frissítés nem található"
 
-#: ../rpmdrake_.c:495
-msgid "Name: "
-msgstr "Név: "
+#: ../rpmdrake:1
+#, c-format
+msgid "(none)"
+msgstr "(egyik sem)"
 
-#: ../rpmdrake_.c:496
-msgid "Version: "
-msgstr "Verzió: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, listing packages..."
+msgstr "A csomagok listázása folyamatban..."
 
-#: ../rpmdrake_.c:497
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KByte"
+msgid "unknown package "
+msgstr "ismeretlen csomag"
 
-#: ../rpmdrake_.c:497
-msgid "Size: "
-msgstr "Méret: "
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Szükség van a következő csomagok valamelyikére:"
 
-#: ../rpmdrake_.c:499
-msgid "Importance: "
-msgstr "Fontosság: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please choose"
+msgstr "Válasszon"
 
-#: ../rpmdrake_.c:500
-msgid "Summary: "
-msgstr "Összefoglaló: "
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:501
-msgid "Description: "
-msgstr "Leírás: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Not selected"
+msgstr "Nincs kijelölve"
 
-#: ../rpmdrake_.c:550
-msgid "Bugfixes updates"
-msgstr "Hibajavító frissítések"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected"
+msgstr "Kijelölve"
 
-#: ../rpmdrake_.c:550
-msgid "Normal updates"
-msgstr "Normál frissítések"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results"
+msgstr "Keresési eredmény"
 
-#: ../rpmdrake_.c:569
-msgid "Mandrake choices"
-msgstr "Mandrake-válogatás"
+#: ../rpmdrake:1
+#, c-format
+msgid "Stop"
+msgstr "Leállítás"
 
-#: ../rpmdrake_.c:570
-msgid "All packages, alphabetical"
-msgstr "Az összes csomag, ábécérendben"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, searching..."
+msgstr "Keresés..."
 
-#: ../rpmdrake_.c:571
-msgid "All packages,"
-msgstr "Az összes csomag,"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
+msgstr "Keresési eredmény (nincs)"
 
-#: ../rpmdrake_.c:594
-msgid "by group"
-msgstr "csoport szerint"
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Egyéb"
 
-#: ../rpmdrake_.c:594
-msgid "by size"
-msgstr "méret szerint"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"Welcome to the packages source editor!\n"
+"\n"
+"This tool will help you configure the packages sources you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"Üdvözli a csomagforrás-szerkesztő.\n"
+"\n"
+"Ezzel a programmal beállíthatja a gépen használni kívánt csomagforrásokat.\n"
+"Ezt követően a források felhasználásával új programokat telepíthet és\n"
+"frissítheti a meglevőket."
 
-# it's a sort method
-# "selected or not"
-#: ../rpmdrake_.c:595
-msgid "by selection state"
-msgstr "kijelölési állapot szerint"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Mentés és kilépés"
 
-#: ../rpmdrake_.c:596
-msgid "by source repository"
-msgstr "forrás alapján"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy..."
+msgstr "Proxy..."
 
-# it's a sort method
-# "new or update"
-#: ../rpmdrake_.c:596
-msgid "by update availability"
-msgstr "telepítettség alapján"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
+msgstr "Frissítés..."
 
-#: ../rpmdrake_.c:617
-msgid "in descriptions"
-msgstr "a leírásokban"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "Felvétel..."
 
-#: ../rpmdrake_.c:617
-msgid "in files"
-msgstr "a fájlokban"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "Módosítás"
 
-#: ../rpmdrake_.c:617
-msgid "in names"
-msgstr "a nevekben"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Source"
+msgstr "Forrás"
 
-#: ../rpmdrake_.c:628
-msgid "Reload the packages list"
-msgstr "A csomaglista újraolvasása"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
+msgstr "Engedélyezve?"
 
-#: ../rpmdrake_.c:628
-msgid "Reset the selection"
-msgstr "A kijelölés visszaállítása"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure sources"
+msgstr "Források beállítása"
 
-#: ../rpmdrake_.c:654
-msgid "Maximum information"
-msgstr "Maximális mennyiségű információ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "Jelszó:"
 
-#: ../rpmdrake_.c:654
-msgid "Normal information"
-msgstr "Normál mennyiségű információ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
+msgstr "Felhasználó:"
 
-#: ../rpmdrake_.c:676
-msgid "Too many packages are selected"
-msgstr "Túl sok csomag van kijelölve"
+#: ../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ó:"
 
-#: ../rpmdrake_.c:722
-msgid "Find:"
-msgstr "Keresés:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "A proxy gépneve:"
 
-#: ../rpmdrake_.c:727
-msgid "Search"
-msgstr "Keresés"
+#: ../edit-urpm-sources.pl: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]>):"
 
-#: ../rpmdrake_.c:733
-msgid "Install"
-msgstr "Telepítés"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "Proxyk beállítása"
 
-#: ../rpmdrake_.c:740 data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrake Update"
-msgstr "Mandrake-frissítés"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr "Az adatforrás frissítése folyamatban..."
 
-#: ../rpmdrake_.c:740
-msgid "Software Packages Installation"
-msgstr "Szoftvercsomag-telepítés"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+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_.c:740
-msgid "Software Packages Removal"
-msgstr "Szoftvercsomag-eltávolítás"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
+msgstr "A folytatáshoz be kell helyeznie az adathordozót"
 
-#: ../rpmdrake_.c:781
-msgid "Please wait, contacting mirror to update packages information."
-msgstr "Kapcsolódás a tükörkiszolgálóhoz; csomaginformációk lekérdezése..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save changes"
+msgstr "Módosítások mentése"
 
-#: ../rpmdrake_.c:783
-msgid "Error updating medium"
-msgstr "Hiba az adatforrás frissítése közben"
+#: ../edit-urpm-sources.pl: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:"
 
-#: ../rpmdrake_.c:784
-msgid "There was an unrecoverable error while updating packages information."
-msgstr "Helyrehozhatatlan hiba történt a csomaginformációk frissítése közben."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake_.c:789
-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
+#, c-format
+msgid "Editing source \"%s\":"
+msgstr "\"%s\" forrás szerkesztése:"
 
-#: ../rpmdrake_.c:797
-msgid "Please wait, contacting mirror to initialize updates packages."
-msgstr "Kapcsolódás a tükörkiszolgálóhoz; a frissítőcsomagok inicializálása..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit a source"
+msgstr "Forrás szerkesztése"
 
-#: ../rpmdrake_.c:800
-msgid "Error adding update medium"
-msgstr "Hiba a frissítési adatforrás felvétele közben"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr "Az adatforrás eltávolítása folyamatban..."
 
-#: ../rpmdrake_.c:831
-msgid "Please wait, finding available packages..."
-msgstr "A rendelkezésre álló csomagok lekérdezése..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, adding medium..."
+msgstr "Az adatforrás felvétele folyamatban..."
 
-#: ../rpmdrake_.c:863
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "%s vizsgálata"
+msgid "Type of source:"
+msgstr "Az adatforrás típusa:"
 
-#: ../rpmdrake_.c:882
-msgid "changes:"
-msgstr "módosítások:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Adding a source:"
+msgstr "Forrás felvétele:"
 
-#: ../rpmdrake_.c:886
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove .%s"
-msgstr ".%s eltávolítása"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr "Már van ilyen néven adatforrás. Szeretné azt felülírni?"
 
-#: ../rpmdrake_.c:888
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr ".%s használata főfájlként"
+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_.c:890
-msgid "Do nothing"
-msgstr "Ne tegyen semmit"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "Név:"
 
-#: ../rpmdrake_.c:902
-msgid "Installation finished"
-msgstr "A telepítés befejeződött"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
+msgstr "Felhasználónév:"
 
-#: ../rpmdrake_.c:912
-msgid "Inspect..."
-msgstr "Vizsgálat..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Válasszon ki egy tükröt..."
 
-#: ../rpmdrake_.c:927
-msgid "Program missing"
-msgstr "Egy program nem található"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Browse..."
+msgstr "Böngészés..."
 
-#: ../rpmdrake_.c:928
-msgid "A required program is missing (grpmi). Check your installation."
-msgstr "Egy szükséges program (grpmi) nem található. Ellenőrizze a telepítést."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Útvonal vagy csatolási pont:"
 
-#: ../rpmdrake_.c:942
-msgid "Unable to get source packages."
-msgstr "A forráscsomagok letöltése sikertelen."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Removable device"
+msgstr "Cserélhető eszköz"
 
-#: ../rpmdrake_.c:943
-msgid "Unable to get source packages, sorry."
-msgstr "A forráscsomagok letöltése sikertelen."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "HTTP server"
+msgstr "HTTP-kiszolgáló"
 
-#: ../rpmdrake_.c:951
-msgid "Change medium"
-msgstr "Adatforrás váltása"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "FTP-kiszolgáló"
 
-#: ../rpmdrake_.c:952
+#: ../edit-urpm-sources.pl:1
 #, 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 "Path:"
+msgstr "Útvonal:"
 
-#: ../rpmdrake_.c:960
-msgid "Installation failed"
-msgstr "A telepítés nem sikerült"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "Helyi fájlok"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add a source"
+msgstr "Forrás felvétele"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
+msgstr "Az adatforrás frissítése nem sikerült, ezért letiltásra kerül."
 
-#: ../rpmdrake_.c:961
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "Az adatforrás létrehozása nem sikerült."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, updating media..."
+msgstr "Az adatforrások frissítése folyamatban..."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
+msgstr "Frissítés"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Select the source(s) you wish to update:"
+msgstr "Válassza ki, mely forrás(oka)t kívánja frissíteni:"
+
+#: ../rpmdrake.pm:1
+#, c-format
+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 ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
-"A telepítés sikertelen volt, mivel bizonyos fájlok\n"
-"nem találhatók. Esetleg frissítse a forrás-adatbázist."
+"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_.c:964
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr ""
-"Csomagok eltávolítása annak érdekében, hogy más csomagokat frissíteni "
-"lehessen..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
+msgstr "Tükörkiszolgáló nem található"
 
-#: ../rpmdrake_.c:985
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"There was an error downloading the mirrors list:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
-"A telepítés befejeződött; %s.\n"
+"Hiba történt a tükörkiszolgálók listájának letöltése közben:\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."
+"%s\n"
+"Elképzelhető, hogy a hálózat vagy a MandrakeSoft-weboldal nem\n"
+"elérhető. Próbálja meg később."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "Hiba a letöltés közben"
+
+#: ../rpmdrake.pm: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..."
 
-#: ../rpmdrake_.c:985
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"some packages failed to install\n"
-"correctly"
+"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 ""
-"bizonyos csomagokat nem sikerült\n"
-"telepíteni"
+"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_.c:986
-msgid "everything was installed correctly"
-msgstr "megfelelően telepítve lett minden"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United States"
+msgstr "Amerikai Egyesült Államok"
 
-#: ../rpmdrake_.c:988
-msgid "Everything installed successfully"
-msgstr "Sikeresen telepítve lett minden"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
+msgstr "Kína"
 
-#: ../rpmdrake_.c:989
-msgid "All requested packages were installed successfully."
-msgstr "Az összes kért csomag telepítve lett."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr "Egyesült Királyság"
 
-#: ../rpmdrake_.c:992
-msgid "Everything already installed."
-msgstr "Már minden telepítve van."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "Tajvan"
 
-#: ../rpmdrake_.c:993
-msgid "Everything already installed (is this supposed to happen at all?)."
-msgstr "Már minden telepítve van (esetleg hiba történt?)."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "Svédország"
 
-#: ../rpmdrake_.c:1000
-msgid "Problem during installation"
-msgstr "Probléma adódott a telepítés során"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
+msgstr "Oroszország"
 
-#: ../rpmdrake_.c:1001
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Probléma adódott a telepítés közben:\n"
-"\n"
-"%s"
+msgid "Portugal"
+msgstr "Portugália"
 
-#: ../rpmdrake_.c:1015
-msgid "Please wait, reading packages database..."
-msgstr "Csomag-adatbázis olvasása..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
+msgstr "Lengyelország"
 
-#: ../rpmdrake_.c:1056
-msgid "Please wait, removing packages..."
-msgstr "Csomagok eltávolítása folyamatban..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
+msgstr "Norvégia"
 
-#: ../rpmdrake_.c:1059
-msgid "Problem during removal"
-msgstr "Probléma adódott az eltávolítás során"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
+msgstr "Hollandia"
 
-#: ../rpmdrake_.c:1060
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Probléma adódott a csomagok eltávolítása közben:\n"
-"\n"
-"%s"
+msgid "Korea"
+msgstr "Korea"
 
-#: ../rpmdrake_.c:1092
-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
+#, c-format
+msgid "Japan"
+msgstr "Japán"
 
-#: ../rpmdrake_.c:1097
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"Üdvözli a MandrakeUpdate (Mandrake-frissítés).\n"
-"\n"
-"Ezzel a programmal kiválaszthatja, mely frissítéseket kívánja\n"
-"telepíteni a gépére."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Italy"
+msgstr "Olaszország"
 
-#: ../rpmdrake_.c:1102
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
-msgstr ""
-"Üdvözli a szoftvertelepítő.\n"
-"\n"
-"A Mandrake Linux rendszer több ezer, CD-n vagy DVD-n található\n"
-"szoftvercsomagot tartalmaz. Ezzel a programmal kiválaszthatja,\n"
-"mely szoftvercsomagokat kívánja telepíteni a gépére."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Israel"
+msgstr "Izrael"
 
-#: data/rpmdrake-remove.desktop.in.h:1
-msgid "Remove Software"
-msgstr "Szoftvereltávolítás"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Görögország"
 
-#: data/rpmdrake-sources.desktop.in.h:1
-msgid "Software Sources Manager"
-msgstr "Szoftverforrás-kezelő"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "France"
+msgstr "Franciaország"
 
-#: data/rpmdrake.desktop.in.h:1
-msgid "Install Software"
-msgstr "Szoftvertelepítés"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "Finnország"
 
-#~ msgid ""
-#~ "There is already a medium by that name, do you\n"
-#~ "really want to replace it?"
-#~ msgstr "Már van ilyen néven adatforrás. Szeretné azt felülírni?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "Spanyolország"
 
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-#~ "Kívánja folytatni?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
+msgstr "Dánia"
 
-#~ 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."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr "Németország"
 
-#~ 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 "Czech Republic"
+msgstr "Cseh Köztársaság"
 
-#~ 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 ""
-#~ "Hiba történt a tükörkiszolgálók listájának letöltése közben:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "Elképzelhető, hogy a hálózat vagy a MandrakeSoft-weboldal nem\n"
-#~ "elérhető. Próbálja meg később."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
-#~ 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 "Canada"
+msgstr "Kanada"
 
-#~ msgid ""
-#~ "The list of updates is void. This means that either there is\n"
-#~ "no available update for the packages installed on your computer,\n"
-#~ "or you already installed all of them."
-#~ msgstr ""
-#~ "A frissítési lista üres. Ez azt jelenti, hogy vagy nincsen az Ön\n"
-#~ "gépére telepített csomagokhoz frissítés, vagy pedig már telepítve\n"
-#~ "lett az összes."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
+msgstr "Brazília"
 
-#~ msgid ""
-#~ "Warning: it seems that you are attempting to add so much\n"
-#~ "packages that your filesystem may run out of free diskspace,\n"
-#~ "during or after package installation ; this is particularly\n"
-#~ "dangerous and should be considered with care.\n"
-#~ "\n"
-#~ "Do you really want to install all the selected packages?"
-#~ msgstr ""
-#~ "Figyelmeztetés: úgy tűnik, hogy a telepítésre kijelölt csomagok\n"
-#~ "nem fognak elférni a fájlrendszerben, vagy pedig nem marad szabad\n"
-#~ "hely a telepítés után. Ez veszélyes lehet, ezért átgondolandó.\n"
-#~ "\n"
-#~ "Biztos abban, hogy telepíteni kívánja az összes kijelölt csomagot?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Belgium"
+msgstr "Belgium"
 
-#~ msgid ""
-#~ "The following packages have to be removed for others to be upgraded:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "A következő csomagokat el kell távolítani ahhoz, hogy más csomagokat\n"
-#~ "frissíteni lehessen:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Kívánja folytatni?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Australia"
+msgstr "Ausztrália"
 
-#~ msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#~ msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
+msgstr "Ausztria"
 
-#~ 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
+#, c-format
+msgid "Info..."
+msgstr "Információ..."
 
-#~ 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."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
+msgstr "Nem"
 
-#~ 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 ""
-#~ "Hiba történt a frissítési adatforrásnak az Urpmi programmal való\n"
-#~ "felvétele közben.\n"
-#~ "\n"
-#~ "Ezt okozhatja például egy hibásan működő vagy elérhetetlen\n"
-#~ "tükörkiszolgáló, vagy esetleg az, hogy az Ön által használt\n"
-#~ "Mandrake Linux-verzióhoz (%s) még / már nincsen hivatalos\n"
-#~ "frissítés.\n"
-#~ "\n"
-#~ "Megpróbál egy másik tükörkiszolgálót?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Igen"
+
+#: data/rpmdrake.desktop.in.h:1
+msgid "Install Software"
+msgstr "Szoftvertelepítés"
+
+#: data/rpmdrake-remove.desktop.in.h:1
+msgid "Remove Software"
+msgstr "Szoftvereltávolítás"
+
+#: data/rpmdrake-sources.desktop.in.h:1
+msgid "Software Sources Manager"
+msgstr "Szoftverforrás-kezelő"
+
+#~ 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--*-*-*-*-*,*"
diff --git a/po/hu.pom b/po/hu.pom
index 55a74b2e..6313c1ad 100644
--- a/po/hu.pom
+++ b/po/hu.pom
@@ -4,167 +4,174 @@ msgstr "Kiszolgáló"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Hálózati számítógép (kliens)"
+msgid "Office Workstation"
+msgstr "Irodai munkaállomás"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS-, SMB-, proxy- és SSH-kiszolgáló"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Irodai programok: szövegszerkesztők (KWord, AbiWord), táblázatkezelők "
+"(KSpread, Gnumeric), PDF-nézegetők, ..."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Iroda"
+msgid "Workstation"
+msgstr "Munkaállomás"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "GNOME-munkaállomás"
+msgid "Game station"
+msgstr "Játékgép"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Segédprogramok a Palmhoz és a Visorhoz"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Játékprogramok: lövöldözős, táblás, stratégiai, ..."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Munkaállomás"
+msgid "Multimedia station"
+msgstr "Multimédiás munkaállomás"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Tűzfal/útválasztó (router)"
+msgid "Sound and video playing/editing programs"
+msgstr "Hang/videólejátszó és -szerkesztő programok"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr "DNS- és NIS-kiszolgáló"
+msgid "Internet station"
+msgstr "Internetes munkaállomás"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
 msgstr ""
-"Irodai programok: szövegszerkesztők (KWord, AbiWord), táblázatkezelők "
-"(KSpread, Gnumeric), PDF-nézegetők, ..."
+"Eszközök levelezéshez, hírkezeléshez (pine, mutt, tin, ...) és a Web "
+"böngészéséhez"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "Hangkezelő eszközök: MP3- és MIDI-lejátszók, hangkeverők, ..."
+msgid "Network Computer (client)"
+msgstr "Hálózati számítógép (kliens)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Linux Standard Base. Külső társaságok alkalmazásainak támogatása."
+msgid "Clients for different protocols including ssh"
+msgstr "Kliensprogramok különféle protokollokhoz (például: ssh)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Könyvek és HOGYAN-ok a Linuxról és a szabad szoftverekről"
+msgid "Configuration"
+msgstr "Beállítás"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "KDE-munkaállomás"
+msgid "Tools to ease the configuration of your computer"
+msgstr "Segédprogramok a számítógép beállításához"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "IceWM, WindowMaker, Enlightenment, Fvwm, ..."
+msgid "Scientific Workstation"
+msgstr "Tudományos munkaállomás"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Multimédia - videó"
+msgid "Scientific applications such as gnuplot"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr "Email-eszközök, hírkezelés, web-eszközök, fájlátvitel és csevegés"
+msgid "Console Tools"
+msgstr "Parancssoros eszközök"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Adatbázis"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Szövegszerkesztők, parancsértelmezők, fájlkezelők, terminálprogramok"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL vagy MySQL adatbázis-kiszolgáló"
+msgid "KDE Workstation"
+msgstr "KDE-munkaállomás"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Segédprogramok a számítógép beállításához"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"A K Desktop Environment - az alapvető grafikus környezet - az ahhoz tartozó "
+"eszközökkel együtt"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "Multimédia - hang"
+msgid "Graphical Environment"
+msgstr "Grafikus környezet"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dokumentáció"
+msgid "Gnome Workstation"
+msgstr "GNOME-munkaállomás"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Parancssoros eszközök"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+"Grafikus környezet felhasználóbarát alkalmazásokkal és segédprogramokkal"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr "Postfix email-kiszolgáló, Inn hírkiszolgáló"
+msgid "Other Graphical Desktops"
+msgstr "Más grafikus környezetek"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Internetes munkaállomás"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "IceWM, WindowMaker, Enlightenment, Fvwm, ..."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Multimédiás munkaállomás"
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+msgid "Development"
+msgstr "Fejlesztés"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Beállítás"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C/C++ fejlesztőkönyvtárak, programok és include fájlok"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "További grafikus környezetek (GNOME, IceWM)"
+msgid "Documentation"
+msgstr "Dokumentáció"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
-"A K Desktop Environment - az alapvető grafikus környezet - az ahhoz tartozó "
-"eszközökkel együtt"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Könyvek és HOGYAN-ok a Linuxról és a szabad szoftverekről"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Grafikus környezet"
+msgid "LSB"
+msgstr "LSB"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Linux Standard Base. Külső társaságok alkalmazásainak támogatása."
+
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-msgid "Development"
-msgstr "Fejlesztés"
+#: ../../share/compssUsers:999
+msgid "Web/FTP"
+msgstr "Web/FTP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -173,23 +180,33 @@ msgstr "Apache, Pro-ftpd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "Segédprogramok CD-íráshoz"
+msgid "Mail/Groupware/News"
+msgstr "E-mail/csoportmunka/hírek"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Irodai munkaállomás"
+msgid "Postfix mail server, Inn news server"
+msgstr "Postfix email-kiszolgáló, Inn hírkiszolgáló"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "GNOME, IceWM, WindowMaker, Enlightenment, Fvwm, ..."
+msgid "Database"
+msgstr "Adatbázis"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Grafikai programok (például a GIMP)"
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL vagy MySQL adatbázis-kiszolgáló"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Firewall/Router"
+msgstr "Tűzfal/útválasztó (router)"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Internet gateway"
+msgstr "Internet-átjáró"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -198,8 +215,8 @@ msgstr "DNS/NIS"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C/C++ fejlesztőkönyvtárak, programok és include fájlok"
+msgid "Domain Name and Network Information Server"
+msgstr "DNS- és NIS-kiszolgáló"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -208,18 +225,18 @@ msgstr "Kiszolgáló hálózati számítógépekhez"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "E-mail/csoportmunka/hírek"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS-, SMB-, proxy- és SSH-kiszolgáló"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Játékgép"
+msgid "Office"
+msgstr "Iroda"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Videólejátszók és -szerkesztők"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr "Email-eszközök, hírkezelés, web-eszközök, fájlátvitel és csevegés"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -228,78 +245,66 @@ msgstr "Multimédia - grafika"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Játékprogramok: lövöldözős, táblás, stratégiai, ..."
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
-"Eszközök levelezéshez, hírkezeléshez (pine, mutt, tin, ...) és a Web "
-"böngészéséhez"
+msgid "Graphics programs such as The Gimp"
+msgstr "Grafikai programok (például a GIMP)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "Személyes pénzügyek"
+msgid "Multimedia - Sound"
+msgstr "Multimédia - hang"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
-"Grafikus környezet felhasználóbarát alkalmazásokkal és segédprogramokkal"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "Hangkezelő eszközök: MP3- és MIDI-lejátszók, hangkeverők, ..."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Kliensprogramok különféle protokollokhoz (például: ssh)"
+msgid "Multimedia - Video"
+msgstr "Multimédia - videó"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
+msgid "Video players and editors"
+msgstr "Videólejátszók és -szerkesztők"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Internet-átjáró"
+msgid "Multimedia - CD Burning"
+msgstr "Multimédia - CD-írás"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Hang/videólejátszó és -szerkesztő programok"
+msgid "Tools to create and burn CD's"
+msgstr "Segédprogramok CD-íráshoz"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Más grafikus környezetek"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "További grafikus környezetek (GNOME, IceWM)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Szövegszerkesztők, parancsértelmezők, fájlkezelők, terminálprogramok"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "GNOME, IceWM, WindowMaker, Enlightenment, Fvwm, ..."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "Programok a személyes pénzügyek kezeléséhez (például: GnuCash)"
+msgid "Personal Information Management"
+msgstr "Személyes információkezelés"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "Személyes információkezelés"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Segédprogramok a Palmhoz és a Visorhoz"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multimédia - CD-írás"
+msgid "Personal Finance"
+msgstr "Személyes pénzügyek"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Tudományos munkaállomás"
+msgid "Programs to manage your finances, such as gnucash"
+msgstr "Programok a személyes pénzügyek kezeléséhez (például: GnuCash)"
 
diff --git a/po/id.po b/po/id.po
index 450baf79..33c7ffd0 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.4\n"
-"POT-Creation-Date: 2003-01-19 16:57+0100\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\n"
 "PO-Revision-Date: 2002-09-16 00:11+0900\n"
 "Last-Translator: Budi Rachmanto <rac@linux-mandrake.com>\n"
 "Language-Team: Bahasa Indonesia <id@li.org>\n"
@@ -15,450 +15,619 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl_.c:39
-msgid "Unable to create medium."
-msgstr "Gagal membuat media."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Lanjutkan?"
 
-#: ../edit-urpm-sources.pl_.c:40
-msgid "Unable to update medium; it will be automatically disabled."
-msgstr "Update media gagal; media akan dinon-aktifkan."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to the software installation tool!\n"
+"\n"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
+msgstr ""
+"Selamat datang di tool instalasi software!\n"
+"\n"
+"Sistem Linux Mandrake Anda hadir dengan ribuan paket piranti lunak dalam\n"
+"CDROM atau DVD. Perkakas ini akan membantu Anda memilih piranti lunak yang\n"
+"hendak diinstal di komputer Anda."
 
-#: ../edit-urpm-sources.pl_.c:51
-#, fuzzy
-msgid "Add a source"
-msgstr "Penambahan source:"
+#: ../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 ""
+"Selamat Datang di MandrakeUpdate!\n"
+"\n"
+"Perkakas ini membantu Anda memilih update yang ingin Anda instal di\n"
+"komputer Anda."
 
-#: ../edit-urpm-sources.pl_.c:52
-msgid "Local files"
-msgstr "File lokal"
+#: ../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 ""
+"Selamat datang di tool penghapus software!\n"
+"\n"
+"Perkakas ini membantu Anda memilih piranti lunak yang ingin Anda hapus\n"
+"dari komputer Anda."
 
-#: ../edit-urpm-sources.pl_.c:52
-msgid "Path:"
-msgstr "Path:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"Ada masalah saat instalasi:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:53
-msgid "FTP server"
-msgstr "Server FTP"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during removal"
+msgstr "Masalah saat instalasi"
 
-#: ../edit-urpm-sources.pl_.c:53 ../edit-urpm-sources.pl_.c:54
-#: ../edit-urpm-sources.pl_.c:56 ../edit-urpm-sources.pl_.c:175
-msgid "URL:"
-msgstr "URL:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages..."
+msgstr "Tunggu, paket sedang dihapus..."
 
-#: ../edit-urpm-sources.pl_.c:54
-msgid "HTTP server"
-msgstr "Server HTTP"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
+msgstr "Tunggu, database paket sedang dibaca..."
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Path or mount point:"
-msgstr "Path atau titik mount:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Ada masalah saat instalasi:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Removable device"
-msgstr "Perangkat portabel"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during installation"
+msgstr "Masalah saat instalasi"
 
-#: ../edit-urpm-sources.pl_.c:56 ../rpmdrake_.c:548
-msgid "Security updates"
-msgstr "Update sekuriti"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
+msgstr "Semua sudah diinstal (inikah yg diharapkan?)."
 
-#: ../edit-urpm-sources.pl_.c:67
-msgid "Browse..."
-msgstr "Selancar..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed."
+msgstr "Semua sudah diinstal."
 
-#: ../edit-urpm-sources.pl_.c:69
-msgid "Choose a mirror..."
-msgstr "Pilih mirror..."
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "Semua paket yg diminta telah sukses diinstal."
 
-#: ../edit-urpm-sources.pl_.c:89
-msgid "Login:"
-msgstr "Login:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr "Semua sukses diinstal"
 
-#: ../edit-urpm-sources.pl_.c:89 ../edit-urpm-sources.pl_.c:215
-msgid "Password:"
-msgstr "Password:"
+#: ../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:"
 
-#: ../edit-urpm-sources.pl_.c:94
-msgid "Name:"
-msgstr "Nama:"
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "semua sudah diinstal dengan benar"
 
-#: ../edit-urpm-sources.pl_.c:96 ../edit-urpm-sources.pl_.c:176
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Path relatif terhadap sintesa atau hdlist:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"some packages failed to install\n"
+"correctly"
+msgstr "beberapa paket gagal diinstal dengan benar"
 
-#: ../edit-urpm-sources.pl_.c:104
-msgid "You need to fill up at least the two first entries."
-msgstr "Setidaknya dua entri pertama harus diisi."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages to allow others to be upgraded..."
+msgstr "Tunggu, paket sedang dihapus agar yg lain dapat di-upgrade..."
 
-#: ../edit-urpm-sources.pl_.c:116
-msgid "Adding a source:"
-msgstr "Penambahan source:"
+#: ../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."
 
-#: ../edit-urpm-sources.pl_.c:117
-msgid "Type of source:"
-msgstr "Jenis source:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation failed"
+msgstr "Instalasi gagal"
 
-#: ../edit-urpm-sources.pl_.c:121 ../edit-urpm-sources.pl_.c:187
-#: ../edit-urpm-sources.pl_.c:219 ../rpmdrake.pm_.c:97 ../rpmdrake.pm_.c:136
-#: ../rpmdrake.pm_.c:319 ../rpmdrake_.c:353 ../rpmdrake_.c:365
-#: ../rpmdrake_.c:369 ../rpmdrake_.c:916 ../rpmdrake_.c:950
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
+msgstr "Batal"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:180
-#: ../edit-urpm-sources.pl_.c:187 ../edit-urpm-sources.pl_.c:220
-#: ../rpmdrake.pm_.c:319 ../rpmdrake.pm_.c:352 ../rpmdrake_.c:353
-#: ../rpmdrake_.c:950
-msgid "Cancel"
-msgstr "Batal"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Masukkan media \"%s\" di device [%s]"
 
-#: ../edit-urpm-sources.pl_.c:140
-msgid "Please wait, adding medium..."
-msgstr "Media sedang ditambahkan..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr "Ubah media"
 
-#: ../edit-urpm-sources.pl_.c:158
-msgid "Please wait, removing medium..."
-msgstr "Media sedang dihapus..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
+msgstr "Gagal mendapatkan paket source, maaf."
 
-#: ../edit-urpm-sources.pl_.c:169
-msgid "Edit a source"
-msgstr "Edit source"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages."
+msgstr "Gagal mendapatkan paket source"
 
-#: ../edit-urpm-sources.pl_.c:173
+#: ../rpmdrake:1
 #, c-format
-msgid "Editing source \"%s\":"
-msgstr "Edit source \"%s\":"
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr "Tak ditemukan: grpmi. Cek instalasi Anda."
 
-#: ../edit-urpm-sources.pl_.c:179
-msgid "Save changes"
-msgstr "Simpan perubahan"
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
+msgstr "Program tak ditemukan"
 
-#: ../edit-urpm-sources.pl_.c:185
-msgid "You need to insert the medium to continue"
-msgstr "Untuk melanjutkan, masukkan media"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
+msgstr "Periksa..."
 
-#: ../edit-urpm-sources.pl_.c:186
-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."
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation finished"
+msgstr "Instalasi usai"
 
-#: ../edit-urpm-sources.pl_.c:191
-msgid "Please wait, updating medium..."
-msgstr "Media sedang di-update..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
+msgstr "Menganggur"
 
-#: ../edit-urpm-sources.pl_.c:202
-msgid "Configure proxies"
-msgstr "Konfigurasikan proxy"
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
+msgstr "Gunakan .%s sebagai file utama"
 
-#: ../edit-urpm-sources.pl_.c:207
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
-msgstr ""
-"Jika perlu proxy, masukkan nama host dan port (syntax: <proxyhost[:port]>):"
+#: ../rpmdrake:1
+#, c-format
+msgid "Remove .%s"
+msgstr "Hapus .%s"
 
-#: ../edit-urpm-sources.pl_.c:209
-msgid "Proxy hostname:"
-msgstr "Nama host proxy:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "changes:"
+msgstr "Simpan perubahan"
 
-#: ../edit-urpm-sources.pl_.c:211
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "Anda dapat menentukan pengguna/katakunci untuk otentikasi proxy:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr "Pemeriksaan %s"
 
-#: ../edit-urpm-sources.pl_.c:213
-msgid "User:"
-msgstr "Pengguna:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, finding available packages..."
+msgstr "Tunggu, sedang mencari paket yg tersedia..."
 
-#: ../edit-urpm-sources.pl_.c:235
-msgid "Configure sources"
-msgstr "Konfigurasikan source"
+#: ../rpmdrake:1
+#, c-format
+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 ""
+"Ada error saat penambahan media update via urpmi.\n"
+"\n"
+"Ini mungkin disebabkan oleh mirror yg rusak / sementara tak dapat dipakai,\n"
+"atau bila versi Linux Mandrake (%s) Anda belum / tak ditunjang lagi oleh\n"
+"Update Resmi Linux Mandrake.\n"
+"\n"
+"Do you want to try another mirror?"
 
-#: ../edit-urpm-sources.pl_.c:242
-msgid "Enabled?"
-msgstr "Diaktifkan?"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
+msgstr "Error saat penambahan media"
 
-#: ../edit-urpm-sources.pl_.c:243
-msgid "Source"
-msgstr "Sumber"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
+msgstr "Mirror sedang dihubungi untuk memulai update paket."
 
-#: ../edit-urpm-sources.pl_.c:264 ../rpmdrake_.c:730
-msgid "Remove"
-msgstr "Hapus"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Sources Manager, and then add a `Security\n"
+"updates' source.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"Anda dapat juga memilih mirror kesukaan Anda secara manual: untuk\n"
+"melakukannya, luncurkan Manajer Source Software, dan tambahkan source\n"
+"`Security updates'.\n"
+"\n"
+"Lalu, restart MandrakeUpdate."
 
-#: ../edit-urpm-sources.pl_.c:266
-msgid "Edit"
-msgstr "Edit"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Cara memilih mirror"
 
-#: ../edit-urpm-sources.pl_.c:268
-msgid "Add..."
-msgstr "Tambahkan..."
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
+msgstr "Ada error yang tak dapat dipulihkan saat meng-update info paket."
 
-#: ../edit-urpm-sources.pl_.c:270
-msgid "Update..."
-msgstr "Update..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
+msgstr "Error saat meng-update media"
 
-#: ../edit-urpm-sources.pl_.c:271
-msgid "Proxy..."
-msgstr "Proxy..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
+msgstr "Mirror sedang dihubungi untuk meng-update info paket."
 
-#: ../edit-urpm-sources.pl_.c:274
-msgid "Save and quit"
-msgstr "Simpan dan keluar"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Mirror harus dihubungi untuk mendapatkan paket update terbaru.\n"
+"Pastikan bahwa jaringan Anda sedang berjalan.\n"
+"\n"
+"Jalan terus?"
 
-#: ../edit-urpm-sources.pl_.c:275 ../rpmdrake_.c:733
-msgid "Quit"
-msgstr "Keluar"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Installation"
+msgstr "Instalasi Paket Software"
 
-#: ../rpmdrake.pm_.c:93
-msgid "Yes"
-msgstr "Ya"
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, c-format
+msgid "Mandrake Update"
+msgstr "Update Mandrake"
 
-#: ../rpmdrake.pm_.c:95
-msgid "No"
-msgstr "Tidak"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
+msgstr "Penghapusan Paket Software"
 
-#: ../rpmdrake.pm_.c:127
-msgid "Info..."
-msgstr "Info..."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Keluar"
 
-#: ../rpmdrake.pm_.c:180
-msgid "Austria"
-msgstr "Austria"
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "Install"
 
-#: ../rpmdrake.pm_.c:181
-msgid "Australia"
-msgstr "Australia"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "Hapus"
 
-#: ../rpmdrake.pm_.c:182
-msgid "Belgium"
-msgstr "Belgia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search"
+msgstr "Cari"
 
-#: ../rpmdrake.pm_.c:183
-msgid "Brazil"
-msgstr "Brazil"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "Cari:"
 
-#: ../rpmdrake.pm_.c:184
-msgid "Canada"
-msgstr "Kanada"
+#: ../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 ""
+"Paket berikut harus dihapus agar yg lain dapat diupgrade:\n"
+"\n"
+"%s\n"
+"\n"
+"Jalan terus?"
 
-#: ../rpmdrake.pm_.c:185
-msgid "Costa Rica"
-msgstr "Kosta Rika"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "Beberapa paket perlu dihapus"
 
-#: ../rpmdrake.pm_.c:186
-msgid "Czech Republic"
-msgstr "Republik Ceko"
+#: ../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?"
 
-#: ../rpmdrake.pm_.c:187
-msgid "Germany"
-msgstr "Jerman"
+#: ../rpmdrake:1
+#, c-format
+msgid "Too many packages are selected"
+msgstr "Terlalu banyak paket dipilih"
 
-#: ../rpmdrake.pm_.c:188
-msgid "Danmark"
-msgstr "Denmark"
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
+msgstr "Info maximum"
 
-#: ../rpmdrake.pm_.c:189 ../rpmdrake.pm_.c:193
-msgid "Greece"
-msgstr "Yunani"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal information"
+msgstr "Info normal"
 
-#: ../rpmdrake.pm_.c:190
-msgid "Spain"
-msgstr "Spanyol"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update source(s)"
+msgstr "Update source"
 
-#: ../rpmdrake.pm_.c:191
-msgid "Finland"
-msgstr "Finlandia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reload the packages list"
+msgstr "Muat ulang daftar paket"
 
-#: ../rpmdrake.pm_.c:192
-msgid "France"
-msgstr "Perancis"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
+msgstr "Reset pilihan"
 
-#: ../rpmdrake.pm_.c:194
-msgid "Israel"
-msgstr "Palestina"
+#: ../rpmdrake:1
+#, c-format
+msgid "in files"
+msgstr "dalam file"
 
-#: ../rpmdrake.pm_.c:195
-msgid "Italy"
-msgstr "Italia"
+#: ../rpmdrake:1
+#, c-format
+msgid "in descriptions"
+msgstr "dalam keterangan"
 
-#: ../rpmdrake.pm_.c:196
-msgid "Japan"
-msgstr "Jepang"
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
+msgstr "dalam nama"
 
-#: ../rpmdrake.pm_.c:197
-msgid "Korea"
-msgstr "Korea"
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
+msgstr "menurut kesediaan update"
 
-#: ../rpmdrake.pm_.c:198
-msgid "Netherlands"
-msgstr "Belanda"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
+msgstr "menurut repositori sumber"
 
-#: ../rpmdrake.pm_.c:199
-msgid "Norway"
-msgstr "Norwegia"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
+msgstr "menurut status pilihan"
 
-#: ../rpmdrake.pm_.c:200
-msgid "Poland"
-msgstr "Polandia"
+#: ../rpmdrake:1
+#, c-format
+msgid "by size"
+msgstr "menurut ukuran"
 
-#: ../rpmdrake.pm_.c:201
-msgid "Portugal"
-msgstr "Portugal"
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
+msgstr "menurut grup"
 
-#: ../rpmdrake.pm_.c:202
-msgid "Russia"
-msgstr "Rusia"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages,"
+msgstr "Semua paket,"
 
-#: ../rpmdrake.pm_.c:203
-msgid "Sweden"
-msgstr "Swedia"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
+msgstr "Semua paket, menurut abjad"
 
-#: ../rpmdrake.pm_.c:204
-msgid "Taiwan"
-msgstr "Taiwan"
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
+msgstr "Pilihan Mandrake"
 
-#: ../rpmdrake.pm_.c:205
-msgid "United Kingdom"
-msgstr "Inggris"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal updates"
+msgstr "Update normal"
 
-#: ../rpmdrake.pm_.c:206
-msgid "China"
-msgstr "Cina"
+#: ../rpmdrake:1
+#, c-format
+msgid "Bugfixes updates"
+msgstr "Update pembetulan kutu"
 
-#: ../rpmdrake.pm_.c:207 ../rpmdrake.pm_.c:208 ../rpmdrake.pm_.c:209
-#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:261
-msgid "United States"
-msgstr "Amerika Serikat"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
+msgstr "Update sekuriti"
 
-#: ../rpmdrake.pm_.c:274
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr "Tunggu, alamat mirror sedang diambil dari website MandrakeSoft."
+#: ../rpmdrake:1
+#, c-format
+msgid "Description: "
+msgstr "Keterangan: "
 
-#: ../rpmdrake.pm_.c:280
-msgid "Error during download"
-msgstr "Error saat download"
+#: ../rpmdrake:1
+#, c-format
+msgid "Summary: "
+msgstr "Ringkasan: "
 
-#: ../rpmdrake.pm_.c:289
-msgid "No mirror"
-msgstr "Tiada mirror"
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "Derajat Kepentingan: "
 
-#: ../rpmdrake.pm_.c:307
-msgid "Please choose the desired mirror."
-msgstr "Pilih mirror yang diinginkan."
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake.pm_.c:339 ../rpmdrake_.c:627
-msgid "Update source(s)"
-msgstr "Update source"
+#: ../rpmdrake:1
+#, c-format
+msgid "Size: "
+msgstr "Ukuran: "
 
-#: ../rpmdrake.pm_.c:343
-msgid "Select the source(s) you wish to update:"
-msgstr "Pilih source yg ingin di-update:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Version: "
+msgstr "Versi: "
 
-#: ../rpmdrake.pm_.c:347
-msgid "Update"
-msgstr "Update"
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "Nama: "
 
-#: ../rpmdrake.pm_.c:358
-msgid "Please wait, updating media..."
-msgstr "Media sedang di-update..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "Alasan update: "
 
-#: ../rpmdrake_.c:99
-msgid "Other"
-msgstr "Lainnya"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
+msgstr "Versi terinstal: "
 
-#: ../rpmdrake_.c:121 ../rpmdrake_.c:135 ../rpmdrake_.c:227 ../rpmdrake_.c:298
-msgid "(none)"
-msgstr "(tiada)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Source: "
+msgstr "Sumber: "
 
-#: ../rpmdrake_.c:141 ../rpmdrake_.c:482 ../rpmdrake_.c:483
+#: ../rpmdrake:1
+#, c-format
 msgid "(Not available)"
 msgstr "(Tak tersedia)"
 
-#: ../rpmdrake_.c:151 ../rpmdrake_.c:208
-msgid "Search results"
-msgstr "Hasil pencarian"
-
-#: ../rpmdrake_.c:151
-msgid "Search results (none)"
-msgstr "Hasil pencarian (tak ada)"
-
-#: ../rpmdrake_.c:161 ../rpmdrake_.c:172
-msgid "Please wait, searching..."
-msgstr "Tunggu, sedang dicari..."
-
-#: ../rpmdrake_.c:175
-msgid "Stop"
-msgstr "Stop"
-
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-msgid "Addable"
-msgstr "Dapat ditambahkan"
-
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-msgid "Upgradable"
-msgstr "Dapat di-upgrade"
-
-#: ../rpmdrake_.c:211
-msgid "Not selected"
-msgstr "Tak terpilih"
-
-#: ../rpmdrake_.c:211
-msgid "Selected"
-msgstr "Terpilih"
-
-#: ../rpmdrake_.c:240
-msgid "rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake_.c:258 ../rpmdrake_.c:360 ../rpmdrake_.c:362
-msgid "More information on package..."
-msgstr "Info tambahan paket..."
-
-#: ../rpmdrake_.c:259
-msgid "One of the following packages is needed:"
-msgstr "Satu di antara paket berikut diperlukan:"
-
-#: ../rpmdrake_.c:259
-msgid "Please choose"
-msgstr "Pilihlah"
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
+msgstr "Changelog:\n"
 
-#: ../rpmdrake_.c:275
-msgid "unknown package "
-msgstr "paket tak dikenal "
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "File:\n"
 
-#: ../rpmdrake_.c:285
-msgid "Please wait, listing packages..."
-msgstr "Tunggu, daftar paket sedang dibuat..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected size: %d MB"
+msgstr "Terpilih: %d MB"
 
-#: ../rpmdrake_.c:300
-msgid "No update"
-msgstr "Tiada update"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Terpilih: %d MB / Tersedia: %d MB"
 
-#: ../rpmdrake_.c:353 ../rpmdrake_.c:354
-msgid "More infos"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
 msgstr ""
+"Karena aspek ketergantungan, paket berikut harus tak dipilih:\n"
+"\n"
 
-#: ../rpmdrake_.c:355
-#, fuzzy
-msgid "Information on packages"
-msgstr "Info tambahan paket..."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+msgstr ""
+"Maaf, paket berikut tak dapat dipilih:\n"
+"\n"
 
-#: ../rpmdrake_.c:376
-msgid "Some additional packages need to be removed"
-msgstr "Beberapa paket tambahan perlu dihapus"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "Beberapa paket tak dapat diinstal"
 
-#: ../rpmdrake_.c:377
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
 "\n"
-msgstr "Untuk memenuhi dependensi, paket-paket berikut perlu dihapus:\n"
+msgstr "Untuk memenuhi ketergantungan, paket berikut juga harus diinstal:\n"
 
-#: ../rpmdrake_.c:383 ../rpmdrake_.c:391
+#: ../rpmdrake:1
+#, c-format
+msgid "Additional packages needed"
+msgstr "Dibutuhkan paket tambahan"
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "Beberapa paket tak dapat dihapus"
 
-#: ../rpmdrake_.c:384
-#, fuzzy
+#: ../rpmdrake:1
+#, fuzzy, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -466,575 +635,591 @@ msgstr ""
 "Maaf, menghapus paket ini berarti merusak sistem Anda:\n"
 "\n"
 
-#: ../rpmdrake_.c:392 ../rpmdrake_.c:451
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
-msgstr ""
-"Karena aspek ketergantungan, paket berikut harus tak dipilih:\n"
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
 "\n"
+msgstr "Untuk memenuhi dependensi, paket-paket berikut perlu dihapus:\n"
 
-#: ../rpmdrake_.c:421
-msgid "Additional packages needed"
-msgstr "Dibutuhkan paket tambahan"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr "Beberapa paket tambahan perlu dihapus"
 
-#: ../rpmdrake_.c:422
-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
+msgid "More information on package..."
+msgstr "Info tambahan paket..."
 
-#: ../rpmdrake_.c:435
-msgid "Some packages can't be installed"
-msgstr "Beberapa paket tak dapat diinstal"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Information on packages"
+msgstr "Info tambahan paket..."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Addable"
+msgstr "Dapat ditambahkan"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Upgradable"
+msgstr "Dapat di-upgrade"
 
-#: ../rpmdrake_.c:436
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
+"The list of updates is void. This 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 ""
-"Maaf, paket berikut tak dapat dipilih:\n"
-"\n"
+"Daftar update kosong. Artinya tidak ada update untuk paket yang\n"
+"terinstal di komputer Anda, atau Anda sudah menginstalnya."
 
-#: ../rpmdrake_.c:450 ../rpmdrake_.c:684
-msgid "Some packages need to be removed"
-msgstr "Beberapa paket perlu dihapus"
+#: ../rpmdrake:1
+#, c-format
+msgid "No update"
+msgstr "Tiada update"
 
-#: ../rpmdrake_.c:472
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Terpilih: %d MB / Tersedia: %d MB"
+msgid "(none)"
+msgstr "(tiada)"
 
-#: ../rpmdrake_.c:474
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "Terpilih: %d MB"
+msgid "Please wait, listing packages..."
+msgstr "Tunggu, daftar paket sedang dibuat..."
 
-#: ../rpmdrake_.c:482
-msgid "Files:\n"
-msgstr "File:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "unknown package "
+msgstr "paket tak dikenal "
 
-#: ../rpmdrake_.c:483
-msgid "Changelog:\n"
-msgstr "Changelog:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Satu di antara paket berikut diperlukan:"
 
-#: ../rpmdrake_.c:486
-msgid "Source: "
-msgstr "Sumber: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please choose"
+msgstr "Pilihlah"
 
-#: ../rpmdrake_.c:487
-msgid "Currently installed version: "
-msgstr "Versi terinstal: "
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:491
-msgid "Reason for update: "
-msgstr "Alasan update: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Not selected"
+msgstr "Tak terpilih"
 
-#: ../rpmdrake_.c:493
-msgid "Name: "
-msgstr "Nama: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected"
+msgstr "Terpilih"
 
-#: ../rpmdrake_.c:494
-msgid "Version: "
-msgstr "Versi: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results"
+msgstr "Hasil pencarian"
 
-#: ../rpmdrake_.c:495
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Stop"
+msgstr "Stop"
 
-#: ../rpmdrake_.c:495
-msgid "Size: "
-msgstr "Ukuran: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, searching..."
+msgstr "Tunggu, sedang dicari..."
 
-#: ../rpmdrake_.c:497
-msgid "Importance: "
-msgstr "Derajat Kepentingan: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
+msgstr "Hasil pencarian (tak ada)"
 
-#: ../rpmdrake_.c:498
-msgid "Summary: "
-msgstr "Ringkasan: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Lainnya"
 
-#: ../rpmdrake_.c:499
-msgid "Description: "
-msgstr "Keterangan: "
+#: ../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 ""
+"Selamat datang di editor sumber paket!\n"
+"\n"
+"Perkakas ini membantu Anda mengkonfigurasikan sumber paket yang ingin Anda\n"
+"pakai di komputer Anda, yang kemudian dapat digunakan untuk menginstal\n"
+"piranti lunak baru atau meng-update"
 
-#: ../rpmdrake_.c:548
-msgid "Bugfixes updates"
-msgstr "Update pembetulan kutu"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Simpan dan keluar"
 
-#: ../rpmdrake_.c:548
-msgid "Normal updates"
-msgstr "Update normal"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy..."
+msgstr "Proxy..."
 
-#: ../rpmdrake_.c:567
-msgid "Mandrake choices"
-msgstr "Pilihan Mandrake"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
+msgstr "Update..."
 
-#: ../rpmdrake_.c:568
-msgid "All packages, alphabetical"
-msgstr "Semua paket, menurut abjad"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "Tambahkan..."
 
-#: ../rpmdrake_.c:569
-msgid "All packages,"
-msgstr "Semua paket,"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "Edit"
 
-#: ../rpmdrake_.c:592
-msgid "by group"
-msgstr "menurut grup"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Source"
+msgstr "Sumber"
 
-#: ../rpmdrake_.c:592
-msgid "by size"
-msgstr "menurut ukuran"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
+msgstr "Diaktifkan?"
 
-#: ../rpmdrake_.c:593
-msgid "by selection state"
-msgstr "menurut status pilihan"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure sources"
+msgstr "Konfigurasikan source"
 
-#: ../rpmdrake_.c:594
-msgid "by source repository"
-msgstr "menurut repositori sumber"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "Password:"
 
-#: ../rpmdrake_.c:594
-msgid "by update availability"
-msgstr "menurut kesediaan update"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
+msgstr "Pengguna:"
 
-#: ../rpmdrake_.c:615
-msgid "in descriptions"
-msgstr "dalam keterangan"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Anda dapat menentukan pengguna/katakunci untuk otentikasi proxy:"
 
-#: ../rpmdrake_.c:615
-msgid "in files"
-msgstr "dalam file"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "Nama host proxy:"
 
-#: ../rpmdrake_.c:615
-msgid "in names"
-msgstr "dalam nama"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"Jika perlu proxy, masukkan nama host dan port (syntax: <proxyhost[:port]>):"
 
-#: ../rpmdrake_.c:626
-msgid "Reload the packages list"
-msgstr "Muat ulang daftar paket"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "Konfigurasikan proxy"
 
-#: ../rpmdrake_.c:626
-msgid "Reset the selection"
-msgstr "Reset pilihan"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr "Media sedang di-update..."
 
-#: ../rpmdrake_.c:652
-msgid "Maximum information"
-msgstr "Info maximum"
+#: ../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."
 
-#: ../rpmdrake_.c:652
-msgid "Normal information"
-msgstr "Info normal"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
+msgstr "Untuk melanjutkan, masukkan media"
 
-#: ../rpmdrake_.c:674
-msgid "Too many packages are selected"
-msgstr "Terlalu banyak paket dipilih"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save changes"
+msgstr "Simpan perubahan"
 
-#: ../rpmdrake_.c:720
-msgid "Find:"
-msgstr "Cari:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Path relatif terhadap sintesa atau hdlist:"
 
-#: ../rpmdrake_.c:725
-msgid "Search"
-msgstr "Cari"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake_.c:731
-msgid "Install"
-msgstr "Install"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Editing source \"%s\":"
+msgstr "Edit source \"%s\":"
 
-#: ../rpmdrake_.c:738 data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrake Update"
-msgstr "Update Mandrake"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit a source"
+msgstr "Edit source"
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Installation"
-msgstr "Instalasi Paket Software"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr "Media sedang dihapus..."
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Removal"
-msgstr "Penghapusan Paket Software"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, adding medium..."
+msgstr "Media sedang ditambahkan..."
 
-#: ../rpmdrake_.c:779
-msgid "Please wait, contacting mirror to update packages information."
-msgstr "Mirror sedang dihubungi untuk meng-update info paket."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of source:"
+msgstr "Jenis source:"
 
-#: ../rpmdrake_.c:781
-msgid "Error updating medium"
-msgstr "Error saat meng-update media"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Adding a source:"
+msgstr "Penambahan source:"
 
-#: ../rpmdrake_.c:782
-msgid "There was an unrecoverable error while updating packages information."
-msgstr "Ada error yang tak dapat dipulihkan saat meng-update info paket."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr "Sudah ada media dengan nama tersebut. Akan ditindih?"
 
-#: ../rpmdrake_.c:787
-msgid "How to choose manually your mirror"
-msgstr "Cara memilih mirror"
+#: ../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_.c:795
-msgid "Please wait, contacting mirror to initialize updates packages."
-msgstr "Mirror sedang dihubungi untuk memulai update paket."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "Nama:"
 
-#: ../rpmdrake_.c:798
-msgid "Error adding update medium"
-msgstr "Error saat penambahan media"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
+msgstr "Login:"
 
-#: ../rpmdrake_.c:829
-msgid "Please wait, finding available packages..."
-msgstr "Tunggu, sedang mencari paket yg tersedia..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Pilih mirror..."
 
-#: ../rpmdrake_.c:861
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Pemeriksaan %s"
+msgid "Browse..."
+msgstr "Selancar..."
 
-#: ../rpmdrake_.c:880
-#, fuzzy
-msgid "changes:"
-msgstr "Simpan perubahan"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Path atau titik mount:"
 
-#: ../rpmdrake_.c:884
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Hapus .%s"
+msgid "Removable device"
+msgstr "Perangkat portabel"
 
-#: ../rpmdrake_.c:886
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Gunakan .%s sebagai file utama"
+msgid "HTTP server"
+msgstr "Server HTTP"
 
-#: ../rpmdrake_.c:888
-msgid "Do nothing"
-msgstr "Menganggur"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "Server FTP"
 
-#: ../rpmdrake_.c:900
-msgid "Installation finished"
-msgstr "Instalasi usai"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path:"
+msgstr "Path:"
 
-#: ../rpmdrake_.c:910
-msgid "Inspect..."
-msgstr "Periksa..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "File lokal"
 
-#: ../rpmdrake_.c:925
-msgid "Program missing"
-msgstr "Program tak ditemukan"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a source"
+msgstr "Penambahan source:"
 
-#: ../rpmdrake_.c:926
-msgid "A required program is missing (grpmi). Check your installation."
-msgstr "Tak ditemukan: grpmi. Cek instalasi Anda."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
+msgstr "Update media gagal; media akan dinon-aktifkan."
 
-#: ../rpmdrake_.c:940
-msgid "Unable to get source packages."
-msgstr "Gagal mendapatkan paket source"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "Gagal membuat media."
 
-#: ../rpmdrake_.c:941
-msgid "Unable to get source packages, sorry."
-msgstr "Gagal mendapatkan paket source, maaf."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, updating media..."
+msgstr "Media sedang di-update..."
 
-#: ../rpmdrake_.c:948
-msgid "Change medium"
-msgstr "Ubah media"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
+msgstr "Update"
 
-#: ../rpmdrake_.c:949
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Masukkan media \"%s\" di device [%s]"
+msgid "Select the source(s) you wish to update:"
+msgstr "Pilih source yg ingin di-update:"
 
-#: ../rpmdrake_.c:957
-msgid "Installation failed"
-msgstr "Instalasi gagal"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please choose the desired mirror."
+msgstr "Pilih mirror yang diinginkan."
 
-#: ../rpmdrake_.c:958
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
-"Instalasi gagal, beberapa file hilang.\n"
-"Anda mungkin perlu meng-update database sumber."
+"Tak ditemukan mirror yang cocok.\n"
+"\n"
+"Sebabnya mungkin banyak; yang paling sering yaitu jika arsitektur\n"
+"prosesor Anda tak ditunjang oleh Update Resmi Linux Mandrake."
 
-#: ../rpmdrake_.c:961
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr "Tunggu, paket sedang dihapus agar yg lain dapat di-upgrade..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
+msgstr "Tiada mirror"
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"There was an error downloading the mirrors list:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
-"Instalasi usai; %s.\n"
+"Error saat pengambilan daftar mirror:\n"
 "\n"
-"Beberapa file konfigurasi telah dibuat dg extensi `.rpmnew' atau `."
-"rpmsave',\n"
-"Anda mungkin perlu memeriksanya sekarang untuk bertindak selanjutnya:"
+"%s\n"
+"Jaringan, atau website MandrakeSoft mungkin tak dapat dipakai.\n"
+"Cobalah lagi nanti."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "Error saat download"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "Tunggu, alamat mirror sedang diambil dari website MandrakeSoft."
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"some packages failed to install\n"
-"correctly"
-msgstr "beberapa paket gagal diinstal dengan benar"
+"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 ""
+"Website MandrakeSoft harus dihubungi untuk mendapatkan daftar mirror.\n"
+"Pastikan bahwa jaringan Anda berjalan baik.\n"
+"\n"
+"Jalan terus?"
 
-#: ../rpmdrake_.c:983
-msgid "everything was installed correctly"
-msgstr "semua sudah diinstal dengan benar"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United States"
+msgstr "Amerika Serikat"
 
-#: ../rpmdrake_.c:985
-msgid "Everything installed successfully"
-msgstr "Semua sukses diinstal"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
+msgstr "Cina"
 
-#: ../rpmdrake_.c:986
-msgid "All requested packages were installed successfully."
-msgstr "Semua paket yg diminta telah sukses diinstal."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr "Inggris"
 
-#: ../rpmdrake_.c:989
-msgid "Everything already installed."
-msgstr "Semua sudah diinstal."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "Taiwan"
 
-#: ../rpmdrake_.c:990
-msgid "Everything already installed (is this supposed to happen at all?)."
-msgstr "Semua sudah diinstal (inikah yg diharapkan?)."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "Swedia"
 
-#: ../rpmdrake_.c:997
-msgid "Problem during installation"
-msgstr "Masalah saat instalasi"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
+msgstr "Rusia"
 
-#: ../rpmdrake_.c:998
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Ada masalah saat instalasi:\n"
-"\n"
-"%s"
+msgid "Portugal"
+msgstr "Portugal"
 
-#: ../rpmdrake_.c:1012
-msgid "Please wait, reading packages database..."
-msgstr "Tunggu, database paket sedang dibaca..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
+msgstr "Polandia"
 
-#: ../rpmdrake_.c:1053
-msgid "Please wait, removing packages..."
-msgstr "Tunggu, paket sedang dihapus..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
+msgstr "Norwegia"
 
-#: ../rpmdrake_.c:1056
-#, fuzzy
-msgid "Problem during removal"
-msgstr "Masalah saat instalasi"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
+msgstr "Belanda"
 
-#: ../rpmdrake_.c:1057
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Ada masalah saat instalasi:\n"
-"\n"
-"%s"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Korea"
+msgstr "Korea"
 
-#: ../rpmdrake_.c:1089
-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 ""
-"Selamat datang di tool penghapus software!\n"
-"\n"
-"Perkakas ini membantu Anda memilih piranti lunak yang ingin Anda hapus\n"
-"dari komputer Anda."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Japan"
+msgstr "Jepang"
 
-#: ../rpmdrake_.c:1094
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"Selamat Datang di MandrakeUpdate!\n"
-"\n"
-"Perkakas ini membantu Anda memilih update yang ingin Anda instal di\n"
-"komputer Anda."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Italy"
+msgstr "Italia"
 
-#: ../rpmdrake_.c:1099
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
-msgstr ""
-"Selamat datang di tool instalasi software!\n"
-"\n"
-"Sistem Linux Mandrake Anda hadir dengan ribuan paket piranti lunak dalam\n"
-"CDROM atau DVD. Perkakas ini akan membantu Anda memilih piranti lunak yang\n"
-"hendak diinstal di komputer Anda."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Israel"
+msgstr "Palestina"
 
-#: data/rpmdrake-remove.desktop.in.h:1
-msgid "Remove Software"
-msgstr "Hapus Software"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Yunani"
 
-#: data/rpmdrake-sources.desktop.in.h:1
-msgid "Software Sources Manager"
-msgstr "Manajer Source Software"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "France"
+msgstr "Perancis"
 
-#: data/rpmdrake.desktop.in.h:1
-msgid "Install Software"
-msgstr "Install Software"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "Finlandia"
 
-#~ 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
+#, c-format
+msgid "Spain"
+msgstr "Spanyol"
 
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-#~ "Lanjutkan?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
+msgstr "Denmark"
 
-#~ 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"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr "Jerman"
 
-#~ 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 ""
-#~ "Website MandrakeSoft harus dihubungi untuk mendapatkan daftar mirror.\n"
-#~ "Pastikan bahwa jaringan Anda berjalan baik.\n"
-#~ "\n"
-#~ "Jalan terus?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
+msgstr "Republik Ceko"
 
-#~ msgid ""
-#~ "There was an error downloading the mirrors list:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "The network, or MandrakeSoft website, are maybe unavailable.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "Error saat pengambilan daftar mirror:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "Jaringan, atau website MandrakeSoft mungkin tak dapat dipakai.\n"
-#~ "Cobalah lagi nanti."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Costa Rica"
+msgstr "Kosta Rika"
 
-#~ 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 ""
-#~ "Tak ditemukan mirror yang cocok.\n"
-#~ "\n"
-#~ "Sebabnya mungkin banyak; yang paling sering yaitu jika arsitektur\n"
-#~ "prosesor Anda tak ditunjang oleh Update Resmi Linux Mandrake."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Canada"
+msgstr "Kanada"
 
-#~ msgid ""
-#~ "The list of updates is void. This means that either there is\n"
-#~ "no available update for the packages installed on your computer,\n"
-#~ "or you already installed all of them."
-#~ msgstr ""
-#~ "Daftar update kosong. Artinya tidak ada update untuk paket yang\n"
-#~ "terinstal di komputer Anda, atau Anda sudah menginstalnya."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
+msgstr "Brazil"
 
-#~ msgid ""
-#~ "Warning: it seems that you are attempting to add so much\n"
-#~ "packages that your filesystem may run out of free diskspace,\n"
-#~ "during or after package installation ; this is particularly\n"
-#~ "dangerous and should be considered with care.\n"
-#~ "\n"
-#~ "Do you really want to install all the selected packages?"
-#~ msgstr ""
-#~ "Awas: Tampaknya Anda mencoba menambahkan begitu banyak paket\n"
-#~ "yg mungkin membuat sistem file Anda kehabisan ruang disk,\n"
-#~ "selama atau setelah instalasi paket ; ini berbahaya\n"
-#~ "dan harus difikirkan hati-hati.\n"
-#~ "\n"
-#~ "Benarkah Anda ingin menginstal semua paket terpilih?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Belgium"
+msgstr "Belgia"
 
-#~ msgid ""
-#~ "The following packages have to be removed for others to be upgraded:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "Paket berikut harus dihapus agar yg lain dapat diupgrade:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Jalan terus?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Australia"
+msgstr "Australia"
 
-#~ msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#~ msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
+msgstr "Austria"
 
-#~ msgid ""
-#~ "I need to contact the mirror to get latest update packages.\n"
-#~ "Please check that your network is currently running.\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "Mirror harus dihubungi untuk mendapatkan paket update terbaru.\n"
-#~ "Pastikan bahwa jaringan Anda sedang berjalan.\n"
-#~ "\n"
-#~ "Jalan terus?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Info..."
+msgstr "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 ""
-#~ "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.pm:1
+#, c-format
+msgid "No"
+msgstr "Tidak"
 
-#~ 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 ""
-#~ "Ada error saat penambahan media update via urpmi.\n"
-#~ "\n"
-#~ "Ini mungkin disebabkan oleh mirror yg rusak / sementara tak dapat "
-#~ "dipakai,\n"
-#~ "atau bila versi Linux Mandrake (%s) Anda belum / tak ditunjang lagi oleh\n"
-#~ "Update Resmi Linux Mandrake.\n"
-#~ "\n"
-#~ "Do you want to try another mirror?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Ya"
+
+#: data/rpmdrake.desktop.in.h:1
+msgid "Install Software"
+msgstr "Install Software"
+
+#: data/rpmdrake-remove.desktop.in.h:1
+msgid "Remove Software"
+msgstr "Hapus Software"
+
+#: data/rpmdrake-sources.desktop.in.h:1
+msgid "Software Sources Manager"
+msgstr "Manajer Source Software"
+
+#~ 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--*-*-*-*-*,*"
diff --git a/po/id.pom b/po/id.pom
index 0b532966..7de6725c 100644
--- a/po/id.pom
+++ b/po/id.pom
@@ -4,167 +4,175 @@ msgstr "Server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Server, Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Komputer Jaringan (klien)"
+msgid "Office Workstation"
+msgstr "Komputer Kantor"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "server NFS, SMB, Proxy, SSH"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Program office: pengolah kata (kword, abiword), spreadsheet (kspread, "
+"gnumeric), viewer pdf,dsb"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Aplikasi Perkantoran"
+msgid "Workstation"
+msgstr "Stasiunkerja"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Stasiunkerja Gnome"
+msgid "Game station"
+msgstr "Komputer Game"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Tool untuk Palm Pilot ataupun Visor"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Program permainan: arcade, board, strategi, dsb"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Stasiunkerja"
+msgid "Multimedia station"
+msgstr "Komputer Multimedia"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Server, Firewall/Router"
+msgid "Sound and video playing/editing programs"
+msgstr "Program untuk memainkan/mengedit suara dan video"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr "Nama Domain dan Server Info Network (NIS)"
+msgid "Internet station"
+msgstr "Komputer Internet"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
 msgstr ""
-"Program office: pengolah kata (kword, abiword), spreadsheet (kspread, "
-"gnumeric), viewer pdf,dsb"
+"Kumpulan tool untuk membaca dan mengirimkan email dan news (pine, mutt, "
+"tin..) dan untuk membrowse Web"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "Tool untuk audio: player mp3 atau midi, mixer, dsb"
+msgid "Network Computer (client)"
+msgstr "Komputer Jaringan (klien)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Basis Standar Linux. Tunjangan aplikasi partai ketiga"
+msgid "Clients for different protocols including ssh"
+msgstr "Klien untuk berbagai protokol, termasuk ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Buku dan Howto untuk Linux dan Free Software"
+msgid "Configuration"
+msgstr "Konfigurasi"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "Workstation KDE"
+msgid "Tools to ease the configuration of your computer"
+msgstr "Alat untuk memudahkan konfigurasi komputer."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, dsb"
+msgid "Scientific Workstation"
+msgstr "Aplikasi Ilmu pengetahuan"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Multimedia - Video"
+msgid "Scientific applications such as gnuplot"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr "Kumpulan tool untuk mail, news, web, transfer file, dan chat"
+msgid "Console Tools"
+msgstr "Alat konsol"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Server, Database"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Editor, shell, tool untuk file, terminal"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "Server database PostgreSQL atau MySQL"
+msgid "KDE Workstation"
+msgstr "Workstation KDE"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Alat untuk memudahkan konfigurasi komputer."
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"The K Desktop Environment, lingkungan grafis dasar dg kumpulan tool-tool "
+"yang menyertainya"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "Multimedia - Suara"
+msgid "Graphical Environment"
+msgstr "Mode Grafis"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dokumentasi"
+msgid "Gnome Workstation"
+msgstr "Stasiunkerja Gnome"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Alat konsol"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+"Environment grafis dengan kumpulan aplikasi dan tool desktop yang mudah "
+"digunakan"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr "Server mail Postfix, server news Inn"
+msgid "Other Graphical Desktops"
+msgstr "Desktop Grafis lainnya"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Komputer Internet"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, dsb"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Komputer Multimedia"
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+msgid "Development"
+msgstr "Development"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Konfigurasi"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "Librari, program, dan file include untuk pemrograman C dan C++"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Desktop Grafis tambahan (Gnome, IceWM)"
+msgid "Documentation"
+msgstr "Dokumentasi"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
-"The K Desktop Environment, lingkungan grafis dasar dg kumpulan tool-tool "
-"yang menyertainya"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Buku dan Howto untuk Linux dan Free Software"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Mode Grafis"
+msgid "LSB"
+msgstr "LSB"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Basis Standar Linux. Tunjangan aplikasi partai ketiga"
+
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-msgid "Development"
-msgstr "Development"
+#: ../../share/compssUsers:999
+msgid "Web/FTP"
+msgstr "Server, Web/FTP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -173,23 +181,33 @@ msgstr "Apache dan Pro-ftpd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "Tool untuk membuat dan memburn CD"
+msgid "Mail/Groupware/News"
+msgstr "Server, Mail/Groupware/News"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Komputer Kantor"
+msgid "Postfix mail server, Inn news server"
+msgstr "Server mail Postfix, server news Inn"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, dsb"
+msgid "Database"
+msgstr "Server, Database"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Program Grafis, misalnya The Gimp"
+msgid "PostgreSQL or MySQL database server"
+msgstr "Server database PostgreSQL atau MySQL"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Firewall/Router"
+msgstr "Server, Firewall/Router"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Internet gateway"
+msgstr "Gerbang Internet"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -198,8 +216,8 @@ msgstr "DNS/NIS "
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "Librari, program, dan file include untuk pemrograman C dan C++"
+msgid "Domain Name and Network Information Server"
+msgstr "Nama Domain dan Server Info Network (NIS)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -208,18 +226,18 @@ msgstr "Komputer Server Jaringan"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "Server, Mail/Groupware/News"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "server NFS, SMB, Proxy, SSH"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Komputer Game"
+msgid "Office"
+msgstr "Aplikasi Perkantoran"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Editor dan Player Video"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr "Kumpulan tool untuk mail, news, web, transfer file, dan chat"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -228,79 +246,66 @@ msgstr "Multimedia - Grafis"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Program permainan: arcade, board, strategi, dsb"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
-"Kumpulan tool untuk membaca dan mengirimkan email dan news (pine, mutt, "
-"tin..) dan untuk membrowse Web"
+msgid "Graphics programs such as The Gimp"
+msgstr "Program Grafis, misalnya The Gimp"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "Keuangan Pribadi"
+msgid "Multimedia - Sound"
+msgstr "Multimedia - Suara"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
-"Environment grafis dengan kumpulan aplikasi dan tool desktop yang mudah "
-"digunakan"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "Tool untuk audio: player mp3 atau midi, mixer, dsb"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Klien untuk berbagai protokol, termasuk ssh"
+msgid "Multimedia - Video"
+msgstr "Multimedia - Video"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
+msgid "Video players and editors"
+msgstr "Editor dan Player Video"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Gerbang Internet"
+msgid "Multimedia - CD Burning"
+msgstr "Multimedia - Bakar CD"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Program untuk memainkan/mengedit suara dan video"
+msgid "Tools to create and burn CD's"
+msgstr "Tool untuk membuat dan memburn CD"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Desktop Grafis lainnya"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Desktop Grafis tambahan (Gnome, IceWM)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Editor, shell, tool untuk file, terminal"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, dsb"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "Program untuk mengelola keuangan, misalnya gnucash"
+msgid "Personal Information Management"
+msgstr "Pengelolaan Informasi Pribadi"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "Pengelolaan Informasi Pribadi"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Tool untuk Palm Pilot ataupun Visor"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multimedia - Bakar CD"
+msgid "Personal Finance"
+msgstr "Keuangan Pribadi"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Aplikasi Ilmu pengetahuan"
+msgid "Programs to manage your finances, such as gnucash"
+msgstr "Program untuk mengelola keuangan, misalnya gnucash"
 
diff --git a/po/is.po b/po/is.po
index caf07052..7d71eeef 100644
--- a/po/is.po
+++ b/po/is.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2003-01-19 16:57+0100\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\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,871 +13,1121 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl_.c:39
-msgid "Unable to create medium."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:40
-msgid "Unable to update medium; it will be automatically disabled."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to the software installation tool!\n"
+"\n"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:51
-#, fuzzy
-msgid "Add a source"
-msgstr "Miđlungs"
+#: ../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 ""
 
-#: ../edit-urpm-sources.pl_.c:52
-#, fuzzy
-msgid "Local files"
-msgstr "Nafn"
+#: ../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_.c:52
-msgid "Path:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:53
-msgid "FTP server"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during removal"
+msgstr "Undirbý innsetningu"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, removing packages..."
+msgstr "Augnablik..."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:53 ../edit-urpm-sources.pl_.c:54
-#: ../edit-urpm-sources.pl_.c:56 ../edit-urpm-sources.pl_.c:175
-msgid "URL:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:54
-msgid "HTTP server"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during installation"
+msgstr "Undirbý innsetningu"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Path or mount point:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Removable device"
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:56 ../rpmdrake_.c:548
-msgid "Security updates"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:67
-msgid "Browse..."
+#: ../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 ""
 
-#: ../edit-urpm-sources.pl_.c:69
-msgid "Choose a mirror..."
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:89
-msgid "Login:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"some packages failed to install\n"
+"correctly"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:89 ../edit-urpm-sources.pl_.c:215
-msgid "Password:"
-msgstr "Lykilorđ:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages to allow others to be upgraded..."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:94
-msgid "Name:"
-msgstr "Nafn:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:96 ../edit-urpm-sources.pl_.c:176
-msgid "Relative path to synthesis/hdlist:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Installation failed"
+msgstr "Set inn"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
+msgstr "Hćtta viđ"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "Í lagi"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:104
-msgid "You need to fill up at least the two first entries."
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:116
-#, fuzzy
-msgid "Adding a source:"
-msgstr "Miđlungs"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:117
-msgid "Type of source:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:121 ../edit-urpm-sources.pl_.c:187
-#: ../edit-urpm-sources.pl_.c:219 ../rpmdrake.pm_.c:97 ../rpmdrake.pm_.c:136
-#: ../rpmdrake.pm_.c:319 ../rpmdrake_.c:353 ../rpmdrake_.c:365
-#: ../rpmdrake_.c:369 ../rpmdrake_.c:916 ../rpmdrake_.c:950
-msgid "Ok"
-msgstr "Í lagi"
+#: ../rpmdrake:1
+#, c-format
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:180
-#: ../edit-urpm-sources.pl_.c:187 ../edit-urpm-sources.pl_.c:220
-#: ../rpmdrake.pm_.c:319 ../rpmdrake.pm_.c:352 ../rpmdrake_.c:353
-#: ../rpmdrake_.c:950
-msgid "Cancel"
-msgstr "Hćtta viđ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:140
-#, fuzzy
-msgid "Please wait, adding medium..."
-msgstr "Augnablik..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:158
-msgid "Please wait, removing medium..."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Installation finished"
+msgstr "Set inn"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:169
-#, fuzzy
-msgid "Edit a source"
-msgstr "Miđlungs"
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:173
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "Miđlungs"
+msgid "Remove .%s"
+msgstr "Fjarlćgja"
 
-#: ../edit-urpm-sources.pl_.c:179
-#, fuzzy
-msgid "Save changes"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "changes:"
 msgstr "Pakka"
 
-#: ../edit-urpm-sources.pl_.c:185
-msgid "You need to insert the medium to continue"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:186
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, finding available packages..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:191
-#, fuzzy
-msgid "Please wait, updating medium..."
-msgstr "Augnablik..."
-
-#: ../edit-urpm-sources.pl_.c:202
-#, fuzzy
-msgid "Configure proxies"
-msgstr "Bćta viđ notanda"
-
-#: ../edit-urpm-sources.pl_.c:207
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+"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 ""
 
-#: ../edit-urpm-sources.pl_.c:209
-msgid "Proxy hostname:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:211
-msgid "You may specify a user/password for the proxy authentication:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:213
-msgid "User:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Sources Manager, and then add a `Security\n"
+"updates' source.\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:235
-#, fuzzy
-msgid "Configure sources"
-msgstr "Bćta viđ notanda"
-
-#: ../edit-urpm-sources.pl_.c:242
-msgid "Enabled?"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:243
-#, fuzzy
-msgid "Source"
-msgstr "Neyđa"
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:264 ../rpmdrake_.c:730
-#, fuzzy
-msgid "Remove"
-msgstr "Fjarlćgja"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:266
-msgid "Edit"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:268
-msgid "Add..."
+#: ../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 ""
 
-#: ../edit-urpm-sources.pl_.c:270
-msgid "Update..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Installation"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:271
-#, fuzzy
-msgid "Proxy..."
-msgstr "Villa..."
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, c-format
+msgid "Mandrake Update"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:274
-msgid "Save and quit"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:275 ../rpmdrake_.c:733
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
 msgid "Quit"
 msgstr "Hćtta"
 
-#: ../rpmdrake.pm_.c:93
-msgid "Yes"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Install"
+msgstr "Set inn:"
 
-#: ../rpmdrake.pm_.c:95
-msgid "No"
-msgstr ""
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Remove"
+msgstr "Fjarlćgja"
 
-#: ../rpmdrake.pm_.c:127
-msgid "Info..."
-msgstr ""
+#: ../rpmdrake:1
+#, c-format
+msgid "Search"
+msgstr "Leita"
 
-#: ../rpmdrake.pm_.c:180
-msgid "Austria"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:181
-msgid "Australia"
+#: ../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 ""
 
-#: ../rpmdrake.pm_.c:182
-msgid "Belgium"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:183
-msgid "Brazil"
+#: ../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 ""
 
-#: ../rpmdrake.pm_.c:184
-msgid "Canada"
+#: ../rpmdrake:1
+#, c-format
+msgid "Too many packages are selected"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:185
-msgid "Costa Rica"
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:186
-msgid "Czech Republic"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Normal information"
+msgstr "Linux-Mandrake uppfćrsla"
+
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update source(s)"
+msgstr "Miđlungs"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Reload the packages list"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:187
-msgid "Germany"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:188
-msgid "Danmark"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "in files"
+msgstr "Nafn"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "in descriptions"
+msgstr "Lýsingar"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:189 ../rpmdrake.pm_.c:193
-msgid "Greece"
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:190
-msgid "Spain"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:191
-msgid "Finland"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:192
-#, fuzzy
-msgid "France"
-msgstr "Hćtta viđ"
+#: ../rpmdrake:1
+#, c-format
+msgid "by size"
+msgstr ""
 
-#: ../rpmdrake.pm_.c:194
-#, fuzzy
-msgid "Israel"
-msgstr "Set inn"
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
+msgstr ""
 
-#: ../rpmdrake.pm_.c:195
-#, fuzzy
-msgid "Italy"
-msgstr "Set inn"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "All packages,"
+msgstr "Fjarlćgja"
 
-#: ../rpmdrake.pm_.c:196
-msgid "Japan"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:197
-msgid "Korea"
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:198
-msgid "Netherlands"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal updates"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:199
-msgid "Norway"
+#: ../rpmdrake:1
+#, c-format
+msgid "Bugfixes updates"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:200
-msgid "Poland"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:201
-msgid "Portugal"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Description: "
+msgstr "Lýsingar"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Summary: "
+msgstr "Yfirlit"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
 msgstr ""
 
-#: ../rpmdrake.pm_.c:202
-msgid "Russia"
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:203
-msgid "Sweden"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Size: "
+msgstr "Stćrđ"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Version: "
 msgstr ""
 
-#: ../rpmdrake.pm_.c:204
-msgid "Taiwan"
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "Nafn: "
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
 msgstr ""
 
-#: ../rpmdrake.pm_.c:205
-msgid "United Kingdom"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
 msgstr ""
 
-#: ../rpmdrake.pm_.c:206
-msgid "China"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Source: "
+msgstr "Neyđa"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "(Not available)"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:207 ../rpmdrake.pm_.c:208 ../rpmdrake.pm_.c:209
-#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:261
-msgid "United States"
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:274
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:280
-msgid "Error during download"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected size: %d MB"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:289
-msgid "No mirror"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:307
-msgid "Please choose the desired mirror."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:339 ../rpmdrake_.c:627
-#, fuzzy
-msgid "Update source(s)"
-msgstr "Miđlungs"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+msgstr ""
 
-#: ../rpmdrake.pm_.c:343
-msgid "Select the source(s) you wish to update:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be installed"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:347
-#, fuzzy
-msgid "Update"
-msgstr "Linux-Mandrake uppfćrsla"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
+msgstr ""
 
-#: ../rpmdrake.pm_.c:358
-#, fuzzy
-msgid "Please wait, updating media..."
-msgstr "Augnablik..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Additional packages needed"
+msgstr ""
 
-#: ../rpmdrake_.c:99
-msgid "Other"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be removed"
 msgstr ""
 
-#: ../rpmdrake_.c:121 ../rpmdrake_.c:135 ../rpmdrake_.c:227 ../rpmdrake_.c:298
-msgid "(none)"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
 msgstr ""
 
-#: ../rpmdrake_.c:141 ../rpmdrake_.c:482 ../rpmdrake_.c:483
-msgid "(Not available)"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
 msgstr ""
 
-#: ../rpmdrake_.c:151 ../rpmdrake_.c:208
-#, fuzzy
-msgid "Search results"
-msgstr "Leita"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr ""
 
-#: ../rpmdrake_.c:151
-#, fuzzy
-msgid "Search results (none)"
-msgstr "Leita"
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
+msgstr ""
 
-#: ../rpmdrake_.c:161 ../rpmdrake_.c:172
-#, fuzzy
-msgid "Please wait, searching..."
-msgstr "Augnablik..."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Information on packages"
+msgstr "Get ekki opnađ pakka"
 
-#: ../rpmdrake_.c:175
-msgid "Stop"
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
 msgstr ""
 
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-#, fuzzy
+#: ../rpmdrake:1
+#, fuzzy, c-format
 msgid "Addable"
 msgstr "Setja kerfiđ inn"
 
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
+#: ../rpmdrake:1
+#, c-format
 msgid "Upgradable"
 msgstr ""
 
-#: ../rpmdrake_.c:211
-#, fuzzy
-msgid "Not selected"
+#: ../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 ""
-"Velja\n"
-"enga"
 
-#: ../rpmdrake_.c:211
-#, fuzzy
-msgid "Selected"
-msgstr "Velja alla"
+#: ../rpmdrake:1
+#, c-format
+msgid "No update"
+msgstr ""
 
-#: ../rpmdrake_.c:240
-msgid "rpmdrake"
-msgstr "rpmdrake"
+#: ../rpmdrake:1
+#, c-format
+msgid "(none)"
+msgstr ""
 
-#: ../rpmdrake_.c:258 ../rpmdrake_.c:360 ../rpmdrake_.c:362
-msgid "More information on package..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, listing packages..."
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "unknown package "
 msgstr ""
 
-#: ../rpmdrake_.c:259
+#: ../rpmdrake:1
+#, c-format
 msgid "One of the following packages is needed:"
 msgstr ""
 
-#: ../rpmdrake_.c:259
-#, fuzzy
+#: ../rpmdrake:1
+#, fuzzy, c-format
 msgid "Please choose"
 msgstr "Augnablik..."
 
-#: ../rpmdrake_.c:275
-msgid "unknown package "
-msgstr ""
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:285
-msgid "Please wait, listing packages..."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Not selected"
 msgstr ""
+"Velja\n"
+"enga"
 
-#: ../rpmdrake_.c:300
-msgid "No update"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Selected"
+msgstr "Velja alla"
 
-#: ../rpmdrake_.c:353 ../rpmdrake_.c:354
-msgid "More infos"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Search results"
+msgstr "Leita"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Stop"
 msgstr ""
 
-#: ../rpmdrake_.c:355
-#, fuzzy
-msgid "Information on packages"
-msgstr "Get ekki opnađ pakka"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, searching..."
+msgstr "Augnablik..."
 
-#: ../rpmdrake_.c:376
-msgid "Some additional packages need to be removed"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Search results (none)"
+msgstr "Leita"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
 msgstr ""
 
-#: ../rpmdrake_.c:377
+#: ../edit-urpm-sources.pl:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"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_.c:383 ../rpmdrake_.c:391
-msgid "Some packages can't be removed"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
 msgstr ""
 
-#: ../rpmdrake_.c:384
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Proxy..."
+msgstr "Villa..."
 
-#: ../rpmdrake_.c:392 ../rpmdrake_.c:451
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
 msgstr ""
 
-#: ../rpmdrake_.c:421
-msgid "Additional packages needed"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
 msgstr ""
 
-#: ../rpmdrake_.c:422
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
 msgstr ""
 
-#: ../rpmdrake_.c:435
-msgid "Some packages can't be installed"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Source"
+msgstr "Neyđa"
 
-#: ../rpmdrake_.c:436
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
 msgstr ""
 
-#: ../rpmdrake_.c:450 ../rpmdrake_.c:684
-msgid "Some packages need to be removed"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure sources"
+msgstr "Bćta viđ notanda"
 
-#: ../rpmdrake_.c:472
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
+msgid "Password:"
+msgstr "Lykilorđ:"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
 msgstr ""
 
-#: ../rpmdrake_.c:474
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected size: %d MB"
+msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 
-#: ../rpmdrake_.c:482
-msgid "Files:\n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
 msgstr ""
 
-#: ../rpmdrake_.c:483
-msgid "Changelog:\n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
 msgstr ""
 
-#: ../rpmdrake_.c:486
-#, fuzzy
-msgid "Source: "
-msgstr "Neyđa"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure proxies"
+msgstr "Bćta viđ notanda"
 
-#: ../rpmdrake_.c:487
-msgid "Currently installed version: "
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, updating medium..."
+msgstr "Augnablik..."
+
+#: ../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_.c:491
-msgid "Reason for update: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
 msgstr ""
 
-#: ../rpmdrake_.c:493
-msgid "Name: "
-msgstr "Nafn: "
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Save changes"
+msgstr "Pakka"
 
-#: ../rpmdrake_.c:494
-msgid "Version: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
 msgstr ""
 
-#: ../rpmdrake_.c:495
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "%s KB"
+msgid "URL:"
 msgstr ""
 
-#: ../rpmdrake_.c:495
-#, fuzzy
-msgid "Size: "
-msgstr "Stćrđ"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing source \"%s\":"
+msgstr "Miđlungs"
 
-#: ../rpmdrake_.c:497
-msgid "Importance: "
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Edit a source"
+msgstr "Miđlungs"
 
-#: ../rpmdrake_.c:498
-#, fuzzy
-msgid "Summary: "
-msgstr "Yfirlit"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr ""
 
-#: ../rpmdrake_.c:499
-#, fuzzy
-msgid "Description: "
-msgstr "Lýsingar"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, adding medium..."
+msgstr "Augnablik..."
 
-#: ../rpmdrake_.c:548
-msgid "Bugfixes updates"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of source:"
 msgstr ""
 
-#: ../rpmdrake_.c:548
-msgid "Normal updates"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Adding a source:"
+msgstr "Miđlungs"
 
-#: ../rpmdrake_.c:567
-msgid "Mandrake choices"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 msgstr ""
 
-#: ../rpmdrake_.c:568
-msgid "All packages, alphabetical"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to fill up at least the two first entries."
 msgstr ""
 
-#: ../rpmdrake_.c:569
-#, fuzzy
-msgid "All packages,"
-msgstr "Fjarlćgja"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "Nafn:"
 
-#: ../rpmdrake_.c:592
-msgid "by group"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
 msgstr ""
 
-#: ../rpmdrake_.c:592
-msgid "by size"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
 msgstr ""
 
-#: ../rpmdrake_.c:593
-msgid "by selection state"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Browse..."
 msgstr ""
 
-#: ../rpmdrake_.c:594
-msgid "by source repository"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
 msgstr ""
 
-#: ../rpmdrake_.c:594
-msgid "by update availability"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Removable device"
 msgstr ""
 
-#: ../rpmdrake_.c:615
-#, fuzzy
-msgid "in descriptions"
-msgstr "Lýsingar"
-
-#: ../rpmdrake_.c:615
-#, fuzzy
-msgid "in files"
-msgstr "Nafn"
-
-#: ../rpmdrake_.c:615
-msgid "in names"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "HTTP server"
 msgstr ""
 
-#: ../rpmdrake_.c:626
-msgid "Reload the packages list"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
 msgstr ""
 
-#: ../rpmdrake_.c:626
-msgid "Reset the selection"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path:"
 msgstr ""
 
-#: ../rpmdrake_.c:652
-msgid "Maximum information"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Local files"
+msgstr "Nafn"
 
-#: ../rpmdrake_.c:652
-#, fuzzy
-msgid "Normal information"
-msgstr "Linux-Mandrake uppfćrsla"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a source"
+msgstr "Miđlungs"
 
-#: ../rpmdrake_.c:674
-msgid "Too many packages are selected"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
 msgstr ""
 
-#: ../rpmdrake_.c:720
-msgid "Find:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to create medium."
 msgstr ""
 
-#: ../rpmdrake_.c:725
-msgid "Search"
-msgstr "Leita"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Please wait, updating media..."
+msgstr "Augnablik..."
 
-#: ../rpmdrake_.c:731
-#, fuzzy
-msgid "Install"
-msgstr "Set inn:"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update"
+msgstr "Linux-Mandrake uppfćrsla"
 
-#: ../rpmdrake_.c:738 data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrake Update"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Select the source(s) you wish to update:"
 msgstr ""
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Installation"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please choose the desired mirror."
 msgstr ""
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Removal"
+#: ../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_.c:779
-msgid "Please wait, contacting mirror to update packages information."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
 msgstr ""
 
-#: ../rpmdrake_.c:781
-msgid "Error updating medium"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid ""
+"There was an error downloading the mirrors list:\n"
+"\n"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
 
-#: ../rpmdrake_.c:782
-msgid "There was an unrecoverable error while updating packages information."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
 msgstr ""
 
-#: ../rpmdrake_.c:787
-msgid "How to choose manually your mirror"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
 
-#: ../rpmdrake_.c:795
-msgid "Please wait, contacting mirror to initialize updates packages."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake_.c:798
-msgid "Error adding update medium"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United States"
 msgstr ""
 
-#: ../rpmdrake_.c:829
-msgid "Please wait, finding available packages..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
 msgstr ""
 
-#: ../rpmdrake_.c:861
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Inspecting %s"
+msgid "United Kingdom"
 msgstr ""
 
-#: ../rpmdrake_.c:880
-#, fuzzy
-msgid "changes:"
-msgstr "Pakka"
-
-#: ../rpmdrake_.c:884
-#, fuzzy, c-format
-msgid "Remove .%s"
-msgstr "Fjarlćgja"
-
-#: ../rpmdrake_.c:886
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Use .%s as main file"
+msgid "Taiwan"
 msgstr ""
 
-#: ../rpmdrake_.c:888
-msgid "Do nothing"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
 msgstr ""
 
-#: ../rpmdrake_.c:900
-#, fuzzy
-msgid "Installation finished"
-msgstr "Set inn"
-
-#: ../rpmdrake_.c:910
-msgid "Inspect..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
 msgstr ""
 
-#: ../rpmdrake_.c:925
-msgid "Program missing"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Portugal"
 msgstr ""
 
-#: ../rpmdrake_.c:926
-msgid "A required program is missing (grpmi). Check your installation."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
 msgstr ""
 
-#: ../rpmdrake_.c:940
-msgid "Unable to get source packages."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
 msgstr ""
 
-#: ../rpmdrake_.c:941
-msgid "Unable to get source packages, sorry."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
 msgstr ""
 
-#: ../rpmdrake_.c:948
-msgid "Change medium"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Korea"
 msgstr ""
 
-#: ../rpmdrake_.c:949
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+msgid "Japan"
 msgstr ""
 
-#: ../rpmdrake_.c:957
-#, fuzzy
-msgid "Installation failed"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Italy"
 msgstr "Set inn"
 
-#: ../rpmdrake_.c:958
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Israel"
+msgstr "Set inn"
 
-#: ../rpmdrake_.c:961
-msgid "Please wait, removing packages to allow others to be upgraded..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
 msgstr ""
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "France"
+msgstr "Hćtta viđ"
+
+#: ../rpmdrake.pm: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 "Finland"
 msgstr ""
 
-#: ../rpmdrake_.c:982
-msgid ""
-"some packages failed to install\n"
-"correctly"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
 msgstr ""
 
-#: ../rpmdrake_.c:983
-msgid "everything was installed correctly"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
 msgstr ""
 
-#: ../rpmdrake_.c:985
-msgid "Everything installed successfully"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
 msgstr ""
 
-#: ../rpmdrake_.c:986
-msgid "All requested packages were installed successfully."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
 msgstr ""
 
-#: ../rpmdrake_.c:989
-msgid "Everything already installed."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Costa Rica"
 msgstr ""
 
-#: ../rpmdrake_.c:990
-msgid "Everything already installed (is this supposed to happen at all?)."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Canada"
 msgstr ""
 
-#: ../rpmdrake_.c:997
-#, fuzzy
-msgid "Problem during installation"
-msgstr "Undirbý innsetningu"
-
-#: ../rpmdrake_.c:998
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
+msgid "Brazil"
 msgstr ""
 
-#: ../rpmdrake_.c:1012
-msgid "Please wait, reading packages database..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Belgium"
 msgstr ""
 
-#: ../rpmdrake_.c:1053
-#, fuzzy
-msgid "Please wait, removing packages..."
-msgstr "Augnablik..."
-
-#: ../rpmdrake_.c:1056
-#, fuzzy
-msgid "Problem during removal"
-msgstr "Undirbý innsetningu"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Australia"
+msgstr ""
 
-#: ../rpmdrake_.c:1057
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
+msgid "Austria"
 msgstr ""
 
-#: ../rpmdrake_.c:1089
-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."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Info..."
 msgstr ""
 
-#: ../rpmdrake_.c:1094
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
 msgstr ""
 
-#: ../rpmdrake_.c:1099
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
 msgstr ""
 
+#: data/rpmdrake.desktop.in.h:1
+#, fuzzy
+msgid "Install Software"
+msgstr "Set inn:"
+
 #: data/rpmdrake-remove.desktop.in.h:1
 msgid "Remove Software"
 msgstr ""
@@ -886,11 +1136,6 @@ msgstr ""
 msgid "Software Sources Manager"
 msgstr ""
 
-#: data/rpmdrake.desktop.in.h:1
-#, fuzzy
-msgid "Install Software"
-msgstr "Set inn:"
-
 #, fuzzy
 #~ msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
 #~ msgstr "-adobe-helvetica-bold-r-*-*-*-140-*-*-*-*-*-*,*"
diff --git a/po/is.pom b/po/is.pom
index c8cda6ed..9293df34 100644
--- a/po/is.pom
+++ b/po/is.pom
@@ -4,175 +4,179 @@ msgstr "netţjónn"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
 #, fuzzy
-msgid "Network Computer (client)"
-msgstr "Viđföng NetWare prentara"
+msgid "Office Workstation"
+msgstr "Upplýsingar"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 #, fuzzy
-msgid "Office"
-msgstr "tćki"
+msgid "Workstation"
+msgstr "Upplýsingar"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 #, fuzzy
-msgid "Gnome Workstation"
-msgstr "Upplýsingar"
+msgid "Game station"
+msgstr "Leiđbeiningar"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
+msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 #, fuzzy
-msgid "Workstation"
-msgstr "Upplýsingar"
+msgid "Multimedia station"
+msgstr "Margmiđlun"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
+msgid "Sound and video playing/editing programs"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr ""
+#, fuzzy
+msgid "Internet station"
+msgstr "Sel stillingar"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr ""
+#, fuzzy
+msgid "Network Computer (client)"
+msgstr "Viđföng NetWare prentara"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
+msgid "Clients for different protocols including ssh"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr ""
+#, fuzzy
+msgid "Configuration"
+msgstr "Uppsetning"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 #, fuzzy
-msgid "KDE Workstation"
+msgid "Tools to ease the configuration of your computer"
+msgstr "Viltu prófa skilgreininguna"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+#, fuzzy
+msgid "Scientific Workstation"
 msgstr "Upplýsingar"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgid "Scientific applications such as gnuplot"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Multimedia - Video"
-msgstr "Margmiđlun"
+msgid "Console Tools"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgid "Editors, shells, file tools, terminals"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr ""
+#, fuzzy
+msgid "KDE Workstation"
+msgstr "Upplýsingar"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Tools to ease the configuration of your computer"
-msgstr "Viltu prófa skilgreininguna"
+msgid "Graphical Environment"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 #, fuzzy
-msgid "Multimedia - Sound"
-msgstr "Margmiđlun"
+msgid "Gnome Workstation"
+msgstr "Upplýsingar"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Leiđbeiningar"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Console Tools"
+msgid "Other Graphical Desktops"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 #, fuzzy
-msgid "Internet station"
-msgstr "Sel stillingar"
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+msgid "Development"
+msgstr "Forritun"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Multimedia station"
-msgstr "Margmiđlun"
+msgid "C and C++ development libraries, programs and include files"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Configuration"
-msgstr "Uppsetning"
+msgid "Documentation"
+msgstr "Leiđbeiningar"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
+msgid "Books and Howto's on Linux and Free Software"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
+msgid "LSB"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
+msgid "Linux Standard Base. Third party applications support"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-msgid "Development"
-msgstr "Forritun"
+msgid "Web/FTP"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -181,33 +185,43 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
+msgid "Mail/Groupware/News"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Office Workstation"
-msgstr "Upplýsingar"
+msgid "Postfix mail server, Inn news server"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgid "Database"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
+msgid "PostgreSQL or MySQL database server"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
+msgid "Firewall/Router"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+#, fuzzy
+msgid "Internet gateway"
+msgstr "Endursníđ..."
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "DNS/NIS "
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
+msgid "Domain Name and Network Information Server"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
@@ -218,18 +232,18 @@ msgstr "Viđföng NetWare prentara"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
+msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 #, fuzzy
-msgid "Game station"
-msgstr "Leiđbeiningar"
+msgid "Office"
+msgstr "tćki"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
@@ -240,77 +254,69 @@ msgstr "Margmiđlun"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
+msgid "Graphics programs such as The Gimp"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr ""
+#, fuzzy
+msgid "Multimedia - Sound"
+msgstr "Margmiđlun"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr ""
+#, fuzzy
+msgid "Multimedia - Video"
+msgstr "Margmiđlun"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "LSB"
+msgid "Video players and editors"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 #, fuzzy
-msgid "Internet gateway"
-msgstr "Endursníđ..."
+msgid "Multimedia - CD Burning"
+msgstr "Margmiđlun"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
+msgid "Tools to create and burn CD's"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
+msgid "More Graphical Desktops (Gnome, IceWM)"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
+msgid "Personal Information Management"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
+msgid "Tools for your Palm Pilot or your Visor"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Multimedia - CD Burning"
-msgstr "Margmiđlun"
+msgid "Personal Finance"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Scientific Workstation"
-msgstr "Upplýsingar"
+msgid "Programs to manage your finances, such as gnucash"
+msgstr ""
+
diff --git a/po/it.po b/po/it.po
index 92c892f6..543210dc 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.4\n"
-"POT-Creation-Date: 2003-02-19 19:47+0100\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\n"
 "PO-Revision-Date: 2003-02-19 17:09+0100\n"
 "Last-Translator: Ruggero T. <ruggero@valtellinux.it>\n"
 "Language-Team: Italian <it@li.org>\n"
@@ -16,455 +16,631 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl_.c:43
-msgid "Unable to create medium."
-msgstr "Impossibile creare il supporto."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Andiamo avanti?"
 
-#: ../edit-urpm-sources.pl_.c:44
-msgid "Unable to update medium; it will be automatically disabled."
-msgstr "Impossibile aggiornare il supporto, sarŕ automaticamente disabilitato."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to the software installation tool!\n"
+"\n"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
+msgstr ""
+"Benvenuto nel programma di installazione software!\n"
+"\n"
+"Il sistema Mandrake Linux offre parecchie migliaia di pacchetti\n"
+"software su CD-ROM o DVD. Questo programma ti aiuterŕ a scegliere il "
+"software\n"
+"da installare sul tuo computer."
 
-#: ../edit-urpm-sources.pl_.c:54
-msgid "Add a source"
-msgstr "Aggiunta sorgente:"
+#: ../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 ""
+"Benvenuto in MandrakeUpdate!\n"
+"\n"
+"Questo programma ti aiuterŕ a scegliere gli aggiornamenti che vuoi "
+"installare sul tuo\n"
+"computer."
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Local files"
-msgstr "File locali"
+#: ../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 ""
+"Benvenuto nell'utilitŕ di rimozione software!\n"
+"\n"
+"Questa utilitŕ ti aiuterŕ a scegliere che software vuoi rimuovere dal\n"
+"tuo computer."
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Path:"
-msgstr "Percorso:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"Si č verificato un problema durante la rimozione dei pacchetti:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:56
-msgid "FTP server"
-msgstr "Server FTP"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during removal"
+msgstr "Si sono verificati dei problemi durante la rimozione"
 
-#: ../edit-urpm-sources.pl_.c:56 ../edit-urpm-sources.pl_.c:57
-#: ../edit-urpm-sources.pl_.c:59 ../edit-urpm-sources.pl_.c:187
-msgid "URL:"
-msgstr "URL:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages..."
+msgstr "Attendere, rimozione dei pacchetti in corso..."
 
-#: ../edit-urpm-sources.pl_.c:57
-msgid "HTTP server"
-msgstr "Server HTTP"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
+msgstr "Attendere, consultazione del database dei pacchetti in corso..."
 
-#: ../edit-urpm-sources.pl_.c:58
-msgid "Path or mount point:"
-msgstr "Percorso o punto di mount:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Si č verificato un problema durante l'installazione:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:58
-msgid "Removable device"
-msgstr "Dispositivo rimovibile"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during installation"
+msgstr "Problemi durante l'installazione"
 
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:550
-msgid "Security updates"
-msgstr "Aggiornamenti sulla sicurezza"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
+msgstr "E' giŕ tutto installato (deve essere cosě?)"
 
-#: ../edit-urpm-sources.pl_.c:70
-msgid "Browse..."
-msgstr "Sfoglia..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed."
+msgstr "E' giŕ tutto installato."
 
-#: ../edit-urpm-sources.pl_.c:72
-msgid "Choose a mirror..."
-msgstr "Scegli un mirror..."
+#: ../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_.c:92
-msgid "Login:"
-msgstr "Login:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr "Tutto č stato installato con successo."
 
-#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:231
-msgid "Password:"
-msgstr "Password:"
+#: ../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:"
 
-#: ../edit-urpm-sources.pl_.c:97
-msgid "Name:"
-msgstr "Nome:"
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "tutto č stato installato correttamente"
 
-#: ../edit-urpm-sources.pl_.c:99 ../edit-urpm-sources.pl_.c:188
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Percorso relativo a synthesis/hdlist"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"some packages failed to install\n"
+"correctly"
+msgstr ""
+"Alcuni pacchetti non sono stati installati\n"
+"correttamente"
 
-#: ../edit-urpm-sources.pl_.c:107
-msgid "You need to fill up at least the two first entries."
-msgstr "Dovresti compilare almeno le prime due caselle."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages to allow others to be upgraded..."
+msgstr ""
+"Attendi, rimuovo dei pacchetti per consentire ad altri di essere "
+"aggiornati..."
 
-#: ../edit-urpm-sources.pl_.c:120
-msgid "Adding a source:"
-msgstr "Aggiunta sorgente:"
+#: ../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."
 
-#: ../edit-urpm-sources.pl_.c:121
-msgid "Type of source:"
-msgstr "Tipo di sorgente:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation failed"
+msgstr "Installazione fallita"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
+msgstr "Annulla"
 
-#: ../edit-urpm-sources.pl_.c:125 ../edit-urpm-sources.pl_.c:202
-#: ../edit-urpm-sources.pl_.c:235 ../rpmdrake.pm_.c:100 ../rpmdrake.pm_.c:139
-#: ../rpmdrake.pm_.c:322 ../rpmdrake_.c:355 ../rpmdrake_.c:367
-#: ../rpmdrake_.c:371 ../rpmdrake_.c:917 ../rpmdrake_.c:952
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../edit-urpm-sources.pl_.c:140 ../edit-urpm-sources.pl_.c:196
-#: ../edit-urpm-sources.pl_.c:202 ../edit-urpm-sources.pl_.c:242
-#: ../rpmdrake.pm_.c:322 ../rpmdrake.pm_.c:355 ../rpmdrake_.c:355
-#: ../rpmdrake_.c:952
-msgid "Cancel"
-msgstr "Annulla"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr ""
+"Per favore inserisci il supporto etichettato \"%s\" nel dispositivo [%s]"
 
-#: ../edit-urpm-sources.pl_.c:147
-msgid "Please wait, adding medium..."
-msgstr "Attendere l'aggiunta del supporto..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr "Cambia supporto"
 
-#: ../edit-urpm-sources.pl_.c:168
-msgid "Please wait, removing medium..."
-msgstr "Attendere la rimozione supporto..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
+msgstr "Impossibile recuperare i pacchetti sorgente, mi spiace."
 
-#: ../edit-urpm-sources.pl_.c:181
-msgid "Edit a source"
-msgstr "Modifica una sorgente"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages."
+msgstr "Impossibile recuperare i pacchetti sorgente."
 
-#: ../edit-urpm-sources.pl_.c:185
+#: ../rpmdrake:1
 #, c-format
-msgid "Editing source \"%s\":"
-msgstr "Modifica sorgente \"%s\":"
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr ""
+"Un programma necessario (grpmi) non č presente. Controllate la vostra "
+"installazione."
 
-#: ../edit-urpm-sources.pl_.c:191
-msgid "Save changes"
-msgstr "Salva le modifiche"
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
+msgstr "Il programma č assente"
 
-#: ../edit-urpm-sources.pl_.c:200
-msgid "You need to insert the medium to continue"
-msgstr "Devi inserire il supporto per continuare"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
+msgstr "Ispezionare..."
 
-#: ../edit-urpm-sources.pl_.c:201
-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:1
+#, c-format
+msgid "Installation finished"
+msgstr "Installazione finita"
 
-#: ../edit-urpm-sources.pl_.c:206
-msgid "Please wait, updating medium..."
-msgstr "Attendere l'aggiornamento del supporto..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
+msgstr "Non fare niente"
 
-#: ../edit-urpm-sources.pl_.c:217
-msgid "Configure proxies"
-msgstr "Configurazione dei proxy"
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
+msgstr "Usa .%s come file principale"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Remove .%s"
+msgstr "Rimuovi .%s"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "changes:"
+msgstr "modifiche:"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr "Ispezione di %s"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, finding available packages..."
+msgstr "Attendi, cerco i pacchetti disponibili..."
 
-#: ../edit-urpm-sources.pl_.c:223
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+"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 ""
-"Se hai bisogno di specificare un proxy, digita il nome dell'host e "
-"opzionalmente la porta\n"
-"(sintassi: <proxy[:porta]>):"
+"C'č stato un errore durante l'aggiunta del supporto per gli aggiornamenti "
+"con urpmi.\n"
+"\n"
+"Potrebbe essere dovuto ad un mirror temporaneamente non in linea, oppure la\n"
+"tua versione di Mandrake Linux (%s) non č ancora / non piů supportata dagli "
+"aggiornamenti ufficiali di\n"
+"Mandrake Linux.\n"
+"\n"
+"Vuoi provare un altro mirror?"
 
-#: ../edit-urpm-sources.pl_.c:225
-msgid "Proxy hostname:"
-msgstr "Nome host del proxy:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
+msgstr "Errore durante l'aggiunta del supporto per gli aggiornamenti"
 
-#: ../edit-urpm-sources.pl_.c:227
-msgid "You may specify a user/password for the proxy authentication:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
 msgstr ""
-"Devi specificare nome utente/password per l'autenticazione da parte del "
-"proxy:"
-
-#: ../edit-urpm-sources.pl_.c:229
-msgid "User:"
-msgstr "Utente:"
+"Attendere, contatto il mirror per inizializzare i pacchetti di aggiornamento."
 
-#: ../edit-urpm-sources.pl_.c:255
-msgid "Configure sources"
-msgstr "Configura sorgenti"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Sources Manager, and then add a `Security\n"
+"updates' source.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"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."
 
-#: ../edit-urpm-sources.pl_.c:262
-msgid "Enabled?"
-msgstr "Abilitato?"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Come scegliere manualmente il mirror"
 
-#: ../edit-urpm-sources.pl_.c:263
-msgid "Source"
-msgstr "Sorgente"
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
+msgstr ""
+"Si č verificato un errore irreversibile durante l'aggiornamento delle "
+"informazioni sui pacchetti."
 
-#: ../edit-urpm-sources.pl_.c:286 ../rpmdrake_.c:731
-msgid "Remove"
-msgstr "Rimuovi"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
+msgstr "Errore nell'aggiornamento del supporto"
 
-#: ../edit-urpm-sources.pl_.c:288
-msgid "Edit"
-msgstr "Modifica"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
+msgstr ""
+"Attendere, contatto il mirror per aggiornare le informazioni sui pacchetti."
 
-#: ../edit-urpm-sources.pl_.c:290
-msgid "Add..."
-msgstr "Aggiungi..."
+#: ../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 ""
+"Devo contattare il mirror per recuperare gli ultimi aggiornamenti.\n"
+"Controlla che la rete sia in funzione.\n"
+"\n"
+"Proseguiamo?"
 
-#: ../edit-urpm-sources.pl_.c:292
-msgid "Update..."
-msgstr "Aggiorna..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Installation"
+msgstr "Installazione pacchetti software"
 
-#: ../edit-urpm-sources.pl_.c:293
-msgid "Proxy..."
-msgstr "Proxy..."
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, c-format
+msgid "Mandrake Update"
+msgstr "Mandrake Update"
 
-#: ../edit-urpm-sources.pl_.c:296
-msgid "Save and quit"
-msgstr "Salva ed esci"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
+msgstr "Rimozione Pacchetti Software"
 
-#: ../edit-urpm-sources.pl_.c:297 ../rpmdrake_.c:734
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
 msgid "Quit"
 msgstr "Esci"
 
-#: ../rpmdrake.pm_.c:96
-msgid "Yes"
-msgstr "Si"
-
-#: ../rpmdrake.pm_.c:98
-msgid "No"
-msgstr "No"
-
-#: ../rpmdrake.pm_.c:130
-msgid "Info..."
-msgstr "Informazioni..."
-
-#: ../rpmdrake.pm_.c:183
-msgid "Austria"
-msgstr "Austria"
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "Installa"
 
-#: ../rpmdrake.pm_.c:184
-msgid "Australia"
-msgstr "Australia"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "Rimuovi"
 
-#: ../rpmdrake.pm_.c:185
-msgid "Belgium"
-msgstr "Belgio"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search"
+msgstr "Cerca"
 
-#: ../rpmdrake.pm_.c:186
-msgid "Brazil"
-msgstr "Brasile"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "Trova:"
 
-#: ../rpmdrake.pm_.c:187
-msgid "Canada"
-msgstr "Canada"
+#: ../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 ""
+"I seguenti pacchetti devono essere rimossi per altri da aggiornare:\n"
+"\n"
+"%s\n"
+"\n"
+"Proseguiamo?"
 
-#: ../rpmdrake.pm_.c:188
-msgid "Costa Rica"
-msgstr "Costa Rica"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "Alcuni pacchetti devono essere rimossi"
 
-#: ../rpmdrake.pm_.c:189
-msgid "Czech Republic"
-msgstr "Repubblica Ceca"
+#: ../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 ""
 
-#: ../rpmdrake.pm_.c:190
-msgid "Germany"
-msgstr "Germania"
+#: ../rpmdrake:1
+#, c-format
+msgid "Too many packages are selected"
+msgstr "Troppi pacchetti selezionati"
 
-#: ../rpmdrake.pm_.c:191
-msgid "Danmark"
-msgstr "Danimarca"
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
+msgstr "Tutte le informazioni"
 
-#: ../rpmdrake.pm_.c:192 ../rpmdrake.pm_.c:196
-msgid "Greece"
-msgstr "Grecia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal information"
+msgstr "Informazioni normali"
 
-#: ../rpmdrake.pm_.c:193
-msgid "Spain"
-msgstr "Spagna"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update source(s)"
+msgstr "Aggiorna sorgente(i)"
 
-#: ../rpmdrake.pm_.c:194
-msgid "Finland"
-msgstr "Finlandia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reload the packages list"
+msgstr "Ricarica la lista dei pacchetti"
 
-#: ../rpmdrake.pm_.c:195
-msgid "France"
-msgstr "Francia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
+msgstr "Annulla la selezione"
 
-#: ../rpmdrake.pm_.c:197
-msgid "Israel"
-msgstr "Israele"
+#: ../rpmdrake:1
+#, c-format
+msgid "in files"
+msgstr "nei file"
 
-#: ../rpmdrake.pm_.c:198
-msgid "Italy"
-msgstr "Italia"
+#: ../rpmdrake:1
+#, c-format
+msgid "in descriptions"
+msgstr "nelle descrizioni"
 
-#: ../rpmdrake.pm_.c:199
-msgid "Japan"
-msgstr "Giappone"
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
+msgstr "nei nomi"
 
-#: ../rpmdrake.pm_.c:200
-msgid "Korea"
-msgstr "Korea"
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
+msgstr "per disponibilitŕ aggiornamenti"
 
-#: ../rpmdrake.pm_.c:201
-msgid "Netherlands"
-msgstr "Paesi Bassi"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
+msgstr "per repositorio di sorgente"
 
-#: ../rpmdrake.pm_.c:202
-msgid "Norway"
-msgstr "Norvegia"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
+msgstr "per selezione"
 
-#: ../rpmdrake.pm_.c:203
-msgid "Poland"
-msgstr "Polonia"
+#: ../rpmdrake:1
+#, c-format
+msgid "by size"
+msgstr "per dimensione"
 
-#: ../rpmdrake.pm_.c:204
-msgid "Portugal"
-msgstr "Portogallo"
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
+msgstr "per gruppo"
 
-#: ../rpmdrake.pm_.c:205
-msgid "Russia"
-msgstr "Russia"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages,"
+msgstr "Tutti i pacchetti,"
 
-#: ../rpmdrake.pm_.c:206
-msgid "Sweden"
-msgstr "Svezia"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
+msgstr "Tutti i pacchetti, alfabeticamente"
 
-#: ../rpmdrake.pm_.c:207
-msgid "Taiwan"
-msgstr "Taiwan"
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
+msgstr "Scelte di Mandrake"
 
-#: ../rpmdrake.pm_.c:208
-msgid "United Kingdom"
-msgstr "Regno Unito"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal updates"
+msgstr "Aggiornamenti comuni"
 
-#: ../rpmdrake.pm_.c:209
-msgid "China"
-msgstr "Cina"
+#: ../rpmdrake:1
+#, c-format
+msgid "Bugfixes updates"
+msgstr "Correzione bug"
 
-#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:211 ../rpmdrake.pm_.c:212
-#: ../rpmdrake.pm_.c:213 ../rpmdrake.pm_.c:264
-msgid "United States"
-msgstr "Stati Uniti"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
+msgstr "Aggiornamenti sulla sicurezza"
 
-#: ../rpmdrake.pm_.c:277
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
-"Attendere il download  degli indirizzi dei mirror dal sito di MandrakeSoft."
+#: ../rpmdrake:1
+#, c-format
+msgid "Description: "
+msgstr "Descrizione: "
 
-#: ../rpmdrake.pm_.c:283
-msgid "Error during download"
-msgstr "Errore durante il download"
+#: ../rpmdrake:1
+#, c-format
+msgid "Summary: "
+msgstr "Riepilogo: "
 
-#: ../rpmdrake.pm_.c:292
-msgid "No mirror"
-msgstr "Nessun mirror"
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "Importanza: "
 
-#: ../rpmdrake.pm_.c:310
-msgid "Please choose the desired mirror."
-msgstr "Scegli il mirror che preferisci."
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake.pm_.c:342 ../rpmdrake_.c:629
-msgid "Update source(s)"
-msgstr "Aggiorna sorgente(i)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Size: "
+msgstr "Dimensioni: "
 
-#: ../rpmdrake.pm_.c:346
-msgid "Select the source(s) you wish to update:"
-msgstr "Seleziona la sorgente che vuoi aggiornare:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Version: "
+msgstr "Versione: "
 
-#: ../rpmdrake.pm_.c:350
-msgid "Update"
-msgstr "Aggiorna"
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "Nome: "
 
-#: ../rpmdrake.pm_.c:360
-msgid "Please wait, updating media..."
-msgstr "Attendere l'aggiornamento del supporto..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "Causa dell'aggiornamento:"
 
-#: ../rpmdrake_.c:101
-msgid "Other"
-msgstr "Altro"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
+msgstr "Versione attualmente installata:"
 
-#: ../rpmdrake_.c:123 ../rpmdrake_.c:137 ../rpmdrake_.c:229 ../rpmdrake_.c:300
-msgid "(none)"
-msgstr "(nessuno)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Source: "
+msgstr "Sorgente: "
 
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:484 ../rpmdrake_.c:485
+#: ../rpmdrake:1
+#, c-format
 msgid "(Not available)"
 msgstr "(Non disponibile)"
 
-#: ../rpmdrake_.c:153 ../rpmdrake_.c:210
-msgid "Search results"
-msgstr "Risultati della Ricerca"
-
-#: ../rpmdrake_.c:153
-msgid "Search results (none)"
-msgstr "Risultati della Ricerca (nessuno)"
-
-#: ../rpmdrake_.c:163 ../rpmdrake_.c:174
-msgid "Please wait, searching..."
-msgstr "Per favore attendere, ricerca in corso..."
-
-#: ../rpmdrake_.c:177
-msgid "Stop"
-msgstr "Stop"
-
-#: ../rpmdrake_.c:211 ../rpmdrake_.c:321
-msgid "Addable"
-msgstr "Aggiungibile"
-
-#: ../rpmdrake_.c:211 ../rpmdrake_.c:321
-msgid "Upgradable"
-msgstr "Aggiornabile"
-
-#: ../rpmdrake_.c:213
-msgid "Not selected"
-msgstr "Non selezionato"
-
-#: ../rpmdrake_.c:213
-msgid "Selected"
-msgstr "Selezionato"
-
-#: ../rpmdrake_.c:242
-msgid "rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake_.c:260 ../rpmdrake_.c:362 ../rpmdrake_.c:364
-msgid "More information on package..."
-msgstr "Ulteriori informazioni sul pacchetto..."
-
-#: ../rpmdrake_.c:261
-msgid "One of the following packages is needed:"
-msgstr "Uno dei seguenti pacchetti č necessario:"
-
-#: ../rpmdrake_.c:261
-msgid "Please choose"
-msgstr "Per favore scegli"
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
+msgstr "Changelog:\n"
 
-#: ../rpmdrake_.c:277
-msgid "unknown package "
-msgstr "pacchetto sconosciuto "
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "File:\n"
 
-#: ../rpmdrake_.c:287
-msgid "Please wait, listing packages..."
-msgstr "Attendere, creo una lista dei pacchetti..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected size: %d MB"
+msgstr "Dimensione selezione: %d MB"
 
-#: ../rpmdrake_.c:302
-msgid "No update"
-msgstr "Nessun aggiornamento"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Selezionati: %d MB / Spazio libero su disco: %d MB"
 
-#: ../rpmdrake_.c:355 ../rpmdrake_.c:356
-msgid "More infos"
-msgstr "Maggiori informazioni"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
+msgstr ""
+"Per soddisfare le dipendenze, i seguenti pacchetti devono essere\n"
+"deselezionati ora:\n"
+"\n"
 
-#: ../rpmdrake_.c:357
-msgid "Information on packages"
-msgstr "Informazioni sui pacchetti"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+msgstr ""
+"Spiacente, i seguenti pacchetti non possono essere selezionati:\n"
+"\n"
 
-#: ../rpmdrake_.c:378
-msgid "Some additional packages need to be removed"
-msgstr "Ci sono altri pacchetti da rimuovere"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "Alcuni pacchetti non possono essere installati"
 
-#: ../rpmdrake_.c:379
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"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 essere\n"
-"rimossi:\n"
+"Per soddisfare le dipendenze, anche i seguenti pacchetti devono\n"
+"essere installati:\n"
 "\n"
 
-#: ../rpmdrake_.c:385 ../rpmdrake_.c:393
+#: ../rpmdrake:1
+#, c-format
+msgid "Additional packages needed"
+msgstr "Sono necessari altri pacchetti"
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "Alcuni pacchetti non possono essere rimossi"
 
-#: ../rpmdrake_.c:386
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -472,585 +648,605 @@ msgstr ""
 "Spiacente, la rimozione di questi pacchetti danneggerebbe il tuo sitema:\n"
 "\n"
 
-#: ../rpmdrake_.c:394 ../rpmdrake_.c:453
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
 "\n"
 msgstr ""
-"Per soddisfare le dipendenze, i seguenti pacchetti devono essere\n"
-"deselezionati ora:\n"
+"Per soddisfare le dipendenze, anche i seguenti pacchetti devono essere\n"
+"rimossi:\n"
 "\n"
 
-#: ../rpmdrake_.c:423
-msgid "Additional packages needed"
-msgstr "Sono necessari altri pacchetti"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr "Ci sono altri pacchetti da rimuovere"
 
-#: ../rpmdrake_.c:424
-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
+msgid "More information on package..."
+msgstr "Ulteriori informazioni sul pacchetto..."
 
-#: ../rpmdrake_.c:437
-msgid "Some packages can't be installed"
-msgstr "Alcuni pacchetti non possono essere installati"
+#: ../rpmdrake:1
+#, c-format
+msgid "Information on packages"
+msgstr "Informazioni sui pacchetti"
 
-#: ../rpmdrake_.c:438
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
+msgstr "Maggiori informazioni"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Addable"
+msgstr "Aggiungibile"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Upgradable"
+msgstr "Aggiornabile"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
+"The list of updates is void. This 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 ""
-"Spiacente, i seguenti pacchetti non possono essere selezionati:\n"
-"\n"
+"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_.c:452 ../rpmdrake_.c:686
-msgid "Some packages need to be removed"
-msgstr "Alcuni pacchetti devono essere rimossi"
+#: ../rpmdrake:1
+#, c-format
+msgid "No update"
+msgstr "Nessun aggiornamento"
 
-#: ../rpmdrake_.c:474
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Selezionati: %d MB / Spazio libero su disco: %d MB"
+msgid "(none)"
+msgstr "(nessuno)"
 
-#: ../rpmdrake_.c:476
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "Dimensione selezione: %d MB"
+msgid "Please wait, listing packages..."
+msgstr "Attendere, creo una lista dei pacchetti..."
 
-#: ../rpmdrake_.c:484
-msgid "Files:\n"
-msgstr "File:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "unknown package "
+msgstr "pacchetto sconosciuto "
 
-#: ../rpmdrake_.c:485
-msgid "Changelog:\n"
-msgstr "Changelog:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Uno dei seguenti pacchetti č necessario:"
 
-#: ../rpmdrake_.c:488
-msgid "Source: "
-msgstr "Sorgente: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please choose"
+msgstr "Per favore scegli"
 
-#: ../rpmdrake_.c:489
-msgid "Currently installed version: "
-msgstr "Versione attualmente installata:"
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:493
-msgid "Reason for update: "
-msgstr "Causa dell'aggiornamento:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Not selected"
+msgstr "Non selezionato"
 
-#: ../rpmdrake_.c:495
-msgid "Name: "
-msgstr "Nome: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected"
+msgstr "Selezionato"
 
-#: ../rpmdrake_.c:496
-msgid "Version: "
-msgstr "Versione: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results"
+msgstr "Risultati della Ricerca"
 
-#: ../rpmdrake_.c:497
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Stop"
+msgstr "Stop"
 
-#: ../rpmdrake_.c:497
-msgid "Size: "
-msgstr "Dimensioni: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, searching..."
+msgstr "Per favore attendere, ricerca in corso..."
 
-#: ../rpmdrake_.c:499
-msgid "Importance: "
-msgstr "Importanza: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
+msgstr "Risultati della Ricerca (nessuno)"
 
-#: ../rpmdrake_.c:500
-msgid "Summary: "
-msgstr "Riepilogo: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Altro"
 
-#: ../rpmdrake_.c:501
-msgid "Description: "
-msgstr "Descrizione: "
+#: ../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 ""
+"Benvenuto all'editor delle sorgenti dei pacchetti!\n"
+"\n"
+"Questa utilitŕ ti aiuterŕ a configurare le sorgenti dei pacchetti che vuoi "
+"usare\n"
+"sul tuo computer. Poi saranno disponibili per installare nuovi pacchetti "
+"software\n"
+"o per effettuare aggiornamenti."
 
-#: ../rpmdrake_.c:550
-msgid "Bugfixes updates"
-msgstr "Correzione bug"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Salva ed esci"
 
-#: ../rpmdrake_.c:550
-msgid "Normal updates"
-msgstr "Aggiornamenti comuni"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy..."
+msgstr "Proxy..."
 
-#: ../rpmdrake_.c:569
-msgid "Mandrake choices"
-msgstr "Scelte di Mandrake"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
+msgstr "Aggiorna..."
 
-#: ../rpmdrake_.c:570
-msgid "All packages, alphabetical"
-msgstr "Tutti i pacchetti, alfabeticamente"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "Aggiungi..."
 
-#: ../rpmdrake_.c:571
-msgid "All packages,"
-msgstr "Tutti i pacchetti,"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "Modifica"
 
-#: ../rpmdrake_.c:594
-msgid "by group"
-msgstr "per gruppo"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Source"
+msgstr "Sorgente"
 
-#: ../rpmdrake_.c:594
-msgid "by size"
-msgstr "per dimensione"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
+msgstr "Abilitato?"
 
-#: ../rpmdrake_.c:595
-msgid "by selection state"
-msgstr "per selezione"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure sources"
+msgstr "Configura sorgenti"
 
-#: ../rpmdrake_.c:596
-msgid "by source repository"
-msgstr "per repositorio di sorgente"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "Password:"
 
-#: ../rpmdrake_.c:596
-msgid "by update availability"
-msgstr "per disponibilitŕ aggiornamenti"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
+msgstr "Utente:"
 
-#: ../rpmdrake_.c:617
-msgid "in descriptions"
-msgstr "nelle descrizioni"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+"Devi specificare nome utente/password per l'autenticazione da parte del "
+"proxy:"
 
-#: ../rpmdrake_.c:617
-msgid "in files"
-msgstr "nei file"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "Nome host del proxy:"
 
-#: ../rpmdrake_.c:617
-msgid "in names"
-msgstr "nei nomi"
+#: ../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]>):"
 
-#: ../rpmdrake_.c:628
-msgid "Reload the packages list"
-msgstr "Ricarica la lista dei pacchetti"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "Configurazione dei proxy"
 
-#: ../rpmdrake_.c:628
-msgid "Reset the selection"
-msgstr "Annulla la selezione"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr "Attendere l'aggiornamento del supporto..."
 
-#: ../rpmdrake_.c:654
-msgid "Maximum information"
-msgstr "Tutte le informazioni"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "Per salvare le modifiche devi inserire il supporto nel drive"
 
-#: ../rpmdrake_.c:654
-msgid "Normal information"
-msgstr "Informazioni normali"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
+msgstr "Devi inserire il supporto per continuare"
 
-#: ../rpmdrake_.c:676
-msgid "Too many packages are selected"
-msgstr "Troppi pacchetti selezionati"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save changes"
+msgstr "Salva le modifiche"
 
-#: ../rpmdrake_.c:721
-msgid "Find:"
-msgstr "Trova:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Percorso relativo a synthesis/hdlist"
 
-#: ../rpmdrake_.c:726
-msgid "Search"
-msgstr "Cerca"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake_.c:732
-msgid "Install"
-msgstr "Installa"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Editing source \"%s\":"
+msgstr "Modifica sorgente \"%s\":"
 
-#: ../rpmdrake_.c:739 data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrake Update"
-msgstr "Mandrake Update"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit a source"
+msgstr "Modifica una sorgente"
 
-#: ../rpmdrake_.c:739
-msgid "Software Packages Installation"
-msgstr "Installazione pacchetti software"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr "Attendere la rimozione supporto..."
 
-#: ../rpmdrake_.c:739
-msgid "Software Packages Removal"
-msgstr "Rimozione Pacchetti Software"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, adding medium..."
+msgstr "Attendere l'aggiunta del supporto..."
 
-#: ../rpmdrake_.c:780
-msgid "Please wait, contacting mirror to update packages information."
-msgstr ""
-"Attendere, contatto il mirror per aggiornare le informazioni sui pacchetti."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of source:"
+msgstr "Tipo di sorgente:"
 
-#: ../rpmdrake_.c:782
-msgid "Error updating medium"
-msgstr "Errore nell'aggiornamento del supporto"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Adding a source:"
+msgstr "Aggiunta sorgente:"
 
-#: ../rpmdrake_.c:783
-msgid "There was an unrecoverable error while updating packages information."
+#: ../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 ""
-"Si č verificato un errore irreversibile durante l'aggiornamento delle "
-"informazioni sui pacchetti."
+"C'č giŕ un supporto con quel nome, vuoi\n"
+"veramente sostrituirlo?"
 
-#: ../rpmdrake_.c:788
-msgid "How to choose manually your mirror"
-msgstr "Come scegliere manualmente il mirror"
+#: ../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_.c:796
-msgid "Please wait, contacting mirror to initialize updates packages."
-msgstr ""
-"Attendere, contatto il mirror per inizializzare i pacchetti di aggiornamento."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "Nome:"
 
-#: ../rpmdrake_.c:799
-msgid "Error adding update medium"
-msgstr "Errore durante l'aggiunta del supporto per gli aggiornamenti"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
+msgstr "Login:"
 
-#: ../rpmdrake_.c:830
-msgid "Please wait, finding available packages..."
-msgstr "Attendi, cerco i pacchetti disponibili..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Scegli un mirror..."
 
-#: ../rpmdrake_.c:862
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Ispezione di %s"
+msgid "Browse..."
+msgstr "Sfoglia..."
 
-#: ../rpmdrake_.c:881
-msgid "changes:"
-msgstr "modifiche:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Percorso o punto di mount:"
 
-#: ../rpmdrake_.c:885
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Rimuovi .%s"
+msgid "Removable device"
+msgstr "Dispositivo rimovibile"
 
-#: ../rpmdrake_.c:887
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Usa .%s come file principale"
+msgid "HTTP server"
+msgstr "Server HTTP"
 
-#: ../rpmdrake_.c:889
-msgid "Do nothing"
-msgstr "Non fare niente"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "Server FTP"
 
-#: ../rpmdrake_.c:901
-msgid "Installation finished"
-msgstr "Installazione finita"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path:"
+msgstr "Percorso:"
 
-#: ../rpmdrake_.c:911
-msgid "Inspect..."
-msgstr "Ispezionare..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "File locali"
 
-#: ../rpmdrake_.c:926
-msgid "Program missing"
-msgstr "Il programma č assente"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add a source"
+msgstr "Aggiunta sorgente:"
 
-#: ../rpmdrake_.c:927
-msgid "A required program is missing (grpmi). Check your installation."
-msgstr ""
-"Un programma necessario (grpmi) non č presente. Controllate la vostra "
-"installazione."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
+msgstr "Impossibile aggiornare il supporto, sarŕ automaticamente disabilitato."
 
-#: ../rpmdrake_.c:941
-msgid "Unable to get source packages."
-msgstr "Impossibile recuperare i pacchetti sorgente."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "Impossibile creare il supporto."
 
-#: ../rpmdrake_.c:942
-msgid "Unable to get source packages, sorry."
-msgstr "Impossibile recuperare i pacchetti sorgente, mi spiace."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, updating media..."
+msgstr "Attendere l'aggiornamento del supporto..."
 
-#: ../rpmdrake_.c:950
-msgid "Change medium"
-msgstr "Cambia supporto"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
+msgstr "Aggiorna"
 
-#: ../rpmdrake_.c:951
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr ""
-"Per favore inserisci il supporto etichettato \"%s\" nel dispositivo [%s]"
+msgid "Select the source(s) you wish to update:"
+msgstr "Seleziona la sorgente che vuoi aggiornare:"
 
-#: ../rpmdrake_.c:959
-msgid "Installation failed"
-msgstr "Installazione fallita"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please choose the desired mirror."
+msgstr "Scegli il mirror che preferisci."
 
-#: ../rpmdrake_.c:960
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
-"Installazione fallita, alcuni file mancano.\n"
-"Potrebbe essere una buona idea aggiornare il database delle sorgenti."
+"Non riesco a trovare un mirror adatto.\n"
+"\n"
+"Possono esserci molte ragioni per questo problema; la piů comun č\n"
+"il caso nel quale l'architettura del tuo processore non č supportata\n"
+"dagli update ufficiali di Mandrake Linux."
 
-#: ../rpmdrake_.c:963
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr ""
-"Attendi, rimuovo dei pacchetti per consentire ad altri di essere "
-"aggiornati..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
+msgstr "Nessun mirror"
 
-#: ../rpmdrake_.c:985
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"There was an error downloading the mirrors list:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
-"L'installazione č terminata, %s.\n"
+"Si č verificato un errore durante lo scaricamento della lista dei mirror:\n"
 "\n"
-"Sono stati creati alcuni file di configurazione `.rpmnew' o `.rpmsave',\n"
-"adesso puoi ispezionarli in modo da decidere cosa fare:"
+"%s\n"
+"La rete, o il sito di MandrakeSoft, sono probabilmente non disponibili.\n"
+"Potresti riprovare piů tardi."
 
-#: ../rpmdrake_.c:985
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "Errore durante il download"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
+"Attendere il download  degli indirizzi dei mirror dal sito di MandrakeSoft."
+
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"some packages failed to install\n"
-"correctly"
+"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 ""
-"Alcuni pacchetti non sono stati installati\n"
-"correttamente"
+"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_.c:986
-msgid "everything was installed correctly"
-msgstr "tutto č stato installato correttamente"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United States"
+msgstr "Stati Uniti"
 
-#: ../rpmdrake_.c:988
-msgid "Everything installed successfully"
-msgstr "Tutto č stato installato con successo."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
+msgstr "Cina"
 
-#: ../rpmdrake_.c:989
-msgid "All requested packages were installed successfully."
-msgstr "Tutti i pacchetti richiesti sono stati installati con successo."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr "Regno Unito"
 
-#: ../rpmdrake_.c:993
-msgid "Everything already installed."
-msgstr "E' giŕ tutto installato."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "Taiwan"
 
-#: ../rpmdrake_.c:994
-msgid "Everything already installed (is this supposed to happen at all?)."
-msgstr "E' giŕ tutto installato (deve essere cosě?)"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "Svezia"
 
-#: ../rpmdrake_.c:1001
-msgid "Problem during installation"
-msgstr "Problemi durante l'installazione"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
+msgstr "Russia"
 
-#: ../rpmdrake_.c:1002
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Si č verificato un problema durante l'installazione:\n"
-"\n"
-"%s"
+msgid "Portugal"
+msgstr "Portogallo"
 
-#: ../rpmdrake_.c:1016
-msgid "Please wait, reading packages database..."
-msgstr "Attendere, consultazione del database dei pacchetti in corso..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
+msgstr "Polonia"
 
-#: ../rpmdrake_.c:1057
-msgid "Please wait, removing packages..."
-msgstr "Attendere, rimozione dei pacchetti in corso..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
+msgstr "Norvegia"
 
-#: ../rpmdrake_.c:1060
-msgid "Problem during removal"
-msgstr "Si sono verificati dei problemi durante la rimozione"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
+msgstr "Paesi Bassi"
 
-#: ../rpmdrake_.c:1061
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Si č verificato un problema durante la rimozione dei pacchetti:\n"
-"\n"
-"%s"
+msgid "Korea"
+msgstr "Korea"
 
-#: ../rpmdrake_.c:1093
-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 ""
-"Benvenuto nell'utilitŕ di rimozione software!\n"
-"\n"
-"Questa utilitŕ ti aiuterŕ a scegliere che software vuoi rimuovere dal\n"
-"tuo computer."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Japan"
+msgstr "Giappone"
 
-#: ../rpmdrake_.c:1098
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"Benvenuto in MandrakeUpdate!\n"
-"\n"
-"Questo programma ti aiuterŕ a scegliere gli aggiornamenti che vuoi "
-"installare sul tuo\n"
-"computer."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Italy"
+msgstr "Italia"
 
-#: ../rpmdrake_.c:1103
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
-msgstr ""
-"Benvenuto nel programma di installazione software!\n"
-"\n"
-"Il sistema Mandrake Linux offre parecchie migliaia di pacchetti\n"
-"software su CD-ROM o DVD. Questo programma ti aiuterŕ a scegliere il "
-"software\n"
-"da installare sul tuo computer."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Israel"
+msgstr "Israele"
 
-#: data/rpmdrake-remove.desktop.in.h:1
-msgid "Remove Software"
-msgstr "Rimuovere Software"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Grecia"
 
-#: data/rpmdrake-sources.desktop.in.h:1
-msgid "Software Sources Manager"
-msgstr "Gestore delle sorgenti software"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "France"
+msgstr "Francia"
 
-#: data/rpmdrake.desktop.in.h:1
-msgid "Install Software"
-msgstr "Installa software"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "Finlandia"
 
-#~ msgid ""
-#~ "There is already a medium by that name, do you\n"
-#~ "really want to replace it?"
-#~ msgstr ""
-#~ "C'č giŕ un supporto con quel nome, vuoi\n"
-#~ "veramente sostrituirlo?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "Spagna"
 
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-#~ "Andiamo avanti?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
+msgstr "Danimarca"
 
-#~ 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."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr "Germania"
 
-#~ 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 ""
-#~ "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.pm:1
+#, c-format
+msgid "Czech Republic"
+msgstr "Repubblica Ceca"
 
-#~ msgid ""
-#~ "There was an error downloading the mirrors list:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "The network, or MandrakeSoft website, are maybe unavailable.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "Si č verificato un errore durante lo scaricamento della lista dei "
-#~ "mirror:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "La rete, o il sito di MandrakeSoft, sono probabilmente non disponibili.\n"
-#~ "Potresti riprovare piů tardi."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
-#~ 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 ""
-#~ "Non riesco a trovare un mirror adatto.\n"
-#~ "\n"
-#~ "Possono esserci molte ragioni per questo problema; la piů comun č\n"
-#~ "il caso nel quale l'architettura del tuo processore non č supportata\n"
-#~ "dagli update ufficiali di Mandrake Linux."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Canada"
+msgstr "Canada"
 
-#~ msgid ""
-#~ "The list of updates is void. This 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
+#, c-format
+msgid "Brazil"
+msgstr "Brasile"
 
-#~ msgid ""
-#~ "The following packages have to be removed for others to be upgraded:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "I seguenti pacchetti devono essere rimossi per altri da aggiornare:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Proseguiamo?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Belgium"
+msgstr "Belgio"
 
-#~ msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#~ msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Australia"
+msgstr "Australia"
 
-#~ 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
+#, c-format
+msgid "Austria"
+msgstr "Austria"
 
-#~ 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."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Info..."
+msgstr "Informazioni..."
 
-#~ 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 ""
-#~ "C'č stato un errore durante l'aggiunta del supporto per gli aggiornamenti "
-#~ "con urpmi.\n"
-#~ "\n"
-#~ "Potrebbe essere dovuto ad un mirror temporaneamente non in linea, oppure "
-#~ "la\n"
-#~ "tua versione di Mandrake Linux (%s) non č ancora / non piů supportata "
-#~ "dagli aggiornamenti ufficiali di\n"
-#~ "Mandrake Linux.\n"
-#~ "\n"
-#~ "Vuoi provare un altro mirror?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
+msgstr "No"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Si"
+
+#: data/rpmdrake.desktop.in.h:1
+msgid "Install Software"
+msgstr "Installa software"
+
+#: data/rpmdrake-remove.desktop.in.h:1
+msgid "Remove Software"
+msgstr "Rimuovere Software"
+
+#: data/rpmdrake-sources.desktop.in.h:1
+msgid "Software Sources Manager"
+msgstr "Gestore delle sorgenti software"
+
+#~ 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--*-*-*-*-*,*"
diff --git a/po/it.pom b/po/it.pom
index cf2194b7..e0426d27 100644
--- a/po/it.pom
+++ b/po/it.pom
@@ -4,167 +4,175 @@ msgstr "Server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
+msgid "Office Workstation"
+msgstr "Postazione di lavoro con programmi Office"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Computer connesso alla rete (cliente)"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Programmi Office: wordprocessor (kword, abiword), fogli elettronici "
+"(kspread, gnumeric), visualizzatori pdf, ecc."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "Server NFS, server SMB, server proxy, server SSH"
+msgid "Workstation"
+msgstr "Workstation"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Office"
+msgid "Game station"
+msgstr "Computer predisposto per i giochi"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Workstation grafica con GNOME"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Programmi di svago: azione, da tavolo, strategia, ecc."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Utilitŕ per il tuo Palm Pilot o Visor"
+msgid "Multimedia station"
+msgstr "Computer multimediale"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Workstation"
+msgid "Sound and video playing/editing programs"
+msgstr "Programmi di riproduzione/modifica audio e video"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Firewall/Router"
+msgid "Internet station"
+msgstr "Computer con accesso ad Internet"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr "Server di nomi di dominio (DNS) e informazioni sulla rete"
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
+"Gruppo di programmi per leggere e inviare posta e news (pine, mutt, tin..) e "
+"per navigare il Web"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
-msgstr ""
-"Programmi Office: wordprocessor (kword, abiword), fogli elettronici "
-"(kspread, gnumeric), visualizzatori pdf, ecc."
+msgid "Network Computer (client)"
+msgstr "Computer connesso alla rete (cliente)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "Utilitŕ audio: riproduttori mp3 o midi, mixer, ecc."
+msgid "Clients for different protocols including ssh"
+msgstr "Clienti per vari protocolli, incluso ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr ""
+msgid "Configuration"
+msgstr "Configurazione"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Libri e Howto su Linux e il software libero"
+msgid "Tools to ease the configuration of your computer"
+msgstr "Strumenti per semplificare la configurazione del computer"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "Workstation grafica con KDE"
+msgid "Scientific Workstation"
+msgstr "Workstation scientifica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, ecc."
+msgid "Scientific applications such as gnuplot"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Multimedia - Video"
+msgid "Console Tools"
+msgstr "Programmi da linea di comando"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr "Set di utilitŕ per posta, news, web, file transfer, e chat"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Editor, shell, programmi di utilitĂ  riguardo i file, terminali"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Database"
+msgid "KDE Workstation"
+msgstr "Workstation grafica con KDE"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "Server di database PostgreSQL o MySQL"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"Il K Desktop Environment, l'ambiente grafico di base con una collezione di "
+"utilitĂ  che lo accompagnano"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Strumenti per semplificare la configurazione del computer"
+msgid "Graphical Environment"
+msgstr "Ambiente grafico"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "Multimedia - Suono"
+msgid "Gnome Workstation"
+msgstr "Workstation grafica con GNOME"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Documentazione"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+"Un ambiente grafico con un set di applicazioni user-friendly e utilitĂ  per "
+"il desktop"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Programmi da linea di comando"
+msgid "Other Graphical Desktops"
+msgstr "Altri desktop grafici"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr "Server di posta Postfix, server di news Inn"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, ecc."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Computer con accesso ad Internet"
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+msgid "Development"
+msgstr "Sviluppo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Computer multimediale"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "Librerie di sviluppo, programmi e file include per C e C++"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Configurazione"
+msgid "Documentation"
+msgstr "Documentazione"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Altri desktop grafici (Gnome, IceWM)"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Libri e Howto su Linux e il software libero"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
+msgid "LSB"
 msgstr ""
-"Il K Desktop Environment, l'ambiente grafico di base con una collezione di "
-"utilitŕ che lo accompagnano"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Ambiente grafico"
+msgid "Linux Standard Base. Third party applications support"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-msgid "Development"
-msgstr "Sviluppo"
+msgid "Web/FTP"
+msgstr "Web/FTP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -173,23 +181,33 @@ msgstr "Apache e Pro-ftpd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "Utilitŕ per creare e masterizzare CD"
+msgid "Mail/Groupware/News"
+msgstr "Posta/Groupware/Newsgroup"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Postazione di lavoro con programmi Office"
+msgid "Postfix mail server, Inn news server"
+msgstr "Server di posta Postfix, server di news Inn"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, ecc."
+msgid "Database"
+msgstr "Database"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Programmi grafici come The Gimp"
+msgid "PostgreSQL or MySQL database server"
+msgstr "Server di database PostgreSQL o MySQL"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Firewall/Router"
+msgstr "Firewall/Router"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Internet gateway"
+msgstr "Gateway per Internet"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -198,8 +216,8 @@ msgstr "DNS/NIS"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "Librerie di sviluppo, programmi e file include per C e C++"
+msgid "Domain Name and Network Information Server"
+msgstr "Server di nomi di dominio (DNS) e informazioni sulla rete"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -208,18 +226,18 @@ msgstr "Server di rete"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "Posta/Groupware/Newsgroup"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "Server NFS, server SMB, server proxy, server SSH"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Computer predisposto per i giochi"
+msgid "Office"
+msgstr "Office"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Riproduttori video e programmi di editing"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr "Set di utilitĂ  per posta, news, web, file transfer, e chat"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -228,79 +246,66 @@ msgstr "Multimedia - Grafica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Programmi di svago: azione, da tavolo, strategia, ecc."
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
-"Gruppo di programmi per leggere e inviare posta e news (pine, mutt, tin..) e "
-"per navigare il Web"
+msgid "Graphics programs such as The Gimp"
+msgstr "Programmi grafici come The Gimp"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "Finanza Personale"
+msgid "Multimedia - Sound"
+msgstr "Multimedia - Suono"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
-"Un ambiente grafico con un set di applicazioni user-friendly e utilitŕ per "
-"il desktop"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "UtilitĂ  audio: riproduttori mp3 o midi, mixer, ecc."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Clienti per vari protocolli, incluso ssh"
+msgid "Multimedia - Video"
+msgstr "Multimedia - Video"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "LSB"
-msgstr ""
+msgid "Video players and editors"
+msgstr "Riproduttori video e programmi di editing"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Gateway per Internet"
+msgid "Multimedia - CD Burning"
+msgstr "Multimedia - Masterizzazione CD"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Programmi di riproduzione/modifica audio e video"
+msgid "Tools to create and burn CD's"
+msgstr "UtilitĂ  per creare e masterizzare CD"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Altri desktop grafici"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Altri desktop grafici (Gnome, IceWM)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Editor, shell, programmi di utilitŕ riguardo i file, terminali"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, ecc."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "Programmi per gestire le tue finanze, come gnucash"
+msgid "Personal Information Management"
+msgstr "Gestione di informazioni personali"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "Gestione di informazioni personali"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "UtilitĂ  per il tuo Palm Pilot o Visor"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multimedia - Masterizzazione CD"
+msgid "Personal Finance"
+msgstr "Finanza Personale"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Workstation scientifica"
+msgid "Programs to manage your finances, such as gnucash"
+msgstr "Programmi per gestire le tue finanze, come gnucash"
 
diff --git a/po/ja.po b/po/ja.po
index fb9a7fa5..e83822a2 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2003-01-19 16:57+0100\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\n"
 "PO-Revision-Date: 2000-09-13 14:44+0200\n"
 "Last-Translator: YAMAGATA Hiroo <hiyori13@alum.mit.edu>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -13,454 +13,614 @@ msgstr ""
 "Content-Type: text/plain; charset=euc-jp\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl_.c:39
-msgid "Unable to create medium."
-msgstr "ĽáĽÇĽŁĽ˘¤Źşî¤ě¤Ţ¤ť¤óĄŁ"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Âł¤ą¤Ć¤¤¤¤¤Ç¤š¤ŤĄŠ"
 
-#: ../edit-urpm-sources.pl_.c:40
-msgid "Unable to update medium; it will be automatically disabled."
-msgstr "ĽáĽÇĽŁĽ˘¤ňššżˇ¤Ç¤­¤Ţ¤ť¤óĄŁťČÍŃÉÔÇ˝¤Ë¤ˇ¤Ţ¤šĄŁ"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to the software installation tool!\n"
+"\n"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
+msgstr ""
+"Ľ˝ĽŐĽČĽ¤ĽóĽšĽČĄźĽëĽÄĄźĽë¤Ř¤¤¤é¤Ă¤ˇ¤ăĄÁ¤¤!\n"
+"\n"
+"Mandrake Linux ĽˇĽšĽĆĽŕ¤Ë¤Ď˛żŔé¤â¤ÎĽ˝ĽŐĽČ¤ŹCDROM¤ŤDVD¤Ç¤Ä¤¤¤Ć¤­¤Ţ¤šĄŁ\n"
+"¤ł¤ÎĽÄĄźĽë¤ĎĄ˘¤É¤ě¤ňĽ¤ĽóĽšĽČĄźĽë¤ˇ¤ż¤¤¤Ť¤ňÁŞ¤Ö¤ŞźęĹÁ¤¤¤ň¤ˇ¤Ţ¤šĄŁ"
 
-#: ../edit-urpm-sources.pl_.c:51
-#, fuzzy
-msgid "Add a source"
-msgstr "Ľ˝ĄźĽš¤ÎÄɲĂ"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"MandrakeUpdate¤Ř¤¤¤é¤Ă¤ˇ¤ă¤¤¤Ţ¤ť!\n"
+"\n"
+"¤ł¤ÎĽÄĄźĽë¤ĎĄ˘Ľ¤ĽóĽšĽČĄźĽë¤ˇ¤ż¤¤ššżˇ¤ňÁŞ¤Ö¤ŞźęĹÁ¤¤¤ň¤ˇ¤Ţ¤šĄŁ"
 
-#: ../edit-urpm-sources.pl_.c:52
-msgid "Local files"
-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"
+"¤ł¤ÎĽÄĄźĽë¤ĎĄ˘şď˝ü¤ˇ¤ż¤¤Ľ˝ĽŐĽČĽŚĽ§Ľ˘¤ňÁŞ¤ÖťŮąç¤ň¤ˇ¤Ţ¤šĄŁ"
 
-#: ../edit-urpm-sources.pl_.c:52
-msgid "Path:"
-msgstr "ĽŃĽšĄ§"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr "Ľ¤ĽóĽšĽČĄźĽëĂć¤ËĚäÂęČŻŔ¸ĄŁ"
 
-#: ../edit-urpm-sources.pl_.c:53
-msgid "FTP server"
-msgstr "FTPĽľĄźĽĐ"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during removal"
+msgstr "Ľ¤ĽóĽšĽČĄźĽëĂć¤ËĚäÂꤏľŻ¤ł¤ę¤Ţ¤ˇ¤ż"
 
-#: ../edit-urpm-sources.pl_.c:53 ../edit-urpm-sources.pl_.c:54
-#: ../edit-urpm-sources.pl_.c:56 ../edit-urpm-sources.pl_.c:175
-msgid "URL:"
-msgstr "URL: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages..."
+msgstr "ĽŃĽĂĽąĄźĽ¸şď˝üĂ楢žŻĄš¤ŞÂÔ¤Á¤ň"
 
-#: ../edit-urpm-sources.pl_.c:54
-msgid "HTTP server"
-msgstr "HTTP ĽľĄźĽĐ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
+msgstr "ĽŃĽĂĽąĄźĽ¸ĽÇĄźĽżĽŮĄźĽšĆɤߚţ¤ßĂ楢žŻĄš¤ŞÂÔ¤Á¤ň"
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Path or mount point:"
-msgstr "ĽŃĽš¤Ţ¤ż¤ĎĽŢĽŚĽóĽČĽÝĽ¤ĽóĽČĄ§"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr "Ľ¤ĽóĽšĽČĄźĽëĂć¤ËĚäÂęČŻŔ¸ĄŁ"
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Removable device"
-msgstr "ĽęĽŕĄźĽĐĽÖĽëĽÇĽĐĽ¤Ľš"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during installation"
+msgstr "Ľ¤ĽóĽšĽČĄźĽëĂć¤ËĚäÂꤏľŻ¤ł¤ę¤Ţ¤ˇ¤ż"
 
-#: ../edit-urpm-sources.pl_.c:56 ../rpmdrake_.c:548
-msgid "Security updates"
-msgstr "ĽťĽ­ĽĺĽęĽĆĽŁžĺ¤Îššżˇ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
+msgstr "¤š¤Ů¤ĆĽ¤ĽóĽšĽČĄźĽëşŃ¤ßĄĘ¤ł¤ó¤Ę¤ł¤Č¤Ź¤˘¤Ă¤Ć¤¤¤¤¤Î¤ŤĄŠĄË"
 
-#: ../edit-urpm-sources.pl_.c:67
-msgid "Browse..."
-msgstr "°Ę˛ź¤ňĽÖĽéĽŚĽş..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed."
+msgstr "¤š¤Ů¤ĆĽ¤ĽóĽšĽČĄźĽëşŃ¤ßĄŁ"
 
-#: ../edit-urpm-sources.pl_.c:69
-msgid "Choose a mirror..."
-msgstr "ĽßĽéĄź¤ňÁޤó¤Ç¤Ż¤Ŕ¤ľ¤¤Ą§"
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "Í׾᤾¤ě¤żĽŃĽĂĽąĄźĽ¸¤Ď¤š¤Ů¤ĆĽ¤ĽóĽšĽČĄźĽëŔŽ¸ů¤Ç¤šĄŁ"
 
-#: ../edit-urpm-sources.pl_.c:89
-msgid "Login:"
-msgstr "Login: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr "¤š¤Ů¤ĆĽ¤ĽóĽšĽČĄźĽë¤ËŔŽ¸ů¤ˇ¤Ţ¤ˇ¤ż"
 
-#: ../edit-urpm-sources.pl_.c:89 ../edit-urpm-sources.pl_.c:215
-msgid "Password:"
-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"
+"¤ł¤ě¤ň¸ĄĆ¤¤ˇ¤ĆÄɲäÎŔßÄę¤ň¤š¤ë¤ł¤Č¤â¤Ç¤­¤Ţ¤š:"
 
-#: ../edit-urpm-sources.pl_.c:94
-msgid "Name:"
-msgstr "ĚžÁ°:"
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "¤š¤Ů¤ĆŔľ¤ˇ¤ŻĽ¤ĽóĽšĽČĄźĽë¤ľ¤ě¤Ţ¤ˇ¤ż"
 
-#: ../edit-urpm-sources.pl_.c:96 ../edit-urpm-sources.pl_.c:176
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Ĺýšç¤Ţ¤ż¤Ďhdlist ¤Ř¤ÎÁęÂĐĽŃĽš:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"some packages failed to install\n"
+"correctly"
+msgstr ""
+"Ŕľ¤ˇ¤ŻĽ¤ĽóĽšĽČĄźĽë¤Ç¤­¤Ę¤Ť¤Ă¤ż\n"
+"ĽŃĽĂĽąĄźĽ¸¤Ź¤˘¤ę¤Ţ¤š"
 
-#: ../edit-urpm-sources.pl_.c:104
-msgid "You need to fill up at least the two first entries."
-msgstr "žŻ¤Ę¤Ż¤Č¤âşÇ˝é¤ÎĆóšŕĚܤĎÉŹżÜ¤Ç¤šĄŁ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages to allow others to be upgraded..."
+msgstr "ž¤Îššżˇ¤Ź¤Ç¤­¤ë¤č¤Ś¤ËĽŃĽĂĽąĄźĽ¸şď˝üĂ楢žŻĄš¤ŞÂÔ¤Á¤ň"
 
-#: ../edit-urpm-sources.pl_.c:116
-msgid "Adding a source:"
-msgstr "Ľ˝ĄźĽš¤ÎÄɲĂ"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
+msgstr ""
+"Ľ¤ĽóĽšĽČĄźĽëźşÇÔĄ˘°ěÉôĽŐĽĄĽ¤Ľë¤Ź¤˘¤ę¤Ţ¤ť¤óĄŁ\n"
+"Ľ˝ĄźĽšĽÇĄźĽżĽŮĄźĽš¤ňššżˇ¤ˇ¤Ć¤ß¤Ć¤Ď¤¤¤Ť¤Ź¤Ç¤ˇ¤ç¤ŚĄŁ"
 
-#: ../edit-urpm-sources.pl_.c:117
-msgid "Type of source:"
-msgstr "Ľ˝ĄźĽš¤ÎźďÎŕ:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation failed"
+msgstr "Ľ¤ĽóĽšĽČĄźĽëźşÇÔ"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
+msgstr "Ľ­ĽăĽóĽťĽë"
 
-#: ../edit-urpm-sources.pl_.c:121 ../edit-urpm-sources.pl_.c:187
-#: ../edit-urpm-sources.pl_.c:219 ../rpmdrake.pm_.c:97 ../rpmdrake.pm_.c:136
-#: ../rpmdrake.pm_.c:319 ../rpmdrake_.c:353 ../rpmdrake_.c:365
-#: ../rpmdrake_.c:369 ../rpmdrake_.c:916 ../rpmdrake_.c:950
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:180
-#: ../edit-urpm-sources.pl_.c:187 ../edit-urpm-sources.pl_.c:220
-#: ../rpmdrake.pm_.c:319 ../rpmdrake.pm_.c:352 ../rpmdrake_.c:353
-#: ../rpmdrake_.c:950
-msgid "Cancel"
-msgstr "Ľ­ĽăĽóĽťĽë"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "%s¤Č¤¤¤ŚĽáĽÇĽŁĽ˘¤ňĽÇĽĐĽ¤Ľš[%s]¤ËÁŢĆţ¤ˇ¤Ć¤Ż¤Ŕ¤ľ¤¤"
 
-#: ../edit-urpm-sources.pl_.c:140
-msgid "Please wait, adding medium..."
-msgstr "žŻĄš¤ŞÂÔ¤Á¤ňĄ˘ĽáĽÇĽŁĽ˘ÄɲĂĂć"
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr "ĽáĽÇĽŁĽ˘ĘŃšš"
 
-#: ../edit-urpm-sources.pl_.c:158
-msgid "Please wait, removing medium..."
-msgstr "žŻĄš¤ŞÂÔ¤Á¤ňĄ˘ĽáĽÇĽŁĽ˘źč¤ę˝Đ¤ˇĂć"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
+msgstr "Ľ˝ĄźĽšĽŃĽĂĽąĄźĽ¸¤ŹĆŔ¤é¤ě¤Ţ¤ť¤óĄ˘¤´¤á¤ó¤Ę¤ľ¤¤ĄŁ"
 
-#: ../edit-urpm-sources.pl_.c:169
-msgid "Edit a source"
-msgstr "Ľ˝ĄźĽš¤ÎĘÔ˝¸"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages."
+msgstr "Ľ˝ĄźĽšĽŃĽĂĽąĄźĽ¸¤Ź¸Ť¤Ä¤Ť¤ę¤Ţ¤ť¤ó"
 
-#: ../edit-urpm-sources.pl_.c:173
+#: ../rpmdrake:1
 #, c-format
-msgid "Editing source \"%s\":"
-msgstr "Ľ˝ĄźĽš %s ¤ÎĘÔ˝¸Ăć:"
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr "ÉŹÍ×Ľ×ĽíĽ°ĽéĽŕ¤Ź¤˘¤ę¤Ţ¤ť¤ó (grpmi)ĄŁĽ¤ĽóĽšĽČĄźĽë¤ňłÎǧ¤ˇ¤Ţ¤ˇ¤ç¤ŚĄŁ"
 
-#: ../edit-urpm-sources.pl_.c:179
-msgid "Save changes"
-msgstr "ĘŃšš¤ňĘݸ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
+msgstr "Ľ×ĽíĽ°ĽéĽŕ¤Ź¤˘¤ę¤Ţ¤ť¤ó"
 
-#: ../edit-urpm-sources.pl_.c:185
-msgid "You need to insert the medium to continue"
-msgstr "Âł¤ą¤ë¤Ë¤ĎĽáĽÇĽŁĽ˘¤ňÁŢĆţ¤ˇ¤Ć¤Ż¤Ŕ¤ľ¤¤"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
+msgstr "¸Ąşş..."
 
-#: ../edit-urpm-sources.pl_.c:186
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "ĘŃšš¤ňĘݸ¤š¤ë¤Ë¤ĎĽáĽÇĽŁĽ˘¤ňĽÉĽéĽ¤ĽÖ¤ËÁŢĆţ¤ˇ¤Ć¤Ż¤Ŕ¤ľ¤¤"
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation finished"
+msgstr "Ľ¤ĽóĽšĽČĄźĽë´°Îť"
 
-#: ../edit-urpm-sources.pl_.c:191
-msgid "Please wait, updating medium..."
-msgstr "žŻĄš¤ŞÂÔ¤Á¤ňĄ˘ĽáĽÇĽŁĽ˘ššżˇĂć"
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
+msgstr "¤Ę¤Ë¤â¤ˇ¤Ę¤¤"
 
-#: ../edit-urpm-sources.pl_.c:202
-msgid "Configure proxies"
-msgstr "Ľ×ĽíĽŻĽˇ¤ÎŔßÄę"
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
+msgstr ".%s ¤ňĽáĽ¤ĽóĽŐĽĄĽ¤Ľë¤Č¤ˇ¤ĆťČ¤Ś"
 
-#: ../edit-urpm-sources.pl_.c:207
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
-msgstr ""
-"Ľ×ĽíĽŻĽˇ¤ŹÉŹÍפʤ饢ĽŰĽšĽČĚž¤ČĽŞĽ×ĽˇĽçĽó¤ÇĽÝĄźĽČČÖšć¤ňĆţÎϤˇ¤Ć¤Ż¤Ŕ¤ľ¤¤(˝ńź°: "
-"<Ľ×ĽíĽŻĽˇĽŰĽšĽČ[:ĽÝĄźĽČ]>):"
+#: ../rpmdrake:1
+#, c-format
+msgid "Remove .%s"
+msgstr ".%s ¤ňźč¤ę˝ü¤Ż"
 
-#: ../edit-urpm-sources.pl_.c:209
-msgid "Proxy hostname:"
-msgstr "Ľ×ĽíĽ­Ľˇ¤ÎĽŰĽšĽČĚžĄ§"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "changes:"
+msgstr "ĘŃšš¤ňĘݸ"
 
-#: ../edit-urpm-sources.pl_.c:211
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "Ľ×ĽíĽŻĽˇÇ§žÚÍѤ˼楟ĽśĚž/ĽŃĽšĽďĄźĽÉ¤ňťŘÄę¤Ç¤­¤Ţ¤š"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr "%s ¸ĄşşĂć"
 
-#: ../edit-urpm-sources.pl_.c:213
-msgid "User:"
-msgstr "ĽćĄźĽśĚžĄ§"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, finding available packages..."
+msgstr "Ä󜥼ѼüąĄźĽ¸¤ňĂľ¤ˇ¤Ć¤¤¤Ţ¤šĄ˘žŻĄš¤ŞÂÔ¤Á¤ň"
 
-#: ../edit-urpm-sources.pl_.c:235
-msgid "Configure sources"
-msgstr "Ľ˝ĄźĽš¤ÎŔßÄę"
+#: ../rpmdrake:1
+#, c-format
+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 ""
+"ššżˇĽáĽÇĽŁĽ˘¤ňurpmi¤ÇÄɲĂĂć¤ËĽ¨ĽéĄź¤Ź¤Ş¤­¤Ţ¤ˇ¤żĄŁ\n"
+"\n"
+"¤ł¤ě¤ĎĽßĽéĄź¤Ź˛ő¤ě¤Ć¤¤¤ë¤ť¤¤¤ŤĄ˘¤˘¤ë¤¤¤Ď¤˘¤Ę¤ż¤ÎMandrake Linux¤Î\n"
+"ĽĐĄźĽ¸ĽçĽó (%s) ¤ŹMandrake Linux ¸řź°Ľ˘ĽĂĽ×ĽÇĄźĽČ¤ÇĽľĽÝĄźĽČ¤ľ¤ě¤Ć\n"
+"¤¤¤Ę¤¤¤Ť¤é¤Ť¤â¤ˇ¤ě¤Ţ¤ť¤óĄŁ\n"
+"\n"
+"Ę̤μ߼饟¤ňťî¤ˇ¤Ć¤ß¤Ţ¤š¤Ť?"
 
-#: ../edit-urpm-sources.pl_.c:242
-msgid "Enabled?"
-msgstr "Í­¸ú¤Ç¤š¤ŤĄŠ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
+msgstr "ššżˇĽáĽÇĽŁĽ˘ÄɲäǼ¨ĽéĄź"
 
-#: ../edit-urpm-sources.pl_.c:243
-msgid "Source"
-msgstr "Ľ˝ĄźĽš"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
+msgstr "ĽßĽéĄź¤Ë¤Ä¤Ę¤¤¤ÇššżˇĽŃĽĂĽąĄźĽ¸¤ň˝é´ü˛˝¤ˇ¤Ţ¤šĄŁžŻĄš¤ŞÂÔ¤Á¤ň"
 
-#: ../edit-urpm-sources.pl_.c:264 ../rpmdrake_.c:730
-msgid "Remove"
-msgstr "źč¤ę˝ü¤Ż"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Sources Manager, and then add a `Security\n"
+"updates' source.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"¤Ţ¤ż´őËž¤ÎĽßĽéĄź¤ňĽŢĽËĽĺĽ˘Ľë¤ÇÁޤ֤ł¤Č¤â¤Ç¤­¤Ţ¤šĄŁ¤ł¤ě¤Ë¤ĎĄ˘\n"
+"Ľ˝ĽŐĽČĽŚĽ§Ľ˘Ľ˝ĄźĽšĽŢĽÍĄźĽ¸Ľă¤ňľŻĆ°¤ˇ¤ĆĄ˘ĄÖĽťĽ­ĽĺĽęĽĆĽŁĽ˘ĽĂĽ×ĽÇĄźĽČĄ×\n"
+"Ľ˝ĄźĽš¤ňÄɲ䡤ޤšĄŁ\n"
+"\n"
+"¤˝¤ě¤Ť¤éMandrakeUpdate¤ňşĆľŻĆ°¤ˇ¤Ţ¤šĄŁ"
 
-#: ../edit-urpm-sources.pl_.c:266
-msgid "Edit"
-msgstr "ĘÔ˝¸"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "ĽßĽéĄź¤ňĽŢĽËĽĺĽ˘Ľë¤ÇÁޤ֤ˤĎ"
 
-#: ../edit-urpm-sources.pl_.c:268
-msgid "Add..."
-msgstr "ÄɲĂ..."
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
+msgstr "ĽŃĽĂĽąĄźĽ¸žđĘóššżˇĂć¤Ë˛óÉüÉÔÇ˝Ľ¨ĽéĄźČŻŔ¸ĄŁ"
 
-#: ../edit-urpm-sources.pl_.c:270
-msgid "Update..."
-msgstr "ššżˇ..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
+msgstr "ĽáĽÇĽŁĽ˘ššżˇ¤ÇĽ¨ĽéĄź"
 
-#: ../edit-urpm-sources.pl_.c:271
-msgid "Proxy..."
-msgstr "Ľ×ĽíĽŻĽˇ..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
+msgstr "žŻĄš¤ŞÂÔ¤Á¤ňĄ˘ĽßĽéĄź¤Ë¤Ä¤Ę¤¤¤ÇĽŃĽĂĽąĄźĽ¸žđĘóššżˇĂ楣"
 
-#: ../edit-urpm-sources.pl_.c:274
-msgid "Save and quit"
-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"
+"Âł¤ą¤Ţ¤š¤Ť?"
 
-#: ../edit-urpm-sources.pl_.c:275 ../rpmdrake_.c:733
-msgid "Quit"
-msgstr "˝ŞÎť"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Installation"
+msgstr "Ľ˝ĽŐĽČĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽë"
 
-#: ../rpmdrake.pm_.c:93
-msgid "Yes"
-msgstr "¤Ď¤¤"
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, c-format
+msgid "Mandrake Update"
+msgstr "MandrakeĽ˘ĽĂĽ×ĽÇĄźĽČ"
 
-#: ../rpmdrake.pm_.c:95
-msgid "No"
-msgstr "¤¤¤¤¤¨"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
+msgstr "Ľ˝ĽŐĽČĽŚĽ§Ľ˘ĽŃĽĂĽąĄźĽ¸şď˝ü"
 
-#: ../rpmdrake.pm_.c:127
-msgid "Info..."
-msgstr "žđĘó..."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "˝ŞÎť"
 
-#: ../rpmdrake.pm_.c:180
-msgid "Austria"
-msgstr "ĽŞĄźĽšĽČĽęĽ˘"
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "Ľ¤ĽóĽšĽČĄźĽë"
 
-#: ../rpmdrake.pm_.c:181
-msgid "Australia"
-msgstr "ĽŞĄźĽšĽČĽéĽęĽ˘"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "źč¤ę˝ü¤Ż"
 
-#: ../rpmdrake.pm_.c:182
-msgid "Belgium"
-msgstr "ĽŮĽëĽŽĄź"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search"
+msgstr "¸Ąş÷"
 
-#: ../rpmdrake.pm_.c:183
-msgid "Brazil"
-msgstr "ĽÖĽéĽ¸Ľë"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "°Ę˛ź¤ňĂľ¤šĄ§"
 
-#: ../rpmdrake.pm_.c:184
-msgid "Canada"
-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"
+"Âł¤ą¤Ć¤¤¤¤¤Ç¤š¤Ť?"
 
-#: ../rpmdrake.pm_.c:185
-msgid "Costa Rica"
-msgstr "ĽłĽšĽżĽęĽŤ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "¤¤¤Ż¤Ä¤Ť¤ÎĽŃĽĂĽąĄźĽ¸¤ňşď˝ü¤ˇ¤Ţ¤š"
 
-#: ../rpmdrake.pm_.c:186
-msgid "Czech Republic"
-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"
+"ËÜĹö¤Ë¤ł¤ÎÁޤó¤ŔĽŃĽĂĽąĄźĽ¸¤ňÁ´ÉôĽ¤ĽóĽšĽČĄźĽë¤ˇ¤Ţ¤š¤ŤĄŠ"
 
-#: ../rpmdrake.pm_.c:187
-msgid "Germany"
-msgstr "ĽÉĽ¤ĽÄ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Too many packages are selected"
+msgstr "Áޤó¤ŔĽŃĽĂĽąĄźĽ¸¤ŹÂż¤š¤Ž¤Ţ¤š"
 
-#: ../rpmdrake.pm_.c:188
-msgid "Danmark"
-msgstr "ĽÇĽóĽŢĄźĽŻ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
+msgstr "žđĘóÎ̤ňşÇÂç¤Ë"
 
-#: ../rpmdrake.pm_.c:189 ../rpmdrake.pm_.c:193
-msgid "Greece"
-msgstr "ĽŽĽęĽˇĽă"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal information"
+msgstr "ÄĚžď¤ÎžđĘó"
 
-#: ../rpmdrake.pm_.c:190
-msgid "Spain"
-msgstr "ĽšĽÚĽ¤Ľó"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update source(s)"
+msgstr "Ľ˝ĄźĽšššżˇ"
 
-#: ../rpmdrake.pm_.c:191
-msgid "Finland"
-msgstr "ĽŐĽŁĽóĽéĽóĽÉ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reload the packages list"
+msgstr "ĽŃĽĂĽąĄźĽ¸°ěÍ÷¤ňĆɤßÄž¤š"
 
-#: ../rpmdrake.pm_.c:192
-msgid "France"
-msgstr "ĽŐĽéĽóĽš"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
+msgstr "ÁŞÂň¤ňĽęĽťĽĂĽČ"
 
-#: ../rpmdrake.pm_.c:194
-msgid "Israel"
-msgstr "Ľ¤ĽšĽéĽ¨Ľë"
+#: ../rpmdrake:1
+#, c-format
+msgid "in files"
+msgstr "ĽŐĽĄĽ¤Ľë¤ÎĂć"
 
-#: ../rpmdrake.pm_.c:195
-msgid "Italy"
-msgstr "Ľ¤ĽżĽęĽ˘"
+#: ../rpmdrake:1
+#, c-format
+msgid "in descriptions"
+msgstr "ŔâĚŔ¤ÎĂć"
 
-#: ../rpmdrake.pm_.c:196
-msgid "Japan"
-msgstr "ĆüËÜ"
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
+msgstr "ĚžžÎ¤ÎĂć"
 
-#: ../rpmdrake.pm_.c:197
-msgid "Korea"
-msgstr "´Úšń"
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
+msgstr "ššżˇ¤ÎÍ­Ěľ˝ç"
 
-#: ../rpmdrake.pm_.c:198
-msgid "Netherlands"
-msgstr "ĽŞĽéĽóĽŔ"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
+msgstr "Ľ˝ĄźĽšrepository˝ç"
 
-#: ../rpmdrake.pm_.c:199
-msgid "Norway"
-msgstr "ĽÎĽëĽŚĽ§Ľ¤"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
+msgstr "ÁŞÂňžőÂÖ˝ç"
 
-#: ../rpmdrake.pm_.c:200
-msgid "Poland"
-msgstr "ĽÝĄźĽéĽóĽÉ"
+#: ../rpmdrake:1
+#, c-format
+msgid "by size"
+msgstr "ĽľĽ¤Ľş˝ç"
 
-#: ../rpmdrake.pm_.c:201
-msgid "Portugal"
-msgstr "ĽÝĽëĽČĽŹĽë"
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
+msgstr "Ľ°ĽëĄźĽ×ĘĚ"
 
-#: ../rpmdrake.pm_.c:202
-msgid "Russia"
-msgstr "ĽíĽˇĽ˘"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages,"
+msgstr "Á´ĽŃĽĂĽąĄźĽ¸"
 
-#: ../rpmdrake.pm_.c:203
-msgid "Sweden"
-msgstr "ĽšĽŚĽ§ĄźĽÇĽó"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
+msgstr "Á´ĽŃĽĂĽąĄźĽ¸Ą˘ABC˝ç"
 
-#: ../rpmdrake.pm_.c:204
-msgid "Taiwan"
-msgstr "ÂćĎŃ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
+msgstr "Mandrake¤ÎÁŞÂň"
 
-#: ../rpmdrake.pm_.c:205
-msgid "United Kingdom"
-msgstr "Ľ¤ĽŽĽęĽš"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal updates"
+msgstr "ÄĚžď¤Îššżˇ"
 
-#: ../rpmdrake.pm_.c:206
-msgid "China"
-msgstr "Ăćšń"
+#: ../rpmdrake:1
+#, c-format
+msgid "Bugfixes updates"
+msgstr "ĽĐĽ°˝¤Ŕľ¤Îššżˇ"
 
-#: ../rpmdrake.pm_.c:207 ../rpmdrake.pm_.c:208 ../rpmdrake.pm_.c:209
-#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:261
-msgid "United States"
-msgstr "Ľ˘ĽáĽęĽŤ"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
+msgstr "ĽťĽ­ĽĺĽęĽĆĽŁžĺ¤Îššżˇ"
 
-#: ../rpmdrake.pm_.c:274
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr "žŻĄš¤ŞÂÔ¤Á¤ňĄ˘MandrakeĽŚĽ§ĽÖĽľĽ¤ĽČ¤Ť¤éĽßĽéĄźĽľĽ¤ĽČ¤ňźčĆŔĂ楣"
+#: ../rpmdrake:1
+#, c-format
+msgid "Description: "
+msgstr "ŔâĚŔ: "
 
-#: ../rpmdrake.pm_.c:280
-msgid "Error during download"
-msgstr "ĽŔĽŚĽóĽíĄźĽÉĂć¤ËĽ¨ĽéĄź"
+#: ../rpmdrake:1
+#, c-format
+msgid "Summary: "
+msgstr "łľÍ×: "
 
-#: ../rpmdrake.pm_.c:289
-msgid "No mirror"
-msgstr "ĽßĽéĄź¤Ę¤ˇ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "˝ĹÍ×Ŕ­: "
 
-#: ../rpmdrake.pm_.c:307
-msgid "Please choose the desired mirror."
-msgstr "´őËž¤ÎĽßĽéĄź¤ňÁޤó¤Ç¤Ż¤Ŕ¤ľ¤¤ĄŁ"
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake.pm_.c:339 ../rpmdrake_.c:627
-msgid "Update source(s)"
-msgstr "Ľ˝ĄźĽšššżˇ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Size: "
+msgstr "ĽľĽ¤Ľş: "
 
-#: ../rpmdrake.pm_.c:343
-msgid "Select the source(s) you wish to update:"
-msgstr "ššżˇ¤ˇ¤ż¤¤Ľ˝ĄźĽš¤ňÁޤó¤Ç¤Ż¤Ŕ¤ľ¤¤:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Version: "
+msgstr "ĽĐĄźĽ¸ĽçĽó: "
 
-#: ../rpmdrake.pm_.c:347
-msgid "Update"
-msgstr "ššżˇ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "ĚžžÎ: "
 
-#: ../rpmdrake.pm_.c:358
-msgid "Please wait, updating media..."
-msgstr "žŻĄš¤ŞÂÔ¤Á¤ňĄ˘ĽáĽÇĽŁĽ˘ššżˇĂć"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "ššżˇ¤ÎÍýÍł: "
 
-#: ../rpmdrake_.c:99
-msgid "Other"
-msgstr "¤˝¤Îž"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
+msgstr "Ľ¤ĽóĽšĽČĄźĽë¤ľ¤ě¤Ć¤¤¤ëĽĐĄźĽ¸ĽçĽó: "
 
-#: ../rpmdrake_.c:121 ../rpmdrake_.c:135 ../rpmdrake_.c:227 ../rpmdrake_.c:298
-msgid "(none)"
-msgstr "(¤Ę¤ˇ)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Source: "
+msgstr "Ľ˝ĄźĽš: "
 
-#: ../rpmdrake_.c:141 ../rpmdrake_.c:482 ../rpmdrake_.c:483
+#: ../rpmdrake:1
+#, c-format
 msgid "(Not available)"
 msgstr "ĄĘ°ě¤Ä¤â¤˘¤ę¤Ţ¤ť¤óĄË"
 
-#: ../rpmdrake_.c:151 ../rpmdrake_.c:208
-msgid "Search results"
-msgstr "¸Ąş÷ˇë˛Ě"
-
-#: ../rpmdrake_.c:151
-msgid "Search results (none)"
-msgstr "¸Ąş÷ˇë˛ĚĄĘ¤Ę¤ˇĄË"
-
-#: ../rpmdrake_.c:161 ../rpmdrake_.c:172
-msgid "Please wait, searching..."
-msgstr "ĽŐĽĄĽ¤Ľë¸Ąş÷Ă楢žŻĄš¤ŞÂÔ¤Á¤ň"
-
-#: ../rpmdrake_.c:175
-msgid "Stop"
-msgstr "Ääťß"
-
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-msgid "Addable"
-msgstr "ÄɲòÄÇ˝¤Ę¤â¤Î"
-
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-msgid "Upgradable"
-msgstr "ššżˇ˛ÄÇ˝¤Ę¤â¤Î"
-
-#: ../rpmdrake_.c:211
-msgid "Not selected"
-msgstr "ÁŞÂň¤ľ¤ě¤Ć¤¤¤Ţ¤ť¤ó"
-
-#: ../rpmdrake_.c:211
-msgid "Selected"
-msgstr "ÁŞÂňşŃ¤ß"
-
-#: ../rpmdrake_.c:240
-msgid "rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake_.c:258 ../rpmdrake_.c:360 ../rpmdrake_.c:362
-msgid "More information on package..."
-msgstr "ĽŃĽĂĽąĄźĽ¸¤ÎžÜşŮžđĘó..."
-
-#: ../rpmdrake_.c:259
-msgid "One of the following packages is needed:"
-msgstr "°Ę˛ź¤ÎĽŃĽĂĽąĄźĽ¸¤Î¤É¤ě¤Ť¤ŹÉŹÍפǤš:"
-
-#: ../rpmdrake_.c:259
-msgid "Please choose"
-msgstr "Áޤó¤Ç¤Ż¤Ŕ¤ľ¤¤"
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
+msgstr "ĘŃššĽíĽ°: \n"
 
-#: ../rpmdrake_.c:275
-msgid "unknown package "
-msgstr "ĂΤé¤Ę¤¤ĽŃĽĂĽąĄźĽ¸¤Ç¤š"
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "ĽŐĽĄĽ¤Ľë: \n"
 
-#: ../rpmdrake_.c:285
-msgid "Please wait, listing packages..."
-msgstr "ĽŃĽĂĽąĄźĽ¸°ěÍ÷É˝ź¨Ă楢žŻĄš¤ŞÂÔ¤Á¤ň"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected size: %d MB"
+msgstr "ÁŞÂňĽľĽ¤Ľş: %d MB"
 
-#: ../rpmdrake_.c:300
-msgid "No update"
-msgstr "ššżˇ¤Ę¤ˇ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "ÁŞÂňĄ§%d MB / ĽÇĽŁĽšĽŻśő¤­ÍĆÎĚ: %d MB"
 
-#: ../rpmdrake_.c:353 ../rpmdrake_.c:354
-msgid "More infos"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
 msgstr ""
+"°Í¸´Řˇ¸¤ň¤ź¤ó¤ÖËţ­¤ľ¤ť¤ë¤ż¤á¤Ë¤ĎĄ˘\n"
+"°Ę˛ź¤ÎĽŃĽĂĽąĄźĽ¸¤ňşŁ¤ĎČóÁŞÂň¤Ë¤ˇ¤Ć¤Ż¤Ŕ¤ľ¤¤:\n"
+"\n"
 
-#: ../rpmdrake_.c:355
-#, fuzzy
-msgid "Information on packages"
-msgstr "ĽŃĽĂĽąĄźĽ¸¤ÎžÜşŮžđĘó..."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+msgstr ""
+"¤š¤ß¤Ţ¤ť¤óĄ˘°Ę˛ź¤ÎĽŃĽĂĽąĄźĽ¸¤ĎÁŞÂň¤Ç¤­¤Ţ¤ť¤ó:\n"
+"\n"
 
-#: ../rpmdrake_.c:376
-msgid "Some additional packages need to be removed"
-msgstr "ž¤Ëşď˝ü¤š¤Ů¤­ĽŃĽĂĽąĄźĽ¸¤Ź¤˘¤ę¤Ţ¤š"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "Ľ¤ĽóĽšĽČĄźĽë¤Ç¤­¤Ę¤¤ĽŃĽĂĽąĄźĽ¸¤Ź¤˘¤ę¤Ţ¤š"
 
-#: ../rpmdrake_.c:377
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
 "\n"
 msgstr ""
-"°Í¸´Řˇ¸¤ň¤ź¤ó¤ÖËţ­¤ľ¤ť¤ë¤ż¤á¤ËĄ˘\n"
-"°Ę˛ź¤ÎĽŃĽĂĽąĄźĽ¸¤ňşď˝ü¤ˇ¤Ţ¤š:\n"
+"°Í¸´Řˇ¸¤ň¤ź¤ó¤ÖËţ­¤ľ¤ť¤ë¤ż¤á¤Ë¤ĎĄ˘\n"
+"°Ę˛ź¤ÎĽŃĽĂĽąĄźĽ¸¤ÎÄɲäŹÉŹÍפǤš:\n"
 "\n"
 
-#: ../rpmdrake_.c:383 ../rpmdrake_.c:391
+#: ../rpmdrake:1
+#, c-format
+msgid "Additional packages needed"
+msgstr "ÄɲüѼüąĄźĽ¸¤ŹÉŹÍפǤš"
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "şď˝ü¤Ç¤­¤Ę¤¤ĽŃĽĂĽąĄźĽ¸¤Ź¤˘¤ę¤Ţ¤š"
 
-#: ../rpmdrake_.c:384
-#, fuzzy
+#: ../rpmdrake:1
+#, fuzzy, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -468,573 +628,599 @@ msgstr ""
 "¤š¤ß¤Ţ¤ť¤óĄ˘¤ł¤ÎĽŃĽĂĽąĄźĽ¸¤ňşď˝ü¤š¤ë¤ČĽˇĽšĽĆĽŕ¤Ź˛ő¤ě¤Ţ¤š:\n"
 "\n"
 
-#: ../rpmdrake_.c:392 ../rpmdrake_.c:451
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
 "\n"
 msgstr ""
-"°Í¸´Řˇ¸¤ň¤ź¤ó¤ÖËţ­¤ľ¤ť¤ë¤ż¤á¤Ë¤ĎĄ˘\n"
-"°Ę˛ź¤ÎĽŃĽĂĽąĄźĽ¸¤ňşŁ¤ĎČóÁŞÂň¤Ë¤ˇ¤Ć¤Ż¤Ŕ¤ľ¤¤:\n"
+"°Í¸´Řˇ¸¤ň¤ź¤ó¤ÖËţ­¤ľ¤ť¤ë¤ż¤á¤ËĄ˘\n"
+"°Ę˛ź¤ÎĽŃĽĂĽąĄźĽ¸¤ňşď˝ü¤ˇ¤Ţ¤š:\n"
 "\n"
 
-#: ../rpmdrake_.c:421
-msgid "Additional packages needed"
-msgstr "ÄɲüѼüąĄźĽ¸¤ŹÉŹÍפǤš"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr "ž¤Ëşď˝ü¤š¤Ů¤­ĽŃĽĂĽąĄźĽ¸¤Ź¤˘¤ę¤Ţ¤š"
 
-#: ../rpmdrake_.c:422
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
+msgstr "ĽŃĽĂĽąĄźĽ¸¤ÎžÜşŮžđĘó..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Information on packages"
+msgstr "ĽŃĽĂĽąĄźĽ¸¤ÎžÜşŮžđĘó..."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
 msgstr ""
-"°Í¸´Řˇ¸¤ň¤ź¤ó¤ÖËţ­¤ľ¤ť¤ë¤ż¤á¤Ë¤ĎĄ˘\n"
-"°Ę˛ź¤ÎĽŃĽĂĽąĄźĽ¸¤ÎÄɲäŹÉŹÍפǤš:\n"
-"\n"
 
-#: ../rpmdrake_.c:435
-msgid "Some packages can't be installed"
-msgstr "Ľ¤ĽóĽšĽČĄźĽë¤Ç¤­¤Ę¤¤ĽŃĽĂĽąĄźĽ¸¤Ź¤˘¤ę¤Ţ¤š"
+#: ../rpmdrake:1
+#, c-format
+msgid "Addable"
+msgstr "ÄɲòÄÇ˝¤Ę¤â¤Î"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Upgradable"
+msgstr "ššżˇ˛ÄÇ˝¤Ę¤â¤Î"
 
-#: ../rpmdrake_.c:436
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
+"The list of updates is void. This means that either there is\n"
+"no available update for the packages installed on your computer,\n"
+"or you already installed all of them."
 msgstr ""
-"¤š¤ß¤Ţ¤ť¤óĄ˘°Ę˛ź¤ÎĽŃĽĂĽąĄźĽ¸¤ĎÁŞÂň¤Ç¤­¤Ţ¤ť¤ó:\n"
-"\n"
+"ššżˇ°ěÍ÷¤ŹĚľ¸ú¤Ç¤šĄŁĽłĽóĽÔĽĺĄźĽż¤ÎĽ¤ĽóĽšĽČĄźĽë¤ľ¤ě¤żĽŃĽĂĽąĄźĽ¸¤Î\n"
+"ššżˇČǤŹ¤Ę¤¤¤ŤĄ˘¤˝¤ě¤Ź¤š¤Ç¤ËĽ¤ĽóĽšĽČĄźĽëşŃ¤ß¤Č¤¤¤Ś¤ł¤Č¤Ç¤šĄŁ"
 
-#: ../rpmdrake_.c:450 ../rpmdrake_.c:684
-msgid "Some packages need to be removed"
-msgstr "¤¤¤Ż¤Ä¤Ť¤ÎĽŃĽĂĽąĄźĽ¸¤ňşď˝ü¤ˇ¤Ţ¤š"
+#: ../rpmdrake:1
+#, c-format
+msgid "No update"
+msgstr "ššżˇ¤Ę¤ˇ"
 
-#: ../rpmdrake_.c:472
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "ÁŞÂňĄ§%d MB / ĽÇĽŁĽšĽŻśő¤­ÍĆÎĚ: %d MB"
+msgid "(none)"
+msgstr "(¤Ę¤ˇ)"
 
-#: ../rpmdrake_.c:474
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "ÁŞÂňĽľĽ¤Ľş: %d MB"
+msgid "Please wait, listing packages..."
+msgstr "ĽŃĽĂĽąĄźĽ¸°ěÍ÷É˝ź¨Ă楢žŻĄš¤ŞÂÔ¤Á¤ň"
 
-#: ../rpmdrake_.c:482
-msgid "Files:\n"
-msgstr "ĽŐĽĄĽ¤Ľë: \n"
+#: ../rpmdrake:1
+#, c-format
+msgid "unknown package "
+msgstr "ĂΤé¤Ę¤¤ĽŃĽĂĽąĄźĽ¸¤Ç¤š"
 
-#: ../rpmdrake_.c:483
-msgid "Changelog:\n"
-msgstr "ĘŃššĽíĽ°: \n"
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "°Ę˛ź¤ÎĽŃĽĂĽąĄźĽ¸¤Î¤É¤ě¤Ť¤ŹÉŹÍפǤš:"
 
-#: ../rpmdrake_.c:486
-msgid "Source: "
-msgstr "Ľ˝ĄźĽš: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please choose"
+msgstr "Áޤó¤Ç¤Ż¤Ŕ¤ľ¤¤"
 
-#: ../rpmdrake_.c:487
-msgid "Currently installed version: "
-msgstr "Ľ¤ĽóĽšĽČĄźĽë¤ľ¤ě¤Ć¤¤¤ëĽĐĄźĽ¸ĽçĽó: "
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:491
-msgid "Reason for update: "
-msgstr "ššżˇ¤ÎÍýÍł: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Not selected"
+msgstr "ÁŞÂň¤ľ¤ě¤Ć¤¤¤Ţ¤ť¤ó"
 
-#: ../rpmdrake_.c:493
-msgid "Name: "
-msgstr "ĚžžÎ: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected"
+msgstr "ÁŞÂňşŃ¤ß"
 
-#: ../rpmdrake_.c:494
-msgid "Version: "
-msgstr "ĽĐĄźĽ¸ĽçĽó: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results"
+msgstr "¸Ąş÷ˇë˛Ě"
 
-#: ../rpmdrake_.c:495
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Stop"
+msgstr "Ääťß"
 
-#: ../rpmdrake_.c:495
-msgid "Size: "
-msgstr "ĽľĽ¤Ľş: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, searching..."
+msgstr "ĽŐĽĄĽ¤Ľë¸Ąş÷Ă楢žŻĄš¤ŞÂÔ¤Á¤ň"
 
-#: ../rpmdrake_.c:497
-msgid "Importance: "
-msgstr "˝ĹÍ×Ŕ­: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
+msgstr "¸Ąş÷ˇë˛ĚĄĘ¤Ę¤ˇĄË"
 
-#: ../rpmdrake_.c:498
-msgid "Summary: "
-msgstr "łľÍ×: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "¤˝¤Îž"
 
-#: ../rpmdrake_.c:499
-msgid "Description: "
-msgstr "ŔâĚŔ: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"Welcome to the packages source editor!\n"
+"\n"
+"This tool will help you configure the packages sources you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"ĽŃĽĂĽąĄźĽ¸Ľ˝ĄźĽšĽ¨ĽÇĽŁĽż¤Ë¤č¤Ś¤ł¤˝!\n"
+"\n"
+"¤ł¤ÎĽÄĄźĽë¤ĎĽłĽóĽÔĽĺĄźĽż¤ÇťČ¤¤¤ż¤¤ĽŃĽĂĽąĄźĽ¸Ľ˝ĄźĽš¤ÎŔßÄę¤ňťŮąç¤ˇ¤Ţ¤šĄŁ\n"
+"żˇ¤ˇ¤¤Ľ˝ĽŐĽČĽŃĽĂĽąĄźĽ¸¤ŹĽ¤ĽóĽšĽČĄźĽë¤Ç¤­¤ż¤ęĄ˘ššżˇ¤Ę¤É¤Ź¤Ç¤­¤Ţ¤šĄŁ"
 
-#: ../rpmdrake_.c:548
-msgid "Bugfixes updates"
-msgstr "ĽĐĽ°˝¤Ŕľ¤Îššżˇ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Ęݸ¤ˇ¤Ć˝ŞÎť"
 
-#: ../rpmdrake_.c:548
-msgid "Normal updates"
-msgstr "ÄĚžď¤Îššżˇ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy..."
+msgstr "Ľ×ĽíĽŻĽˇ..."
 
-#: ../rpmdrake_.c:567
-msgid "Mandrake choices"
-msgstr "Mandrake¤ÎÁŞÂň"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
+msgstr "ššżˇ..."
 
-#: ../rpmdrake_.c:568
-msgid "All packages, alphabetical"
-msgstr "Á´ĽŃĽĂĽąĄźĽ¸Ą˘ABC˝ç"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "ÄɲĂ..."
 
-#: ../rpmdrake_.c:569
-msgid "All packages,"
-msgstr "Á´ĽŃĽĂĽąĄźĽ¸"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "ĘÔ˝¸"
 
-#: ../rpmdrake_.c:592
-msgid "by group"
-msgstr "Ľ°ĽëĄźĽ×ĘĚ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Source"
+msgstr "Ľ˝ĄźĽš"
 
-#: ../rpmdrake_.c:592
-msgid "by size"
-msgstr "ĽľĽ¤Ľş˝ç"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
+msgstr "Í­¸ú¤Ç¤š¤ŤĄŠ"
 
-#: ../rpmdrake_.c:593
-msgid "by selection state"
-msgstr "ÁŞÂňžőÂÖ˝ç"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure sources"
+msgstr "Ľ˝ĄźĽš¤ÎŔßÄę"
 
-#: ../rpmdrake_.c:594
-msgid "by source repository"
-msgstr "Ľ˝ĄźĽšrepository˝ç"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "ĽŃĽšĽďĄźĽÉ:"
 
-#: ../rpmdrake_.c:594
-msgid "by update availability"
-msgstr "ššżˇ¤ÎÍ­Ěľ˝ç"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
+msgstr "ĽćĄźĽśĚžĄ§"
 
-#: ../rpmdrake_.c:615
-msgid "in descriptions"
-msgstr "ŔâĚŔ¤ÎĂć"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Ľ×ĽíĽŻĽˇÇ§žÚÍѤ˼楟ĽśĚž/ĽŃĽšĽďĄźĽÉ¤ňťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: ../rpmdrake_.c:615
-msgid "in files"
-msgstr "ĽŐĽĄĽ¤Ľë¤ÎĂć"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "Ľ×ĽíĽ­Ľˇ¤ÎĽŰĽšĽČĚžĄ§"
 
-#: ../rpmdrake_.c:615
-msgid "in names"
-msgstr "ĚžžÎ¤ÎĂć"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"Ľ×ĽíĽŻĽˇ¤ŹÉŹÍפʤ饢ĽŰĽšĽČĚž¤ČĽŞĽ×ĽˇĽçĽó¤ÇĽÝĄźĽČČÖšć¤ňĆţÎϤˇ¤Ć¤Ż¤Ŕ¤ľ¤¤(˝ńź°: "
+"<Ľ×ĽíĽŻĽˇĽŰĽšĽČ[:ĽÝĄźĽČ]>):"
 
-#: ../rpmdrake_.c:626
-msgid "Reload the packages list"
-msgstr "ĽŃĽĂĽąĄźĽ¸°ěÍ÷¤ňĆɤßÄž¤š"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "Ľ×ĽíĽŻĽˇ¤ÎŔßÄę"
 
-#: ../rpmdrake_.c:626
-msgid "Reset the selection"
-msgstr "ÁŞÂň¤ňĽęĽťĽĂĽČ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr "žŻĄš¤ŞÂÔ¤Á¤ňĄ˘ĽáĽÇĽŁĽ˘ššżˇĂć"
 
-#: ../rpmdrake_.c:652
-msgid "Maximum information"
-msgstr "žđĘóÎ̤ňşÇÂç¤Ë"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "ĘŃšš¤ňĘݸ¤š¤ë¤Ë¤ĎĽáĽÇĽŁĽ˘¤ňĽÉĽéĽ¤ĽÖ¤ËÁŢĆţ¤ˇ¤Ć¤Ż¤Ŕ¤ľ¤¤"
 
-#: ../rpmdrake_.c:652
-msgid "Normal information"
-msgstr "ÄĚžď¤ÎžđĘó"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
+msgstr "Âł¤ą¤ë¤Ë¤ĎĽáĽÇĽŁĽ˘¤ňÁŢĆţ¤ˇ¤Ć¤Ż¤Ŕ¤ľ¤¤"
 
-#: ../rpmdrake_.c:674
-msgid "Too many packages are selected"
-msgstr "Áޤó¤ŔĽŃĽĂĽąĄźĽ¸¤ŹÂż¤š¤Ž¤Ţ¤š"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save changes"
+msgstr "ĘŃšš¤ňĘݸ"
 
-#: ../rpmdrake_.c:720
-msgid "Find:"
-msgstr "°Ę˛ź¤ňĂľ¤šĄ§"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Ĺýšç¤Ţ¤ż¤Ďhdlist ¤Ř¤ÎÁęÂĐĽŃĽš:"
 
-#: ../rpmdrake_.c:725
-msgid "Search"
-msgstr "¸Ąş÷"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL: "
 
-#: ../rpmdrake_.c:731
-msgid "Install"
-msgstr "Ľ¤ĽóĽšĽČĄźĽë"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Editing source \"%s\":"
+msgstr "Ľ˝ĄźĽš %s ¤ÎĘÔ˝¸Ăć:"
 
-#: ../rpmdrake_.c:738 data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrake Update"
-msgstr "MandrakeĽ˘ĽĂĽ×ĽÇĄźĽČ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit a source"
+msgstr "Ľ˝ĄźĽš¤ÎĘÔ˝¸"
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Installation"
-msgstr "Ľ˝ĽŐĽČĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽë"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr "žŻĄš¤ŞÂÔ¤Á¤ňĄ˘ĽáĽÇĽŁĽ˘źč¤ę˝Đ¤ˇĂć"
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Removal"
-msgstr "Ľ˝ĽŐĽČĽŚĽ§Ľ˘ĽŃĽĂĽąĄźĽ¸şď˝ü"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, adding medium..."
+msgstr "žŻĄš¤ŞÂÔ¤Á¤ňĄ˘ĽáĽÇĽŁĽ˘ÄɲĂĂć"
 
-#: ../rpmdrake_.c:779
-msgid "Please wait, contacting mirror to update packages information."
-msgstr "žŻĄš¤ŞÂÔ¤Á¤ňĄ˘ĽßĽéĄź¤Ë¤Ä¤Ę¤¤¤ÇĽŃĽĂĽąĄźĽ¸žđĘóššżˇĂ楣"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of source:"
+msgstr "Ľ˝ĄźĽš¤ÎźďÎŕ:"
 
-#: ../rpmdrake_.c:781
-msgid "Error updating medium"
-msgstr "ĽáĽÇĽŁĽ˘ššżˇ¤ÇĽ¨ĽéĄź"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Adding a source:"
+msgstr "Ľ˝ĄźĽš¤ÎÄɲĂ"
 
-#: ../rpmdrake_.c:782
-msgid "There was an unrecoverable error while updating packages information."
-msgstr "ĽŃĽĂĽąĄźĽ¸žđĘóššżˇĂć¤Ë˛óÉüÉÔÇ˝Ľ¨ĽéĄźČŻŔ¸ĄŁ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"Ćą¤¸ĚžÁ°¤ÎĽáĽÇĽŁĽ˘¤Ź¤š¤Ç¤Ë¤˘¤ę¤Ţ¤šĄŁËÜĹö¤Ë\n"
+"ĂÖ¤­´š¤¨¤Ţ¤š¤ŤĄŠ"
 
-#: ../rpmdrake_.c:787
-msgid "How to choose manually your mirror"
-msgstr "ĽßĽéĄź¤ňĽŢĽËĽĺĽ˘Ľë¤ÇÁޤ֤ˤĎ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to fill up at least the two first entries."
+msgstr "žŻ¤Ę¤Ż¤Č¤âşÇ˝é¤ÎĆóšŕĚܤĎÉŹżÜ¤Ç¤šĄŁ"
 
-#: ../rpmdrake_.c:795
-msgid "Please wait, contacting mirror to initialize updates packages."
-msgstr "ĽßĽéĄź¤Ë¤Ä¤Ę¤¤¤ÇššżˇĽŃĽĂĽąĄźĽ¸¤ň˝é´ü˛˝¤ˇ¤Ţ¤šĄŁžŻĄš¤ŞÂÔ¤Á¤ň"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "ĚžÁ°:"
 
-#: ../rpmdrake_.c:798
-msgid "Error adding update medium"
-msgstr "ššżˇĽáĽÇĽŁĽ˘ÄɲäǼ¨ĽéĄź"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
+msgstr "Login: "
 
-#: ../rpmdrake_.c:829
-msgid "Please wait, finding available packages..."
-msgstr "Ä󜥼ѼüąĄźĽ¸¤ňĂľ¤ˇ¤Ć¤¤¤Ţ¤šĄ˘žŻĄš¤ŞÂÔ¤Á¤ň"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "ĽßĽéĄź¤ňÁޤó¤Ç¤Ż¤Ŕ¤ľ¤¤Ą§"
 
-#: ../rpmdrake_.c:861
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "%s ¸ĄşşĂć"
+msgid "Browse..."
+msgstr "°Ę˛ź¤ňĽÖĽéĽŚĽş..."
 
-#: ../rpmdrake_.c:880
-#, fuzzy
-msgid "changes:"
-msgstr "ĘŃšš¤ňĘݸ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "ĽŃĽš¤Ţ¤ż¤ĎĽŢĽŚĽóĽČĽÝĽ¤ĽóĽČĄ§"
 
-#: ../rpmdrake_.c:884
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove .%s"
-msgstr ".%s ¤ňźč¤ę˝ü¤Ż"
+msgid "Removable device"
+msgstr "ĽęĽŕĄźĽĐĽÖĽëĽÇĽĐĽ¤Ľš"
 
-#: ../rpmdrake_.c:886
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr ".%s ¤ňĽáĽ¤ĽóĽŐĽĄĽ¤Ľë¤Č¤ˇ¤ĆťČ¤Ś"
+msgid "HTTP server"
+msgstr "HTTP ĽľĄźĽĐ"
 
-#: ../rpmdrake_.c:888
-msgid "Do nothing"
-msgstr "¤Ę¤Ë¤â¤ˇ¤Ę¤¤"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "FTPĽľĄźĽĐ"
 
-#: ../rpmdrake_.c:900
-msgid "Installation finished"
-msgstr "Ľ¤ĽóĽšĽČĄźĽë´°Îť"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path:"
+msgstr "ĽŃĽšĄ§"
 
-#: ../rpmdrake_.c:910
-msgid "Inspect..."
-msgstr "¸Ąşş..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "ĽíĄźĽŤĽëĽŐĽĄĽ¤Ľë"
 
-#: ../rpmdrake_.c:925
-msgid "Program missing"
-msgstr "Ľ×ĽíĽ°ĽéĽŕ¤Ź¤˘¤ę¤Ţ¤ť¤ó"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a source"
+msgstr "Ľ˝ĄźĽš¤ÎÄɲĂ"
 
-#: ../rpmdrake_.c:926
-msgid "A required program is missing (grpmi). Check your installation."
-msgstr "ÉŹÍ×Ľ×ĽíĽ°ĽéĽŕ¤Ź¤˘¤ę¤Ţ¤ť¤ó (grpmi)ĄŁĽ¤ĽóĽšĽČĄźĽë¤ňłÎǧ¤ˇ¤Ţ¤ˇ¤ç¤ŚĄŁ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
+msgstr "ĽáĽÇĽŁĽ˘¤ňššżˇ¤Ç¤­¤Ţ¤ť¤óĄŁťČÍŃÉÔÇ˝¤Ë¤ˇ¤Ţ¤šĄŁ"
 
-#: ../rpmdrake_.c:940
-msgid "Unable to get source packages."
-msgstr "Ľ˝ĄźĽšĽŃĽĂĽąĄźĽ¸¤Ź¸Ť¤Ä¤Ť¤ę¤Ţ¤ť¤ó"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "ĽáĽÇĽŁĽ˘¤Źşî¤ě¤Ţ¤ť¤óĄŁ"
 
-#: ../rpmdrake_.c:941
-msgid "Unable to get source packages, sorry."
-msgstr "Ľ˝ĄźĽšĽŃĽĂĽąĄźĽ¸¤ŹĆŔ¤é¤ě¤Ţ¤ť¤óĄ˘¤´¤á¤ó¤Ę¤ľ¤¤ĄŁ"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, updating media..."
+msgstr "žŻĄš¤ŞÂÔ¤Á¤ňĄ˘ĽáĽÇĽŁĽ˘ššżˇĂć"
 
-#: ../rpmdrake_.c:948
-msgid "Change medium"
-msgstr "ĽáĽÇĽŁĽ˘ĘŃšš"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
+msgstr "ššżˇ"
 
-#: ../rpmdrake_.c:949
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "%s¤Č¤¤¤ŚĽáĽÇĽŁĽ˘¤ňĽÇĽĐĽ¤Ľš[%s]¤ËÁŢĆţ¤ˇ¤Ć¤Ż¤Ŕ¤ľ¤¤"
+msgid "Select the source(s) you wish to update:"
+msgstr "ššżˇ¤ˇ¤ż¤¤Ľ˝ĄźĽš¤ňÁޤó¤Ç¤Ż¤Ŕ¤ľ¤¤:"
 
-#: ../rpmdrake_.c:957
-msgid "Installation failed"
-msgstr "Ľ¤ĽóĽšĽČĄźĽëźşÇÔ"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please choose the desired mirror."
+msgstr "´őËž¤ÎĽßĽéĄź¤ňÁޤó¤Ç¤Ż¤Ŕ¤ľ¤¤ĄŁ"
 
-#: ../rpmdrake_.c:958
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
-"Ľ¤ĽóĽšĽČĄźĽëźşÇÔĄ˘°ěÉôĽŐĽĄĽ¤Ľë¤Ź¤˘¤ę¤Ţ¤ť¤óĄŁ\n"
-"Ľ˝ĄźĽšĽÇĄźĽżĽŮĄźĽš¤ňššżˇ¤ˇ¤Ć¤ß¤Ć¤Ď¤¤¤Ť¤Ź¤Ç¤ˇ¤ç¤ŚĄŁ"
+"ťČ¤¨¤ëĽßĽéĄź¤Ź¸Ť¤Ä¤Ť¤ę¤Ţ¤ť¤óĄŁ\n"
+"\n"
+"ÍýÍł¤Ď¤¤¤í¤¤¤íšÍ¤¨¤é¤ě¤Ţ¤š¤ŹĄ˘¤¤¤Á¤Đ¤ó¤˘¤ę¤Ź¤Á¤Ę¤Î¤ĎĄ˘¤˘¤Ę¤ż¤Î\n"
+"Ľ×ĽíĽťĽĂĽľ¤ÎĽ˘ĄźĽ­ĽĆĽŻĽÁĽă¤ŹMandrake Linux ¸řź°Ľ˘ĽĂĽ×ĽÇĄźĽČ¤Ç\n"
+"¤ĎĽľĽÝĄźĽČ¤ľ¤ě¤Ć¤¤¤Ę¤¤žěšç¤Ç¤šĄŁ"
 
-#: ../rpmdrake_.c:961
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr "ž¤Îššżˇ¤Ź¤Ç¤­¤ë¤č¤Ś¤ËĽŃĽĂĽąĄźĽ¸şď˝üĂ楢žŻĄš¤ŞÂÔ¤Á¤ň"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
+msgstr "ĽßĽéĄź¤Ę¤ˇ"
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"There was an error downloading the mirrors list:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
-"Ľ¤ĽóĽšĽČĄźĽë¤Ď´°Îť¤ˇ¤Ţ¤ˇ¤ż; %s.\n"
+"ĽßĽéĄź°ěÍ÷ĽŔĽŚĽóĽíĄźĽÉĂć¤ËĽ¨ĽéĄź¤ŹĂÖ¤­¤Ţ¤ˇ¤ż:\n"
 "\n"
-"`.rpmnew' ¤ä `.rpmsave'¤Č¤¤¤ŚŔßÄęĽŐĽĄĽ¤Ľë¤ŹŔ¸ŔŽ¤ľ¤ě¤Ţ¤ˇ¤żĄŁ\n"
-"¤ł¤ě¤ň¸ĄĆ¤¤ˇ¤ĆÄɲäÎŔßÄę¤ň¤š¤ë¤ł¤Č¤â¤Ç¤­¤Ţ¤š:"
+"%s\n"
+"ĽÍĽĂĽČĽďĄźĽŻ¤ŤMandrakesoftĽŚĽ§ĽÖĽľĽ¤ĽČ¤ŹťČ¤¨¤Ę¤¤¤č¤Ś¤Ç¤šĄŁ\n"
+"¤˘¤Č¤Ç¤ä¤ę¤Ę¤Ş¤ˇ¤Ć¤Ż¤Ŕ¤ľ¤¤ĄŁ"
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "ĽŔĽŚĽóĽíĄźĽÉĂć¤ËĽ¨ĽéĄź"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "žŻĄš¤ŞÂÔ¤Á¤ňĄ˘MandrakeĽŚĽ§ĽÖĽľĽ¤ĽČ¤Ť¤éĽßĽéĄźĽľĽ¤ĽČ¤ňźčĆŔĂ楣"
+
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"some packages failed to install\n"
-"correctly"
+"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"
-"ĽŃĽĂĽąĄźĽ¸¤Ź¤˘¤ę¤Ţ¤š"
+"MandrakeSoft ĽŚĽ§ĽÖĽľĽ¤ĽČ¤ËŔÜÂł¤ˇ¤ĆĽßĽéĄźĽľĽ¤ĽČ¤Î°ěÍ÷¤ňźčĆŔ\n"
+"¤ˇ¤Ţ¤šĄŁĽÍĽĂĽČĽďĄźĽŻ¤ŹÍ­¸ú¤ŤłÎǧ¤ˇ¤Ć¤Ż¤Ŕ¤ľ¤¤ĄŁ\n"
+"\n"
+"Âł¤ą¤Ţ¤š¤Ť?"
 
-#: ../rpmdrake_.c:983
-msgid "everything was installed correctly"
-msgstr "¤š¤Ů¤ĆŔľ¤ˇ¤ŻĽ¤ĽóĽšĽČĄźĽë¤ľ¤ě¤Ţ¤ˇ¤ż"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United States"
+msgstr "Ľ˘ĽáĽęĽŤ"
 
-#: ../rpmdrake_.c:985
-msgid "Everything installed successfully"
-msgstr "¤š¤Ů¤ĆĽ¤ĽóĽšĽČĄźĽë¤ËŔŽ¸ů¤ˇ¤Ţ¤ˇ¤ż"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
+msgstr "Ăćšń"
 
-#: ../rpmdrake_.c:986
-msgid "All requested packages were installed successfully."
-msgstr "Í׾᤾¤ě¤żĽŃĽĂĽąĄźĽ¸¤Ď¤š¤Ů¤ĆĽ¤ĽóĽšĽČĄźĽëŔŽ¸ů¤Ç¤šĄŁ"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr "Ľ¤ĽŽĽęĽš"
 
-#: ../rpmdrake_.c:989
-msgid "Everything already installed."
-msgstr "¤š¤Ů¤ĆĽ¤ĽóĽšĽČĄźĽëşŃ¤ßĄŁ"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "ÂćĎŃ"
 
-#: ../rpmdrake_.c:990
-msgid "Everything already installed (is this supposed to happen at all?)."
-msgstr "¤š¤Ů¤ĆĽ¤ĽóĽšĽČĄźĽëşŃ¤ßĄĘ¤ł¤ó¤Ę¤ł¤Č¤Ź¤˘¤Ă¤Ć¤¤¤¤¤Î¤ŤĄŠĄË"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "ĽšĽŚĽ§ĄźĽÇĽó"
 
-#: ../rpmdrake_.c:997
-#, fuzzy
-msgid "Problem during installation"
-msgstr "Ľ¤ĽóĽšĽČĄźĽëĂć¤ËĚäÂꤏľŻ¤ł¤ę¤Ţ¤ˇ¤ż"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
+msgstr "ĽíĽˇĽ˘"
 
-#: ../rpmdrake_.c:998
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr "Ľ¤ĽóĽšĽČĄźĽëĂć¤ËĚäÂęČŻŔ¸ĄŁ"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Portugal"
+msgstr "ĽÝĽëĽČĽŹĽë"
 
-#: ../rpmdrake_.c:1012
-msgid "Please wait, reading packages database..."
-msgstr "ĽŃĽĂĽąĄźĽ¸ĽÇĄźĽżĽŮĄźĽšĆɤߚţ¤ßĂ楢žŻĄš¤ŞÂÔ¤Á¤ň"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
+msgstr "ĽÝĄźĽéĽóĽÉ"
 
-#: ../rpmdrake_.c:1053
-msgid "Please wait, removing packages..."
-msgstr "ĽŃĽĂĽąĄźĽ¸şď˝üĂ楢žŻĄš¤ŞÂÔ¤Á¤ň"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
+msgstr "ĽÎĽëĽŚĽ§Ľ¤"
 
-#: ../rpmdrake_.c:1056
-#, fuzzy
-msgid "Problem during removal"
-msgstr "Ľ¤ĽóĽšĽČĄźĽëĂć¤ËĚäÂꤏľŻ¤ł¤ę¤Ţ¤ˇ¤ż"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
+msgstr "ĽŞĽéĽóĽŔ"
 
-#: ../rpmdrake_.c:1057
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr "Ľ¤ĽóĽšĽČĄźĽëĂć¤ËĚäÂęČŻŔ¸ĄŁ"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Korea"
+msgstr "´Úšń"
 
-#: ../rpmdrake_.c:1089
-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 "Japan"
+msgstr "ĆüËÜ"
 
-#: ../rpmdrake_.c:1094
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"MandrakeUpdate¤Ř¤¤¤é¤Ă¤ˇ¤ă¤¤¤Ţ¤ť!\n"
-"\n"
-"¤ł¤ÎĽÄĄźĽë¤ĎĄ˘Ľ¤ĽóĽšĽČĄźĽë¤ˇ¤ż¤¤ššżˇ¤ňÁŞ¤Ö¤ŞźęĹÁ¤¤¤ň¤ˇ¤Ţ¤šĄŁ"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Italy"
+msgstr "Ľ¤ĽżĽęĽ˘"
 
-#: ../rpmdrake_.c:1099
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
-msgstr ""
-"Ľ˝ĽŐĽČĽ¤ĽóĽšĽČĄźĽëĽÄĄźĽë¤Ř¤¤¤é¤Ă¤ˇ¤ăĄÁ¤¤!\n"
-"\n"
-"Mandrake Linux ĽˇĽšĽĆĽŕ¤Ë¤Ď˛żŔé¤â¤ÎĽ˝ĽŐĽČ¤ŹCDROM¤ŤDVD¤Ç¤Ä¤¤¤Ć¤­¤Ţ¤šĄŁ\n"
-"¤ł¤ÎĽÄĄźĽë¤ĎĄ˘¤É¤ě¤ňĽ¤ĽóĽšĽČĄźĽë¤ˇ¤ż¤¤¤Ť¤ňÁŞ¤Ö¤ŞźęĹÁ¤¤¤ň¤ˇ¤Ţ¤šĄŁ"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Israel"
+msgstr "Ľ¤ĽšĽéĽ¨Ľë"
 
-#: data/rpmdrake-remove.desktop.in.h:1
-msgid "Remove Software"
-msgstr "Ľ˝ĽŐĽČĽŚĽ§Ľ˘şď˝ü"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "ĽŽĽęĽˇĽă"
 
-#: data/rpmdrake-sources.desktop.in.h:1
-msgid "Software Sources Manager"
-msgstr "Ľ˝ĽŐĽČĽŚĽ§Ľ˘Ľ˝ĄźĽšĽŢĽÍĄźĽ¸Ľă"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "France"
+msgstr "ĽŐĽéĽóĽš"
 
-#: data/rpmdrake.desktop.in.h:1
-msgid "Install Software"
-msgstr "Ľ˝ĽŐĽČ¤ňĽ¤ĽóĽšĽČĄźĽë"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "ĽŐĽŁĽóĽéĽóĽÉ"
 
-#~ msgid ""
-#~ "There is already a medium by that name, do you\n"
-#~ "really want to replace it?"
-#~ msgstr ""
-#~ "Ćą¤¸ĚžÁ°¤ÎĽáĽÇĽŁĽ˘¤Ź¤š¤Ç¤Ë¤˘¤ę¤Ţ¤šĄŁËÜĹö¤Ë\n"
-#~ "ĂÖ¤­´š¤¨¤Ţ¤š¤ŤĄŠ"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "ĽšĽÚĽ¤Ľó"
 
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-#~ "Âł¤ą¤Ć¤¤¤¤¤Ç¤š¤ŤĄŠ"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
+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"
-#~ "żˇ¤ˇ¤¤Ľ˝ĽŐĽČĽŃĽĂĽąĄźĽ¸¤ŹĽ¤ĽóĽšĽČĄźĽë¤Ç¤­¤ż¤ęĄ˘ššżˇ¤Ę¤É¤Ź¤Ç¤­¤Ţ¤šĄŁ"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+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 "Czech Republic"
+msgstr "ĽÁĽ§Ľł"
 
-#~ msgid ""
-#~ "There was an error downloading the mirrors list:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "The network, or MandrakeSoft website, are maybe unavailable.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "ĽßĽéĄź°ěÍ÷ĽŔĽŚĽóĽíĄźĽÉĂć¤ËĽ¨ĽéĄź¤ŹĂÖ¤­¤Ţ¤ˇ¤ż:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "ĽÍĽĂĽČĽďĄźĽŻ¤ŤMandrakesoftĽŚĽ§ĽÖĽľĽ¤ĽČ¤ŹťČ¤¨¤Ę¤¤¤č¤Ś¤Ç¤šĄŁ\n"
-#~ "¤˘¤Č¤Ç¤ä¤ę¤Ę¤Ş¤ˇ¤Ć¤Ż¤Ŕ¤ľ¤¤ĄŁ"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Costa Rica"
+msgstr "ĽłĽšĽżĽęĽŤ"
 
-#~ msgid ""
-#~ "I can't find any suitable mirror.\n"
-#~ "\n"
-#~ "There can be many reasons for this problem; the most frequent is\n"
-#~ "the case when the architecture of your processor is not supported\n"
-#~ "by Mandrake Linux Official Updates."
-#~ msgstr ""
-#~ "ťČ¤¨¤ëĽßĽéĄź¤Ź¸Ť¤Ä¤Ť¤ę¤Ţ¤ť¤óĄŁ\n"
-#~ "\n"
-#~ "ÍýÍł¤Ď¤¤¤í¤¤¤íšÍ¤¨¤é¤ě¤Ţ¤š¤ŹĄ˘¤¤¤Á¤Đ¤ó¤˘¤ę¤Ź¤Á¤Ę¤Î¤ĎĄ˘¤˘¤Ę¤ż¤Î\n"
-#~ "Ľ×ĽíĽťĽĂĽľ¤ÎĽ˘ĄźĽ­ĽĆĽŻĽÁĽă¤ŹMandrake Linux ¸řź°Ľ˘ĽĂĽ×ĽÇĄźĽČ¤Ç\n"
-#~ "¤ĎĽľĽÝĄźĽČ¤ľ¤ě¤Ć¤¤¤Ę¤¤žěšç¤Ç¤šĄŁ"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Canada"
+msgstr "ĽŤĽĘĽŔ"
 
-#~ msgid ""
-#~ "The list of updates is void. This means that either there is\n"
-#~ "no available update for the packages installed on your computer,\n"
-#~ "or you already installed all of them."
-#~ msgstr ""
-#~ "ššżˇ°ěÍ÷¤ŹĚľ¸ú¤Ç¤šĄŁĽłĽóĽÔĽĺĄźĽż¤ÎĽ¤ĽóĽšĽČĄźĽë¤ľ¤ě¤żĽŃĽĂĽąĄźĽ¸¤Î\n"
-#~ "ššżˇČǤŹ¤Ę¤¤¤ŤĄ˘¤˝¤ě¤Ź¤š¤Ç¤ËĽ¤ĽóĽšĽČĄźĽëşŃ¤ß¤Č¤¤¤Ś¤ł¤Č¤Ç¤šĄŁ"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
+msgstr "ĽÖĽéĽ¸Ľë"
 
-#~ msgid ""
-#~ "Warning: it seems that you are attempting to add so much\n"
-#~ "packages that your filesystem may run out of free diskspace,\n"
-#~ "during or after package installation ; this is particularly\n"
-#~ "dangerous and should be considered with care.\n"
-#~ "\n"
-#~ "Do you really want to install all the selected packages?"
-#~ msgstr ""
-#~ "ˇŮšđĄ§Äɲ䡤褌¤Č¤ˇ¤Ć¤¤¤ëĽŃĽĂĽąĄźĽ¸¤ŹÂż¤š¤Ž¤ĆĄ˘ĽŐĽĄĽ¤ĽëĽˇĽšĽĆĽŕ\n"
-#~ "¤ÎĽÇĽŁĽšĽŻÍĆÎ̤ŹĽ¤ĽóĽšĽČĄźĽëĂć¤ËÉÔ­¤š¤ë¤Ť¤â¤ˇ¤ě¤Ţ¤ť¤óĄŁ¤ł¤ě¤Ď\n"
-#~ "¤Č¤Ć¤â´í¸ą¤Ę¤ł¤Č¤Ę¤Î¤ÇĄ˘żľ˝Ĺ¤ËšÍ¤¨¤Ć¤Ż¤Ŕ¤ľ¤¤ĄŁ\n"
-#~ "\n"
-#~ "ËÜĹö¤Ë¤ł¤ÎÁޤó¤ŔĽŃĽĂĽąĄźĽ¸¤ňÁ´ÉôĽ¤ĽóĽšĽČĄźĽë¤ˇ¤Ţ¤š¤ŤĄŠ"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Belgium"
+msgstr "ĽŮĽëĽŽĄź"
 
-#~ msgid ""
-#~ "The following packages have to be removed for others to be upgraded:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "°Ę˛ź¤ÎĽŃĽĂĽąĄźĽ¸¤ňşď˝ü¤ˇ¤Ę¤¤¤Čž¤Źššżˇ¤Ç¤­¤Ţ¤ť¤ó:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Âł¤ą¤Ć¤¤¤¤¤Ç¤š¤Ť?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Australia"
+msgstr "ĽŞĄźĽšĽČĽéĽęĽ˘"
 
-#~ msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#~ msgstr ""
-#~ "-adobe-helvetica-bold-r-*-*-*-120-*-*-*-*-*-*,-misc-fixed-medium-r-"
-#~ "normal--12-*-75-75-c-*-jisx0208.1983-0,*"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
+msgstr "ĽŞĄźĽšĽČĽęĽ˘"
 
-#~ msgid ""
-#~ "I need to contact the mirror to get latest update packages.\n"
-#~ "Please check that your network is currently running.\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "ĽßĽéĄź¤ËŔÜÂł¤ˇ¤ĆşÇżˇ¤ÎššżˇĽŃĽĂĽąĄźĽ¸¤ňźčĆŔ¤ˇ¤Ţ¤šĄŁ\n"
-#~ "ĽÍĽĂĽČĽďĄźĽŻ¤ŹÍ­¸ú¤ŤłÎǧ¤ˇ¤Ć¤Ż¤Ŕ¤ľ¤¤ĄŁ\n"
-#~ "\n"
-#~ "Âł¤ą¤Ţ¤š¤Ť?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "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.pm:1
+#, c-format
+msgid "No"
+msgstr "¤¤¤¤¤¨"
 
-#~ 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?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "¤Ď¤¤"
+
+#: data/rpmdrake.desktop.in.h:1
+msgid "Install Software"
+msgstr "Ľ˝ĽŐĽČ¤ňĽ¤ĽóĽšĽČĄźĽë"
+
+#: data/rpmdrake-remove.desktop.in.h:1
+msgid "Remove Software"
+msgstr "Ľ˝ĽŐĽČĽŚĽ§Ľ˘şď˝ü"
+
+#: data/rpmdrake-sources.desktop.in.h:1
+msgid "Software Sources Manager"
+msgstr "Ľ˝ĽŐĽČĽŚĽ§Ľ˘Ľ˝ĄźĽšĽŢĽÍĄźĽ¸Ľă"
+
+#~ msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
 #~ msgstr ""
-#~ "ššżˇĽáĽÇĽŁĽ˘¤ňurpmi¤ÇÄɲĂĂć¤ËĽ¨ĽéĄź¤Ź¤Ş¤­¤Ţ¤ˇ¤żĄŁ\n"
-#~ "\n"
-#~ "¤ł¤ě¤ĎĽßĽéĄź¤Ź˛ő¤ě¤Ć¤¤¤ë¤ť¤¤¤ŤĄ˘¤˘¤ë¤¤¤Ď¤˘¤Ę¤ż¤ÎMandrake Linux¤Î\n"
-#~ "ĽĐĄźĽ¸ĽçĽó (%s) ¤ŹMandrake Linux ¸řź°Ľ˘ĽĂĽ×ĽÇĄźĽČ¤ÇĽľĽÝĄźĽČ¤ľ¤ě¤Ć\n"
-#~ "¤¤¤Ę¤¤¤Ť¤é¤Ť¤â¤ˇ¤ě¤Ţ¤ť¤óĄŁ\n"
-#~ "\n"
-#~ "Ę̤μ߼饟¤ňťî¤ˇ¤Ć¤ß¤Ţ¤š¤Ť?"
+#~ "-adobe-helvetica-bold-r-*-*-*-120-*-*-*-*-*-*,-misc-fixed-medium-r-"
+#~ "normal--12-*-75-75-c-*-jisx0208.1983-0,*"
 
 #~ msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
 #~ msgstr ""
diff --git a/po/ja.pom b/po/ja.pom
index 2f622077..4390cbc2 100644
--- a/po/ja.pom
+++ b/po/ja.pom
@@ -4,165 +4,170 @@ msgstr "ĽľĄźĽĐ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "ĽľĄźĽĐĄ˘Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "ĽÍĽĂĽČĽďĄźĽŻĽłĽóĽÔĽĺĄźĽż (ĽŻĽéĽ¤Ľ˘ĽóĽČ)"
+msgid "Office Workstation"
+msgstr "ĽŞĽŐĽŁĽšĽďĄźĽŻĽšĽĆĄźĽˇĽçĽó"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS ĽľĄźĽĐ, SMB ĽľĄźĽĐ, Proxy ĽľĄźĽĐ, SSH ĽľĄźĽĐ"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"ĽŞĽŐĽŁĽšˇĎĽ˝ĽŐĽČ: ĽďĄźĽ×Ľí (kword, abiword), É˝ˇ×ťť (kspread, gnumeric), pdf"
+"ĽÓĽĺĄźĽ˘¤Ę¤É"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "ĽŞĽŐĽŁĽš´ŘϢ"
+msgid "Workstation"
+msgstr "ĽďĄźĽŻĽšĽĆĄźĽˇĽçĽó"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Gnome ĽďĄźĽŻĽšĽĆĄźĽˇĽçĽó"
+msgid "Game station"
+msgstr "Ľ˛ĄźĽŕĽšĽĆĄźĽˇĽçĽó"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Palm Pilot ¤ä VisorÍŃĽÄĄźĽë"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "¸äłÚĽ˝ĽŐĽČĄ§ĽĆĽěĽÓĽ˛ĄźĽŕĄ˘ĽÜĄźĽÉĽ˛ĄźĽŕĄ˘ŔďÎŹĽ˛ĄźĽŕ¤Ę¤É"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "ĽďĄźĽŻĽšĽĆĄźĽˇĽçĽó"
+msgid "Multimedia station"
+msgstr "ĽŢĽëĽÁĽáĽÇĽŁĽ˘ĄŚĽšĽĆĄźĽˇĽçĽó"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "ĽľĄźĽĐĄ˘ĽŐĽĄĽ¤Ľ˘ĽŚĽŠĄźĽë/ĽëĄźĽż"
+msgid "Sound and video playing/editing programs"
+msgstr "ĽľĽŚĽóĽÉ¤äĽÓĽÇĽŞ¤ÎşĆŔ¸ĘÔ˝¸Ľ˝ĽŐĽČ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr "ĽÉĽáĽ¤ĽóĚžĽľĄźĽĐ (DNS) ¤ČĽÍĽĂĽČĽďĄźĽŻžđĘ󼾥źĽĐĄĘNIS)"
+msgid "Internet station"
+msgstr "Ľ¤ĽóĽżĄźĽÍĽĂĽČĄŚĽšĽĆĄźĽˇĽçĽó"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
 msgstr ""
-"ĽŞĽŐĽŁĽšˇĎĽ˝ĽŐĽČ: ĽďĄźĽ×Ľí (kword, abiword), É˝ˇ×ťť (kspread, gnumeric), pdf"
-"ĽÓĽĺĄźĽ˘¤Ę¤É"
+"ĽáĄźĽë¤äĽËĽĺĄźĽš¤ÎÁ÷źőżŽÍŃĽÄĄźĽë (pine, mutt, tin..) ¤ČĄ˘WebĽÖĽéĽŚĽşÍŃĽÄĄźĽë"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "ĽŞĄźĽÇĽŁĽŞ´ŘϢĽÄĄźĽëĄ§mp3, midi, ĽßĽ­ĽľĄź¤Ę¤É"
+msgid "Network Computer (client)"
+msgstr "ĽÍĽĂĽČĽďĄźĽŻĽłĽóĽÔĽĺĄźĽż (ĽŻĽéĽ¤Ľ˘ĽóĽČ)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Linux Standard Base. Third party applications support"
+msgid "Clients for different protocols including ssh"
+msgstr "ssh ¤Ę¤ÉłĆźďĽ×ĽíĽČĽłĽëÍŃĽŻĽéĽ¤Ľ˘ĽóĽČ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Linux ¤äĽŐĽęĄźĽ˝ĽŐĽČ´ŘϢ¤ÎËܤäĽĎĽŚĽÄĄźĘ¸˝ń"
+msgid "Configuration"
+msgstr "ŔßÄę"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "KDE ĽďĄźĽŻĽšĽĆĄźĽˇĽçĽó"
+msgid "Tools to ease the configuration of your computer"
+msgstr "ĽŢĽˇĽó¤ÎŔßÄę¤ňłÚ¤Ë¤š¤ëĽÄĄźĽë"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm¤Ę¤É"
+msgid "Scientific Workstation"
+msgstr "˛ĘłŘĽďĄźĽŻĽšĽĆĄźĽˇĽçĽó"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "ĽŢĽëĽÁĽáĽÇĽŁĽ˘Ą§ĽÓĽÇĽŞ"
+msgid "Scientific applications such as gnuplot"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr "ĽáĄźĽëĄ˘ĽËĽĺĄźĽšĄ˘web, ĽŐĽĄĽ¤ĽëĹžÁ÷Ą˘ĽÁĽăĽĂĽČ¤Ę¤É¤ÎĽÄĄźĽë"
+msgid "Console Tools"
+msgstr "ĽłĽóĽ˝ĄźĽëĽÄĄźĽë"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "ĽÇĄźĽżĽŮĄźĽš"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Ľ¨ĽÇĽŁĽżĄ˘ĽˇĽ§ĽëĄ˘ĽŐĽĄĽ¤Ľë´ŘϢĽÄĄźĽëĄ˘ĽżĄźĽßĽĘĽë"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL ¤Ť MySQL ĽÇĄźĽżĽŮĄźĽšĽľĄźĽĐ"
+msgid "KDE Workstation"
+msgstr "KDE ĽďĄźĽŻĽšĽĆĄźĽˇĽçĽó"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "ĽŢĽˇĽó¤ÎŔßÄę¤ňłÚ¤Ë¤š¤ëĽÄĄźĽë"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr "K ĽÇĽšĽŻĽČĽĂĽ×´Äś­ĄŁ´đËÜĹŞ¤ĘĽ°ĽéĽŐĽŁĽšĽŻ´Äś­¤ËĄ˘´ŘϢĽÄĄźĽëľÍ¤ášç¤ď¤ť"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "ĽŢĽëĽÁĽáĽÇĽŁĽ˘ĄĄĽľĽŚĽóĽÉ"
+msgid "Graphical Environment"
+msgstr "Ľ°ĽéĽŐĽŁĽĂĽŻ´Äś­"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "ĽÉĽ­ĽĺĽáĽóĽĆĄźĽˇĽçĽó"
+msgid "Gnome Workstation"
+msgstr "Gnome ĽďĄźĽŻĽšĽĆĄźĽˇĽçĽó"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "ĽłĽóĽ˝ĄźĽëĽÄĄźĽë"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr "ťČ¤¤¤ä¤š¤¤Ľ˘Ľ×ĽęĽąĄźĽˇĽçĽó¤äĽÇĽšĽŻĽČĽĂĽ×ĽÄĄźĽë¤ňťý¤ÄĄ˘Ľ°ĽéĽŐĽŁĽŻĽš´Äś­"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr "Postfix ĽáĄźĽëĽľĄźĽĐ, Inn ĽËĽĺĄźĽšĽľĄźĽĐ"
+msgid "Other Graphical Desktops"
+msgstr "¤˝¤ÎžĽ°ĽéĽŐĽŁĽĂĽŻĽÇĽšĽŻĽČĽĂĽ×"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Ľ¤ĽóĽżĄźĽÍĽĂĽČĄŚĽšĽĆĄźĽˇĽçĽó"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm¤Ę¤É"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "ĽŢĽëĽÁĽáĽÇĽŁĽ˘ĄŚĽšĽĆĄźĽˇĽçĽó"
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+msgid "Development"
+msgstr "łŤČŻÍŃ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "ŔßÄę"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C ¤Č C++ łŤČŻĽéĽ¤ĽÖĽéĽęĄ˘Ľ×ĽíĽ°ĽéĽŕ¤ä include ĽŐĽĄĽ¤Ľë"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Ľ°ĽéĽŐĽŁĽŤĽë¤ĘĽÇĽšĽŻĽČĽĂĽ×¤ň¤â¤Ă¤Č"
+msgid "Documentation"
+msgstr "ĽÉĽ­ĽĺĽáĽóĽĆĄźĽˇĽçĽó"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr "K ĽÇĽšĽŻĽČĽĂĽ×´Äś­ĄŁ´đËÜĹŞ¤ĘĽ°ĽéĽŐĽŁĽšĽŻ´Äś­¤ËĄ˘´ŘϢĽÄĄźĽëľÍ¤ášç¤ď¤ť"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Linux ¤äĽŐĽęĄźĽ˝ĽŐĽČ´ŘϢ¤ÎËܤäĽĎĽŚĽÄĄźĘ¸˝ń"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Ľ°ĽéĽŐĽŁĽĂĽŻ´Äś­"
+msgid "LSB"
+msgstr "LSB"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Linux Standard Base. Third party applications support"
+
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-msgid "Development"
-msgstr "łŤČŻÍŃ"
+#: ../../share/compssUsers:999
+msgid "Web/FTP"
+msgstr "ĽľĄźĽĐĄ˘Web/FTP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -171,23 +176,33 @@ msgstr "Apache ¤Č Pro-ftpd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "CD ¤ň¤Ä¤Ż¤Ă¤ĆžĆ¤ŻĽÄĄźĽë"
+msgid "Mail/Groupware/News"
+msgstr "ĽľĄźĽĐĄ˘ĽáĄźĽë/Ľ°ĽëĄźĽ×ĽŚĽ§Ľ˘/ĽËĽĺĄźĽš"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "ĽŞĽŐĽŁĽšĽďĄźĽŻĽšĽĆĄźĽˇĽçĽó"
+msgid "Postfix mail server, Inn news server"
+msgstr "Postfix ĽáĄźĽëĽľĄźĽĐ, Inn ĽËĽĺĄźĽšĽľĄźĽĐ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm ¤Ę¤É"
+msgid "Database"
+msgstr "ĽÇĄźĽżĽŮĄźĽš"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "The Gimp¤Ę¤É¤Î˛čÁü˝čÍýĽ˝ĽŐĽČ"
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL ¤Ť MySQL ĽÇĄźĽżĽŮĄźĽšĽľĄźĽĐ"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Firewall/Router"
+msgstr "ĽľĄźĽĐĄ˘ĽŐĽĄĽ¤Ľ˘ĽŚĽŠĄźĽë/ĽëĄźĽż"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Internet gateway"
+msgstr "Ľ¤ĽóĽżĄźĽÍĽĂĽČĽ˛ĄźĽČĽŚĽ§Ľ¤"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -196,8 +211,8 @@ msgstr "DNS/NIS "
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C ¤Č C++ łŤČŻĽéĽ¤ĽÖĽéĽęĄ˘Ľ×ĽíĽ°ĽéĽŕ¤ä include ĽŐĽĄĽ¤Ľë"
+msgid "Domain Name and Network Information Server"
+msgstr "ĽÉĽáĽ¤ĽóĚžĽľĄźĽĐ (DNS) ¤ČĽÍĽĂĽČĽďĄźĽŻžđĘ󼾥źĽĐĄĘNIS)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -206,18 +221,18 @@ msgstr "ĽÍĽĂĽČĽďĄźĽŻĽłĽóĽÔĽĺĄźĽżĄŚĽľĄźĽĐ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "ĽľĄźĽĐĄ˘ĽáĄźĽë/Ľ°ĽëĄźĽ×ĽŚĽ§Ľ˘/ĽËĽĺĄźĽš"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS ĽľĄźĽĐ, SMB ĽľĄźĽĐ, Proxy ĽľĄźĽĐ, SSH ĽľĄźĽĐ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Ľ˛ĄźĽŕĽšĽĆĄźĽˇĽçĽó"
+msgid "Office"
+msgstr "ĽŞĽŐĽŁĽš´ŘϢ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "ĽÓĽÇĽŞĽ×ĽěĄźĽä¤äĘÔ˝¸Ľ˝ĽŐĽČ"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr "ĽáĄźĽëĄ˘ĽËĽĺĄźĽšĄ˘web, ĽŐĽĄĽ¤ĽëĹžÁ÷Ą˘ĽÁĽăĽĂĽČ¤Ę¤É¤ÎĽÄĄźĽë"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -226,76 +241,66 @@ msgstr "ĽŢĽëĽÁĽáĽÇĽŁĽ˘ĄĄ˛čÁü"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "¸äłÚĽ˝ĽŐĽČĄ§ĽĆĽěĽÓĽ˛ĄźĽŕĄ˘ĽÜĄźĽÉĽ˛ĄźĽŕĄ˘ŔďÎŹĽ˛ĄźĽŕ¤Ę¤É"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
-"ĽáĄźĽë¤äĽËĽĺĄźĽš¤ÎÁ÷źőżŽÍŃĽÄĄźĽë (pine, mutt, tin..) ¤ČĄ˘WebĽÖĽéĽŚĽşÍŃĽÄĄźĽë"
+msgid "Graphics programs such as The Gimp"
+msgstr "The Gimp¤Ę¤É¤Î˛čÁü˝čÍýĽ˝ĽŐĽČ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "¸ÄżÍ¤ÎşâĚł´ÉÍý"
+msgid "Multimedia - Sound"
+msgstr "ĽŢĽëĽÁĽáĽÇĽŁĽ˘ĄĄĽľĽŚĽóĽÉ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr "ťČ¤¤¤ä¤š¤¤Ľ˘Ľ×ĽęĽąĄźĽˇĽçĽó¤äĽÇĽšĽŻĽČĽĂĽ×ĽÄĄźĽë¤ňťý¤ÄĄ˘Ľ°ĽéĽŐĽŁĽŻĽš´Äś­"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "ĽŞĄźĽÇĽŁĽŞ´ŘϢĽÄĄźĽëĄ§mp3, midi, ĽßĽ­ĽľĄź¤Ę¤É"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "ssh ¤Ę¤ÉłĆźďĽ×ĽíĽČĽłĽëÍŃĽŻĽéĽ¤Ľ˘ĽóĽČ"
+msgid "Multimedia - Video"
+msgstr "ĽŢĽëĽÁĽáĽÇĽŁĽ˘Ą§ĽÓĽÇĽŞ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
+msgid "Video players and editors"
+msgstr "ĽÓĽÇĽŞĽ×ĽěĄźĽä¤äĘÔ˝¸Ľ˝ĽŐĽČ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Ľ¤ĽóĽżĄźĽÍĽĂĽČĽ˛ĄźĽČĽŚĽ§Ľ¤"
+msgid "Multimedia - CD Burning"
+msgstr "ĽŢĽëĽÁĽáĽÇĽŁĽ˘ĄĄCD ¤ňžĆ¤Ż"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "ĽľĽŚĽóĽÉ¤äĽÓĽÇĽŞ¤ÎşĆŔ¸ĘÔ˝¸Ľ˝ĽŐĽČ"
+msgid "Tools to create and burn CD's"
+msgstr "CD ¤ň¤Ä¤Ż¤Ă¤ĆžĆ¤ŻĽÄĄźĽë"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "¤˝¤ÎžĽ°ĽéĽŐĽŁĽĂĽŻĽÇĽšĽŻĽČĽĂĽ×"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Ľ°ĽéĽŐĽŁĽŤĽë¤ĘĽÇĽšĽŻĽČĽĂĽ×¤ň¤â¤Ă¤Č"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Ľ¨ĽÇĽŁĽżĄ˘ĽˇĽ§ĽëĄ˘ĽŐĽĄĽ¤Ľë´ŘϢĽÄĄźĽëĄ˘ĽżĄźĽßĽĘĽë"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm ¤Ę¤É"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "gnucash¤Ę¤É¤Î˛Čˇ×´ÉÍýĽ˝ĽŐĽČ"
+msgid "Personal Information Management"
+msgstr "¸ÄżÍžđĘó´ÉÍý"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "¸ÄżÍžđĘó´ÉÍý"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Palm Pilot ¤ä VisorÍŃĽÄĄźĽë"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "ĽŢĽëĽÁĽáĽÇĽŁĽ˘ĄĄCD ¤ňžĆ¤Ż"
+msgid "Personal Finance"
+msgstr "¸ÄżÍ¤ÎşâĚł´ÉÍý"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "˛ĘłŘĽďĄźĽŻĽšĽĆĄźĽˇĽçĽó"
+msgid "Programs to manage your finances, such as gnucash"
+msgstr "gnucash¤Ę¤É¤Î˛Čˇ×´ÉÍýĽ˝ĽŐĽČ"
 
diff --git a/po/ko.po b/po/ko.po
index 3a64aabd..a20e97b2 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.4\n"
-"POT-Creation-Date: 2003-01-19 16:57+0100\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\n"
 "PO-Revision-Date: 2002-09-09 06:57+0900\n"
 "Last-Translator: Jaegeum Cze <baedaron@hanafos.com>\n"
 "Language-Team: Korean <baedaron@hananet.net>\n"
@@ -15,1034 +15,1223 @@ msgstr ""
 "Content-Type: text/plain; charset=euc-kr\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl_.c:39
-msgid "Unable to create medium."
-msgstr "¸ĹĂź¸Ś ťýźşÇŇ źö žř˝Ŕ´Ď´Ů."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"°čźÓÇŇąîżä?"
 
-#: ../edit-urpm-sources.pl_.c:40
-msgid "Unable to update medium; it will be automatically disabled."
-msgstr "¸ĹĂź¸Ś ž÷ľĽŔĚĆŽÇŇ źö žř˝Ŕ´Ď´Ů; ŔÚľżŔ¸ˇÎ ťçżëşŇ°ĄľÉ °ÍŔÔ´Ď´Ů."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to the software installation tool!\n"
+"\n"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
+msgstr ""
+"źŇÇÁĆŽżţžî źłÄĄ ľľą¸ŔÔ´Ď´Ů!\n"
+"\n"
+"¸ÇľĺˇšŔĚĹŠ ¸Ž´Ş˝şŔÇ CDROM śÇ´Â DVDżĄ´Â źöĂľ °łŔÇ źŇÇÁĆŽżţžî°Ą\n"
+"ŔÖ˝Ŕ´Ď´Ů. ŔĚ ľľą¸´Â ą× ÁßżĄź­ žîś˛ źŇÇÁĆŽżţžî¸Ś źłÄĄÇŇ Áö¸Ś źąĹĂÇŇ źö ŔÖľľ"
+"ˇĎ\n"
+"ľľżÍ ÁÝ´Ď´Ů."
 
-#: ../edit-urpm-sources.pl_.c:51
-#, fuzzy
-msgid "Add a source"
-msgstr "źŇ˝ş Ăß°Ą:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"¸ÇľĺˇšŔĚĹŠ ž÷ľĽŔĚĆŽżĄ Ŕß żŔźĚ˝Ŕ´Ď´Ů!\n"
+"\n"
+"ŔĚ ľľą¸´Â ÄÄÇťĹÍżĄ źłÄĄÇŇ ž÷ľĽŔĚĆŽľČ źŇÇÁĆŽżţžî¸Ś źąĹĂÇŇ źö ŔÖľľˇĎ\n"
+"ľľżÍ ÁÝ´Ď´Ů."
 
-#: ../edit-urpm-sources.pl_.c:52
-msgid "Local files"
-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"
+"ľľżÍ ÁÝ´Ď´Ů."
 
-#: ../edit-urpm-sources.pl_.c:52
-msgid "Path:"
-msgstr "°ćˇÎ:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:53
-msgid "FTP server"
-msgstr "FTP ź­šö"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during removal"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:53 ../edit-urpm-sources.pl_.c:54
-#: ../edit-urpm-sources.pl_.c:56 ../edit-urpm-sources.pl_.c:175
-msgid "URL:"
-msgstr "URL:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages..."
+msgstr "ąâ´ŮˇÁ ÁÖźźżä. ĆŃĹ°Áö ÁŚ°Ĺ Áß..."
 
-#: ../edit-urpm-sources.pl_.c:54
-msgid "HTTP server"
-msgstr "HTTP ź­šö"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
+msgstr "ąâ´ŮˇÁ ÁÖźźżä. ĆŃĹ°Áö ľĽŔĚĹÍşŁŔĚ˝ş ŔĐ´Â Áß..."
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Path or mount point:"
-msgstr "°ćˇÎ śÇ´Â ¸śżîĆŽ Ŕ§ÄĄ:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Removable device"
-msgstr "ĹťÂř˝Ä ŔĺÄĄ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during installation"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:56 ../rpmdrake_.c:548
-msgid "Security updates"
-msgstr "ş¸žČ ž÷ľĽŔĚĆŽ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
+msgstr "ŔĚšĚ źłÄĄľÇžî ŔÖ˝Ŕ´Ď´Ů.(°úżŹ Ŕ̡ą ŔĎŔĚ ŔÖŔť źö ŔÖłŞżä?)"
 
-#: ../edit-urpm-sources.pl_.c:67
-msgid "Browse..."
-msgstr "ĂŁžĆş¸ąâ..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed."
+msgstr "ŔĚšĚ źłÄĄľÇžî ŔÖ˝Ŕ´Ď´Ů."
 
-#: ../edit-urpm-sources.pl_.c:69
-msgid "Choose a mirror..."
-msgstr "šĚˇŻ źąĹĂ..."
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "żäĂťľČ ¸đľç ĆŃĹ°ÁöŔÇ źłÄĄ¸Ś ¸śĂĆ˝Ŕ´Ď´Ů."
 
-#: ../edit-urpm-sources.pl_.c:89
-msgid "Login:"
-msgstr "žĆŔĚľđ:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr "¸đľç źłÄĄ¸Ś ¸śĂĆ˝Ŕ´Ď´Ů."
 
-#: ../edit-urpm-sources.pl_.c:89 ../edit-urpm-sources.pl_.c:215
-msgid "Password:"
-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"
+"ÁśÄĄ¸Ś ĂëÇĎąâ Ŕ§ÇŘ ŔϺθŚ ÁśťçÇŘ şź źö ŔÖ˝Ŕ´Ď´Ů:"
 
-#: ../edit-urpm-sources.pl_.c:94
-msgid "Name:"
-msgstr "Ŕ̸§:"
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "¸đľÎ żĂšŮ¸Ł°Ô źłÄĄľÇžú˝Ŕ´Ď´Ů."
 
-#: ../edit-urpm-sources.pl_.c:96 ../edit-urpm-sources.pl_.c:176
-msgid "Relative path to synthesis/hdlist:"
-msgstr "ÇŐźş/¸ńˇĎ ĆÄŔϡÎŔÇ ťó´ë °ćˇÎ:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"some packages failed to install\n"
+"correctly"
+msgstr ""
+"ŔϺΠĆŃĹ°Áö´Â żĂšŮ¸Ł°Ô źłÄĄľÇÁö\n"
+"žĘžŇ˝Ŕ´Ď´Ů."
 
-#: ../edit-urpm-sources.pl_.c:104
-msgid "You need to fill up at least the two first entries."
-msgstr "ĂÖźŇÇŃ ĂłŔ˝ ľÎ Ç׸ńżĄ´Â ąâŔÔÇŘžß ÇŐ´Ď´Ů."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages to allow others to be upgraded..."
+msgstr ""
+"ąâ´ŮˇÁ ÁÖźźżä. ´Ů¸Ľ ĆŃĹ°Áö¸Ś ž÷ą×ˇšŔĚľĺÇĎąâ Ŕ§ÇŘ ŔϺΠĆŃĹ°Áö¸Ś ÁŚ°Ĺ Áß..."
 
-#: ../edit-urpm-sources.pl_.c:116
-msgid "Adding a source:"
-msgstr "źŇ˝ş Ăß°Ą:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
+msgstr ""
+"źłÄĄ ˝ÇĆĐ. ŔϺΠĆÄŔĎŔĚ žř˝Ŕ´Ď´Ů.\n"
+"źŇ˝ş ľĽŔĚĹÍşŁŔĚ˝ş¸Ś ž÷ľĽŔĚĆŽÇŘ ş¸źźżä."
 
-#: ../edit-urpm-sources.pl_.c:117
-msgid "Type of source:"
-msgstr "źŇ˝ş ŔŻÇü:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation failed"
+msgstr "źłÄĄ ˝ÇĆĐ"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
+msgstr "ĂëźŇ"
 
-#: ../edit-urpm-sources.pl_.c:121 ../edit-urpm-sources.pl_.c:187
-#: ../edit-urpm-sources.pl_.c:219 ../rpmdrake.pm_.c:97 ../rpmdrake.pm_.c:136
-#: ../rpmdrake.pm_.c:319 ../rpmdrake_.c:353 ../rpmdrake_.c:365
-#: ../rpmdrake_.c:369 ../rpmdrake_.c:916 ../rpmdrake_.c:950
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
 msgid "Ok"
 msgstr "ČŽŔÎ"
 
-#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:180
-#: ../edit-urpm-sources.pl_.c:187 ../edit-urpm-sources.pl_.c:220
-#: ../rpmdrake.pm_.c:319 ../rpmdrake.pm_.c:352 ../rpmdrake_.c:353
-#: ../rpmdrake_.c:950
-msgid "Cancel"
-msgstr "ĂëźŇ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "[%s] ¸ĹĂź¸Ś [%s]ŔĺÄĄżĄ łÖžî ÁÖźźżä."
 
-#: ../edit-urpm-sources.pl_.c:140
-msgid "Please wait, adding medium..."
-msgstr "ąâ´ŮˇÁ ÁÖźźżä. ¸ĹĂź Ăß°Ą Áß..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr "¸ĹĂź ąłČŻ"
 
-#: ../edit-urpm-sources.pl_.c:158
-msgid "Please wait, removing medium..."
-msgstr "ąâ´ŮˇÁ ÁÖźźżä. ¸ĹĂź ÁŚ°Ĺ Áß..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
+msgstr "źŇ˝ş ĆŃĹ°Áö¸Ś °ĄÁŽżĂ źö žř˝Ŕ´Ď´Ů."
 
-#: ../edit-urpm-sources.pl_.c:169
-msgid "Edit a source"
-msgstr "źŇ˝ş ĆíÁý"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages."
+msgstr "źŇ˝ş ĆŃĹ°Áö¸Ś °ĄÁŽżĂ źö žř˝Ŕ´Ď´Ů."
 
-#: ../edit-urpm-sources.pl_.c:173
+#: ../rpmdrake:1
 #, c-format
-msgid "Editing source \"%s\":"
-msgstr "źŇ˝ş [%s] ĆíÁý:"
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr "żäĂťÇŃ ÇÁˇÎą×ˇĽŔĚ Á¸ŔçÇĎÁö žĘ˝Ŕ´Ď´Ů(grpmi). źłÄĄ¸Ś ČŽŔÎÇĎźźżä."
 
-#: ../edit-urpm-sources.pl_.c:179
-msgid "Save changes"
-msgstr "şŻ°ćťçÇ× ŔúŔĺ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
+msgstr "ÇÁˇÎą×ˇĽ Á¸ŔçÇĎÁö žĘŔ˝"
 
-#: ../edit-urpm-sources.pl_.c:185
-msgid "You need to insert the medium to continue"
-msgstr "°ÔźÓÇϡÁ¸é ¸ĹĂź¸Ś ťđŔÔÇŘžß ÇŐ´Ď´Ů."
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
+msgstr "Áśťç..."
 
-#: ../edit-urpm-sources.pl_.c:186
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "şŻ°ćťçÇ×Ŕť ŔúŔĺÇϡÁ¸é, ¸ĹĂź¸Ś ľĺśóŔ̺꿥 ťđŔÔÇŘžß ÇŐ´Ď´Ů."
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation finished"
+msgstr "źłÄĄ żĎˇá"
 
-#: ../edit-urpm-sources.pl_.c:191
-msgid "Please wait, updating medium..."
-msgstr "ąâ´ŮˇÁ ÁÖźźżä. ¸ĹĂź ž÷ľĽŔĚĆŽ Áß..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
+msgstr "ą×łÉ ľŇ"
 
-#: ../edit-urpm-sources.pl_.c:202
-msgid "Configure proxies"
-msgstr "ÇÁśô˝Ă źłÁ¤"
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
+msgstr ".%sŔť(¸Ś) ÁÖ ĆÄŔϡΠťçżë"
 
-#: ../edit-urpm-sources.pl_.c:207
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
-msgstr ""
-"ÇÁśô˝Ă°Ą ÇĘżäÇϴٸé, ÇÁśô˝Ă ČŁ˝şĆŽ¸í°ú Ć÷ĆŽ(żÉźÇ)¸Ś ŔÔˇÂÇĎźźżä.(šŽšý: <ČŁ˝şĆŽ"
-"¸í[:Ć÷ĆŽ]>):"
+#: ../rpmdrake:1
+#, c-format
+msgid "Remove .%s"
+msgstr ".%s ÁŚ°Ĺ"
 
-#: ../edit-urpm-sources.pl_.c:209
-msgid "Proxy hostname:"
-msgstr "ÇÁśô˝Ă ČŁ˝şĆŽ¸í:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "changes:"
+msgstr "şŻ°ćťçÇ× ŔúŔĺ"
 
-#: ../edit-urpm-sources.pl_.c:211
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "ÇÁśô˝Ă ŔÎÁőŔĚ ŔÖ´Ů¸é ťçżëŔÚ¸í°ú žĎČŁ¸Ś ŔÔˇÂÇŇ źö ŔÖ˝Ŕ´Ď´Ů:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr "%s ÁśťçÁß"
 
-#: ../edit-urpm-sources.pl_.c:213
-msgid "User:"
-msgstr "ťçżëŔÚ:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, finding available packages..."
+msgstr "ąâ´ŮˇÁ ÁÖźźżä. ŔŻČżÇŃ ĆŃĹ°Áö °Ëťö Áß..."
 
-#: ../edit-urpm-sources.pl_.c:235
-msgid "Configure sources"
-msgstr "źŇ˝ş źłÁ¤"
+#: ../rpmdrake:1
+#, c-format
+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 ""
+"[urpmi]ˇÎ ž÷ľĽŔĚĆŽ ¸ĹĂź¸Ś Ăß°ĄÇĎ´Â ľľÁßżĄ żŔˇů°Ą ŔÖžú˝Ŕ´Ď´Ů.\n"
+"\n"
+"Ŕ߸řľČ śÇ´Â ŔĎ˝ĂŔűŔ¸ˇÎ ŔŻČżÇĎÁö žĘŔş šĚˇŻŔĚ°ĹłŞ,\n"
+"¸ÇľĺˇšŔĚĹŠ ¸Ž´Ş˝ş °ř˝Ä ž÷ľĽŔĚĆŽ°Ą žĆÁ÷ śÇ´Â ´ő ŔĚťó ÁöżřÇĎÁö žĘ´Â\n"
+"¸ÇľĺˇšŔĚĹŠ ¸Ž´Ş˝ş šöŔü(%s)ŔÔ´Ď´Ů.\n"
+"\n"
+"´Ů¸Ľ šĚˇŻ¸Ś ťçżëÇŘ ş¸˝Ă°Ú˝Ŕ´Ďąî?"
 
-#: ../edit-urpm-sources.pl_.c:242
-msgid "Enabled?"
-msgstr "ťçżë°Ą?"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
+msgstr "ž÷ľĽŔĚĆŽ ¸ĹĂź Ăß°Ą Áß żŔˇů"
 
-#: ../edit-urpm-sources.pl_.c:243
-msgid "Source"
-msgstr "źŇ˝ş"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
+msgstr "ąâ´ŮˇÁ ÁÖźźżä. ž÷ľĽŔĚĆŽ ĆŃĹ°Áö¸Ś ĂĘąâČ­ÇĎąâ Ŕ§ÇŘ šĚˇŻżĄ Á˘źÓ Áß..."
 
-#: ../edit-urpm-sources.pl_.c:264 ../rpmdrake_.c:730
-msgid "Remove"
-msgstr "ÁŚ°Ĺ"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Sources Manager, and then add a `Security\n"
+"updates' source.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"źöľżŔ¸ˇÎ żřÇĎ´Â šĚˇŻ¸Ś źąĹĂÇŇ źö ŔÖ˝Ŕ´Ď´Ů: ą×ˇŻąâ Ŕ§ÇŘź­´Â,\n"
+"źŇÇÁĆŽżţžî źŇ˝ş °ü¸ŽŔÚ¸Ś ˝ÇÇŕÇŃ ČÄ, [ş¸žČ ž÷ľĽŔĚĆŽ] źŇ˝ş¸Ś\n"
+"Ăß°ĄÇĎźźżä.\n"
+"\n"
+"ą×ˇą ČÄ, ¸ÇľĺˇšŔĚĹŠ ž÷ľĽŔĚĆŽ¸Ś ´Ů˝Ă ˝ÇÇŕÇĎźźżä."
 
-#: ../edit-urpm-sources.pl_.c:266
-msgid "Edit"
-msgstr "ĆíÁý"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "źöľżŔ¸ˇÎ šĚˇŻ¸Ś źąĹĂÇĎ´Â šćšý"
 
-#: ../edit-urpm-sources.pl_.c:268
-msgid "Add..."
-msgstr "Ăß°Ą..."
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
+msgstr "ĆŃĹ°Áö Á¤ş¸ ž÷ľĽŔĚĆŽ ľľÁßżĄ şšą¸ şŇ°Ą´ÉÇŃ żŔˇů°Ą ŔÖžú˝Ŕ´Ď´Ů."
 
-#: ../edit-urpm-sources.pl_.c:270
-msgid "Update..."
-msgstr "ž÷ľĽŔĚĆŽ..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
+msgstr "¸ĹĂź ž÷ľĽŔĚĆŽ Áß żŔˇů"
 
-#: ../edit-urpm-sources.pl_.c:271
-msgid "Proxy..."
-msgstr "ÇÁśô˝Ă..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
+msgstr "ąâ´ŮˇÁ ÁÖźźżä. ĆŃĹ°Áö Á¤ş¸¸Ś ž÷ľĽŔĚĆŽÇĎąâ Ŕ§ÇŘ šĚˇŻżĄ Á˘źÓ Áß..."
 
-#: ../edit-urpm-sources.pl_.c:274
-msgid "Save and quit"
-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"
+"°čźÓÇŇąîżä?"
 
-#: ../edit-urpm-sources.pl_.c:275 ../rpmdrake_.c:733
-msgid "Quit"
-msgstr "Ážˇá"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Installation"
+msgstr "źŇÇÁĆŽżţžî ĆŃĹ°Áö źłÄĄ"
 
-#: ../rpmdrake.pm_.c:93
-msgid "Yes"
-msgstr "żš"
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, c-format
+msgid "Mandrake Update"
+msgstr "¸ÇľĺˇšŔĚĹŠ ž÷ľĽŔĚĆŽ"
 
-#: ../rpmdrake.pm_.c:95
-msgid "No"
-msgstr "žĆ´ĎżŔ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
+msgstr "źŇÇÁĆŽżţžî ĆŃĹ°Áö ÁŚ°Ĺ"
 
-#: ../rpmdrake.pm_.c:127
-msgid "Info..."
-msgstr "Á¤ş¸..."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Ážˇá"
 
-#: ../rpmdrake.pm_.c:180
-msgid "Austria"
-msgstr "żŔ˝şĆŽ¸ŽžĆ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "źłÄĄ"
 
-#: ../rpmdrake.pm_.c:181
-msgid "Australia"
-msgstr "żŔ˝şĆŽˇšŔϸŽžĆ"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "ÁŚ°Ĺ"
 
-#: ../rpmdrake.pm_.c:182
-msgid "Belgium"
-msgstr "ş§ąâżĄ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search"
+msgstr "°Ëťö"
 
-#: ../rpmdrake.pm_.c:183
-msgid "Brazil"
-msgstr "şęśóÁú"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "ĂŁąâ"
 
-#: ../rpmdrake.pm_.c:184
-msgid "Canada"
-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"
+"°čźÓÇŇąîżä?"
 
-#: ../rpmdrake.pm_.c:185
-msgid "Costa Rica"
-msgstr "ÄÚ˝şĹ¸¸ŽÄŤ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "ŔϺΠĆŃĹ°Áö´Â ÁŚ°ĹľÇžîžß ÇŐ´Ď´Ů."
 
-#: ../rpmdrake.pm_.c:186
-msgid "Czech Republic"
-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"
+"\n"
+"Á¤¸ťˇÎ źąĹĂľČ ¸đľç ĆŃĹ°Áö¸Ś źłÄĄÇϽðڽŔ´Ďąî?"
 
-#: ../rpmdrake.pm_.c:187
-msgid "Germany"
-msgstr "ľśŔĎ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Too many packages are selected"
+msgstr "łĘšŤ ¸šŔş ĆŃĹ°Áö¸Ś źąĹĂÇĎż´˝Ŕ´Ď´Ů."
 
-#: ../rpmdrake.pm_.c:188
-msgid "Danmark"
-msgstr "ľ§¸śĹŠ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
+msgstr "ĂÖ´ë Á¤ş¸"
 
-#: ../rpmdrake.pm_.c:189 ../rpmdrake.pm_.c:193
-msgid "Greece"
-msgstr "ą×¸Ž˝ş"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal information"
+msgstr "ŔĎšÝ Á¤ş¸"
 
-#: ../rpmdrake.pm_.c:190
-msgid "Spain"
-msgstr "˝şĆäŔÎ"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update source(s)"
+msgstr "źŇ˝ş ž÷ľĽŔĚĆŽ"
 
-#: ../rpmdrake.pm_.c:191
-msgid "Finland"
-msgstr "ÇÉśőľĺ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reload the packages list"
+msgstr "ĆŃĹ°Áö ¸ńˇĎ ´Ů˝Ă ŔĐąâ"
 
-#: ../rpmdrake.pm_.c:192
-msgid "France"
-msgstr "ÇÁśű˝ş"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
+msgstr "źąĹĂ ŔçźłÁ¤"
 
-#: ../rpmdrake.pm_.c:194
-msgid "Israel"
-msgstr "ŔĚ˝şśóż¤"
+#: ../rpmdrake:1
+#, c-format
+msgid "in files"
+msgstr "ĆÄŔĎş°"
 
-#: ../rpmdrake.pm_.c:195
-msgid "Italy"
-msgstr "ŔĚŸŽ"
+#: ../rpmdrake:1
+#, c-format
+msgid "in descriptions"
+msgstr "źł¸íş°"
 
-#: ../rpmdrake.pm_.c:196
-msgid "Japan"
-msgstr "ŔĎşť"
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
+msgstr "Ŕ̸§ş°"
 
-#: ../rpmdrake.pm_.c:197
-msgid "Korea"
-msgstr "´ëÇњιš"
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
+msgstr "ž÷ľĽŔĚĆŽ °Ą´Éźşş°"
 
-#: ../rpmdrake.pm_.c:198
-msgid "Netherlands"
-msgstr "ł×´úśőľĺ"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
+msgstr "źŇ˝ş ľîˇĎş°"
 
-#: ../rpmdrake.pm_.c:199
-msgid "Norway"
-msgstr "łë¸ŁżţŔĚ"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
+msgstr "źąĹĂ ťóĹÂş°"
 
-#: ../rpmdrake.pm_.c:200
-msgid "Poland"
-msgstr "Ćúśőľĺ"
+#: ../rpmdrake:1
+#, c-format
+msgid "by size"
+msgstr "ĹŠąâş°"
 
-#: ../rpmdrake.pm_.c:201
-msgid "Portugal"
-msgstr "Ć÷¸ŁĹő°Ľ"
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
+msgstr "ą×ˇěş°"
 
-#: ../rpmdrake.pm_.c:202
-msgid "Russia"
-msgstr "ˇŻ˝ĂžĆ"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages,"
+msgstr "¸đľç ĆŃĹ°Áö"
 
-#: ../rpmdrake.pm_.c:203
-msgid "Sweden"
-msgstr "˝şżţľ§"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
+msgstr "¸đľç ĆŃĹ°Áö, °ĄłŞ´Ůźř"
 
-#: ../rpmdrake.pm_.c:204
-msgid "Taiwan"
-msgstr "´ë¸¸"
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
+msgstr "¸ÇľĺˇšŔĚĹŠ źąĹĂ"
 
-#: ../rpmdrake.pm_.c:205
-msgid "United Kingdom"
-msgstr "żľąš"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal updates"
+msgstr "ŔĎšÝ ž÷ľĽŔĚĆŽ"
 
-#: ../rpmdrake.pm_.c:206
-msgid "China"
-msgstr "Áßąš"
+#: ../rpmdrake:1
+#, c-format
+msgid "Bugfixes updates"
+msgstr "šöą×źöÁ¤ ž÷ľĽŔĚĆŽ"
 
-#: ../rpmdrake.pm_.c:207 ../rpmdrake.pm_.c:208 ../rpmdrake.pm_.c:209
-#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:261
-msgid "United States"
-msgstr "šĚąš"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
+msgstr "ş¸žČ ž÷ľĽŔĚĆŽ"
 
-#: ../rpmdrake.pm_.c:274
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
-"ąâ´ŮˇÁ ÁÖźźżä. ¸ÇľĺˇšŔĚĹŠźŇÇÁĆŽ ŔĽťçŔĚĆŽżĄź­ šĚˇŻ ¸ńˇĎŔť łťˇÁšŢ°í ŔÖ˝Ŕ´Ď´Ů."
+#: ../rpmdrake:1
+#, c-format
+msgid "Description: "
+msgstr "źł¸í:"
 
-#: ../rpmdrake.pm_.c:280
-msgid "Error during download"
-msgstr "łťˇÁšŢąâ Áß żŔˇů"
+#: ../rpmdrake:1
+#, c-format
+msgid "Summary: "
+msgstr "żäžŕ źł¸í: "
 
-#: ../rpmdrake.pm_.c:289
-msgid "No mirror"
-msgstr "šĚˇŻ žřŔ˝"
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "Áßżäľľ: "
 
-#: ../rpmdrake.pm_.c:307
-msgid "Please choose the desired mirror."
-msgstr "Čń¸ÁÇĎ´Â šĚˇŻ¸Ś źąĹĂÇĎźźżä."
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake.pm_.c:339 ../rpmdrake_.c:627
-msgid "Update source(s)"
-msgstr "źŇ˝ş ž÷ľĽŔĚĆŽ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Size: "
+msgstr "ĹŠąâ: "
 
-#: ../rpmdrake.pm_.c:343
-msgid "Select the source(s) you wish to update:"
-msgstr "ž÷ľĽŔĚĆŽÇϡÁ´Â źŇ˝şŔť źąĹĂÇŘ ÁÖźźżä:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Version: "
+msgstr "šöŔü: "
 
-#: ../rpmdrake.pm_.c:347
-msgid "Update"
-msgstr "ž÷ľĽŔĚĆŽ šöŔü"
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "Ŕ̸§: "
 
-#: ../rpmdrake.pm_.c:358
-msgid "Please wait, updating media..."
-msgstr "ąâ´ŮˇÁ ÁÖźźżä. ¸ĹĂź ž÷ľĽŔĚĆŽ Áß..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "ž÷ľĽŔĚĆŽ ŔĚŔŻ:"
 
-#: ../rpmdrake_.c:99
-msgid "Other"
-msgstr "ąâŸ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
+msgstr "źłÄĄľČ šöŔü:"
 
-#: ../rpmdrake_.c:121 ../rpmdrake_.c:135 ../rpmdrake_.c:227 ../rpmdrake_.c:298
-msgid "(none)"
-msgstr "(žřŔ˝)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Source: "
+msgstr "źŇ˝ş: "
 
-#: ../rpmdrake_.c:141 ../rpmdrake_.c:482 ../rpmdrake_.c:483
+#: ../rpmdrake:1
+#, c-format
 msgid "(Not available)"
 msgstr "(ŔŻČżÇĎÁö žĘŔ˝)"
 
-#: ../rpmdrake_.c:151 ../rpmdrake_.c:208
-msgid "Search results"
-msgstr "°Ëťö °á°ú"
-
-#: ../rpmdrake_.c:151
-msgid "Search results (none)"
-msgstr "°Ëťö °á°ú(žřŔ˝)"
-
-#: ../rpmdrake_.c:161 ../rpmdrake_.c:172
-msgid "Please wait, searching..."
-msgstr "ąâ´ŮˇÁ ÁÖźźżä. °Ëťö Áß..."
-
-#: ../rpmdrake_.c:175
-msgid "Stop"
-msgstr "ÁßÁö"
-
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-msgid "Addable"
-msgstr "Ăß°Ą °Ą´É"
-
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-msgid "Upgradable"
-msgstr "ž÷ą×ˇšŔĚľĺ °Ą´É"
-
-#: ../rpmdrake_.c:211
-msgid "Not selected"
-msgstr "źąĹĂ žČľĘ"
-
-#: ../rpmdrake_.c:211
-msgid "Selected"
-msgstr "źąĹĂľĘ"
-
-#: ../rpmdrake_.c:240
-msgid "rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake_.c:258 ../rpmdrake_.c:360 ../rpmdrake_.c:362
-msgid "More information on package..."
-msgstr "Ăß°Ą ĆŃĹ°Áö Á¤ş¸..."
-
-#: ../rpmdrake_.c:259
-msgid "One of the following packages is needed:"
-msgstr "´ŮŔ˝ ĆŃĹ°Áöľé Áß ÇĎłŞ°Ą ÇĘżäÇŐ´Ď´Ů:"
-
-#: ../rpmdrake_.c:259
-msgid "Please choose"
-msgstr "źąĹĂÇĎźźżä"
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
+msgstr "şŻ°ćťçÇ×:\n"
 
-#: ../rpmdrake_.c:275
-msgid "unknown package "
-msgstr "žË źö žř´Â ĆŃĹ°Áö"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Files:\n"
+msgstr "%sĆÄŔĎľé:\n"
 
-#: ../rpmdrake_.c:285
-msgid "Please wait, listing packages..."
-msgstr "ąâ´ŮˇÁ ÁÖźźżä. ĆŃĹ°Áö ¸ńˇĎ Á¤ˇÄ Áß..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected size: %d MB"
+msgstr "źąĹĂľČ ĹŠąâ: %d MB"
 
-#: ../rpmdrake_.c:300
-msgid "No update"
-msgstr "ž÷ľĽŔĚĆŽ žřŔ˝"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "źąĹĂľČ żëˇŽ: %d MB / żŠŔŻ °ř°Ł: %d MB"
 
-#: ../rpmdrake_.c:353 ../rpmdrake_.c:354
-msgid "More infos"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
 msgstr ""
+"ŔÇÁ¸źş šŽÁŚˇÎ ŔÎÇĎżŠ, ´ŮŔ˝ ĆŃĹ°ÁöľéŔş\n"
+"ÁöąÝ źąĹĂ ÇŘÁŚľÇžîžß ÇŐ´Ď´Ů:\n"
+"\n"
 
-#: ../rpmdrake_.c:355
-#, fuzzy
-msgid "Information on packages"
-msgstr "Ăß°Ą ĆŃĹ°Áö Á¤ş¸..."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+msgstr ""
+"´ŮŔ˝ ĆŃĹ°ÁöľéŔş źąĹĂľÉ źö žř˝Ŕ´Ď´Ů:\n"
+"\n"
 
-#: ../rpmdrake_.c:376
-msgid "Some additional packages need to be removed"
-msgstr "ŔϺΠĆŃĹ°Áö°Ą ´ő ÁŚ°Ĺ ľÇžîžß ÇŐ´Ď´Ů."
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "ŔϺΠĆŃĹ°Áö´Â źłÄĄľÉ źö žř˝Ŕ´Ď´Ů."
 
-#: ../rpmdrake_.c:377
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
 "\n"
 msgstr ""
-"ŔÇÁ¸źş šŽÁŚˇÎ ŔÎÇĎżŠ,\n"
-"´ŮŔ˝ ĆŃĹ°Áöľéľľ ÁŚ°Ĺ ľÇžîžß ÇŐ´Ď´Ů:\n"
+"ŔÇÁ¸źş šŽÁŚˇÎ ŔÎÇĎżŠ, ´ŮŔ˝ ĆŃĹ°Áöľéľľ\n"
+"źłÄĄľÇžîžß ÇŐ´Ď´Ů.\n"
 "\n"
 
-#: ../rpmdrake_.c:383 ../rpmdrake_.c:391
+#: ../rpmdrake:1
+#, c-format
+msgid "Additional packages needed"
+msgstr "Ăß°Ą ĆŃĹ°Áö°Ą ÇĘżäÇŐ´Ď´Ů."
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "ŔϺΠĆŃĹ°Áö´Â ÁŚ°ĹľÉ źö žř˝Ŕ´Ď´Ů."
 
-#: ../rpmdrake_.c:384
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake_.c:392 ../rpmdrake_.c:451
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
 "\n"
 msgstr ""
-"ŔÇÁ¸źş šŽÁŚˇÎ ŔÎÇĎżŠ, ´ŮŔ˝ ĆŃĹ°ÁöľéŔş\n"
-"ÁöąÝ źąĹĂ ÇŘÁŚľÇžîžß ÇŐ´Ď´Ů:\n"
+"ŔÇÁ¸źş šŽÁŚˇÎ ŔÎÇĎżŠ,\n"
+"´ŮŔ˝ ĆŃĹ°Áöľéľľ ÁŚ°Ĺ ľÇžîžß ÇŐ´Ď´Ů:\n"
 "\n"
 
-#: ../rpmdrake_.c:421
-msgid "Additional packages needed"
-msgstr "Ăß°Ą ĆŃĹ°Áö°Ą ÇĘżäÇŐ´Ď´Ů."
+#: ../rpmdrake:1
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr "ŔϺΠĆŃĹ°Áö°Ą ´ő ÁŚ°Ĺ ľÇžîžß ÇŐ´Ď´Ů."
 
-#: ../rpmdrake_.c:422
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
+msgstr "Ăß°Ą ĆŃĹ°Áö Á¤ş¸..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Information on packages"
+msgstr "Ăß°Ą ĆŃĹ°Áö Á¤ş¸..."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
 msgstr ""
-"ŔÇÁ¸źş šŽÁŚˇÎ ŔÎÇĎżŠ, ´ŮŔ˝ ĆŃĹ°Áöľéľľ\n"
-"źłÄĄľÇžîžß ÇŐ´Ď´Ů.\n"
-"\n"
 
-#: ../rpmdrake_.c:435
-msgid "Some packages can't be installed"
-msgstr "ŔϺΠĆŃĹ°Áö´Â źłÄĄľÉ źö žř˝Ŕ´Ď´Ů."
+#: ../rpmdrake:1
+#, c-format
+msgid "Addable"
+msgstr "Ăß°Ą °Ą´É"
 
-#: ../rpmdrake_.c:436
+#: ../rpmdrake:1
+#, c-format
+msgid "Upgradable"
+msgstr "ž÷ą×ˇšŔĚľĺ °Ą´É"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
+"The list of updates is void. This means that either there is\n"
+"no available update for the packages installed on your computer,\n"
+"or you already installed all of them."
 msgstr ""
-"´ŮŔ˝ ĆŃĹ°ÁöľéŔş źąĹĂľÉ źö žř˝Ŕ´Ď´Ů:\n"
-"\n"
+"ž÷ľĽŔĚĆŽ ¸ńˇĎŔĚ şńžú˝Ŕ´Ď´Ů. ˝Ă˝şĹŰ ťóżĄ źłÄĄľČ\n"
+"ĆŃĹ°ÁöżĄ ´ëÇŃ ž÷ľĽŔĚĆŽ°Ą žř°ĹłŞ,\n"
+"ŔĚšĚ ´Ů źłÄĄľČ °ćżěŔÔ´Ď´Ů."
 
-#: ../rpmdrake_.c:450 ../rpmdrake_.c:684
-msgid "Some packages need to be removed"
-msgstr "ŔϺΠĆŃĹ°Áö´Â ÁŚ°ĹľÇžîžß ÇŐ´Ď´Ů."
+#: ../rpmdrake:1
+#, c-format
+msgid "No update"
+msgstr "ž÷ľĽŔĚĆŽ žřŔ˝"
 
-#: ../rpmdrake_.c:472
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "źąĹĂľČ żëˇŽ: %d MB / żŠŔŻ °ř°Ł: %d MB"
+msgid "(none)"
+msgstr "(žřŔ˝)"
 
-#: ../rpmdrake_.c:474
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "źąĹĂľČ ĹŠąâ: %d MB"
+msgid "Please wait, listing packages..."
+msgstr "ąâ´ŮˇÁ ÁÖźźżä. ĆŃĹ°Áö ¸ńˇĎ Á¤ˇÄ Áß..."
 
-#: ../rpmdrake_.c:482
-msgid "Files:\n"
-msgstr "%sĆÄŔĎľé:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "unknown package "
+msgstr "žË źö žř´Â ĆŃĹ°Áö"
 
-#: ../rpmdrake_.c:483
-msgid "Changelog:\n"
-msgstr "şŻ°ćťçÇ×:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "´ŮŔ˝ ĆŃĹ°Áöľé Áß ÇĎłŞ°Ą ÇĘżäÇŐ´Ď´Ů:"
 
-#: ../rpmdrake_.c:486
-msgid "Source: "
-msgstr "źŇ˝ş: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please choose"
+msgstr "źąĹĂÇĎźźżä"
 
-#: ../rpmdrake_.c:487
-msgid "Currently installed version: "
-msgstr "źłÄĄľČ šöŔü:"
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:491
-msgid "Reason for update: "
-msgstr "ž÷ľĽŔĚĆŽ ŔĚŔŻ:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Not selected"
+msgstr "źąĹĂ žČľĘ"
 
-#: ../rpmdrake_.c:493
-msgid "Name: "
-msgstr "Ŕ̸§: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected"
+msgstr "źąĹĂľĘ"
 
-#: ../rpmdrake_.c:494
-msgid "Version: "
-msgstr "šöŔü: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results"
+msgstr "°Ëťö °á°ú"
 
-#: ../rpmdrake_.c:495
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Stop"
+msgstr "ÁßÁö"
 
-#: ../rpmdrake_.c:495
-msgid "Size: "
-msgstr "ĹŠąâ: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, searching..."
+msgstr "ąâ´ŮˇÁ ÁÖźźżä. °Ëťö Áß..."
 
-#: ../rpmdrake_.c:497
-msgid "Importance: "
-msgstr "Áßżäľľ: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
+msgstr "°Ëťö °á°ú(žřŔ˝)"
 
-#: ../rpmdrake_.c:498
-msgid "Summary: "
-msgstr "żäžŕ źł¸í: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "ąâŸ"
 
-#: ../rpmdrake_.c:499
-msgid "Description: "
-msgstr "źł¸í:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"Welcome to the packages source editor!\n"
+"\n"
+"This tool will help you configure the packages sources you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"ĆŃĹ°Áö źŇ˝ş ĆíÁýąâżĄ Ŕß żŔźĚ˝Ŕ´Ď´Ů!\n"
+"\n"
+"ŔĚ ľľą¸´Â ŔĚ ÄÄÇťĹÍ ťóżĄź­ ťçżëÇŇ ĆŃĹ°Áö źŇ˝ş źłÁ¤Ŕť ľľżÍ ÁÝ´Ď´Ů.\n"
+"źłÁ¤ľČ źŇ˝ş´Â ťő źŇÇÁĆŽżţžî ĆŃĹ°Áö¸Ś źłÄĄÇĎ°ĹłŞ ž÷ľĽŔĚĆŽÇŇ ś§\n"
+"ťçżëľË´Ď´Ů."
 
-#: ../rpmdrake_.c:548
-msgid "Bugfixes updates"
-msgstr "šöą×źöÁ¤ ž÷ľĽŔĚĆŽ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "ŔúŔĺ ČÄ Ážˇá"
 
-#: ../rpmdrake_.c:548
-msgid "Normal updates"
-msgstr "ŔĎšÝ ž÷ľĽŔĚĆŽ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy..."
+msgstr "ÇÁśô˝Ă..."
 
-#: ../rpmdrake_.c:567
-msgid "Mandrake choices"
-msgstr "¸ÇľĺˇšŔĚĹŠ źąĹĂ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
+msgstr "ž÷ľĽŔĚĆŽ..."
 
-#: ../rpmdrake_.c:568
-msgid "All packages, alphabetical"
-msgstr "¸đľç ĆŃĹ°Áö, °ĄłŞ´Ůźř"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "Ăß°Ą..."
 
-#: ../rpmdrake_.c:569
-msgid "All packages,"
-msgstr "¸đľç ĆŃĹ°Áö"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "ĆíÁý"
 
-#: ../rpmdrake_.c:592
-msgid "by group"
-msgstr "ą×ˇěş°"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Source"
+msgstr "źŇ˝ş"
 
-#: ../rpmdrake_.c:592
-msgid "by size"
-msgstr "ĹŠąâş°"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
+msgstr "ťçżë°Ą?"
 
-#: ../rpmdrake_.c:593
-msgid "by selection state"
-msgstr "źąĹĂ ťóĹÂş°"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure sources"
+msgstr "źŇ˝ş źłÁ¤"
 
-#: ../rpmdrake_.c:594
-msgid "by source repository"
-msgstr "źŇ˝ş ľîˇĎş°"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "žĎČŁ:"
 
-#: ../rpmdrake_.c:594
-msgid "by update availability"
-msgstr "ž÷ľĽŔĚĆŽ °Ą´Éźşş°"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
+msgstr "ťçżëŔÚ:"
 
-#: ../rpmdrake_.c:615
-msgid "in descriptions"
-msgstr "źł¸íş°"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "ÇÁśô˝Ă ŔÎÁőŔĚ ŔÖ´Ů¸é ťçżëŔÚ¸í°ú žĎČŁ¸Ś ŔÔˇÂÇŇ źö ŔÖ˝Ŕ´Ď´Ů:"
 
-#: ../rpmdrake_.c:615
-msgid "in files"
-msgstr "ĆÄŔĎş°"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "ÇÁśô˝Ă ČŁ˝şĆŽ¸í:"
 
-#: ../rpmdrake_.c:615
-msgid "in names"
-msgstr "Ŕ̸§ş°"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"ÇÁśô˝Ă°Ą ÇĘżäÇϴٸé, ÇÁśô˝Ă ČŁ˝şĆŽ¸í°ú Ć÷ĆŽ(żÉźÇ)¸Ś ŔÔˇÂÇĎźźżä.(šŽšý: <ČŁ˝şĆŽ"
+"¸í[:Ć÷ĆŽ]>):"
 
-#: ../rpmdrake_.c:626
-msgid "Reload the packages list"
-msgstr "ĆŃĹ°Áö ¸ńˇĎ ´Ů˝Ă ŔĐąâ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "ÇÁśô˝Ă źłÁ¤"
 
-#: ../rpmdrake_.c:626
-msgid "Reset the selection"
-msgstr "źąĹĂ ŔçźłÁ¤"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr "ąâ´ŮˇÁ ÁÖźźżä. ¸ĹĂź ž÷ľĽŔĚĆŽ Áß..."
 
-#: ../rpmdrake_.c:652
-msgid "Maximum information"
-msgstr "ĂÖ´ë Á¤ş¸"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "şŻ°ćťçÇ×Ŕť ŔúŔĺÇϡÁ¸é, ¸ĹĂź¸Ś ľĺśóŔ̺꿥 ťđŔÔÇŘžß ÇŐ´Ď´Ů."
 
-#: ../rpmdrake_.c:652
-msgid "Normal information"
-msgstr "ŔĎšÝ Á¤ş¸"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
+msgstr "°ÔźÓÇϡÁ¸é ¸ĹĂź¸Ś ťđŔÔÇŘžß ÇŐ´Ď´Ů."
 
-#: ../rpmdrake_.c:674
-msgid "Too many packages are selected"
-msgstr "łĘšŤ ¸šŔş ĆŃĹ°Áö¸Ś źąĹĂÇĎż´˝Ŕ´Ď´Ů."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save changes"
+msgstr "şŻ°ćťçÇ× ŔúŔĺ"
 
-#: ../rpmdrake_.c:720
-msgid "Find:"
-msgstr "ĂŁąâ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "ÇŐźş/¸ńˇĎ ĆÄŔϡÎŔÇ ťó´ë °ćˇÎ:"
 
-#: ../rpmdrake_.c:725
-msgid "Search"
-msgstr "°Ëťö"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake_.c:731
-msgid "Install"
-msgstr "źłÄĄ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Editing source \"%s\":"
+msgstr "źŇ˝ş [%s] ĆíÁý:"
 
-#: ../rpmdrake_.c:738 data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrake Update"
-msgstr "¸ÇľĺˇšŔĚĹŠ ž÷ľĽŔĚĆŽ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit a source"
+msgstr "źŇ˝ş ĆíÁý"
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Installation"
-msgstr "źŇÇÁĆŽżţžî ĆŃĹ°Áö źłÄĄ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr "ąâ´ŮˇÁ ÁÖźźżä. ¸ĹĂź ÁŚ°Ĺ Áß..."
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Removal"
-msgstr "źŇÇÁĆŽżţžî ĆŃĹ°Áö ÁŚ°Ĺ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, adding medium..."
+msgstr "ąâ´ŮˇÁ ÁÖźźżä. ¸ĹĂź Ăß°Ą Áß..."
 
-#: ../rpmdrake_.c:779
-msgid "Please wait, contacting mirror to update packages information."
-msgstr "ąâ´ŮˇÁ ÁÖźźżä. ĆŃĹ°Áö Á¤ş¸¸Ś ž÷ľĽŔĚĆŽÇĎąâ Ŕ§ÇŘ šĚˇŻżĄ Á˘źÓ Áß..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of source:"
+msgstr "źŇ˝ş ŔŻÇü:"
 
-#: ../rpmdrake_.c:781
-msgid "Error updating medium"
-msgstr "¸ĹĂź ž÷ľĽŔĚĆŽ Áß żŔˇů"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Adding a source:"
+msgstr "źŇ˝ş Ăß°Ą:"
 
-#: ../rpmdrake_.c:782
-msgid "There was an unrecoverable error while updating packages information."
-msgstr "ĆŃĹ°Áö Á¤ş¸ ž÷ľĽŔĚĆŽ ľľÁßżĄ şšą¸ şŇ°Ą´ÉÇŃ żŔˇů°Ą ŔÖžú˝Ŕ´Ď´Ů."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"ŔĚšĚ ľżŔĎÇŃ Ŕ̸§ŔÇ ¸ĹĂź°Ą ŔÖ˝Ŕ´Ď´Ů.\n"
+"ťőˇÎ šŮ˛Ů˝Ă°Ú˝Ŕ´Ďąî?"
 
-#: ../rpmdrake_.c:787
-msgid "How to choose manually your mirror"
-msgstr "źöľżŔ¸ˇÎ šĚˇŻ¸Ś źąĹĂÇĎ´Â šćšý"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to fill up at least the two first entries."
+msgstr "ĂÖźŇÇŃ ĂłŔ˝ ľÎ Ç׸ńżĄ´Â ąâŔÔÇŘžß ÇŐ´Ď´Ů."
 
-#: ../rpmdrake_.c:795
-msgid "Please wait, contacting mirror to initialize updates packages."
-msgstr "ąâ´ŮˇÁ ÁÖźźżä. ž÷ľĽŔĚĆŽ ĆŃĹ°Áö¸Ś ĂĘąâČ­ÇĎąâ Ŕ§ÇŘ šĚˇŻżĄ Á˘źÓ Áß..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "Ŕ̸§:"
 
-#: ../rpmdrake_.c:798
-msgid "Error adding update medium"
-msgstr "ž÷ľĽŔĚĆŽ ¸ĹĂź Ăß°Ą Áß żŔˇů"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
+msgstr "žĆŔĚľđ:"
 
-#: ../rpmdrake_.c:829
-msgid "Please wait, finding available packages..."
-msgstr "ąâ´ŮˇÁ ÁÖźźżä. ŔŻČżÇŃ ĆŃĹ°Áö °Ëťö Áß..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "šĚˇŻ źąĹĂ..."
 
-#: ../rpmdrake_.c:861
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "%s ÁśťçÁß"
+msgid "Browse..."
+msgstr "ĂŁžĆş¸ąâ..."
 
-#: ../rpmdrake_.c:880
-#, fuzzy
-msgid "changes:"
-msgstr "şŻ°ćťçÇ× ŔúŔĺ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "°ćˇÎ śÇ´Â ¸śżîĆŽ Ŕ§ÄĄ:"
 
-#: ../rpmdrake_.c:884
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove .%s"
-msgstr ".%s ÁŚ°Ĺ"
+msgid "Removable device"
+msgstr "ĹťÂř˝Ä ŔĺÄĄ"
 
-#: ../rpmdrake_.c:886
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr ".%sŔť(¸Ś) ÁÖ ĆÄŔϡΠťçżë"
+msgid "HTTP server"
+msgstr "HTTP ź­šö"
 
-#: ../rpmdrake_.c:888
-msgid "Do nothing"
-msgstr "ą×łÉ ľŇ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "FTP ź­šö"
 
-#: ../rpmdrake_.c:900
-msgid "Installation finished"
-msgstr "źłÄĄ żĎˇá"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path:"
+msgstr "°ćˇÎ:"
 
-#: ../rpmdrake_.c:910
-msgid "Inspect..."
-msgstr "Áśťç..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "ÁöżŞ ĆÄŔĎ"
 
-#: ../rpmdrake_.c:925
-msgid "Program missing"
-msgstr "ÇÁˇÎą×ˇĽ Á¸ŔçÇĎÁö žĘŔ˝"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a source"
+msgstr "źŇ˝ş Ăß°Ą:"
 
-#: ../rpmdrake_.c:926
-msgid "A required program is missing (grpmi). Check your installation."
-msgstr "żäĂťÇŃ ÇÁˇÎą×ˇĽŔĚ Á¸ŔçÇĎÁö žĘ˝Ŕ´Ď´Ů(grpmi). źłÄĄ¸Ś ČŽŔÎÇĎźźżä."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
+msgstr "¸ĹĂź¸Ś ž÷ľĽŔĚĆŽÇŇ źö žř˝Ŕ´Ď´Ů; ŔÚľżŔ¸ˇÎ ťçżëşŇ°ĄľÉ °ÍŔÔ´Ď´Ů."
 
-#: ../rpmdrake_.c:940
-msgid "Unable to get source packages."
-msgstr "źŇ˝ş ĆŃĹ°Áö¸Ś °ĄÁŽżĂ źö žř˝Ŕ´Ď´Ů."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "¸ĹĂź¸Ś ťýźşÇŇ źö žř˝Ŕ´Ď´Ů."
 
-#: ../rpmdrake_.c:941
-msgid "Unable to get source packages, sorry."
-msgstr "źŇ˝ş ĆŃĹ°Áö¸Ś °ĄÁŽżĂ źö žř˝Ŕ´Ď´Ů."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, updating media..."
+msgstr "ąâ´ŮˇÁ ÁÖźźżä. ¸ĹĂź ž÷ľĽŔĚĆŽ Áß..."
 
-#: ../rpmdrake_.c:948
-msgid "Change medium"
-msgstr "¸ĹĂź ąłČŻ"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
+msgstr "ž÷ľĽŔĚĆŽ šöŔü"
 
-#: ../rpmdrake_.c:949
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "[%s] ¸ĹĂź¸Ś [%s]ŔĺÄĄżĄ łÖžî ÁÖźźżä."
+msgid "Select the source(s) you wish to update:"
+msgstr "ž÷ľĽŔĚĆŽÇϡÁ´Â źŇ˝şŔť źąĹĂÇŘ ÁÖźźżä:"
 
-#: ../rpmdrake_.c:957
-msgid "Installation failed"
-msgstr "źłÄĄ ˝ÇĆĐ"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please choose the desired mirror."
+msgstr "Čń¸ÁÇĎ´Â šĚˇŻ¸Ś źąĹĂÇĎźźżä."
 
-#: ../rpmdrake_.c:958
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
-"źłÄĄ ˝ÇĆĐ. ŔϺΠĆÄŔĎŔĚ žř˝Ŕ´Ď´Ů.\n"
-"źŇ˝ş ľĽŔĚĹÍşŁŔĚ˝ş¸Ś ž÷ľĽŔĚĆŽÇŘ ş¸źźżä."
+"Ŕű´çÇŃ šĚˇŻ¸Ś ĂŁŔť źö žř˝Ŕ´Ď´Ů.\n"
+"\n"
+"ŔĚ šŽÁŚŔÇ żřŔÎŔş żŠˇŻ°ĄÁöŔĎ źö ŔÖ˝Ŕ´Ď´Ů; °ĄŔĺ ČçÇŃ żřŔÎŔş\n"
+"ŔĚ ÄÄÇťĹÍŔÇ ÇÁˇÎźźź­¸Ś ¸ÇľĺˇšŔĚĹŠ ¸Ž´Ş˝ş °ř˝Ä ž÷ľĽŔĚĆŽ°Ą\n"
+"ÁöżřÇĎÁö žĘ´Â °ćżěŔÔ´Ď´Ů."
 
-#: ../rpmdrake_.c:961
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr ""
-"ąâ´ŮˇÁ ÁÖźźżä. ´Ů¸Ľ ĆŃĹ°Áö¸Ś ž÷ą×ˇšŔĚľĺÇĎąâ Ŕ§ÇŘ ŔϺΠĆŃĹ°Áö¸Ś ÁŚ°Ĺ Áß..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
+msgstr "šĚˇŻ žřŔ˝"
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"There was an error downloading the mirrors list:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
-"źłÄĄ¸Ś żĎˇáÇĎż´˝Ŕ´Ď´Ů; %s.\n"
+"šĚˇŻ ¸ńˇĎŔť łťˇÁšŢ´Â ľľÁßżĄ żŔˇů°Ą ŔÖžú˝Ŕ´Ď´Ů:\n"
 "\n"
-"ŔϺΠźłÁ¤ ĆÄŔĎľéŔş '.rpmnew' śÇ´Â '.rpmsave'ˇÎ ťýźşľÇžú˝Ŕ´Ď´Ů.\n"
-"ÁśÄĄ¸Ś ĂëÇĎąâ Ŕ§ÇŘ ŔϺθŚ ÁśťçÇŘ şź źö ŔÖ˝Ŕ´Ď´Ů:"
+"%s\n"
+"ł×ĆŽż÷ śÇ´Â ¸ÇľĺˇšŔĚĹŠźŇÇÁĆŽ ŔĽťçŔĚĆŽ°Ą ÇöŔç ŔŻČżÇĎÁö žĘŔş ľí ÇŐ´Ď´Ů.\n"
+"łŞÁßżĄ ´Ů˝Ă ˝ĂľľÇŘ ş¸źźżä."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "łťˇÁšŢąâ Áß żŔˇů"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
+"ąâ´ŮˇÁ ÁÖźźżä. ¸ÇľĺˇšŔĚĹŠźŇÇÁĆŽ ŔĽťçŔĚĆŽżĄź­ šĚˇŻ ¸ńˇĎŔť łťˇÁšŢ°í ŔÖ˝Ŕ´Ď´Ů."
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"some packages failed to install\n"
-"correctly"
+"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"
+"\n"
+"°čźÓÇŇąîżä?"
 
-#: ../rpmdrake_.c:983
-msgid "everything was installed correctly"
-msgstr "¸đľÎ żĂšŮ¸Ł°Ô źłÄĄľÇžú˝Ŕ´Ď´Ů."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United States"
+msgstr "šĚąš"
 
-#: ../rpmdrake_.c:985
-msgid "Everything installed successfully"
-msgstr "¸đľç źłÄĄ¸Ś ¸śĂĆ˝Ŕ´Ď´Ů."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
+msgstr "Áßąš"
 
-#: ../rpmdrake_.c:986
-msgid "All requested packages were installed successfully."
-msgstr "żäĂťľČ ¸đľç ĆŃĹ°ÁöŔÇ źłÄĄ¸Ś ¸śĂĆ˝Ŕ´Ď´Ů."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr "żľąš"
 
-#: ../rpmdrake_.c:989
-msgid "Everything already installed."
-msgstr "ŔĚšĚ źłÄĄľÇžî ŔÖ˝Ŕ´Ď´Ů."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "´ë¸¸"
 
-#: ../rpmdrake_.c:990
-msgid "Everything already installed (is this supposed to happen at all?)."
-msgstr "ŔĚšĚ źłÄĄľÇžî ŔÖ˝Ŕ´Ď´Ů.(°úżŹ Ŕ̡ą ŔĎŔĚ ŔÖŔť źö ŔÖłŞżä?)"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "˝şżţľ§"
 
-#: ../rpmdrake_.c:997
-msgid "Problem during installation"
-msgstr ""
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
+msgstr "ˇŻ˝ĂžĆ"
 
-#: ../rpmdrake_.c:998
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
+msgid "Portugal"
+msgstr "Ć÷¸ŁĹő°Ľ"
 
-#: ../rpmdrake_.c:1012
-msgid "Please wait, reading packages database..."
-msgstr "ąâ´ŮˇÁ ÁÖźźżä. ĆŃĹ°Áö ľĽŔĚĹÍşŁŔĚ˝ş ŔĐ´Â Áß..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
+msgstr "Ćúśőľĺ"
 
-#: ../rpmdrake_.c:1053
-msgid "Please wait, removing packages..."
-msgstr "ąâ´ŮˇÁ ÁÖźźżä. ĆŃĹ°Áö ÁŚ°Ĺ Áß..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
+msgstr "łë¸ŁżţŔĚ"
 
-#: ../rpmdrake_.c:1056
-msgid "Problem during removal"
-msgstr ""
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
+msgstr "ł×´úśőľĺ"
 
-#: ../rpmdrake_.c:1057
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
+msgid "Korea"
+msgstr "´ëÇњιš"
 
-#: ../rpmdrake_.c:1089
-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 "Japan"
+msgstr "ŔĎşť"
 
-#: ../rpmdrake_.c:1094
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"¸ÇľĺˇšŔĚĹŠ ž÷ľĽŔĚĆŽżĄ Ŕß żŔźĚ˝Ŕ´Ď´Ů!\n"
-"\n"
-"ŔĚ ľľą¸´Â ÄÄÇťĹÍżĄ źłÄĄÇŇ ž÷ľĽŔĚĆŽľČ źŇÇÁĆŽżţžî¸Ś źąĹĂÇŇ źö ŔÖľľˇĎ\n"
-"ľľżÍ ÁÝ´Ď´Ů."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Italy"
+msgstr "ŔĚŸŽ"
 
-#: ../rpmdrake_.c:1099
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
-msgstr ""
-"źŇÇÁĆŽżţžî źłÄĄ ľľą¸ŔÔ´Ď´Ů!\n"
-"\n"
-"¸ÇľĺˇšŔĚĹŠ ¸Ž´Ş˝şŔÇ CDROM śÇ´Â DVDżĄ´Â źöĂľ °łŔÇ źŇÇÁĆŽżţžî°Ą\n"
-"ŔÖ˝Ŕ´Ď´Ů. ŔĚ ľľą¸´Â ą× ÁßżĄź­ žîś˛ źŇÇÁĆŽżţžî¸Ś źłÄĄÇŇ Áö¸Ś źąĹĂÇŇ źö ŔÖľľ"
-"ˇĎ\n"
-"ľľżÍ ÁÝ´Ď´Ů."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Israel"
+msgstr "ŔĚ˝şśóż¤"
 
-#: data/rpmdrake-remove.desktop.in.h:1
-msgid "Remove Software"
-msgstr "źŇÇÁĆŽżţžî ÁŚ°Ĺ"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "ą×¸Ž˝ş"
 
-#: data/rpmdrake-sources.desktop.in.h:1
-msgid "Software Sources Manager"
-msgstr "źŇÇÁĆŽżţžî źŇ˝ş °ü¸ŽŔÚ"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "France"
+msgstr "ÇÁśű˝ş"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "ÇÉśőľĺ"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "˝şĆäŔÎ"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
+msgstr "ľ§¸śĹŠ"
+
+#: ../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.pm:1
+#, c-format
+msgid "Australia"
+msgstr "żŔ˝şĆŽˇšŔϸŽžĆ"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
+msgstr "żŔ˝şĆŽ¸ŽžĆ"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Info..."
+msgstr "Á¤ş¸..."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
+msgstr "žĆ´ĎżŔ"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "żš"
 
 #: data/rpmdrake.desktop.in.h:1
 msgid "Install Software"
 msgstr "źŇÇÁĆŽżţžî źłÄĄ"
 
-#~ msgid ""
-#~ "There is already a medium by that name, do you\n"
-#~ "really want to replace it?"
-#~ msgstr ""
-#~ "ŔĚšĚ ľżŔĎÇŃ Ŕ̸§ŔÇ ¸ĹĂź°Ą ŔÖ˝Ŕ´Ď´Ů.\n"
-#~ "ťőˇÎ šŮ˛Ů˝Ă°Ú˝Ŕ´Ďąî?"
+#: data/rpmdrake-remove.desktop.in.h:1
+msgid "Remove Software"
+msgstr "źŇÇÁĆŽżţžî ÁŚ°Ĺ"
 
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "%s\n"
-#~ "\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 ""
-#~ "ĆŃĹ°Áö źŇ˝ş ĆíÁýąâżĄ Ŕß żŔźĚ˝Ŕ´Ď´Ů!\n"
-#~ "\n"
-#~ "ŔĚ ľľą¸´Â ŔĚ ÄÄÇťĹÍ ťóżĄź­ ťçżëÇŇ ĆŃĹ°Áö źŇ˝ş źłÁ¤Ŕť ľľżÍ ÁÝ´Ď´Ů.\n"
-#~ "źłÁ¤ľČ źŇ˝ş´Â ťő źŇÇÁĆŽżţžî ĆŃĹ°Áö¸Ś źłÄĄÇĎ°ĹłŞ ž÷ľĽŔĚĆŽÇŇ ś§\n"
-#~ "ťçżëľË´Ď´Ů."
-
-#~ msgid ""
-#~ "I need to contact MandrakeSoft website to get the mirrors list.\n"
-#~ "Please check that your network is currently running.\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "šĚˇŻ ¸ńˇĎŔť °ĄÁŽżŔąâ Ŕ§ÇŘź­ ¸ÇľĺˇšŔĚĹŠźŇÇÁĆŽ ŔĽťçŔĚĆŽżĄ Á˘źÓÇŘžß ÇŐ´Ď´Ů.\n"
-#~ "ÇöŔç ł×ĆŽż÷ŔĚ °Ą´ÉÇŃÁö ČŽŔÎÇĎźźżä.\n"
-#~ "\n"
-#~ "°čźÓÇŇąîżä?"
-
-#~ msgid ""
-#~ "There was an error downloading the mirrors list:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "The network, or MandrakeSoft website, are maybe unavailable.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "šĚˇŻ ¸ńˇĎŔť łťˇÁšŢ´Â ľľÁßżĄ żŔˇů°Ą ŔÖžú˝Ŕ´Ď´Ů:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "ł×ĆŽż÷ śÇ´Â ¸ÇľĺˇšŔĚĹŠźŇÇÁĆŽ ŔĽťçŔĚĆŽ°Ą ÇöŔç ŔŻČżÇĎÁö žĘŔş ľí ÇŐ´Ď´Ů.\n"
-#~ "łŞÁßżĄ ´Ů˝Ă ˝ĂľľÇŘ ş¸źźżä."
-
-#~ 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 ""
-#~ "The list of updates is void. This 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 ""
-#~ "Warning: it seems that you are attempting to add so much\n"
-#~ "packages that your filesystem may 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 ""
-#~ "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"
-#~ "°čźÓÇŇąîżä?"
+#: data/rpmdrake-sources.desktop.in.h:1
+msgid "Software Sources Manager"
+msgstr "źŇÇÁĆŽżţžî źŇ˝ş °ü¸ŽŔÚ"
 
 #~ msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
 #~ msgstr ""
 #~ "-adobe-times-medium-r-normal--18-*-75-75-p-*-iso8859-1,-*-batang-medium-r-"
 #~ "normal--18-*-75-75-*-*-ksc5601.1987-0,*-r-*"
 
-#~ 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 ""
-#~ "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 ""
-#~ "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 ""
-#~ "[urpmi]ˇÎ ž÷ľĽŔĚĆŽ ¸ĹĂź¸Ś Ăß°ĄÇĎ´Â ľľÁßżĄ żŔˇů°Ą ŔÖžú˝Ŕ´Ď´Ů.\n"
-#~ "\n"
-#~ "Ŕ߸řľČ śÇ´Â ŔĎ˝ĂŔűŔ¸ˇÎ ŔŻČżÇĎÁö žĘŔş šĚˇŻŔĚ°ĹłŞ,\n"
-#~ "¸ÇľĺˇšŔĚĹŠ ¸Ž´Ş˝ş °ř˝Ä ž÷ľĽŔĚĆŽ°Ą žĆÁ÷ śÇ´Â ´ő ŔĚťó ÁöżřÇĎÁö žĘ´Â\n"
-#~ "¸ÇľĺˇšŔĚĹŠ ¸Ž´Ş˝ş šöŔü(%s)ŔÔ´Ď´Ů.\n"
-#~ "\n"
-#~ "´Ů¸Ľ šĚˇŻ¸Ś ťçżëÇŘ ş¸˝Ă°Ú˝Ŕ´Ďąî?"
-
 #~ msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
 #~ msgstr ""
 #~ "-misc-fixed-medium-r-normal--12-*-75-75-p-*-iso8859-1,-*-gulim-medium-r-"
diff --git a/po/ko.pom b/po/ko.pom
index 06e34c28..57d42343 100644
--- a/po/ko.pom
+++ b/po/ko.pom
@@ -4,165 +4,169 @@ msgstr "ź­šö"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "ŔĽ/FTP"
+msgid "Office Workstation"
+msgstr "żŔÇÇ˝ş żöĹŠ˝şĹ×ŔĚźÇ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "ł×ĆŽż÷ ÄÄÇťĹÍ (ĹŹśóŔĚžđĆŽ)"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"żŔÇÇ˝ş ÇÁˇÎą×ˇĽľé: żöľĺÇÁˇÎźźź­ (kword, abiword), ˝şÇÁˇšľĺ˝ŹĆŽ (kspread,"
+"gnumeric), pdf şäžî, ľîľî"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS ź­šö, ťďšŮ ź­šö, ÇÁśô˝Ă ź­šö, SSH ź­šö"
+msgid "Workstation"
+msgstr "żöĹŠ˝şĹ×ŔĚźÇ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "żŔÇÇ˝ş"
+msgid "Game station"
+msgstr "°ÔŔÓ ˝şĹ×ŔĚźÇ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "GNOME żöĹŠ˝şĹ×ŔĚźÇ"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Ŕĺł­°¨ ÇÁˇÎą×ˇĽ: arcade, boards, strategy, ľîľî"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Palm pilot śÇ´Â Visorżë ľľą¸ľé"
+msgid "Multimedia station"
+msgstr "¸ÖĆźšĚľđžî ˝şĹ×ŔĚźÇ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "żöĹŠ˝şĹ×ŔĚźÇ"
+msgid "Sound and video playing/editing programs"
+msgstr "ťçżîľĺ š× şńľđżŔ żŹÁÖ/ĆíÁý ÇÁˇÎą×ˇĽ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "šćČ­şŽ/śóżěĹÍ"
+msgid "Internet station"
+msgstr "ŔÎĹÍłÝ ˝şĹ×ŔĚźÇ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr "ľľ¸ŢŔÎ ł×ŔÓ š× ł×ĆŽż÷ Á¤ş¸ ź­šö"
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr "¸ŢŔĎ/´ş˝ş¸Ś ŔĎ°í ş¸łť¸ç ŔĽ°ËťöŔť Ŕ§ÇŃ ľľą¸¸đŔ˝(pine, mutt, tin...)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
-msgstr ""
-"żŔÇÇ˝ş ÇÁˇÎą×ˇĽľé: żöľĺÇÁˇÎźźź­ (kword, abiword), ˝şÇÁˇšľĺ˝ŹĆŽ (kspread,"
-"gnumeric), pdf şäžî, ľîľî"
+msgid "Network Computer (client)"
+msgstr "ł×ĆŽż÷ ÄÄÇťĹÍ (ĹŹśóŔĚžđĆŽ)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "żŔľđżŔ °üˇĂ ľľą¸; mp3/midi ÇášŔĚžî, šÍź­, ľîľî"
+msgid "Clients for different protocols including ssh"
+msgstr "SSH š× ´Ů¸Ľ ÇÁˇÎĹäÄÝŔÇ ĹŹśóŔĚžđĆŽ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "¸Ž´Ş˝ş ÇĽÁŘ ąâšÝ. żÜşÎ žÖÇøŽÄÉŔĚźÇ Áöżř"
+msgid "Configuration"
+msgstr "źłÁ¤"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "¸Ž´Ş˝ş š× ŔÚŔŻ źŇÇÁĆŽżţžîżĄ ´ëÇŃ ź­Ŕű°ú HowtošŽź­"
+msgid "Tools to ease the configuration of your computer"
+msgstr "˝Źżî ÄÄÇťĹÍ źłÁ¤Ŕť Ŕ§ÇŃ ľľą¸"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "KDE żöĹŠ˝şĹ×ŔĚźÇ"
+msgid "Scientific Workstation"
+msgstr "°úÇĐ żöĹŠ˝şĹ×ŔĚźÇ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, ŔŠľľżě ¸ŢŔĚÄż, ŔÎśóŔĚĆ°¸ŐĆŽ, Fvwm, ľîľî"
+msgid "Scientific applications such as gnuplot"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "¸ÖĆźšĚľđžî - şńľđżŔ"
+msgid "Console Tools"
+msgstr "ÄÜźÖ ľľą¸"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr "¸ŢŔĎ, ´ş˝ş, ŔĽ, ĆÄŔĎŔüźŰ, äĆĂżë ľľą¸¸đŔ˝"
+msgid "Editors, shells, file tools, terminals"
+msgstr "żĄľđĹÍ, ˝Š, ĆÄŔĎľľą¸, Ĺ͚̳Î"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "ľĽŔĚĹÍşŁŔĚ˝ş"
+msgid "KDE Workstation"
+msgstr "KDE żöĹŠ˝şĹ×ŔĚźÇ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL śÇ´Â MySQL ľĽŔĚĹÍşŁŔĚ˝ş ź­šö"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr "K Desktop ČŻ°ć, żŠˇŻ°ĄÁö ľľą¸¸Ś źöšÝÇŃ ąâşť ą×ˇĄÇČ ČŻ°ć"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "˝Źżî ÄÄÇťĹÍ źłÁ¤Ŕť Ŕ§ÇŃ ľľą¸"
+msgid "Graphical Environment"
+msgstr "ą×ˇĄÇČ ČŻ°ć"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "¸ÖĆźšĚľđžî - ťçżîľĺ"
+msgid "Gnome Workstation"
+msgstr "GNOME żöĹŠ˝şĹ×ŔĚźÇ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "šŽź­"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr "ťçżëŔÚ ÄŁČ­Ŕű ÇÁˇÎą×ˇĽ°ú ľĽ˝şĹŠĹž ľľą¸¸Ś °ĄÁř ą×ˇĄÇČ ČŻ°ć"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "ÄÜźÖ ľľą¸"
+msgid "Other Graphical Desktops"
+msgstr "ąâŸ ą×ˇĄÇČ ľĽ˝şĹŠĹž"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr "postfix ¸ŢŔĎ ź­šö, Inn ´ş˝ş ź­šö"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, ŔŠľľżě ¸ŢŔĚÄż, ŔÎśóŔĚĆ°¸ŐĆŽ, Fvwm, ľîľî"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "ŔÎĹÍłÝ ˝şĹ×ŔĚźÇ"
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+msgid "Development"
+msgstr "°łšß"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "¸ÖĆźšĚľđžî ˝şĹ×ŔĚźÇ"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C/C++ °łšß śóŔ̺ꡯ¸Ž, ÇÁˇÎą×ˇĽ š× Çě´őĆÄŔĎ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "źłÁ¤"
+msgid "Documentation"
+msgstr "šŽź­"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Ăß°Ą ą×ˇĄÇČ ľĽ˝şĹŠĹž (Gnome, IceWM)"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "¸Ž´Ş˝ş š× ŔÚŔŻ źŇÇÁĆŽżţžîżĄ ´ëÇŃ ź­Ŕű°ú HowtošŽź­"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr "K Desktop ČŻ°ć, żŠˇŻ°ĄÁö ľľą¸¸Ś źöšÝÇŃ ąâşť ą×ˇĄÇČ ČŻ°ć"
+msgid "LSB"
+msgstr "LSB"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "ą×ˇĄÇČ ČŻ°ć"
+msgid "Linux Standard Base. Third party applications support"
+msgstr "¸Ž´Ş˝ş ÇĽÁŘ ąâšÝ. żÜşÎ žÖÇøŽÄÉŔĚźÇ Áöżř"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-msgid "Development"
-msgstr "°łšß"
+msgid "Web/FTP"
+msgstr "ŔĽ/FTP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -171,23 +175,33 @@ msgstr "žĆĆÄÄĄżÍ ÇÁˇÎFTPD"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "CD ÁŚŔŰ š× ąÁąâ ľľą¸"
+msgid "Mail/Groupware/News"
+msgstr "¸ŢŔĎ/ą×ˇěżţžî/´ş˝ş"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "żŔÇÇ˝ş żöĹŠ˝şĹ×ŔĚźÇ"
+msgid "Postfix mail server, Inn news server"
+msgstr "postfix ¸ŢŔĎ ź­šö, Inn ´ş˝ş ź­šö"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "ą×łđ, Icewm, ŔŠľľżě ¸ŢŔĚÄż, ŔÎśóŔĚĆ°¸ŐĆŽ, Fvwm, ľîľî"
+msgid "Database"
+msgstr "ľĽŔĚĹÍşŁŔĚ˝ş"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "GIMP °°Ŕş ą×ˇĄÇČ ÇÁˇÎą×ˇĽ"
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL śÇ´Â MySQL ľĽŔĚĹÍşŁŔĚ˝ş ź­šö"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Firewall/Router"
+msgstr "šćČ­şŽ/śóżěĹÍ"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Internet gateway"
+msgstr "ŔÎĹÍłÝ °ÔŔĚĆŽżţŔĚ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -196,8 +210,8 @@ msgstr "DNS/NIS"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C/C++ °łšß śóŔ̺ꡯ¸Ž, ÇÁˇÎą×ˇĽ š× Çě´őĆÄŔĎ"
+msgid "Domain Name and Network Information Server"
+msgstr "ľľ¸ŢŔÎ ł×ŔÓ š× ł×ĆŽż÷ Á¤ş¸ ź­šö"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -206,18 +220,18 @@ msgstr "ł×ĆŽż÷ ÄÄÇťĹÍ ź­šö"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "¸ŢŔĎ/ą×ˇěżţžî/´ş˝ş"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS ź­šö, ťďšŮ ź­šö, ÇÁśô˝Ă ź­šö, SSH ź­šö"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "°ÔŔÓ ˝şĹ×ŔĚźÇ"
+msgid "Office"
+msgstr "żŔÇÇ˝ş"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "şńľđżŔ ÇášŔĚžî š× żĄľđĹÍ"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr "¸ŢŔĎ, ´ş˝ş, ŔĽ, ĆÄŔĎŔüźŰ, äĆĂżë ľľą¸¸đŔ˝"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -226,75 +240,66 @@ msgstr "¸ÖĆźšĚľđžî - ą×ˇĄÇČ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Ŕĺł­°¨ ÇÁˇÎą×ˇĽ: arcade, boards, strategy, ľîľî"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr "¸ŢŔĎ/´ş˝ş¸Ś ŔĎ°í ş¸łť¸ç ŔĽ°ËťöŔť Ŕ§ÇŃ ľľą¸¸đŔ˝(pine, mutt, tin...)"
+msgid "Graphics programs such as The Gimp"
+msgstr "GIMP °°Ŕş ą×ˇĄÇČ ÇÁˇÎą×ˇĽ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "°łŔÎ ąÝŔś"
+msgid "Multimedia - Sound"
+msgstr "¸ÖĆźšĚľđžî - ťçżîľĺ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr "ťçżëŔÚ ÄŁČ­Ŕű ÇÁˇÎą×ˇĽ°ú ľĽ˝şĹŠĹž ľľą¸¸Ś °ĄÁř ą×ˇĄÇČ ČŻ°ć"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "żŔľđżŔ °üˇĂ ľľą¸; mp3/midi ÇášŔĚžî, šÍź­, ľîľî"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "SSH š× ´Ů¸Ľ ÇÁˇÎĹäÄÝŔÇ ĹŹśóŔĚžđĆŽ"
+msgid "Multimedia - Video"
+msgstr "¸ÖĆźšĚľđžî - şńľđżŔ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
+msgid "Video players and editors"
+msgstr "şńľđżŔ ÇášŔĚžî š× żĄľđĹÍ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "ŔÎĹÍłÝ °ÔŔĚĆŽżţŔĚ"
+msgid "Multimedia - CD Burning"
+msgstr "¸ÖĆźšĚľđžî - CD ąÁąâ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "ťçżîľĺ š× şńľđżŔ żŹÁÖ/ĆíÁý ÇÁˇÎą×ˇĽ"
+msgid "Tools to create and burn CD's"
+msgstr "CD ÁŚŔŰ š× ąÁąâ ľľą¸"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "ąâŸ ą×ˇĄÇČ ľĽ˝şĹŠĹž"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Ăß°Ą ą×ˇĄÇČ ľĽ˝şĹŠĹž (Gnome, IceWM)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "żĄľđĹÍ, ˝Š, ĆÄŔĎľľą¸, Ĺ͚̳Î"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "ą×łđ, Icewm, ŔŠľľżě ¸ŢŔĚÄż, ŔÎśóŔĚĆ°¸ŐĆŽ, Fvwm, ľîľî"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "gnucash °°Ŕş Ŕڹݰü¸Ž ÇÁˇÎą×ˇĽ"
+msgid "Personal Information Management"
+msgstr "°łŔÎ Á¤ş¸°ü¸Ž"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "°łŔÎ Á¤ş¸°ü¸Ž"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Palm pilot śÇ´Â Visorżë ľľą¸ľé"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "¸ÖĆźšĚľđžî - CD ąÁąâ"
+msgid "Personal Finance"
+msgstr "°łŔÎ ąÝŔś"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "°úÇĐ żöĹŠ˝şĹ×ŔĚźÇ"
+msgid "Programs to manage your finances, such as gnucash"
+msgstr "gnucash °°Ŕş Ŕڹݰü¸Ž ÇÁˇÎą×ˇĽ"
 
diff --git a/po/lt.po b/po/lt.po
index 7a2ee4d2..8bf02f44 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2003-01-19 16:57+0100\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\n"
 "PO-Revision-Date: 2001-03-04 15:30+0200\n"
 "Last-Translator: Mykolas Norvaiđas <Myka@centras.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -16,909 +16,1138 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-13\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl_.c:39
-#, fuzzy
-msgid "Unable to create medium."
-msgstr "Nepavyko sukurti raporto bylos, nutraukiu.\n"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:40
-msgid "Unable to update medium; it will be automatically disabled."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to the software installation tool!\n"
+"\n"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:51
-#, fuzzy
-msgid "Add a source"
-msgstr "Redaguoti Laikmena"
+#: ../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 ""
 
-#: ../edit-urpm-sources.pl_.c:52
-#, fuzzy
-msgid "Local files"
-msgstr "%d bylos"
+#: ../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_.c:52
-#, fuzzy
-msgid "Path:"
-msgstr "kelias:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr "Ádiegimo metu ávyko klaida"
 
-#: ../edit-urpm-sources.pl_.c:53
-msgid "FTP server"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during removal"
+msgstr "Ádiegimo metu ávyko klaida"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, removing packages..."
+msgstr "Prađom palaukti.Pađalinami paketai"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, reading packages database..."
+msgstr "Prađom palaukti.Pađalinami paketai"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr "Ádiegimo metu ávyko klaida"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during installation"
+msgstr "Ádiegimo metu ávyko klaida"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:53 ../edit-urpm-sources.pl_.c:54
-#: ../edit-urpm-sources.pl_.c:56 ../edit-urpm-sources.pl_.c:175
-msgid "URL:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:54
-msgid "HTTP server"
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:55
-#, fuzzy
-msgid "Path or mount point:"
-msgstr "prijungimo vieta:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:55
-#, fuzzy
-msgid "Removable device"
-msgstr "Iđmesti laikmenŕ"
+#: ../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 ""
 
-#: ../edit-urpm-sources.pl_.c:56 ../rpmdrake_.c:548
-msgid "Security updates"
-msgstr "Saugumo atnaujinimai"
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:67
-msgid "Browse..."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"some packages failed to install\n"
+"correctly"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:69
-#, fuzzy
-msgid "Choose a mirror..."
-msgstr "Pasirinkite veidrodá:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, removing packages to allow others to be upgraded..."
+msgstr "Prađom palaukti.Pađalinami paketai"
 
-#: ../edit-urpm-sources.pl_.c:89
-msgid "Login:"
-msgstr "Login:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:89 ../edit-urpm-sources.pl_.c:215
-msgid "Password:"
-msgstr "Slaptaţodis:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Installation failed"
+msgstr "Ádiegiama "
 
-#: ../edit-urpm-sources.pl_.c:94
-msgid "Name:"
-msgstr "Pavadinimas:"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
+msgstr "Nutraukti"
 
-#: ../edit-urpm-sources.pl_.c:96 ../edit-urpm-sources.pl_.c:176
-#, fuzzy
-msgid "Relative path to synthesis/hdlist:"
-msgstr "reliatyvus kelias iki hdlist: "
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "Gerai"
 
-#: ../edit-urpm-sources.pl_.c:104
-msgid "You need to fill up at least the two first entries."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:116
-#, fuzzy
-msgid "Adding a source:"
-msgstr "Redaguoti Laikmena"
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:117
-#, fuzzy
-msgid "Type of source:"
-msgstr "Laikmenos tipas:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:121 ../edit-urpm-sources.pl_.c:187
-#: ../edit-urpm-sources.pl_.c:219 ../rpmdrake.pm_.c:97 ../rpmdrake.pm_.c:136
-#: ../rpmdrake.pm_.c:319 ../rpmdrake_.c:353 ../rpmdrake_.c:365
-#: ../rpmdrake_.c:369 ../rpmdrake_.c:916 ../rpmdrake_.c:950
-msgid "Ok"
-msgstr "Gerai"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:180
-#: ../edit-urpm-sources.pl_.c:187 ../edit-urpm-sources.pl_.c:220
-#: ../rpmdrake.pm_.c:319 ../rpmdrake.pm_.c:352 ../rpmdrake_.c:353
-#: ../rpmdrake_.c:950
-msgid "Cancel"
-msgstr "Nutraukti"
+#: ../rpmdrake:1
+#, c-format
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:140
-#, fuzzy
-msgid "Please wait, adding medium..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
 msgstr ""
-"Prađom palaukti\n"
-"Iđmetama laikmena"
 
-#: ../edit-urpm-sources.pl_.c:158
-#, fuzzy
-msgid "Please wait, removing medium..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
 msgstr ""
-"Prađom palaukti\n"
-"Iđmetama laikmena"
 
-#: ../edit-urpm-sources.pl_.c:169
-#, fuzzy
-msgid "Edit a source"
-msgstr "Redaguoti Laikmena"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Installation finished"
+msgstr "Ádiegiama "
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:173
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "Redaguoti Laikmena"
+msgid "Remove .%s"
+msgstr "Iđimama"
 
-#: ../edit-urpm-sources.pl_.c:179
-#, fuzzy
-msgid "Save changes"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "changes:"
 msgstr "Paketai"
 
-#: ../edit-urpm-sources.pl_.c:185
-msgid "You need to insert the medium to continue"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:186
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, finding available packages..."
+msgstr "Prađom palaukti.Pađalinami paketai"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
+"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 ""
 
-#: ../edit-urpm-sources.pl_.c:191
-#, fuzzy
-msgid "Please wait, updating medium..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
 msgstr ""
-"Prađom palaukti\n"
-"Iđmetama laikmena"
 
-#: ../edit-urpm-sources.pl_.c:202
-#, fuzzy
-msgid "Configure proxies"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
 msgstr ""
-"Atnaujinti\n"
-"laikmenŕ"
 
-#: ../edit-urpm-sources.pl_.c:207
+#: ../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 ""
 
-#: ../edit-urpm-sources.pl_.c:209
-#, fuzzy
-msgid "Proxy hostname:"
-msgstr "Tarpinës stoties (proxy) vartotojo vardas:"
-
-#: ../edit-urpm-sources.pl_.c:211
-msgid "You may specify a user/password for the proxy authentication:"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:213
-#, fuzzy
-msgid "User:"
-msgstr "Vartotojo vardas (username):"
-
-#: ../edit-urpm-sources.pl_.c:235
-#, fuzzy
-msgid "Configure sources"
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
 msgstr ""
-"Atnaujinti\n"
-"laikmenŕ"
 
-#: ../edit-urpm-sources.pl_.c:242
-msgid "Enabled?"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:243
-msgid "Source"
-msgstr "Đaltinis"
-
-#: ../edit-urpm-sources.pl_.c:264 ../rpmdrake_.c:730
-#, fuzzy
-msgid "Remove"
-msgstr "Iđimama"
-
-#: ../edit-urpm-sources.pl_.c:266
-msgid "Edit"
-msgstr "Redaguoti"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:268
-msgid "Add..."
+#: ../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 ""
 
-#: ../edit-urpm-sources.pl_.c:270
-msgid "Update..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Installation"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:271
-#, fuzzy
-msgid "Proxy..."
-msgstr "Klaida..."
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, c-format
+msgid "Mandrake Update"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:274
-msgid "Save and quit"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:275 ../rpmdrake_.c:733
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
 msgid "Quit"
 msgstr "Iđeiti"
 
-#: ../rpmdrake.pm_.c:93
-msgid "Yes"
-msgstr ""
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "Ádiegti"
 
-#: ../rpmdrake.pm_.c:95
-msgid "No"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Remove"
+msgstr "Iđimama"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Search"
+msgstr "Ieđkoti"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "Surasti:"
+
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:127
-msgid "Info..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:180
-msgid "Austria"
+#: ../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 ""
 
-#: ../rpmdrake.pm_.c:181
-msgid "Australia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Too many packages are selected"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:182
-msgid "Belgium"
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:183
-msgid "Brazil"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Normal information"
+msgstr "Saugumo atnaujinimai"
+
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update source(s)"
+msgstr "Atnaujinti laikmenŕ"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Reload the packages list"
+msgstr "Paketas %s nëra pasirađytas"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:184
-msgid "Canada"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "in files"
+msgstr "%d bylos"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "in descriptions"
+msgstr "Aprađymai"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:185
-msgid "Costa Rica"
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:186
-msgid "Czech Republic"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:187
-msgid "Germany"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:188
-msgid "Danmark"
+#: ../rpmdrake:1
+#, c-format
+msgid "by size"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:189 ../rpmdrake.pm_.c:193
-msgid "Greece"
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:190
-msgid "Spain"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "All packages,"
+msgstr "0 paketř, 0 baitř"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:191
-#, fuzzy
-msgid "Finland"
-msgstr "Surasti:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
+msgstr ""
 
-#: ../rpmdrake.pm_.c:192
-#, fuzzy
-msgid "France"
-msgstr "Nutraukti"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Normal updates"
+msgstr "Saugumo atnaujinimai"
 
-#: ../rpmdrake.pm_.c:194
-#, fuzzy
-msgid "Israel"
-msgstr "Ádiegti"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Bugfixes updates"
+msgstr "Saugumo atnaujinimai"
 
-#: ../rpmdrake.pm_.c:195
-#, fuzzy
-msgid "Italy"
-msgstr "Ádiegti"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
+msgstr "Saugumo atnaujinimai"
 
-#: ../rpmdrake.pm_.c:196
-msgid "Japan"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Description: "
+msgstr "Aprađymai"
 
-#: ../rpmdrake.pm_.c:197
-msgid "Korea"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Summary: "
+msgstr "Turinys"
 
-#: ../rpmdrake.pm_.c:198
-msgid "Netherlands"
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
 msgstr ""
 
-#: ../rpmdrake.pm_.c:199
-msgid "Norway"
-msgstr ""
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake.pm_.c:200
-msgid "Poland"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Size: "
+msgstr "Dydis"
 
-#: ../rpmdrake.pm_.c:201
-msgid "Portugal"
-msgstr ""
+#: ../rpmdrake:1
+#, c-format
+msgid "Version: "
+msgstr "Versija: "
 
-#: ../rpmdrake.pm_.c:202
-msgid "Russia"
-msgstr ""
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "Pavadinimas: "
 
-#: ../rpmdrake.pm_.c:203
-msgid "Sweden"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
 msgstr ""
 
-#: ../rpmdrake.pm_.c:204
-msgid "Taiwan"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
 msgstr ""
 
-#: ../rpmdrake.pm_.c:205
-msgid "United Kingdom"
-msgstr ""
+#: ../rpmdrake:1
+#, c-format
+msgid "Source: "
+msgstr "Đaltinis: "
 
-#: ../rpmdrake.pm_.c:206
-msgid "China"
+#: ../rpmdrake:1
+#, c-format
+msgid "(Not available)"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:207 ../rpmdrake.pm_.c:208 ../rpmdrake.pm_.c:209
-#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:261
-msgid "United States"
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:274
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Files:\n"
+msgstr "/_Byla"
 
-#: ../rpmdrake.pm_.c:280
-msgid "Error during download"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Selected size: %d MB"
+msgstr "%d paţymëti paketai: %.1f MB"
 
-#: ../rpmdrake.pm_.c:289
-#, fuzzy
-msgid "No mirror"
-msgstr "Lemtinga klaida"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "%d paţymëti paketai: %.1f MB"
 
-#: ../rpmdrake.pm_.c:307
-#, fuzzy
-msgid "Please choose the desired mirror."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
 msgstr ""
-"Prađom palaukti\n"
-"Gabenamas veidrodţiř sŕrađas"
 
-#: ../rpmdrake.pm_.c:339 ../rpmdrake_.c:627
-#, fuzzy
-msgid "Update source(s)"
-msgstr "Atnaujinti laikmenŕ"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+msgstr ""
 
-#: ../rpmdrake.pm_.c:343
-msgid "Select the source(s) you wish to update:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be installed"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:347
-msgid "Update"
-msgstr "Atnaujinti"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
+msgstr ""
 
-#: ../rpmdrake.pm_.c:358
-#, fuzzy
-msgid "Please wait, updating media..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Additional packages needed"
 msgstr ""
-"Prađom palaukti\n"
-"Iđmetama laikmena"
 
-#: ../rpmdrake_.c:99
-msgid "Other"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be removed"
 msgstr ""
 
-#: ../rpmdrake_.c:121 ../rpmdrake_.c:135 ../rpmdrake_.c:227 ../rpmdrake_.c:298
-msgid "(none)"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
 msgstr ""
 
-#: ../rpmdrake_.c:141 ../rpmdrake_.c:482 ../rpmdrake_.c:483
-msgid "(Not available)"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
 msgstr ""
+"Kad bűtř patenkintos visos priklausomybës,\n"
+"đie paketai bus pađalinti:"
 
-#: ../rpmdrake_.c:151 ../rpmdrake_.c:208
-#, fuzzy
-msgid "Search results"
-msgstr "Paieđkos rezultatai"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some additional packages need to be removed"
+msgstr ""
+"Đis papildomas paketas turi bűti ádiegtas kad viskas dirbtř gerai gerai:"
 
-#: ../rpmdrake_.c:151
-#, fuzzy
-msgid "Search results (none)"
-msgstr "Paieđkos rezultatai"
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
+msgstr ""
 
-#: ../rpmdrake_.c:161 ../rpmdrake_.c:172
-#, fuzzy
-msgid "Please wait, searching..."
-msgstr "Prađom palaukti.Pađalinami paketai"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Information on packages"
+msgstr "Negaliu atidaryti paketo"
 
-#: ../rpmdrake_.c:175
-msgid "Stop"
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
 msgstr ""
 
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-#, fuzzy
+#: ../rpmdrake:1
+#, fuzzy, c-format
 msgid "Addable"
 msgstr "Galimi"
 
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
+#: ../rpmdrake:1
+#, c-format
 msgid "Upgradable"
 msgstr ""
 
-#: ../rpmdrake_.c:211
-#, fuzzy
-msgid "Not selected"
+#: ../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 ""
-"Nesirinkti\n"
-"nieko"
-
-#: ../rpmdrake_.c:211
-#, fuzzy
-msgid "Selected"
-msgstr "Pasirinkti visus"
 
-#: ../rpmdrake_.c:240
-msgid "rpmdrake"
-msgstr "rpmdrake"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "No update"
+msgstr "Saugumo atnaujinimai"
 
-#: ../rpmdrake_.c:258 ../rpmdrake_.c:360 ../rpmdrake_.c:362
-msgid "More information on package..."
+#: ../rpmdrake:1
+#, c-format
+msgid "(none)"
 msgstr ""
 
-#: ../rpmdrake_.c:259
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, listing packages..."
+msgstr "Prađom palaukti.Pađalinami paketai"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "Neţinomas"
+
+#: ../rpmdrake:1
+#, c-format
 msgid "One of the following packages is needed:"
 msgstr ""
 
-#: ../rpmdrake_.c:259
-#, fuzzy
+#: ../rpmdrake:1
+#, fuzzy, c-format
 msgid "Please choose"
 msgstr "Prađom patvirtinti"
 
-#: ../rpmdrake_.c:275
-#, fuzzy
-msgid "unknown package "
-msgstr "Neţinomas"
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:285
-#, fuzzy
-msgid "Please wait, listing packages..."
-msgstr "Prađom palaukti.Pađalinami paketai"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Not selected"
+msgstr ""
+"Nesirinkti\n"
+"nieko"
 
-#: ../rpmdrake_.c:300
-#, fuzzy
-msgid "No update"
-msgstr "Saugumo atnaujinimai"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Selected"
+msgstr "Pasirinkti visus"
 
-#: ../rpmdrake_.c:353 ../rpmdrake_.c:354
-msgid "More infos"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Search results"
+msgstr "Paieđkos rezultatai"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Stop"
 msgstr ""
 
-#: ../rpmdrake_.c:355
-#, fuzzy
-msgid "Information on packages"
-msgstr "Negaliu atidaryti paketo"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, searching..."
+msgstr "Prađom palaukti.Pađalinami paketai"
 
-#: ../rpmdrake_.c:376
-#, fuzzy
-msgid "Some additional packages need to be removed"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Search results (none)"
+msgstr "Paieđkos rezultatai"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
 msgstr ""
-"Đis papildomas paketas turi bűti ádiegtas kad viskas dirbtř gerai gerai:"
 
-#: ../rpmdrake_.c:377
-#, fuzzy
+#: ../edit-urpm-sources.pl:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"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 ""
-"Kad bűtř patenkintos visos priklausomybës,\n"
-"đie paketai bus pađalinti:"
 
-#: ../rpmdrake_.c:383 ../rpmdrake_.c:391
-msgid "Some packages can't be removed"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
 msgstr ""
 
-#: ../rpmdrake_.c:384
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Proxy..."
+msgstr "Klaida..."
 
-#: ../rpmdrake_.c:392 ../rpmdrake_.c:451
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
 msgstr ""
 
-#: ../rpmdrake_.c:421
-msgid "Additional packages needed"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
 msgstr ""
 
-#: ../rpmdrake_.c:422
-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 "Edit"
+msgstr "Redaguoti"
 
-#: ../rpmdrake_.c:435
-msgid "Some packages can't be installed"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Source"
+msgstr "Đaltinis"
 
-#: ../rpmdrake_.c:436
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
 msgstr ""
 
-#: ../rpmdrake_.c:450 ../rpmdrake_.c:684
-msgid "Some packages need to be removed"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure sources"
 msgstr ""
+"Atnaujinti\n"
+"laikmenŕ"
 
-#: ../rpmdrake_.c:472
-#, 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 "Password:"
+msgstr "Slaptaţodis:"
 
-#: ../rpmdrake_.c:474
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Selected size: %d MB"
-msgstr "%d paţymëti paketai: %.1f MB"
-
-#: ../rpmdrake_.c:482
-#, fuzzy
-msgid "Files:\n"
-msgstr "/_Byla"
+msgid "User:"
+msgstr "Vartotojo vardas (username):"
 
-#: ../rpmdrake_.c:483
-msgid "Changelog:\n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 
-#: ../rpmdrake_.c:486
-msgid "Source: "
-msgstr "Đaltinis: "
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Proxy hostname:"
+msgstr "Tarpinës stoties (proxy) vartotojo vardas:"
 
-#: ../rpmdrake_.c:487
-msgid "Currently installed version: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
 msgstr ""
 
-#: ../rpmdrake_.c:491
-msgid "Reason for update: "
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure proxies"
 msgstr ""
+"Atnaujinti\n"
+"laikmenŕ"
 
-#: ../rpmdrake_.c:493
-msgid "Name: "
-msgstr "Pavadinimas: "
-
-#: ../rpmdrake_.c:494
-msgid "Version: "
-msgstr "Versija: "
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, updating medium..."
+msgstr ""
+"Prađom palaukti\n"
+"Iđmetama laikmena"
 
-#: ../rpmdrake_.c:495
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: ../rpmdrake_.c:495
-#, fuzzy
-msgid "Size: "
-msgstr "Dydis"
-
-#: ../rpmdrake_.c:497
-msgid "Importance: "
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
 msgstr ""
 
-#: ../rpmdrake_.c:498
-#, fuzzy
-msgid "Summary: "
-msgstr "Turinys"
-
-#: ../rpmdrake_.c:499
-#, fuzzy
-msgid "Description: "
-msgstr "Aprađymai"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
+msgstr ""
 
-#: ../rpmdrake_.c:548
-#, fuzzy
-msgid "Bugfixes updates"
-msgstr "Saugumo atnaujinimai"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Save changes"
+msgstr "Paketai"
 
-#: ../rpmdrake_.c:548
-#, fuzzy
-msgid "Normal updates"
-msgstr "Saugumo atnaujinimai"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "reliatyvus kelias iki hdlist: "
 
-#: ../rpmdrake_.c:567
-msgid "Mandrake choices"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
 msgstr ""
 
-#: ../rpmdrake_.c:568
-msgid "All packages, alphabetical"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing source \"%s\":"
+msgstr "Redaguoti Laikmena"
 
-#: ../rpmdrake_.c:569
-#, fuzzy
-msgid "All packages,"
-msgstr "0 paketř, 0 baitř"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Edit a source"
+msgstr "Redaguoti Laikmena"
 
-#: ../rpmdrake_.c:592
-msgid "by group"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, removing medium..."
 msgstr ""
+"Prađom palaukti\n"
+"Iđmetama laikmena"
 
-#: ../rpmdrake_.c:592
-msgid "by size"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, adding medium..."
 msgstr ""
+"Prađom palaukti\n"
+"Iđmetama laikmena"
 
-#: ../rpmdrake_.c:593
-msgid "by selection state"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Type of source:"
+msgstr "Laikmenos tipas:"
 
-#: ../rpmdrake_.c:594
-msgid "by source repository"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Adding a source:"
+msgstr "Redaguoti Laikmena"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 msgstr ""
 
-#: ../rpmdrake_.c:594
-msgid "by update availability"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to fill up at least the two first entries."
 msgstr ""
 
-#: ../rpmdrake_.c:615
-#, fuzzy
-msgid "in descriptions"
-msgstr "Aprađymai"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "Pavadinimas:"
 
-#: ../rpmdrake_.c:615
-#, fuzzy
-msgid "in files"
-msgstr "%d bylos"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
+msgstr "Login:"
 
-#: ../rpmdrake_.c:615
-msgid "in names"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Choose a mirror..."
+msgstr "Pasirinkite veidrodá:"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Browse..."
 msgstr ""
 
-#: ../rpmdrake_.c:626
-#, fuzzy
-msgid "Reload the packages list"
-msgstr "Paketas %s nëra pasirađytas"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Path or mount point:"
+msgstr "prijungimo vieta:"
 
-#: ../rpmdrake_.c:626
-msgid "Reset the selection"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Removable device"
+msgstr "Iđmesti laikmenŕ"
 
-#: ../rpmdrake_.c:652
-msgid "Maximum information"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "HTTP server"
 msgstr ""
 
-#: ../rpmdrake_.c:652
-#, fuzzy
-msgid "Normal information"
-msgstr "Saugumo atnaujinimai"
-
-#: ../rpmdrake_.c:674
-msgid "Too many packages are selected"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
 msgstr ""
 
-#: ../rpmdrake_.c:720
-msgid "Find:"
-msgstr "Surasti:"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Path:"
+msgstr "kelias:"
 
-#: ../rpmdrake_.c:725
-msgid "Search"
-msgstr "Ieđkoti"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Local files"
+msgstr "%d bylos"
 
-#: ../rpmdrake_.c:731
-msgid "Install"
-msgstr "Ádiegti"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a source"
+msgstr "Redaguoti Laikmena"
 
-#: ../rpmdrake_.c:738 data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrake Update"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
 msgstr ""
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Installation"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Unable to create medium."
+msgstr "Nepavyko sukurti raporto bylos, nutraukiu.\n"
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Removal"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Please wait, updating media..."
 msgstr ""
+"Prađom palaukti\n"
+"Iđmetama laikmena"
 
-#: ../rpmdrake_.c:779
-msgid "Please wait, contacting mirror to update packages information."
-msgstr ""
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
+msgstr "Atnaujinti"
 
-#: ../rpmdrake_.c:781
-msgid "Error updating medium"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Select the source(s) you wish to update:"
 msgstr ""
 
-#: ../rpmdrake_.c:782
-msgid "There was an unrecoverable error while updating packages information."
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Please choose the desired mirror."
 msgstr ""
+"Prađom palaukti\n"
+"Gabenamas veidrodţiř sŕrađas"
 
-#: ../rpmdrake_.c:787
-msgid "How to choose manually your mirror"
+#: ../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_.c:795
-msgid "Please wait, contacting mirror to initialize updates packages."
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "No mirror"
+msgstr "Lemtinga klaida"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid ""
+"There was an error downloading the mirrors list:\n"
+"\n"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
 
-#: ../rpmdrake_.c:798
-msgid "Error adding update medium"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
 msgstr ""
 
-#: ../rpmdrake_.c:829
-#, fuzzy
-msgid "Please wait, finding available packages..."
-msgstr "Prađom palaukti.Pađalinami paketai"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
 
-#: ../rpmdrake_.c:861
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Inspecting %s"
+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_.c:880
-#, fuzzy
-msgid "changes:"
-msgstr "Paketai"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United States"
+msgstr ""
 
-#: ../rpmdrake_.c:884
-#, fuzzy, c-format
-msgid "Remove .%s"
-msgstr "Iđimama"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
+msgstr ""
 
-#: ../rpmdrake_.c:886
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Use .%s as main file"
+msgid "United Kingdom"
 msgstr ""
 
-#: ../rpmdrake_.c:888
-msgid "Do nothing"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
 msgstr ""
 
-#: ../rpmdrake_.c:900
-#, fuzzy
-msgid "Installation finished"
-msgstr "Ádiegiama "
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr ""
 
-#: ../rpmdrake_.c:910
-msgid "Inspect..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
 msgstr ""
 
-#: ../rpmdrake_.c:925
-msgid "Program missing"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Portugal"
 msgstr ""
 
-#: ../rpmdrake_.c:926
-msgid "A required program is missing (grpmi). Check your installation."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
 msgstr ""
 
-#: ../rpmdrake_.c:940
-msgid "Unable to get source packages."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
 msgstr ""
 
-#: ../rpmdrake_.c:941
-msgid "Unable to get source packages, sorry."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
 msgstr ""
 
-#: ../rpmdrake_.c:948
-msgid "Change medium"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Korea"
 msgstr ""
 
-#: ../rpmdrake_.c:949
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+msgid "Japan"
 msgstr ""
 
-#: ../rpmdrake_.c:957
-#, fuzzy
-msgid "Installation failed"
-msgstr "Ádiegiama "
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Italy"
+msgstr "Ádiegti"
 
-#: ../rpmdrake_.c:958
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Israel"
+msgstr "Ádiegti"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
 msgstr ""
 
-#: ../rpmdrake_.c:961
-#, fuzzy
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr "Prađom palaukti.Pađalinami paketai"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "France"
+msgstr "Nutraukti"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Finland"
+msgstr "Surasti:"
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm: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 "Spain"
 msgstr ""
 
-#: ../rpmdrake_.c:982
-msgid ""
-"some packages failed to install\n"
-"correctly"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
 msgstr ""
 
-#: ../rpmdrake_.c:983
-msgid "everything was installed correctly"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
 msgstr ""
 
-#: ../rpmdrake_.c:985
-msgid "Everything installed successfully"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
 msgstr ""
 
-#: ../rpmdrake_.c:986
-msgid "All requested packages were installed successfully."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Costa Rica"
 msgstr ""
 
-#: ../rpmdrake_.c:989
-msgid "Everything already installed."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Canada"
 msgstr ""
 
-#: ../rpmdrake_.c:990
-msgid "Everything already installed (is this supposed to happen at all?)."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
 msgstr ""
 
-#: ../rpmdrake_.c:997
-#, fuzzy
-msgid "Problem during installation"
-msgstr "Ádiegimo metu ávyko klaida"
-
-#: ../rpmdrake_.c:998
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr "Ádiegimo metu ávyko klaida"
-
-#: ../rpmdrake_.c:1012
-#, fuzzy
-msgid "Please wait, reading packages database..."
-msgstr "Prađom palaukti.Pađalinami paketai"
-
-#: ../rpmdrake_.c:1053
-#, fuzzy
-msgid "Please wait, removing packages..."
-msgstr "Prađom palaukti.Pađalinami paketai"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Belgium"
+msgstr ""
 
-#: ../rpmdrake_.c:1056
-#, fuzzy
-msgid "Problem during removal"
-msgstr "Ádiegimo metu ávyko klaida"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Australia"
+msgstr ""
 
-#: ../rpmdrake_.c:1057
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr "Ádiegimo metu ávyko klaida"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
+msgstr ""
 
-#: ../rpmdrake_.c:1089
-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."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Info..."
 msgstr ""
 
-#: ../rpmdrake_.c:1094
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
 msgstr ""
 
-#: ../rpmdrake_.c:1099
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
 msgstr ""
 
+#: data/rpmdrake.desktop.in.h:1
+#, fuzzy
+msgid "Install Software"
+msgstr "Ádiegti visus"
+
 #: data/rpmdrake-remove.desktop.in.h:1
 msgid "Remove Software"
 msgstr ""
@@ -927,11 +1156,6 @@ msgstr ""
 msgid "Software Sources Manager"
 msgstr ""
 
-#: data/rpmdrake.desktop.in.h:1
-#, fuzzy
-msgid "Install Software"
-msgstr "Ádiegti visus"
-
 #, fuzzy
 #~ msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
 #~ msgstr ""
diff --git a/po/lt.pom b/po/lt.pom
index 7f3ea12f..f08c2fa8 100644
--- a/po/lt.pom
+++ b/po/lt.pom
@@ -4,174 +4,181 @@ msgstr "serveris"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Serveris, Tinklapiř/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Network Computer (client)"
-msgstr "Tinklo Kompiuteris, X klientas"
+msgid "Office Workstation"
+msgstr "Biuro darbo stotis"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
 msgstr ""
+"Biuro programos: tekstř redaktoriai (kword, abiword), skaičiuoklës (kspread, "
+"gnumeric), pdf perţiűros programos ir pan."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Biuras"
+#, fuzzy
+msgid "Workstation"
+msgstr "KDE darbo stotis"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Gnome darbo stotis"
+msgid "Game station"
+msgstr "Ţaidimř stotis"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Árankiai tavo Palm Pilot arba Visor"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr ""
+"Programos pasilinksminimui: lentos, strateginiai, kortř ţaidimai ir pan."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Workstation"
-msgstr "KDE darbo stotis"
+msgid "Multimedia station"
+msgstr "Multimedija stotis"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Serveris, Firewall/Routeris"
+msgid "Sound and video playing/editing programs"
+msgstr "Garso ir vaizdo grojimo/redagavimo programos"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr ""
+msgid "Internet station"
+msgstr "Interneto stotis"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
 msgstr ""
-"Biuro programos: tekstř redaktoriai (kword, abiword), skaičiuoklës (kspread, "
-"gnumeric), pdf perţiűros programos ir pan."
+"Rinkinys árankiř skaityti ir siřsti pađtŕ bei naujienas (pine, mutt, tin) ir "
+"narđyti ţiniatinklá (WWW)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "Su garsu susijć árankiai: mp3 ir midi grotuvai, mikđeriai ir pan."
+#, fuzzy
+msgid "Network Computer (client)"
+msgstr "Tinklo Kompiuteris, X klientas"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
+msgid "Clients for different protocols including ssh"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Knygos ir HOWTO apie Linux ir Free Software"
+#, fuzzy
+msgid "Configuration"
+msgstr "LAN Konfiguravimas"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "KDE darbo stotis"
+#, fuzzy
+msgid "Tools to ease the configuration of your computer"
+msgstr "Ar tu nori iđbandyti nustatymus?"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "IceWM, Window Maker, Enlightenment, Fvwm ir pan."
+msgid "Scientific Workstation"
+msgstr "Mokslinës darbo stotis"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Multimedija - Vaizdas"
+msgid "Scientific applications such as gnuplot"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr ""
-"Árankiř rinkinys pađtui, naujienoms, ţiniatinkliui, bylř siuntimui ir "
-"pokalbiams"
+msgid "Console Tools"
+msgstr "Konsolës árankiai"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Serveris, Duomenř baziř"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Redaktoriai, shell'ai, bylř árankiai, terminalai"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
+msgid "KDE Workstation"
+msgstr "KDE darbo stotis"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
 msgstr ""
+"The K Desktop Environment, pagrindinë grafinë aplinka su dideliu rinkiniu "
+"pritaikytř programř"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Tools to ease the configuration of your computer"
-msgstr "Ar tu nori iđbandyti nustatymus?"
+msgid "Graphical Environment"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "Multimedija - Garsas"
+msgid "Gnome Workstation"
+msgstr "Gnome darbo stotis"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dokumentacija"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+"Grafinë aplinka su vartotojui draugiđkř programř ir darbalaukio árankiř "
+"rinkiniu"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Konsolës árankiai"
+msgid "Other Graphical Desktops"
+msgstr "Kiti grafiniai darbalaukiai"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr ""
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "IceWM, Window Maker, Enlightenment, Fvwm ir pan."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Interneto stotis"
+#, fuzzy
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+msgid "Development"
+msgstr "Kűrimo, Tinklapiř"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Multimedija stotis"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C bei C++ kűrimo bibliotekos, programos ir include bylos"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Configuration"
-msgstr "LAN Konfiguravimas"
+msgid "Documentation"
+msgstr "Dokumentacija"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Daugiau grafiniř darbalaukiř (Gnome, IceWM)"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Knygos ir HOWTO apie Linux ir Free Software"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
+msgid "LSB"
 msgstr ""
-"The K Desktop Environment, pagrindinë grafinë aplinka su dideliu rinkiniu "
-"pritaikytř programř"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
+msgid "Linux Standard Base. Third party applications support"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-msgid "Development"
-msgstr "Kűrimo, Tinklapiř"
+msgid "Web/FTP"
+msgstr "Serveris, Tinklapiř/FTP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -180,23 +187,34 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "Árankiai kurti ir kepti CD"
+msgid "Mail/Groupware/News"
+msgstr "Serveris, Pađto/Grupinio darbo/Naujienř"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Biuro darbo stotis"
+msgid "Postfix mail server, Inn news server"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm ir Pan."
+msgid "Database"
+msgstr "Serveris, Duomenř baziř"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Grafikos programos, tokios kaip The GIMP"
+msgid "PostgreSQL or MySQL database server"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Firewall/Router"
+msgstr "Serveris, Firewall/Routeris"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+#, fuzzy
+msgid "Internet gateway"
+msgstr "Priëjimas prie Interneto"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -205,8 +223,8 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C bei C++ kűrimo bibliotekos, programos ir include bylos"
+msgid "Domain Name and Network Information Server"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -216,18 +234,20 @@ msgstr "Serveris, Tinklo Kompiuterio serveris"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "Serveris, Pađto/Grupinio darbo/Naujienř"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Ţaidimř stotis"
+msgid "Office"
+msgstr "Biuras"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Vaizdo grotuvai ir redaktoriai"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr ""
+"Árankiř rinkinys pađtui, naujienoms, ţiniatinkliui, bylř siuntimui ir "
+"pokalbiams"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -236,81 +256,66 @@ msgstr "Multimedija - grafika"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr ""
-"Programos pasilinksminimui: lentos, strateginiai, kortř ţaidimai ir pan."
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
-"Rinkinys árankiř skaityti ir siřsti pađtŕ bei naujienas (pine, mutt, tin) ir "
-"narđyti ţiniatinklá (WWW)"
+msgid "Graphics programs such as The Gimp"
+msgstr "Grafikos programos, tokios kaip The GIMP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "Asmeniniai finansai"
+msgid "Multimedia - Sound"
+msgstr "Multimedija - Garsas"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
-"Grafinë aplinka su vartotojui draugiđkř programř ir darbalaukio árankiř "
-"rinkiniu"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "Su garsu susijć árankiai: mp3 ir midi grotuvai, mikđeriai ir pan."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr ""
+msgid "Multimedia - Video"
+msgstr "Multimedija - Vaizdas"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "LSB"
-msgstr ""
+msgid "Video players and editors"
+msgstr "Vaizdo grotuvai ir redaktoriai"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Internet gateway"
-msgstr "Priëjimas prie Interneto"
+msgid "Multimedia - CD Burning"
+msgstr "Multimedija - CD kepimas"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Garso ir vaizdo grojimo/redagavimo programos"
+msgid "Tools to create and burn CD's"
+msgstr "Árankiai kurti ir kepti CD"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Kiti grafiniai darbalaukiai"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Daugiau grafiniř darbalaukiř (Gnome, IceWM)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Redaktoriai, shell'ai, bylř árankiai, terminalai"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm ir Pan."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "Programos, skirtos tvarkyti tavo finansus, pvz. gnucash"
+msgid "Personal Information Management"
+msgstr "Asmeninës informacijos tvarkyklë (PIM)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "Asmeninës informacijos tvarkyklë (PIM)"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Árankiai tavo Palm Pilot arba Visor"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multimedija - CD kepimas"
+msgid "Personal Finance"
+msgstr "Asmeniniai finansai"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Mokslinës darbo stotis"
+msgid "Programs to manage your finances, such as gnucash"
+msgstr "Programos, skirtos tvarkyti tavo finansus, pvz. gnucash"
 
diff --git a/po/lv.po b/po/lv.po
index aa5b11cb..dfa33dda 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2003-01-19 16:57+0100\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\n"
 "PO-Revision-Date: 2002-09-30 17:02+0200\n"
 "Last-Translator: Raivo Saars <spaiks@inbox.lv>\n"
 "Language-Team: ll10nt <ll10nt@listes.murds.lv>\n"
@@ -15,894 +15,1220 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-13\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl_.c:39
-msgid "Unable to create medium."
-msgstr "Nevaru izveidot datu nesçju."
-
-#: ../edit-urpm-sources.pl_.c:40
-msgid "Unable to update medium; it will be automatically disabled."
-msgstr "Nav iespçjams atjauninât datu nesçju; tas tiks automâtiski atslçgts."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Vai ir labi turpinât?"
 
-#: ../edit-urpm-sources.pl_.c:51
-#, fuzzy
-msgid "Add a source"
-msgstr "Pievienoju avotu:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to the software installation tool!\n"
+"\n"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
+msgstr ""
+"Laipni lűdzam programmatűras instalçđanas rîkâ!\n"
+"\n"
+"Jűsu Mandrake Linux sistçma nâk ar daţiem űkstođiem programmatűras\n"
+"pakotňu uz CDROM vai DVD. Đis rîks palîdzçs Jums izvçlçties, kuru\n"
+"programmatűru vçlaties instalçt uz Jűsu datora."
 
-#: ../edit-urpm-sources.pl_.c:52
-msgid "Local files"
-msgstr "Lokâlie faili"
+#: ../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 ""
+"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_.c:52
-msgid "Path:"
-msgstr "Ceďđ:"
+#: ../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."
 
-#: ../edit-urpm-sources.pl_.c:53
-msgid "FTP server"
-msgstr "FTP serveris"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"Instalçđanas laikâ bija problçma:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:53 ../edit-urpm-sources.pl_.c:54
-#: ../edit-urpm-sources.pl_.c:56 ../edit-urpm-sources.pl_.c:175
-msgid "URL:"
-msgstr "URL:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during removal"
+msgstr "Problçma instalçđanas laikâ"
 
-#: ../edit-urpm-sources.pl_.c:54
-msgid "HTTP server"
-msgstr "HTTP serveris"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages..."
+msgstr "Lűdzu gaidiet, noňemu pakotnes..."
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Path or mount point:"
-msgstr "Ceďđ uz montçđanas punktu:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
+msgstr "Lűdzu gaidiet, nolasu pakotňu datubâzi..."
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Removable device"
-msgstr "Atvienojama ierîce"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Instalçđanas laikâ bija problçma:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:56 ../rpmdrake_.c:548
-msgid "Security updates"
-msgstr "Drođîbas atjauninâjumi"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during installation"
+msgstr "Problçma instalçđanas laikâ"
 
-#: ../edit-urpm-sources.pl_.c:67
-msgid "Browse..."
-msgstr "Pârlűkot..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
+msgstr "Viss jau uzinstalçts (vai tâ vispâr var gadîties?)."
 
-#: ../edit-urpm-sources.pl_.c:69
-msgid "Choose a mirror..."
-msgstr "Izvçlieties spoguďserveri..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed."
+msgstr "Viss jau ir uzinstalçts"
 
-#: ../edit-urpm-sources.pl_.c:89
-msgid "Login:"
-msgstr "Lietotâjs:"
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "Visas pieprasîtâs pakotnes tika veiksmîgi instalçtas."
 
-#: ../edit-urpm-sources.pl_.c:89 ../edit-urpm-sources.pl_.c:215
-msgid "Password:"
-msgstr "Parole:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr "Viss tika instalçts veiksmîgi"
 
-#: ../edit-urpm-sources.pl_.c:94
-msgid "Name:"
-msgstr "Vârds:"
+#: ../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 ""
+"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_.c:96 ../edit-urpm-sources.pl_.c:176
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Relatîvais čeďđ uz synthesis/hdlist: "
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "viss tika uzinstalçts korekti"
 
-#: ../edit-urpm-sources.pl_.c:104
-msgid "You need to fill up at least the two first entries."
-msgstr "Jums jâaizpilda vismaz pirmie divi ievadlauki."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"some packages failed to install\n"
+"correctly"
+msgstr ""
+"daţas pakotnes neizdevâs instalçt\n"
+"korekti"
 
-#: ../edit-urpm-sources.pl_.c:116
-#, fuzzy
-msgid "Adding a source:"
-msgstr "Pievienoju avotu:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages to allow others to be upgraded..."
+msgstr "Lűdzu gaidiet, noňemu pakotnes, lai varçtu atjauninât citas..."
 
-#: ../edit-urpm-sources.pl_.c:117
-#, fuzzy
-msgid "Type of source:"
-msgstr "Avota tips:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
+msgstr ""
+"Instalçđana neizdevâs, trűkst daţi faili.\n"
+"Jűs varbűt vçlaties atjauninât avotu datubâzi."
 
-#: ../edit-urpm-sources.pl_.c:121 ../edit-urpm-sources.pl_.c:187
-#: ../edit-urpm-sources.pl_.c:219 ../rpmdrake.pm_.c:97 ../rpmdrake.pm_.c:136
-#: ../rpmdrake.pm_.c:319 ../rpmdrake_.c:353 ../rpmdrake_.c:365
-#: ../rpmdrake_.c:369 ../rpmdrake_.c:916 ../rpmdrake_.c:950
-msgid "Ok"
-msgstr "Labi"
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation failed"
+msgstr "Instalçđana neizdevâs"
 
-#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:180
-#: ../edit-urpm-sources.pl_.c:187 ../edit-urpm-sources.pl_.c:220
-#: ../rpmdrake.pm_.c:319 ../rpmdrake.pm_.c:352 ../rpmdrake_.c:353
-#: ../rpmdrake_.c:950
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
 msgid "Cancel"
 msgstr "Atlikt"
 
-#: ../edit-urpm-sources.pl_.c:140
-msgid "Please wait, adding medium..."
-msgstr "Lűdzu gaidiet, pievienoju datu nesçju..."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "Labi"
 
-#: ../edit-urpm-sources.pl_.c:158
-msgid "Please wait, removing medium..."
-msgstr "Lűdzu gaidiet, atvienoju datu nesçju..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Lűdzu, ievietojiet datu nesçju \"%s\" ierîcç [%s]"
 
-#: ../edit-urpm-sources.pl_.c:169
-#, fuzzy
-msgid "Edit a source"
-msgstr "Labot avotu"
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr "Nomainiet datu nesçju"
 
-#: ../edit-urpm-sources.pl_.c:173
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "Laboju avotu \"%s\":"
+msgid "Unable to get source packages, sorry."
+msgstr "Atvainojiet, nebija iespçjams paňemt izejas pakotnes."
 
-#: ../edit-urpm-sources.pl_.c:179
-msgid "Save changes"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages."
+msgstr "Nebija iespçjams saňemt izejas pakotnes."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr ""
+"Pieprasîtâ programma (grpmi) nav pieejama. Pârbaudiet Jűsu instalâciju."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
+msgstr "Programma nav pieejama"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
+msgstr "Pârbaude..."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation finished"
+msgstr "Instalçđana pabeigta"
+
+#: ../rpmdrake:1
+#, 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"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "changes:"
 msgstr "Saglabât izmaiňas"
 
-#: ../edit-urpm-sources.pl_.c:185
-msgid "You need to insert the medium to continue"
-msgstr "Jums jâielik datu nesçjs, lai turpinâtu"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr "Pârbaudu %s"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, finding available packages..."
+msgstr "Lűdzu gaidiet, meklçju pieejamâs pakotnes..."
 
-#: ../edit-urpm-sources.pl_.c:186
+#: ../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â."
+"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 ""
+"Bija kďűda, pievienojot atjauninâđanas datu nesçju ar urpmi.\n"
+"\n"
+"Tas varçtu bűt, jo ir laicîgi nepieejams spoguďserveris, vai arî Jűsu "
+"lietotâ\n"
+"Mandrake Linux versija (%s) vçl / vairs netiek atbalstîta no Mandrake Linux\n"
+"ifociâlo jauninâjumu puses.\n"
+"\n"
+"Vai vçlaties izvçlçties citu spoguďserveri?"
 
-#: ../edit-urpm-sources.pl_.c:191
-msgid "Please wait, updating medium..."
-msgstr "Lűdzu gaidiet, atjauninu datu nesçju..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
+msgstr "Kďűda pievienojot atjaunođanas datu nesçju"
 
-#: ../edit-urpm-sources.pl_.c:202
-msgid "Configure proxies"
-msgstr "Konfigurçt proxy serverus"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
+msgstr ""
+"Lűdzu gaidiet, sazinos ar spoguďserveri lai uzsâktu pakotňu atjauninâđanu."
 
-#: ../edit-urpm-sources.pl_.c:207
-#, fuzzy
+#: ../rpmdrake:1
+#, fuzzy, 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 ""
-"Ja nepiecieđams proxy, ievadiet hosta vârdu un opcionâli portu (sintakse: "
-"<proxy hosts[:ports]>):"
+"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."
 
-#: ../edit-urpm-sources.pl_.c:209
-msgid "Proxy hostname:"
-msgstr "Proxy hosta vârds:"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Kâ ar rokâm izvçlçties spoguďserveri"
 
-#: ../edit-urpm-sources.pl_.c:211
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "Varat norâdît lietotâja vârdu/paroli priekđi proxy autentifikâcijas:"
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
+msgstr "Atjaunojot pakotňu informâciju, notika neatgriezeniska kďűda."
 
-#: ../edit-urpm-sources.pl_.c:213
-msgid "User:"
-msgstr "Lietotâjs:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
+msgstr "Kďűda atjaunojot datu nesçju"
 
-#: ../edit-urpm-sources.pl_.c:235
-#, fuzzy
-msgid "Configure sources"
-msgstr "Konfigurçt izejas kodus"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
+msgstr ""
+"Lűdzu gaidiet, sazinos ar spoguďserveri, lai atjauninâtu pakotňu informâciju."
 
-#: ../edit-urpm-sources.pl_.c:242
-msgid "Enabled?"
-msgstr "Atďauts?"
+#: ../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 ""
+"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?"
 
-#: ../edit-urpm-sources.pl_.c:243
-#, fuzzy
-msgid "Source"
-msgstr "Avots"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Installation"
+msgstr "Programmatűras pakotňu instalçđana"
+
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, c-format
+msgid "Mandrake Update"
+msgstr "Mandrake atjauninâđana"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
+msgstr "Programmatűras pakotňu noňemđana"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Iziet"
 
-#: ../edit-urpm-sources.pl_.c:264 ../rpmdrake_.c:730
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "Instalçt"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
 msgid "Remove"
 msgstr "Noňemt"
 
-#: ../edit-urpm-sources.pl_.c:266
-msgid "Edit"
-msgstr "Rediěçt"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search"
+msgstr "Meklçt"
 
-#: ../edit-urpm-sources.pl_.c:268
-msgid "Add..."
-msgstr "Pievienot..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "Meklçt:"
 
-#: ../edit-urpm-sources.pl_.c:270
-msgid "Update..."
-msgstr "Atjauninât..."
+#: ../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?"
 
-#: ../edit-urpm-sources.pl_.c:271
-msgid "Proxy..."
-msgstr "Proxy..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "Daţas pakotnes nepiecieđams noňemt"
 
-#: ../edit-urpm-sources.pl_.c:274
-msgid "Save and quit"
-msgstr "Saglabât un iziet"
+#: ../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?"
 
-#: ../edit-urpm-sources.pl_.c:275 ../rpmdrake_.c:733
-msgid "Quit"
-msgstr "Iziet"
+#: ../rpmdrake:1
+#, c-format
+msgid "Too many packages are selected"
+msgstr "Izvçlçtas pa daudz pakotnes"
 
-#: ../rpmdrake.pm_.c:93
-msgid "Yes"
-msgstr "Jâ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
+msgstr "Maksimâla informâcija"
 
-#: ../rpmdrake.pm_.c:95
-msgid "No"
-msgstr "Nç"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal information"
+msgstr "Parasta informâcija"
 
-#: ../rpmdrake.pm_.c:127
-msgid "Info..."
-msgstr "Info..."
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update source(s)"
+msgstr "Atjaunot avotus"
 
-#: ../rpmdrake.pm_.c:180
-msgid "Austria"
-msgstr "Austrija"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reload the packages list"
+msgstr "Pârlâdçjiet pakotňu sarakstu"
 
-#: ../rpmdrake.pm_.c:181
-msgid "Australia"
-msgstr "Austrâlija"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
+msgstr "Izvçlçties no jauna"
 
-#: ../rpmdrake.pm_.c:182
-msgid "Belgium"
-msgstr "Beďěija"
+#: ../rpmdrake:1
+#, c-format
+msgid "in files"
+msgstr "failos"
 
-#: ../rpmdrake.pm_.c:183
-msgid "Brazil"
-msgstr "Brazîlija"
+#: ../rpmdrake:1
+#, c-format
+msgid "in descriptions"
+msgstr "aprakstos"
 
-#: ../rpmdrake.pm_.c:184
-msgid "Canada"
-msgstr "Kanâda"
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
+msgstr "vârdos"
 
-#: ../rpmdrake.pm_.c:185
-msgid "Costa Rica"
-msgstr "Kostarika"
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
+msgstr "pçc atjauninâjuma pieejamîbas"
 
-#: ../rpmdrake.pm_.c:186
-msgid "Czech Republic"
-msgstr "Čehija"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "by source repository"
+msgstr "pçc avota repozitârija"
 
-#: ../rpmdrake.pm_.c:187
-msgid "Germany"
-msgstr "Vâcija"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
+msgstr "pçc izvçlçđanâs statusa"
 
-#: ../rpmdrake.pm_.c:188
-msgid "Danmark"
-msgstr "Dânija"
+#: ../rpmdrake:1
+#, c-format
+msgid "by size"
+msgstr "pçc apjoma"
 
-#: ../rpmdrake.pm_.c:189 ../rpmdrake.pm_.c:193
-msgid "Greece"
-msgstr "Grieíija"
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
+msgstr "pçc grupas"
 
-#: ../rpmdrake.pm_.c:190
-msgid "Spain"
-msgstr "Spânija"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages,"
+msgstr "Visas pakotnes,"
 
-#: ../rpmdrake.pm_.c:191
-msgid "Finland"
-msgstr "Somija"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
+msgstr "Visas pakotnes, pçc alfabçta"
 
-#: ../rpmdrake.pm_.c:192
-msgid "France"
-msgstr "Francija"
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
+msgstr "Mandrake izvçles"
 
-#: ../rpmdrake.pm_.c:194
-msgid "Israel"
-msgstr "Izraçla"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal updates"
+msgstr "Parasti jauninâjumi"
 
-#: ../rpmdrake.pm_.c:195
-msgid "Italy"
-msgstr "Itâlija"
+#: ../rpmdrake:1
+#, c-format
+msgid "Bugfixes updates"
+msgstr "Kďűdu labojumu jauninâjumi"
 
-#: ../rpmdrake.pm_.c:196
-msgid "Japan"
-msgstr "Japâna"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
+msgstr "Drođîbas atjauninâjumi"
 
-#: ../rpmdrake.pm_.c:197
-msgid "Korea"
-msgstr "Koreja"
+#: ../rpmdrake:1
+#, c-format
+msgid "Description: "
+msgstr "Apraksts: "
 
-#: ../rpmdrake.pm_.c:198
-msgid "Netherlands"
-msgstr "Holande"
+#: ../rpmdrake:1
+#, c-format
+msgid "Summary: "
+msgstr "Kopsavilkums: "
 
-#: ../rpmdrake.pm_.c:199
-msgid "Norway"
-msgstr "Norvçěija"
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "Svarîgums: "
 
-#: ../rpmdrake.pm_.c:200
-msgid "Poland"
-msgstr "Polija"
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake.pm_.c:201
-msgid "Portugal"
-msgstr "Portugâle"
+#: ../rpmdrake:1
+#, c-format
+msgid "Size: "
+msgstr "Apjoms: "
 
-#: ../rpmdrake.pm_.c:202
-msgid "Russia"
-msgstr "Krievija"
+#: ../rpmdrake:1
+#, c-format
+msgid "Version: "
+msgstr "Versija: "
 
-#: ../rpmdrake.pm_.c:203
-msgid "Sweden"
-msgstr "Zviedrija"
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "Vârds: "
 
-#: ../rpmdrake.pm_.c:204
-msgid "Taiwan"
-msgstr "Taivâna"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "Atjauninâđanas iemesls: "
 
-#: ../rpmdrake.pm_.c:205
-msgid "United Kingdom"
-msgstr "Apvienotâ Karaliste"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
+msgstr "Patreiz instalçtâ versija: "
 
-#: ../rpmdrake.pm_.c:206
-msgid "China"
-msgstr "Íîna"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Source: "
+msgstr "Avots: "
 
-#: ../rpmdrake.pm_.c:207 ../rpmdrake.pm_.c:208 ../rpmdrake.pm_.c:209
-#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:261
-msgid "United States"
-msgstr "ASV"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "(Not available)"
+msgstr "(Nav pieejams)"
 
-#: ../rpmdrake.pm_.c:274
-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
+#, c-format
+msgid "Changelog:\n"
+msgstr "Izmaiňu ţurnâls:\n"
 
-#: ../rpmdrake.pm_.c:280
-msgid "Error during download"
-msgstr "Kďűda, veicot lejupielâdi"
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "Faili:\n"
 
-#: ../rpmdrake.pm_.c:289
-msgid "No mirror"
-msgstr "Nav spoguďservera"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected size: %d MB"
+msgstr "Izvçles apjoms: %d MB"
 
-#: ../rpmdrake.pm_.c:307
-msgid "Please choose the desired mirror."
-msgstr "Lűdzu izvçlieties spoguďserveri"
+#: ../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.pm_.c:339 ../rpmdrake_.c:627
-#, fuzzy
-msgid "Update source(s)"
-msgstr "Atjaunot avotus"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
+msgstr ""
+"Sakarâ ar atkarîbâm, sekojođâm pakotnçm jânoňem atzîmçjums:\n"
+"\n"
+"\n"
 
-#: ../rpmdrake.pm_.c:343
-#, fuzzy
-msgid "Select the source(s) you wish to update:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
 msgstr ""
-"Lűdzu izvçlieties avotus,\n"
-"kurus vçlaties atnunot:"
+"Atvainojiet, sekojođas pakotnes nevar tikt izvçlçtas\"\n"
+"\n"
 
-#: ../rpmdrake.pm_.c:347
-msgid "Update"
-msgstr "Atjauninât"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "Daţas pakotnes nevar tikt iznstalçtas"
 
-#: ../rpmdrake.pm_.c:358
-msgid "Please wait, updating media..."
-msgstr "Lűdzu gaidiet, atjuaninu datu nesçju"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
+msgstr ""
+"Lai apmierinâtu visas atkarîbas,\n"
+"ir nepiecieđams instalçt arî sekojođa(s) pakotne(s):\n"
+"\n"
 
-#: ../rpmdrake_.c:99
-msgid "Other"
-msgstr "Cits"
+#: ../rpmdrake:1
+#, c-format
+msgid "Additional packages needed"
+msgstr "Papildus nepiecieđamâs pakotnes"
 
-#: ../rpmdrake_.c:121 ../rpmdrake_.c:135 ../rpmdrake_.c:227 ../rpmdrake_.c:298
-msgid "(none)"
-msgstr "(neviens)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be removed"
+msgstr "Daţas pakotnes nevar tikt noňemtas"
 
-#: ../rpmdrake_.c:141 ../rpmdrake_.c:482 ../rpmdrake_.c:483
-#, fuzzy
-msgid "(Not available)"
-msgstr "(Nav pieejams)"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
 
-#: ../rpmdrake_.c:151 ../rpmdrake_.c:208
-msgid "Search results"
-msgstr "Meklçđanas rezultâti"
+#: ../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"
 
-#: ../rpmdrake_.c:151
-msgid "Search results (none)"
-msgstr "Meklçđanas rezultâti (neviens)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr "Nepiecieđams noňemt daţas papildus pakotnes"
 
-#: ../rpmdrake_.c:161 ../rpmdrake_.c:172
-msgid "Please wait, searching..."
-msgstr "Lűdzu gaidiet, meklçju..."
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
+msgstr "Vairâk informâcijas par pakotni..."
 
-#: ../rpmdrake_.c:175
-#, fuzzy
-msgid "Stop"
-msgstr "Stop"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Information on packages"
+msgstr "Vairâk informâcijas par pakotni..."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
+msgstr ""
 
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
+#: ../rpmdrake:1
+#, c-format
 msgid "Addable"
 msgstr "Pievienojams"
 
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
+#: ../rpmdrake:1
+#, c-format
 msgid "Upgradable"
 msgstr "Atjauninâms"
 
-#: ../rpmdrake_.c:211
-msgid "Not selected"
-msgstr "Neizvçlçts"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"The list of updates is void. This means that either there is\n"
+"no available update for the packages installed on your computer,\n"
+"or you already installed all of them."
+msgstr ""
+"Atjauninâjumu saraksts ir tukđs. Tas nozîmç, ka vai nu nav\n"
+"pieejami atjauninâjumi uz Jűsu datora instalçtajâm pakotnçm,\n"
+"vai arî Jűs tos visus jau esat uzinstalçjuđi."
 
-#: ../rpmdrake_.c:211
-msgid "Selected"
-msgstr "Izvçlçts"
+#: ../rpmdrake:1
+#, c-format
+msgid "No update"
+msgstr "Nav jauninâjuma"
 
-#: ../rpmdrake_.c:240
-msgid "rpmdrake"
-msgstr "rpmdrake"
+#: ../rpmdrake:1
+#, c-format
+msgid "(none)"
+msgstr "(neviens)"
 
-#: ../rpmdrake_.c:258 ../rpmdrake_.c:360 ../rpmdrake_.c:362
-msgid "More information on package..."
-msgstr "Vairâk informâcijas par pakotni..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, listing packages..."
+msgstr "Lűdzu gaidiet, veidoju pakotňu sarakstu..."
 
-#: ../rpmdrake_.c:259
+#: ../rpmdrake:1
+#, c-format
+msgid "unknown package "
+msgstr "nezinâma pakotne"
+
+#: ../rpmdrake:1
+#, c-format
 msgid "One of the following packages is needed:"
 msgstr "Ir nepiecieđama viena no sekojođâm pakotnçm:"
 
-#: ../rpmdrake_.c:259
+#: ../rpmdrake:1
+#, c-format
 msgid "Please choose"
 msgstr "Lűdzu izvçlieties"
 
-#: ../rpmdrake_.c:275
-msgid "unknown package "
-msgstr "nezinâma pakotne"
-
-#: ../rpmdrake_.c:285
-msgid "Please wait, listing packages..."
-msgstr "Lűdzu gaidiet, veidoju pakotňu sarakstu..."
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:300
-msgid "No update"
-msgstr "Nav jauninâjuma"
+#: ../rpmdrake:1
+#, c-format
+msgid "Not selected"
+msgstr "Neizvçlçts"
 
-#: ../rpmdrake_.c:353 ../rpmdrake_.c:354
-msgid "More infos"
-msgstr ""
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected"
+msgstr "Izvçlçts"
 
-#: ../rpmdrake_.c:355
-#, fuzzy
-msgid "Information on packages"
-msgstr "Vairâk informâcijas par pakotni..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results"
+msgstr "Meklçđanas rezultâti"
 
-#: ../rpmdrake_.c:376
-msgid "Some additional packages need to be removed"
-msgstr "Nepiecieđams noňemt daţas papildus pakotnes"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Stop"
+msgstr "Stop"
 
-#: ../rpmdrake_.c:377
-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"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, searching..."
+msgstr "Lűdzu gaidiet, meklçju..."
 
-#: ../rpmdrake_.c:383 ../rpmdrake_.c:391
-msgid "Some packages can't be removed"
-msgstr "Daţas pakotnes nevar tikt noňemtas"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
+msgstr "Meklçđanas rezultâti (neviens)"
 
-#: ../rpmdrake_.c:384
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Cits"
 
-#: ../rpmdrake_.c:392 ../rpmdrake_.c:451
-#, fuzzy
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"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 ""
-"Sakarâ ar atkarîbâm, sekojođâm pakotnçm jânoňem atzîmçjums:\n"
-"\n"
+"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_.c:421
-msgid "Additional packages needed"
-msgstr "Papildus nepiecieđamâs pakotnes"
-
-#: ../rpmdrake_.c:422
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
-msgstr ""
-"Lai apmierinâtu visas atkarîbas,\n"
-"ir nepiecieđams instalçt arî sekojođa(s) pakotne(s):\n"
-"\n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Saglabât un iziet"
 
-#: ../rpmdrake_.c:435
-msgid "Some packages can't be installed"
-msgstr "Daţas pakotnes nevar tikt iznstalçtas"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy..."
+msgstr "Proxy..."
 
-#: ../rpmdrake_.c:436
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-msgstr ""
-"Atvainojiet, sekojođas pakotnes nevar tikt izvçlçtas\"\n"
-"\n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
+msgstr "Atjauninât..."
 
-#: ../rpmdrake_.c:450 ../rpmdrake_.c:684
-msgid "Some packages need to be removed"
-msgstr "Daţas pakotnes nepiecieđams noňemt"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "Pievienot..."
 
-#: ../rpmdrake_.c:472
+#: ../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 "Edit"
+msgstr "Rediěçt"
 
-#: ../rpmdrake_.c:474
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Source"
+msgstr "Avots"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "Izvçles apjoms: %d MB"
+msgid "Enabled?"
+msgstr "Atďauts?"
 
-#: ../rpmdrake_.c:482
-msgid "Files:\n"
-msgstr "Faili:\n"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure sources"
+msgstr "Konfigurçt izejas kodus"
 
-#: ../rpmdrake_.c:483
-msgid "Changelog:\n"
-msgstr "Izmaiňu ţurnâls:\n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "Parole:"
 
-#: ../rpmdrake_.c:486
-#, fuzzy
-msgid "Source: "
-msgstr "Avots: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
+msgstr "Lietotâjs:"
 
-#: ../rpmdrake_.c:487
-msgid "Currently installed version: "
-msgstr "Patreiz instalçtâ 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:"
 
-#: ../rpmdrake_.c:491
-msgid "Reason for update: "
-msgstr "Atjauninâđanas iemesls: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "Proxy hosta vârds:"
 
-#: ../rpmdrake_.c:493
-msgid "Name: "
-msgstr "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_.c:494
-msgid "Version: "
-msgstr "Versija: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "Konfigurçt proxy serverus"
 
-#: ../rpmdrake_.c:495
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Please wait, updating medium..."
+msgstr "Lűdzu gaidiet, atjauninu datu nesçju..."
 
-#: ../rpmdrake_.c:495
-msgid "Size: "
-msgstr "Apjoms: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "Lai saglabâtu izmaiňas, Jums jâieliek datu nesçjs iekârtâ."
 
-#: ../rpmdrake_.c:497
-msgid "Importance: "
-msgstr "Svarîgums: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
+msgstr "Jums jâielik datu nesçjs, lai turpinâtu"
 
-#: ../rpmdrake_.c:498
-msgid "Summary: "
-msgstr "Kopsavilkums: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save changes"
+msgstr "Saglabât izmaiňas"
 
-#: ../rpmdrake_.c:499
-msgid "Description: "
-msgstr "Apraksts: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Relatîvais čeďđ uz synthesis/hdlist: "
 
-#: ../rpmdrake_.c:548
-msgid "Bugfixes updates"
-msgstr "Kďűdu labojumu jauninâjumi"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake_.c:548
-msgid "Normal updates"
-msgstr "Parasti jauninâjumi"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing source \"%s\":"
+msgstr "Laboju avotu \"%s\":"
 
-#: ../rpmdrake_.c:567
-msgid "Mandrake choices"
-msgstr "Mandrake izvçles"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Edit a source"
+msgstr "Labot avotu"
 
-#: ../rpmdrake_.c:568
-msgid "All packages, alphabetical"
-msgstr "Visas pakotnes, pçc alfabçta"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr "Lűdzu gaidiet, atvienoju datu nesçju..."
 
-#: ../rpmdrake_.c:569
-msgid "All packages,"
-msgstr "Visas pakotnes,"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, adding medium..."
+msgstr "Lűdzu gaidiet, pievienoju datu nesçju..."
 
-#: ../rpmdrake_.c:592
-msgid "by group"
-msgstr "pçc grupas"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Type of source:"
+msgstr "Avota tips:"
 
-#: ../rpmdrake_.c:592
-msgid "by size"
-msgstr "pçc apjoma"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Adding a source:"
+msgstr "Pievienoju avotu:"
 
-#: ../rpmdrake_.c:593
-msgid "by selection state"
-msgstr "pçc izvçlçđanâs statusa"
+#: ../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 ""
+"Jau ir datu nesçjs ar đâdu vârdu,\n"
+"vai tieđâm vçlaties to aizvietot?"
 
-#: ../rpmdrake_.c:594
-#, fuzzy
-msgid "by source repository"
-msgstr "pçc avota repozitârija"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to fill up at least the two first entries."
+msgstr "Jums jâaizpilda vismaz pirmie divi ievadlauki."
 
-#: ../rpmdrake_.c:594
-msgid "by update availability"
-msgstr "pçc atjauninâjuma pieejamîbas"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "Vârds:"
 
-#: ../rpmdrake_.c:615
-msgid "in descriptions"
-msgstr "aprakstos"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
+msgstr "Lietotâjs:"
 
-#: ../rpmdrake_.c:615
-msgid "in files"
-msgstr "failos"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Izvçlieties spoguďserveri..."
 
-#: ../rpmdrake_.c:615
-msgid "in names"
-msgstr "vârdos"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Browse..."
+msgstr "Pârlűkot..."
 
-#: ../rpmdrake_.c:626
-msgid "Reload the packages list"
-msgstr "Pârlâdçjiet pakotňu sarakstu"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Ceďđ uz montçđanas punktu:"
 
-#: ../rpmdrake_.c:626
-msgid "Reset the selection"
-msgstr "Izvçlçties no jauna"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Removable device"
+msgstr "Atvienojama ierîce"
 
-#: ../rpmdrake_.c:652
-msgid "Maximum information"
-msgstr "Maksimâla informâcija"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "HTTP server"
+msgstr "HTTP serveris"
 
-#: ../rpmdrake_.c:652
-msgid "Normal information"
-msgstr "Parasta informâcija"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "FTP serveris"
 
-#: ../rpmdrake_.c:674
-msgid "Too many packages are selected"
-msgstr "Izvçlçtas pa daudz pakotnes"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path:"
+msgstr "Ceďđ:"
 
-#: ../rpmdrake_.c:720
-msgid "Find:"
-msgstr "Meklçt:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "Lokâlie faili"
 
-#: ../rpmdrake_.c:725
-msgid "Search"
-msgstr "Meklçt"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a source"
+msgstr "Pievienoju avotu:"
 
-#: ../rpmdrake_.c:731
-msgid "Install"
-msgstr "Instalçt"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
+msgstr "Nav iespçjams atjauninât datu nesçju; tas tiks automâtiski atslçgts."
 
-#: ../rpmdrake_.c:738 data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrake Update"
-msgstr "Mandrake atjauninâđana"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "Nevaru izveidot datu nesçju."
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Installation"
-msgstr "Programmatűras pakotňu instalçđana"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, updating media..."
+msgstr "Lűdzu gaidiet, atjuaninu datu nesçju"
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Removal"
-msgstr "Programmatűras pakotňu noňemđana"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
+msgstr "Atjauninât"
 
-#: ../rpmdrake_.c:779
-msgid "Please wait, contacting mirror to update packages information."
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Select the source(s) you wish to update:"
 msgstr ""
-"Lűdzu gaidiet, sazinos ar spoguďserveri, lai atjauninâtu pakotňu informâciju."
+"Lűdzu izvçlieties avotus,\n"
+"kurus vçlaties atnunot:"
 
-#: ../rpmdrake_.c:781
-msgid "Error updating medium"
-msgstr "Kďűda atjaunojot datu nesçju"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please choose the desired mirror."
+msgstr "Lűdzu izvçlieties spoguďserveri"
 
-#: ../rpmdrake_.c:782
-msgid "There was an unrecoverable error while updating packages information."
-msgstr "Atjaunojot pakotňu informâciju, notika neatgriezeniska kďűda."
+#: ../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_.c:787
-msgid "How to choose manually your mirror"
-msgstr "Kâ ar rokâm izvçlçties spoguďserveri"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
+msgstr "Nav spoguďservera"
 
-#: ../rpmdrake_.c:795
-#, fuzzy
-msgid "Please wait, contacting mirror to initialize updates packages."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid ""
+"There was an error downloading the mirrors list:\n"
+"\n"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
-"Lűdzu gaidiet, sazinos ar spoguďserveri lai uzsâktu pakotňu atjauninâđanu."
+"Bija kďűda lejuplâdçjot spoguďserveru sarakstu:\n"
+"\n"
+"%s\n"
+"Tîkls, vai arî MandrakeSoft web vieta, iespçjams, nav pieejami.\n"
+"Lűdzu, mçěiniet vçlreiz vçlâk."
 
-#: ../rpmdrake_.c:798
-msgid "Error adding update medium"
-msgstr "Kďűda pievienojot atjaunođanas datu nesçju"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "Kďűda, veicot lejupielâdi"
 
-#: ../rpmdrake_.c:829
-msgid "Please wait, finding available packages..."
-msgstr "Lűdzu gaidiet, meklçju pieejamâs pakotnes..."
+#: ../rpmdrake.pm: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."
 
-#: ../rpmdrake_.c:861
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Pârbaudu %s"
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Man jâkontaktçjas ar MandrakeSoft web vietu, lai saňemtu\n"
+"spoguďserveru sarakstu. Lűdzu, pârliecinieties, ka Jűsu tîkls\n"
+"patreiz darbojas.\n"
+"\n"
+"Vai ir labi turpinât?"
 
-#: ../rpmdrake_.c:880
-#, fuzzy
-msgid "changes:"
-msgstr "Saglabât izmaiňas"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United States"
+msgstr "ASV"
 
-#: ../rpmdrake_.c:884
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Noňemt .%s"
+msgid "China"
+msgstr "Íîna"
 
-#: ../rpmdrake_.c:886
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Lietojiet .%s kâ galveno failu"
+msgid "United Kingdom"
+msgstr "Apvienotâ Karaliste"
 
-#: ../rpmdrake_.c:888
-msgid "Do nothing"
-msgstr "Nedarît neko"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "Taivâna"
 
-#: ../rpmdrake_.c:900
-msgid "Installation finished"
-msgstr "Instalçđana pabeigta"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "Zviedrija"
 
-#: ../rpmdrake_.c:910
-msgid "Inspect..."
-msgstr "Pârbaude..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
+msgstr "Krievija"
 
-#: ../rpmdrake_.c:925
-msgid "Program missing"
-msgstr "Programma nav pieejama"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Portugal"
+msgstr "Portugâle"
 
-#: ../rpmdrake_.c:926
-msgid "A required program is missing (grpmi). Check your installation."
-msgstr ""
-"Pieprasîtâ programma (grpmi) nav pieejama. Pârbaudiet Jűsu instalâciju."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
+msgstr "Polija"
 
-#: ../rpmdrake_.c:940
-#, fuzzy
-msgid "Unable to get source packages."
-msgstr "Nebija iespçjams saňemt izejas pakotnes."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
+msgstr "Norvçěija"
 
-#: ../rpmdrake_.c:941
-#, fuzzy
-msgid "Unable to get source packages, sorry."
-msgstr "Atvainojiet, nebija iespçjams paňemt izejas pakotnes."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
+msgstr "Holande"
 
-#: ../rpmdrake_.c:948
-msgid "Change medium"
-msgstr "Nomainiet datu nesçju"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Korea"
+msgstr "Koreja"
 
-#: ../rpmdrake_.c:949
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Lűdzu, ievietojiet datu nesçju \"%s\" ierîcç [%s]"
+msgid "Japan"
+msgstr "Japâna"
 
-#: ../rpmdrake_.c:957
-msgid "Installation failed"
-msgstr "Instalçđana neizdevâs"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Italy"
+msgstr "Itâlija"
 
-#: ../rpmdrake_.c:958
-#, fuzzy
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"Instalçđana neizdevâs, trűkst daţi faili.\n"
-"Jűs varbűt vçlaties atjauninât avotu datubâzi."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Israel"
+msgstr "Izraçla"
 
-#: ../rpmdrake_.c:961
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr "Lűdzu gaidiet, noňemu pakotnes, lai varçtu atjauninât citas..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Grieíija"
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm: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 ""
-"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:"
+msgid "France"
+msgstr "Francija"
 
-#: ../rpmdrake_.c:982
-msgid ""
-"some packages failed to install\n"
-"correctly"
-msgstr ""
-"daţas pakotnes neizdevâs instalçt\n"
-"korekti"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "Somija"
 
-#: ../rpmdrake_.c:983
-msgid "everything was installed correctly"
-msgstr "viss tika uzinstalçts korekti"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "Spânija"
 
-#: ../rpmdrake_.c:985
-msgid "Everything installed successfully"
-msgstr "Viss tika instalçts veiksmîgi"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
+msgstr "Dânija"
 
-#: ../rpmdrake_.c:986
-msgid "All requested packages were installed successfully."
-msgstr "Visas pieprasîtâs pakotnes tika veiksmîgi instalçtas."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr "Vâcija"
 
-#: ../rpmdrake_.c:989
-msgid "Everything already installed."
-msgstr "Viss jau ir uzinstalçts"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
+msgstr "Čehija"
 
-#: ../rpmdrake_.c:990
-msgid "Everything already installed (is this supposed to happen at all?)."
-msgstr "Viss jau uzinstalçts (vai tâ vispâr var gadîties?)."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Costa Rica"
+msgstr "Kostarika"
 
-#: ../rpmdrake_.c:997
-msgid "Problem during installation"
-msgstr "Problçma instalçđanas laikâ"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Canada"
+msgstr "Kanâda"
 
-#: ../rpmdrake_.c:998
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Instalçđanas laikâ bija problçma:\n"
-"\n"
-"%s"
+msgid "Brazil"
+msgstr "Brazîlija"
 
-#: ../rpmdrake_.c:1012
-msgid "Please wait, reading packages database..."
-msgstr "Lűdzu gaidiet, nolasu pakotňu datubâzi..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Belgium"
+msgstr "Beďěija"
 
-#: ../rpmdrake_.c:1053
-msgid "Please wait, removing packages..."
-msgstr "Lűdzu gaidiet, noňemu pakotnes..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Australia"
+msgstr "Austrâlija"
 
-#: ../rpmdrake_.c:1056
-#, fuzzy
-msgid "Problem during removal"
-msgstr "Problçma instalçđanas laikâ"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
+msgstr "Austrija"
 
-#: ../rpmdrake_.c:1057
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Instalçđanas laikâ bija problçma:\n"
-"\n"
-"%s"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Info..."
+msgstr "Info..."
 
-#: ../rpmdrake_.c:1089
-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
+#, c-format
+msgid "No"
+msgstr "Nç"
 
-#: ../rpmdrake_.c:1094
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"Laipni lűdzam MandrakeUpdate!\n"
-"\n"
-"Đis rîks palîdzçs Jums izvçlçties atjauninâjumus, kurus vçlaties\n"
-"instalçt uz datora."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Jâ"
 
-#: ../rpmdrake_.c:1099
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
-msgstr ""
-"Laipni lűdzam programmatűras instalçđanas rîkâ!\n"
-"\n"
-"Jűsu Mandrake Linux sistçma nâk ar daţiem űkstođiem programmatűras\n"
-"pakotňu uz CDROM vai DVD. Đis rîks palîdzçs Jums izvçlçties, kuru\n"
-"programmatűru vçlaties instalçt uz Jűsu datora."
+#: data/rpmdrake.desktop.in.h:1
+msgid "Install Software"
+msgstr "Instalçt programmatűru"
 
 #: data/rpmdrake-remove.desktop.in.h:1
 msgid "Remove Software"
@@ -913,167 +1239,8 @@ msgstr "Noňemt programmatűru"
 msgid "Software Sources Manager"
 msgstr "Programmatűras avotu pârvaldnieks"
 
-#: data/rpmdrake.desktop.in.h:1
-msgid "Install Software"
-msgstr "Instalçt programmatűru"
-
-#~ 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 ""
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-#~ "Vai ir labi turpinât?"
-
-#, fuzzy
-#~ msgid ""
-#~ "Welcome to the packages source editor!\n"
-#~ "\n"
-#~ "This tool will help you configure the packages sources you wish to use "
-#~ "on\n"
-#~ "your computer. They will then be available to install new software "
-#~ "package\n"
-#~ "or to perform updates."
-#~ msgstr ""
-#~ "Laipni lűdzam pakotňu avota redaktorâ!\n"
-#~ "\n"
-#~ "Đis rîks palîdzçs Jums konfigurçt pakotňu avotus, kurus vçlaties lietot\n"
-#~ "uz Jűsu datora. Tie tad bűs pieejami, lai instalçtu jaunu programmatűras\n"
-#~ "pakotni, vai lai veiktu jauninâjumus."
-
-#~ msgid ""
-#~ "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 ""
-#~ "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 ""
-#~ "Bija kďűda lejuplâdçjot spoguďserveru sarakstu:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "Tîkls, vai arî MandrakeSoft web vieta, iespçjams, nav pieejami.\n"
-#~ "Lűdzu, mçěiniet vçlreiz vçlâk."
-
-#~ 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 ""
-#~ "The list of updates is void. This 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 ""
-#~ "Warning: it seems that you are attempting to add so much\n"
-#~ "packages that your filesystem may 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 ""
-#~ "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 "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
 #~ msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
 
-#~ 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?"
-
-#, fuzzy
-#~ 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."
-
-#, fuzzy
-#~ 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 ""
-#~ "Bija kďűda, pievienojot atjauninâđanas datu nesçju ar urpmi.\n"
-#~ "\n"
-#~ "Tas varçtu bűt, jo ir laicîgi nepieejams spoguďserveris, vai arî Jűsu "
-#~ "lietotâ\n"
-#~ "Mandrake Linux versija (%s) vçl / vairs netiek atbalstîta no Mandrake "
-#~ "Linux\n"
-#~ "ifociâlo jauninâjumu puses.\n"
-#~ "\n"
-#~ "Vai vçlaties izvçlçties citu spoguďserveri?"
-
 #~ msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
 #~ msgstr "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
diff --git a/po/lv.pom b/po/lv.pom
index 801e30e6..d8030222 100644
--- a/po/lv.pom
+++ b/po/lv.pom
@@ -4,167 +4,174 @@ msgstr "Serveris"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Tîmeklis/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Tîkla dators (klients)"
+msgid "Office Workstation"
+msgstr "Biroja dators"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS serveris, SMB serveris, Proxy serveris, ssh serveris"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Biroja programmas: teksta procesori (kword, abiword), izklâjlapas (lspread, "
+"gnumeric), pdf skatîtâji, u.c."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Birojs"
+msgid "Workstation"
+msgstr "Darbastacija"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Gnome darbastacija"
+msgid "Game station"
+msgstr "Spçďu dators"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Rîki darbam ar Palm Pilot vai Visor"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Izklaides programmas: arkâde, galdiňspçles, stratçěija u.c."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Darbastacija"
+msgid "Multimedia station"
+msgstr "Multimçdiju dators"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Ugunsműris/Marđrutizators"
+msgid "Sound and video playing/editing programs"
+msgstr "Skaňas un video atskaňođanas/rediěçđanas programmas"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Domain Name and Network Information Server"
-msgstr "DNS un NIS serveris"
+msgid "Internet station"
+msgstr "Interneta dators"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
 msgstr ""
-"Biroja programmas: teksta procesori (kword, abiword), izklâjlapas (lspread, "
-"gnumeric), pdf skatîtâji, u.c."
+"Rîku komplekts, lai lasîtu un sűtîtu pastu vai jaunumus (pine, mutt, tin..) "
+"un pârlűkotu Tîmekli"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "Audio rîki: mp3 un midi atskaňotâji, mikđeri u.c."
+msgid "Network Computer (client)"
+msgstr "Tîkla dators (klients)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr ""
+msgid "Clients for different protocols including ssh"
+msgstr "Klienti daţâdiem protokoliem, ieskaitot ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Grâmatas un Howto faili par Linux un Brîvo programmatűru"
+msgid "Configuration"
+msgstr "Konfigurâcija"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "KDE darbastacija"
+msgid "Tools to ease the configuration of your computer"
+msgstr "Rîki datora konfigurçđanas atvieglođanai"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm u.c."
+msgid "Scientific Workstation"
+msgstr "Zinâtniska darbastacija"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Multimçdiji - Video"
+msgid "Scientific applications such as gnuplot"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr "Rîki pastam, jaunumiem, tîmeklim, failu saňemđanai un čatam"
+msgid "Console Tools"
+msgstr "Konsoles rîki"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Datubâzes"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Redaktori, čaulas, failu rîki, terminâďi"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL vai MySQL datubâzu serveris"
+msgid "KDE Workstation"
+msgstr "KDE darbastacija"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Rîki datora konfigurçđanas atvieglođanai"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"K Desktop Environment, galvenâ grafiskâ vide kopâ ar papildus rîku kolekciju"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "Multimçdiji - Skaňa"
+msgid "Graphical Environment"
+msgstr "Grafiskâ vide"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dokumentâcija"
+msgid "Gnome Workstation"
+msgstr "Gnome darbastacija"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Konsoles rîki"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+"Grafiskâ vide ar lietotâjiem draudzîgu programmu komplektu un darbavirsmas "
+"rîkiem"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr "Postfix pasta serveris, Inn jaunumu serveris"
+msgid "Other Graphical Desktops"
+msgstr "Citas grafiskâs darbavirsmas"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Interneta dators"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm u.c."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Multimçdiju dators"
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+msgid "Development"
+msgstr "Izstrâde"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Konfigurâcija"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C un C++ izstrâdes bibliotçkas, programmas un include faili"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Citas grafiskas darbavirsmas (Gnome, IceWM)"
+msgid "Documentation"
+msgstr "Dokumentâcija"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
-"K Desktop Environment, galvenâ grafiskâ vide kopâ ar papildus rîku kolekciju"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Grâmatas un Howto faili par Linux un Brîvo programmatűru"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Grafiskâ vide"
+msgid "LSB"
+msgstr "LSB"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
+msgid "Linux Standard Base. Third party applications support"
+msgstr ""
+
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-msgid "Development"
-msgstr "Izstrâde"
+#: ../../share/compssUsers:999
+msgid "Web/FTP"
+msgstr "Tîmeklis/FTP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -173,23 +180,33 @@ msgstr "Apache, Pro-ftpd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "Rîki CD disku radîđanai un ierakstîđanai"
+msgid "Mail/Groupware/News"
+msgstr "Pasts/Grupu rîki/Jaunumi"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Biroja dators"
+msgid "Postfix mail server, Inn news server"
+msgstr "Postfix pasta serveris, Inn jaunumu serveris"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm u.c."
+msgid "Database"
+msgstr "Datubâzes"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Grafiskâs programmas, piemçram, The Gimp"
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL vai MySQL datubâzu serveris"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Firewall/Router"
+msgstr "Ugunsműris/Marđrutizators"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Internet gateway"
+msgstr "Interneta vârteja"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -198,8 +215,9 @@ msgstr "DNS/NIS"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C un C++ izstrâdes bibliotçkas, programmas un include faili"
+#, fuzzy
+msgid "Domain Name and Network Information Server"
+msgstr "DNS un NIS serveris"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -208,18 +226,18 @@ msgstr "Tîkla datoru serveris"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "Pasts/Grupu rîki/Jaunumi"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS serveris, SMB serveris, Proxy serveris, ssh serveris"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Spçďu dators"
+msgid "Office"
+msgstr "Birojs"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Video atskaňotâji un redaktori"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr "Rîki pastam, jaunumiem, tîmeklim, failu saňemđanai un čatam"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -228,79 +246,66 @@ msgstr "Multimçdiji - Grafika"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Izklaides programmas: arkâde, galdiňspçles, stratçěija u.c."
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
-"Rîku komplekts, lai lasîtu un sűtîtu pastu vai jaunumus (pine, mutt, tin..) "
-"un pârlűkotu Tîmekli"
+msgid "Graphics programs such as The Gimp"
+msgstr "Grafiskâs programmas, piemçram, The Gimp"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "Personîgâs finanses"
+msgid "Multimedia - Sound"
+msgstr "Multimçdiji - Skaňa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
-"Grafiskâ vide ar lietotâjiem draudzîgu programmu komplektu un darbavirsmas "
-"rîkiem"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "Audio rîki: mp3 un midi atskaňotâji, mikđeri u.c."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Klienti daţâdiem protokoliem, ieskaitot ssh"
+msgid "Multimedia - Video"
+msgstr "Multimçdiji - Video"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
+msgid "Video players and editors"
+msgstr "Video atskaňotâji un redaktori"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Interneta vârteja"
+msgid "Multimedia - CD Burning"
+msgstr "Multimçdiji - CD ierakstîđana"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Skaňas un video atskaňođanas/rediěçđanas programmas"
+msgid "Tools to create and burn CD's"
+msgstr "Rîki CD disku radîđanai un ierakstîđanai"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Citas grafiskâs darbavirsmas"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Citas grafiskas darbavirsmas (Gnome, IceWM)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Redaktori, čaulas, failu rîki, terminâďi"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm u.c."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "Programmas jűsu finanđu pârvaldîđanai, piemçram, gnucach"
+msgid "Personal Information Management"
+msgstr "Personîgâs informâcijas menedţments"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "Personîgâs informâcijas menedţments"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Rîki darbam ar Palm Pilot vai Visor"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multimçdiji - CD ierakstîđana"
+msgid "Personal Finance"
+msgstr "Personîgâs finanses"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Zinâtniska darbastacija"
+msgid "Programs to manage your finances, such as gnucash"
+msgstr "Programmas jűsu finanđu pârvaldîđanai, piemçram, gnucach"
 
diff --git a/po/ms.po b/po/ms.po
index a4208268..7fb94e03 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.4\n"
-"POT-Creation-Date: 2003-01-19 16:57+0100\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\n"
 "PO-Revision-Date: 2002-03-12 11:29+0800\n"
 "Last-Translator: Yuzz <yuzz@emasonline.com>\n"
 "Language-Team: Malaysia <yuzz@emasonline.com>\n"
@@ -14,906 +14,1129 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl_.c:39
-#, fuzzy
-msgid "Unable to create medium."
-msgstr "Gagal membuat laporan fail. keluar\n"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:40
-msgid "Unable to update medium; it will be automatically disabled."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to the software installation tool!\n"
+"\n"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:51
-#, fuzzy
-msgid "Add a source"
+#: ../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 ""
-"Tunggu\n"
-"Penambahan sumber"
 
-#: ../edit-urpm-sources.pl_.c:52
-#, fuzzy
-msgid "Local files"
-msgstr "Setempat"
+#: ../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_.c:52
-#, fuzzy
-msgid "Path:"
-msgstr "path: "
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr "Ada masalah semasa instalasi"
 
-#: ../edit-urpm-sources.pl_.c:53
-msgid "FTP server"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during removal"
+msgstr "Ada masalah semasa instalasi"
 
-#: ../edit-urpm-sources.pl_.c:53 ../edit-urpm-sources.pl_.c:54
-#: ../edit-urpm-sources.pl_.c:56 ../edit-urpm-sources.pl_.c:175
-#, fuzzy
-msgid "URL:"
-msgstr "URL: "
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, removing packages..."
+msgstr "Tunggu, pakej berikut sedang dihapus:"
 
-#: ../edit-urpm-sources.pl_.c:54
-msgid "HTTP server"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:55
-#, fuzzy
-msgid "Path or mount point:"
-msgstr "path atau titik mount:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr "Ada masalah semasa instalasi"
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Removable device"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during installation"
+msgstr "Ada masalah semasa instalasi"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:56 ../rpmdrake_.c:548
-msgid "Security updates"
-msgstr "Kemaskini sekuriti"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Everything already installed."
+msgstr "Pakej sudah diinstal sebelumnya"
 
-#: ../edit-urpm-sources.pl_.c:67
-msgid "Browse..."
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:69
-#, fuzzy
-msgid "Choose a mirror..."
-msgstr "Sila pilih mirror:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:89
-#, fuzzy
-msgid "Login:"
-msgstr "login:"
+#: ../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 ""
 
-#: ../edit-urpm-sources.pl_.c:89 ../edit-urpm-sources.pl_.c:215
-#, fuzzy
-msgid "Password:"
-msgstr "katalaluan:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "everything was installed correctly"
+msgstr "Pakej sudah diinstal sebelumnya"
 
-#: ../edit-urpm-sources.pl_.c:94
-#, fuzzy
-msgid "Name:"
-msgstr "Nama"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"some packages failed to install\n"
+"correctly"
+msgstr "Pakej ini sudah diinstal sebelumnya"
 
-#: ../edit-urpm-sources.pl_.c:96 ../edit-urpm-sources.pl_.c:176
-#, fuzzy
-msgid "Relative path to synthesis/hdlist:"
-msgstr "path relatif  ke sintesis atau hdlist: "
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, removing packages to allow others to be upgraded..."
+msgstr "Pilih pakej yg ingin dikemaskini"
 
-#: ../edit-urpm-sources.pl_.c:104
-msgid "You need to fill up at least the two first entries."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:116
-#, fuzzy
-msgid "Adding a source:"
-msgstr ""
-"Tunggu\n"
-"Penambahan sumber"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Installation failed"
+msgstr "dapat diinstal"
 
-#: ../edit-urpm-sources.pl_.c:117
-msgid "Type of source:"
-msgstr "Jenis sumber:"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
+msgstr "Batal"
 
-#: ../edit-urpm-sources.pl_.c:121 ../edit-urpm-sources.pl_.c:187
-#: ../edit-urpm-sources.pl_.c:219 ../rpmdrake.pm_.c:97 ../rpmdrake.pm_.c:136
-#: ../rpmdrake.pm_.c:319 ../rpmdrake_.c:353 ../rpmdrake_.c:365
-#: ../rpmdrake_.c:369 ../rpmdrake_.c:916 ../rpmdrake_.c:950
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:180
-#: ../edit-urpm-sources.pl_.c:187 ../edit-urpm-sources.pl_.c:220
-#: ../rpmdrake.pm_.c:319 ../rpmdrake.pm_.c:352 ../rpmdrake_.c:353
-#: ../rpmdrake_.c:950
-msgid "Cancel"
-msgstr "Batal"
-
-#: ../edit-urpm-sources.pl_.c:140
-#, fuzzy
-msgid "Please wait, adding medium..."
-msgstr "Penmeriksaan kebergantungan..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:158
-#, fuzzy
-msgid "Please wait, removing medium..."
-msgstr "Penmeriksaan kebergantungan..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:169
-#, fuzzy
-msgid "Edit a source"
-msgstr "Ubah Sumber"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:173
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "Ubah Sumber"
+msgid "Unable to get source packages."
+msgstr "Pakej rosak, tidak boleh dibaca/dicari"
 
-#: ../edit-urpm-sources.pl_.c:179
-#, fuzzy
-msgid "Save changes"
-msgstr "Pakej"
+#: ../rpmdrake:1
+#, c-format
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:185
-msgid "You need to insert the medium to continue"
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:186
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:191
-#, fuzzy
-msgid "Please wait, updating medium..."
-msgstr "Penmeriksaan kebergantungan..."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Installation finished"
+msgstr "dapat diinstal"
 
-#: ../edit-urpm-sources.pl_.c:202
-#, fuzzy
-msgid "Configure proxies"
-msgstr "Konfigurasikan sumber?"
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:207
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:209
-msgid "Proxy hostname:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Remove .%s"
+msgstr "Boleh dihapus"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "changes:"
+msgstr "Pakej"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:211
-msgid "You may specify a user/password for the proxy authentication:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, finding available packages..."
+msgstr "muat ulang senarai pakej yg tersedia"
+
+#: ../rpmdrake:1
+#, c-format
+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 ""
 
-#: ../edit-urpm-sources.pl_.c:213
-msgid "User:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:235
-#, fuzzy
-msgid "Configure sources"
-msgstr "Konfigurasikan sumber?"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:242
-msgid "Enabled?"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Sources Manager, and then add a `Security\n"
+"updates' source.\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:243
-msgid "Source"
-msgstr "Sumber"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:264 ../rpmdrake_.c:730
-#, fuzzy
-msgid "Remove"
-msgstr "Boleh dihapus"
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:266
-msgid "Edit"
-msgstr "Ubah"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:268
-msgid "Add..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:270
-msgid "Update..."
+#: ../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 ""
 
-#: ../edit-urpm-sources.pl_.c:271
-#, fuzzy
-msgid "Proxy..."
-msgstr "Ralat..."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Software Packages Installation"
+msgstr "Instalasi paket"
 
-#: ../edit-urpm-sources.pl_.c:274
-msgid "Save and quit"
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, fuzzy, c-format
+msgid "Mandrake Update"
 msgstr ""
+"Mandrake\n"
+"Update"
 
-#: ../edit-urpm-sources.pl_.c:275 ../rpmdrake_.c:733
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Software Packages Removal"
+msgstr " Pengurus Perisian "
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
 msgid "Quit"
 msgstr "Keluar"
 
-#: ../rpmdrake.pm_.c:93
-msgid "Yes"
-msgstr ""
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "Install"
 
-#: ../rpmdrake.pm_.c:95
-msgid "No"
-msgstr ""
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Remove"
+msgstr "Boleh dihapus"
 
-#: ../rpmdrake.pm_.c:127
-msgid "Info..."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Search"
+msgstr "Carian"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "Cari:"
+
+#: ../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 ""
 
-#: ../rpmdrake.pm_.c:180
-msgid "Austria"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:181
-msgid "Australia"
+#: ../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 ""
 
-#: ../rpmdrake.pm_.c:182
-msgid "Belgium"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Too many packages are selected"
+msgstr "Pakej ini sudah diinstal sebelumnya"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:183
-msgid "Brazil"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Normal information"
+msgstr "kemaskini normal"
+
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update source(s)"
+msgstr "Ubah Sumber"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Reload the packages list"
+msgstr "Pakej %s belum ditandatangani"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:184
-msgid "Canada"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "in files"
+msgstr "Setempat"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "in descriptions"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:185
-msgid "Costa Rica"
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:186
-msgid "Czech Republic"
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:187
-msgid "Germany"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:188
-msgid "Danmark"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:189 ../rpmdrake.pm_.c:193
-msgid "Greece"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "by size"
+msgstr "Kedalaman"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:190
-msgid "Spain"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "All packages,"
+msgstr "0 pakej, 0 bait"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:191
-#, fuzzy
-msgid "Finland"
-msgstr "Cari:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mandrake choices"
+msgstr "MandrakeUpdate"
 
-#: ../rpmdrake.pm_.c:192
-#, fuzzy
-msgid "France"
-msgstr "Batal"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Normal updates"
+msgstr "kemaskini normal"
 
-#: ../rpmdrake.pm_.c:194
-#, fuzzy
-msgid "Israel"
-msgstr "Terinstal"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Bugfixes updates"
+msgstr "Kemaskini sekuriti"
 
-#: ../rpmdrake.pm_.c:195
-#, fuzzy
-msgid "Italy"
-msgstr "Terinstal"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
+msgstr "Kemaskini sekuriti"
 
-#: ../rpmdrake.pm_.c:196
-msgid "Japan"
+#: ../rpmdrake:1
+#, c-format
+msgid "Description: "
 msgstr ""
 
-#: ../rpmdrake.pm_.c:197
-msgid "Korea"
+#: ../rpmdrake:1
+#, c-format
+msgid "Summary: "
 msgstr ""
 
-#: ../rpmdrake.pm_.c:198
-msgid "Netherlands"
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
 msgstr ""
 
-#: ../rpmdrake.pm_.c:199
-msgid "Norway"
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:200
-msgid "Poland"
+#: ../rpmdrake:1
+#, c-format
+msgid "Size: "
 msgstr ""
 
-#: ../rpmdrake.pm_.c:201
-#, fuzzy
-msgid "Portugal"
-msgstr "Port:"
-
-#: ../rpmdrake.pm_.c:202
-msgid "Russia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Version: "
 msgstr ""
 
-#: ../rpmdrake.pm_.c:203
-msgid "Sweden"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Name: "
+msgstr "Nama"
 
-#: ../rpmdrake.pm_.c:204
-msgid "Taiwan"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
 msgstr ""
 
-#: ../rpmdrake.pm_.c:205
-msgid "United Kingdom"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
 msgstr ""
 
-#: ../rpmdrake.pm_.c:206
-msgid "China"
+#: ../rpmdrake:1
+#, c-format
+msgid "Source: "
+msgstr "Sumber: "
+
+#: ../rpmdrake:1
+#, c-format
+msgid "(Not available)"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:207 ../rpmdrake.pm_.c:208 ../rpmdrake.pm_.c:209
-#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:261
-msgid "United States"
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:274
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:280
-msgid "Error during download"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected size: %d MB"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:289
-#, fuzzy
-msgid "No mirror"
-msgstr "Tiada ralat"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr ""
 
-#: ../rpmdrake.pm_.c:307
-#, fuzzy
-msgid "Please choose the desired mirror."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
 msgstr ""
-"Tunggu\n"
-"Senarai mirror sedang diambil"
 
-#: ../rpmdrake.pm_.c:339 ../rpmdrake_.c:627
-#, fuzzy
-msgid "Update source(s)"
-msgstr "Ubah Sumber"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+msgstr ""
 
-#: ../rpmdrake.pm_.c:343
-#, fuzzy
-msgid "Select the source(s) you wish to update:"
-msgstr "Pilih sumber yg ingin dikemaskini"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be installed"
+msgstr "Pakej ini sudah diinstal sebelumnya"
 
-#: ../rpmdrake.pm_.c:347
-#, fuzzy
-msgid "Update"
-msgstr "Kemaskini saja"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
+msgstr ""
 
-#: ../rpmdrake.pm_.c:358
-#, fuzzy
-msgid "Please wait, updating media..."
-msgstr "Penmeriksaan kebergantungan..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Additional packages needed"
+msgstr ""
 
-#: ../rpmdrake_.c:99
-msgid "Other"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be removed"
 msgstr ""
 
-#: ../rpmdrake_.c:121 ../rpmdrake_.c:135 ../rpmdrake_.c:227 ../rpmdrake_.c:298
-msgid "(none)"
-msgstr "(tiada)"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
 
-#: ../rpmdrake_.c:141 ../rpmdrake_.c:482 ../rpmdrake_.c:483
-msgid "(Not available)"
+#: ../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_.c:151 ../rpmdrake_.c:208
-#, fuzzy
-msgid "Search results"
-msgstr "Hasil Pencarian"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some additional packages need to be removed"
+msgstr "Pakej-pakej ini perlu diinstal dulu agar semuanya dapat berjalan baik."
 
-#: ../rpmdrake_.c:151
-#, fuzzy
-msgid "Search results (none)"
-msgstr "Hasil Pencarian"
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
+msgstr ""
 
-#: ../rpmdrake_.c:161 ../rpmdrake_.c:172
-#, fuzzy
-msgid "Please wait, searching..."
-msgstr "Tunggu, pakej berikut sedang dihapus:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Information on packages"
+msgstr "Tidak boleh buka pakej"
 
-#: ../rpmdrake_.c:175
-msgid "Stop"
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
 msgstr ""
 
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
+#: ../rpmdrake:1
+#, c-format
 msgid "Addable"
 msgstr ""
 
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
+#: ../rpmdrake:1
+#, c-format
 msgid "Upgradable"
 msgstr ""
 
-#: ../rpmdrake_.c:211
-msgid "Not selected"
+#: ../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_.c:211
-msgid "Selected"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "No update"
+msgstr "kemaskini normal"
 
-#: ../rpmdrake_.c:240
-msgid "rpmdrake"
-msgstr "rpmdrake"
+#: ../rpmdrake:1
+#, c-format
+msgid "(none)"
+msgstr "(tiada)"
 
-#: ../rpmdrake_.c:258 ../rpmdrake_.c:360 ../rpmdrake_.c:362
-msgid "More information on package..."
-msgstr ""
+#: ../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 "Mukasurat tiada"
 
-#: ../rpmdrake_.c:259
+#: ../rpmdrake:1
+#, c-format
 msgid "One of the following packages is needed:"
 msgstr ""
 
-#: ../rpmdrake_.c:259
+#: ../rpmdrake:1
+#, c-format
 msgid "Please choose"
 msgstr ""
 
-#: ../rpmdrake_.c:275
-#, fuzzy
-msgid "unknown package "
-msgstr "Mukasurat tiada"
-
-#: ../rpmdrake_.c:285
-#, fuzzy
-msgid "Please wait, listing packages..."
-msgstr "Tunggu, pakej berikut sedang dihapus:"
-
-#: ../rpmdrake_.c:300
-#, fuzzy
-msgid "No update"
-msgstr "kemaskini normal"
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:353 ../rpmdrake_.c:354
-msgid "More infos"
+#: ../rpmdrake:1
+#, c-format
+msgid "Not selected"
 msgstr ""
 
-#: ../rpmdrake_.c:355
-#, fuzzy
-msgid "Information on packages"
-msgstr "Tidak boleh buka pakej"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected"
+msgstr ""
 
-#: ../rpmdrake_.c:376
-#, fuzzy
-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 "Search results"
+msgstr "Hasil Pencarian"
 
-#: ../rpmdrake_.c:377
-#, fuzzy
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "Stop"
 msgstr ""
-"Untuk memenuhi kebergantungan,\n"
-"Pakej-pakej berikut akan dihapus:"
 
-#: ../rpmdrake_.c:383 ../rpmdrake_.c:391
-msgid "Some packages can't be removed"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, searching..."
+msgstr "Tunggu, pakej berikut sedang dihapus:"
 
-#: ../rpmdrake_.c:384
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Search results (none)"
+msgstr "Hasil Pencarian"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
 msgstr ""
 
-#: ../rpmdrake_.c:392 ../rpmdrake_.c:451
+#: ../edit-urpm-sources.pl:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"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_.c:421
-msgid "Additional packages needed"
-msgstr ""
-
-#: ../rpmdrake_.c:422
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
 msgstr ""
 
-#: ../rpmdrake_.c:435
-#, fuzzy
-msgid "Some packages can't be installed"
-msgstr "Pakej ini sudah diinstal sebelumnya"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Proxy..."
+msgstr "Ralat..."
 
-#: ../rpmdrake_.c:436
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
 msgstr ""
 
-#: ../rpmdrake_.c:450 ../rpmdrake_.c:684
-msgid "Some packages need to be removed"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
 msgstr ""
 
-#: ../rpmdrake_.c:472
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr ""
+msgid "Edit"
+msgstr "Ubah"
 
-#: ../rpmdrake_.c:474
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr ""
+msgid "Source"
+msgstr "Sumber"
 
-#: ../rpmdrake_.c:482
-msgid "Files:\n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
 msgstr ""
 
-#: ../rpmdrake_.c:483
-msgid "Changelog:\n"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure sources"
+msgstr "Konfigurasikan sumber?"
 
-#: ../rpmdrake_.c:486
-msgid "Source: "
-msgstr "Sumber: "
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Password:"
+msgstr "katalaluan:"
 
-#: ../rpmdrake_.c:487
-msgid "Currently installed version: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
 msgstr ""
 
-#: ../rpmdrake_.c:491
-msgid "Reason for update: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 
-#: ../rpmdrake_.c:493
-#, fuzzy
-msgid "Name: "
-msgstr "Nama"
-
-#: ../rpmdrake_.c:494
-msgid "Version: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
 msgstr ""
 
-#: ../rpmdrake_.c:495
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "%s KB"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
 msgstr ""
 
-#: ../rpmdrake_.c:495
-msgid "Size: "
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure proxies"
+msgstr "Konfigurasikan sumber?"
 
-#: ../rpmdrake_.c:497
-msgid "Importance: "
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, updating medium..."
+msgstr "Penmeriksaan kebergantungan..."
 
-#: ../rpmdrake_.c:498
-msgid "Summary: "
+#: ../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_.c:499
-msgid "Description: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
 msgstr ""
 
-#: ../rpmdrake_.c:548
-#, fuzzy
-msgid "Bugfixes updates"
-msgstr "Kemaskini sekuriti"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Save changes"
+msgstr "Pakej"
 
-#: ../rpmdrake_.c:548
-#, fuzzy
-msgid "Normal updates"
-msgstr "kemaskini normal"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "path relatif  ke sintesis atau hdlist: "
 
-#: ../rpmdrake_.c:567
-#, fuzzy
-msgid "Mandrake choices"
-msgstr "MandrakeUpdate"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "URL:"
+msgstr "URL: "
 
-#: ../rpmdrake_.c:568
-msgid "All packages, alphabetical"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing source \"%s\":"
+msgstr "Ubah Sumber"
 
-#: ../rpmdrake_.c:569
-#, fuzzy
-msgid "All packages,"
-msgstr "0 pakej, 0 bait"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Edit a source"
+msgstr "Ubah Sumber"
 
-#: ../rpmdrake_.c:592
-msgid "by group"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, removing medium..."
+msgstr "Penmeriksaan kebergantungan..."
 
-#: ../rpmdrake_.c:592
-#, fuzzy
-msgid "by size"
-msgstr "Kedalaman"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, adding medium..."
+msgstr "Penmeriksaan kebergantungan..."
 
-#: ../rpmdrake_.c:593
-msgid "by selection state"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of source:"
+msgstr "Jenis sumber:"
 
-#: ../rpmdrake_.c:594
-msgid "by source repository"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Adding a source:"
 msgstr ""
+"Tunggu\n"
+"Penambahan sumber"
 
-#: ../rpmdrake_.c:594
-msgid "by update availability"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 msgstr ""
 
-#: ../rpmdrake_.c:615
-msgid "in descriptions"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to fill up at least the two first entries."
 msgstr ""
 
-#: ../rpmdrake_.c:615
-#, fuzzy
-msgid "in files"
-msgstr "Setempat"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Name:"
+msgstr "Nama"
 
-#: ../rpmdrake_.c:615
-msgid "in names"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Login:"
+msgstr "login:"
 
-#: ../rpmdrake_.c:626
-#, fuzzy
-msgid "Reload the packages list"
-msgstr "Pakej %s belum ditandatangani"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Choose a mirror..."
+msgstr "Sila pilih mirror:"
 
-#: ../rpmdrake_.c:626
-msgid "Reset the selection"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Browse..."
 msgstr ""
 
-#: ../rpmdrake_.c:652
-msgid "Maximum information"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Path or mount point:"
+msgstr "path atau titik mount:"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Removable device"
 msgstr ""
 
-#: ../rpmdrake_.c:652
-#, fuzzy
-msgid "Normal information"
-msgstr "kemaskini normal"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "HTTP server"
+msgstr ""
 
-#: ../rpmdrake_.c:674
-#, fuzzy
-msgid "Too many packages are selected"
-msgstr "Pakej ini sudah diinstal sebelumnya"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr ""
 
-#: ../rpmdrake_.c:720
-msgid "Find:"
-msgstr "Cari:"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Path:"
+msgstr "path: "
 
-#: ../rpmdrake_.c:725
-#, fuzzy
-msgid "Search"
-msgstr "Carian"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Local files"
+msgstr "Setempat"
 
-#: ../rpmdrake_.c:731
-msgid "Install"
-msgstr "Install"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a source"
+msgstr ""
+"Tunggu\n"
+"Penambahan sumber"
 
-#: ../rpmdrake_.c:738 data/mandrakeupdate.desktop.in.h:1
-#, fuzzy
-msgid "Mandrake Update"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
 msgstr ""
-"Mandrake\n"
-"Update"
 
-#: ../rpmdrake_.c:738
-#, fuzzy
-msgid "Software Packages Installation"
-msgstr "Instalasi paket"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Unable to create medium."
+msgstr "Gagal membuat laporan fail. keluar\n"
 
-#: ../rpmdrake_.c:738
-#, fuzzy
-msgid "Software Packages Removal"
-msgstr " Pengurus Perisian "
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Please wait, updating media..."
+msgstr "Penmeriksaan kebergantungan..."
 
-#: ../rpmdrake_.c:779
-msgid "Please wait, contacting mirror to update packages information."
-msgstr ""
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update"
+msgstr "Kemaskini saja"
 
-#: ../rpmdrake_.c:781
-msgid "Error updating medium"
-msgstr ""
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Select the source(s) you wish to update:"
+msgstr "Pilih sumber yg ingin dikemaskini"
 
-#: ../rpmdrake_.c:782
-msgid "There was an unrecoverable error while updating packages information."
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Please choose the desired mirror."
 msgstr ""
+"Tunggu\n"
+"Senarai mirror sedang diambil"
 
-#: ../rpmdrake_.c:787
-msgid "How to choose manually your mirror"
+#: ../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_.c:795
-msgid "Please wait, contacting mirror to initialize updates packages."
-msgstr ""
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "No mirror"
+msgstr "Tiada ralat"
 
-#: ../rpmdrake_.c:798
-msgid "Error adding update medium"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid ""
+"There was an error downloading the mirrors list:\n"
+"\n"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
 
-#: ../rpmdrake_.c:829
-#, fuzzy
-msgid "Please wait, finding available packages..."
-msgstr "muat ulang senarai pakej yg tersedia"
-
-#: ../rpmdrake_.c:861
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Inspecting %s"
+msgid "Error during download"
 msgstr ""
 
-#: ../rpmdrake_.c:880
-#, fuzzy
-msgid "changes:"
-msgstr "Pakej"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
 
-#: ../rpmdrake_.c:884
-#, fuzzy, c-format
-msgid "Remove .%s"
-msgstr "Boleh dihapus"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
 
-#: ../rpmdrake_.c:886
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Use .%s as main file"
+msgid "United States"
 msgstr ""
 
-#: ../rpmdrake_.c:888
-msgid "Do nothing"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
 msgstr ""
 
-#: ../rpmdrake_.c:900
-#, fuzzy
-msgid "Installation finished"
-msgstr "dapat diinstal"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr ""
 
-#: ../rpmdrake_.c:910
-msgid "Inspect..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
 msgstr ""
 
-#: ../rpmdrake_.c:925
-msgid "Program missing"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
 msgstr ""
 
-#: ../rpmdrake_.c:926
-msgid "A required program is missing (grpmi). Check your installation."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
 msgstr ""
 
-#: ../rpmdrake_.c:940
-#, fuzzy
-msgid "Unable to get source packages."
-msgstr "Pakej rosak, tidak boleh dibaca/dicari"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Portugal"
+msgstr "Port:"
 
-#: ../rpmdrake_.c:941
-msgid "Unable to get source packages, sorry."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
 msgstr ""
 
-#: ../rpmdrake_.c:948
-msgid "Change medium"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
 msgstr ""
 
-#: ../rpmdrake_.c:949
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+msgid "Netherlands"
 msgstr ""
 
-#: ../rpmdrake_.c:957
-#, fuzzy
-msgid "Installation failed"
-msgstr "dapat diinstal"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Korea"
+msgstr ""
 
-#: ../rpmdrake_.c:958
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Japan"
 msgstr ""
 
-#: ../rpmdrake_.c:961
-#, fuzzy
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr "Pilih pakej yg ingin dikemaskini"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Italy"
+msgstr "Terinstal"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Israel"
+msgstr "Terinstal"
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm: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 "Greece"
 msgstr ""
 
-#: ../rpmdrake_.c:982
-#, fuzzy
-msgid ""
-"some packages failed to install\n"
-"correctly"
-msgstr "Pakej ini sudah diinstal sebelumnya"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "France"
+msgstr "Batal"
 
-#: ../rpmdrake_.c:983
-#, fuzzy
-msgid "everything was installed correctly"
-msgstr "Pakej sudah diinstal sebelumnya"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Finland"
+msgstr "Cari:"
 
-#: ../rpmdrake_.c:985
-msgid "Everything installed successfully"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
 msgstr ""
 
-#: ../rpmdrake_.c:986
-msgid "All requested packages were installed successfully."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
 msgstr ""
 
-#: ../rpmdrake_.c:989
-#, fuzzy
-msgid "Everything already installed."
-msgstr "Pakej sudah diinstal sebelumnya"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr ""
 
-#: ../rpmdrake_.c:990
-msgid "Everything already installed (is this supposed to happen at all?)."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
 msgstr ""
 
-#: ../rpmdrake_.c:997
-#, fuzzy
-msgid "Problem during installation"
-msgstr "Ada masalah semasa instalasi"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Costa Rica"
+msgstr ""
 
-#: ../rpmdrake_.c:998
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr "Ada masalah semasa instalasi"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Canada"
+msgstr ""
 
-#: ../rpmdrake_.c:1012
-msgid "Please wait, reading packages database..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
 msgstr ""
 
-#: ../rpmdrake_.c:1053
-#, fuzzy
-msgid "Please wait, removing packages..."
-msgstr "Tunggu, pakej berikut sedang dihapus:"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Belgium"
+msgstr ""
 
-#: ../rpmdrake_.c:1056
-#, fuzzy
-msgid "Problem during removal"
-msgstr "Ada masalah semasa instalasi"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Australia"
+msgstr ""
 
-#: ../rpmdrake_.c:1057
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr "Ada masalah semasa instalasi"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
+msgstr ""
 
-#: ../rpmdrake_.c:1089
-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."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Info..."
 msgstr ""
 
-#: ../rpmdrake_.c:1094
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
 msgstr ""
 
-#: ../rpmdrake_.c:1099
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
 msgstr ""
 
+#: data/rpmdrake.desktop.in.h:1
+#, fuzzy
+msgid "Install Software"
+msgstr "Install semua"
+
 #: data/rpmdrake-remove.desktop.in.h:1
 msgid "Remove Software"
 msgstr ""
@@ -922,11 +1145,6 @@ msgstr ""
 msgid "Software Sources Manager"
 msgstr ""
 
-#: data/rpmdrake.desktop.in.h:1
-#, fuzzy
-msgid "Install Software"
-msgstr "Install semua"
-
 #, fuzzy
 #~ msgid "Update sources"
 #~ msgstr "Ubah Sumber"
diff --git a/po/mt.po b/po/mt.po
index 7c1a4777..ae445bff 100644
--- a/po/mt.po
+++ b/po/mt.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-mt\n"
-"POT-Creation-Date: 2003-01-19 16:57+0100\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\n"
 "PO-Revision-Date: 2002-09-12 17:02CET\n"
 "Last-Translator: Ramon Casha <ramon.casha@linux.org.mt>\n"
 "Language-Team: Maltese <mt@li.org>\n"
@@ -14,454 +14,629 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0beta2\n"
 
-#: ../edit-urpm-sources.pl_.c:39
-msgid "Unable to create medium."
-msgstr "Ma nistax noħloq medju."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Trid li nkomplu?"
 
-#: ../edit-urpm-sources.pl_.c:40
-msgid "Unable to update medium; it will be automatically disabled."
-msgstr "Ma nistax naÄĄÄĄorna medju, se jiÄĄi diĹźabbilit awtomatikament."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to the software installation tool!\n"
+"\n"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
+msgstr ""
+"Merħba għall-għodda ta' installazzjoni ta' softwer!\n"
+"\n"
+"Is-sistema Mandrake Linux tiÄĄi b'eluf ta' pakketti ta' softwer fuq CDROM\n"
+"jew DVD. Din l-għodda tgħinek tagħşel liema softwer tixtieq tinstalla fuq\n"
+"il-kompjuter tiegħek."
 
-#: ../edit-urpm-sources.pl_.c:51
-#, fuzzy
-msgid "Add a source"
-msgstr "Qed jiÄĄi miĹźjud sors:"
+#: ../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 ""
+"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_.c:52
-msgid "Local files"
-msgstr "Fajls lokali"
+#: ../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."
 
-#: ../edit-urpm-sources.pl_.c:52
-msgid "Path:"
-msgstr "Direttorju: "
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"Inqalgħet problema fl-installazzjoni:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:53
-msgid "FTP server"
-msgstr "Server FTP"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during removal"
+msgstr "Problema waqt l-installazzjoni"
 
-#: ../edit-urpm-sources.pl_.c:53 ../edit-urpm-sources.pl_.c:54
-#: ../edit-urpm-sources.pl_.c:56 ../edit-urpm-sources.pl_.c:175
-msgid "URL:"
-msgstr "URL:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages..."
+msgstr "Stenna ftit, qed jitneħħew il-pakketti..."
 
-#: ../edit-urpm-sources.pl_.c:54
-msgid "HTTP server"
-msgstr "Server HTTP"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
+msgstr "Stenna ftit, qed jinqara d-database tal-pakketti..."
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Path or mount point:"
-msgstr "Direttorju jew punt ta' mmuntar:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Inqalgħet problema fl-installazzjoni:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Removable device"
-msgstr "Apparat jinħareĥ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during installation"
+msgstr "Problema waqt l-installazzjoni"
 
-#: ../edit-urpm-sources.pl_.c:56 ../rpmdrake_.c:548
-msgid "Security updates"
-msgstr "AÄĄÄĄornamenti ta' sigurtĂ "
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
+msgstr "Kollox diÄĄĂ  nstallat"
 
-#: ../edit-urpm-sources.pl_.c:67
-msgid "Browse..."
-msgstr "Fittex..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed."
+msgstr "Kollox diÄĄĂ  nstallat"
 
-#: ../edit-urpm-sources.pl_.c:69
-msgid "Choose a mirror..."
-msgstr "Agħşel mera..."
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "Il-pakketti kollha mitluba ÄĄew installati."
 
-#: ../edit-urpm-sources.pl_.c:89
-msgid "Login:"
-msgstr "Login:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr "Kollox ÄĄie nstallat."
 
-#: ../edit-urpm-sources.pl_.c:89 ../edit-urpm-sources.pl_.c:215
-msgid "Password:"
-msgstr "Password:"
+#: ../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-installazzjoni lestiet; %s.\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_.c:94
-msgid "Name:"
-msgstr "Isem:"
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "Kollox ÄĄie nstallat sew"
 
-#: ../edit-urpm-sources.pl_.c:96 ../edit-urpm-sources.pl_.c:176
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Direttorju relattiv għas-sintesi jew hdlist:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"some packages failed to install\n"
+"correctly"
+msgstr ""
+"Xi pakketti ma jistgħux jiĥu \n"
+"nstallati sew"
 
-#: ../edit-urpm-sources.pl_.c:104
-msgid "You need to fill up at least the two first entries."
-msgstr "Trid timla tal-inqas l-ewwel ĹźewÄĄ elementi."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages to allow others to be upgraded..."
+msgstr ""
+"Stenna ftit, qed jitneħħew pakketti biex ikunu jistgħu jiĥu aĥĥornati "
+"oħrajn..."
 
-#: ../edit-urpm-sources.pl_.c:116
-msgid "Adding a source:"
-msgstr "Qed jiÄĄi miĹźjud sors:"
+#: ../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."
 
-#: ../edit-urpm-sources.pl_.c:117
-msgid "Type of source:"
-msgstr "Tip ta' sors:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation failed"
+msgstr "Installazzjoni falliet"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
+msgstr "Ikkanċella"
 
-#: ../edit-urpm-sources.pl_.c:121 ../edit-urpm-sources.pl_.c:187
-#: ../edit-urpm-sources.pl_.c:219 ../rpmdrake.pm_.c:97 ../rpmdrake.pm_.c:136
-#: ../rpmdrake.pm_.c:319 ../rpmdrake_.c:353 ../rpmdrake_.c:365
-#: ../rpmdrake_.c:369 ../rpmdrake_.c:916 ../rpmdrake_.c:950
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:180
-#: ../edit-urpm-sources.pl_.c:187 ../edit-urpm-sources.pl_.c:220
-#: ../rpmdrake.pm_.c:319 ../rpmdrake.pm_.c:352 ../rpmdrake_.c:353
-#: ../rpmdrake_.c:950
-msgid "Cancel"
-msgstr "Ikkanċella"
+#: ../rpmdrake:1
+#, 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]"
 
-#: ../edit-urpm-sources.pl_.c:140
-msgid "Please wait, adding medium..."
-msgstr "Stenna ftit, qed jiÄĄi miĹźjud medju..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr "Ibdel sors"
 
-#: ../edit-urpm-sources.pl_.c:158
-msgid "Please wait, removing medium..."
-msgstr "Stenna ftit, qed jitneħħa l-medju..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
+msgstr "Ma nistax nikseb pakketti sors, jiddispjaċini."
 
-#: ../edit-urpm-sources.pl_.c:169
-msgid "Edit a source"
-msgstr "Editja sors"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages."
+msgstr "Ma nistax nikseb pakketti sors."
 
-#: ../edit-urpm-sources.pl_.c:173
+#: ../rpmdrake:1
 #, c-format
-msgid "Editing source \"%s\":"
-msgstr "Editja s-sors \"%s\":"
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr "Programm essenzjali (grpmi) huwa nieqes. Iċċekkja l-installazzjoni."
 
-#: ../edit-urpm-sources.pl_.c:179
-msgid "Save changes"
-msgstr "Ikteb bidliet"
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
+msgstr "Programm nieqes"
 
-#: ../edit-urpm-sources.pl_.c:185
-msgid "You need to insert the medium to continue"
-msgstr "Trid iddaħħal id-diska biex tkompli"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
+msgstr "Spezzjona..."
 
-#: ../edit-urpm-sources.pl_.c:186
-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:1
+#, c-format
+msgid "Installation finished"
+msgstr "Installazzjoni lesta"
 
-#: ../edit-urpm-sources.pl_.c:191
-msgid "Please wait, updating medium..."
-msgstr "Stenna ftit, qed jiÄĄi aÄĄÄĄornat il-medju..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
+msgstr "Tagħmel xejn"
 
-#: ../edit-urpm-sources.pl_.c:202
-msgid "Configure proxies"
-msgstr "Ikkonfigura proxies"
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
+msgstr "Uża .%s bħala fajl prinċipali"
 
-#: ../edit-urpm-sources.pl_.c:207
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
-msgstr ""
-"Jekk trid proxy, daħħal isem il-kompjuter u opzjonalment port (sintassi: "
-"<kompjuterproxy[:port]>):"
+#: ../rpmdrake:1
+#, c-format
+msgid "Remove .%s"
+msgstr "Neħħi .%s"
 
-#: ../edit-urpm-sources.pl_.c:209
-msgid "Proxy hostname:"
-msgstr "Kompjuter tal-proxy:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "changes:"
+msgstr "Ikteb bidliet"
 
-#: ../edit-urpm-sources.pl_.c:211
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "Trid tispeċifika user/password għall-awtenitikazzjoni tal-proxy:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr "Qed jiÄĄi nspezzjonat %s"
 
-#: ../edit-urpm-sources.pl_.c:213
-msgid "User:"
-msgstr "User:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, finding available packages..."
+msgstr "Stenna ftit, qed insib pakketti disponibbli..."
 
-#: ../edit-urpm-sources.pl_.c:235
-msgid "Configure sources"
-msgstr "Ikkonfigura sorsi"
+#: ../rpmdrake:1
+#, c-format
+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 ""
+"Inqalgħet problema waqt iş-şieda tas-sors permezz ta' urpmi.\n"
+"\n"
+"Dan jista' jkun minħabba mera temporanjament indisposta, jew meta\n"
+"l-verşjoni ta' Mandrake Linux tiegħek (%s) għadu m'hux / m'għadux \n"
+"sapportit mill-aġġornamenti uffiċjali ta' Mandrake Linux.\n"
+"\n"
+"Trid tipprova mera oħra?"
 
-#: ../edit-urpm-sources.pl_.c:242
-msgid "Enabled?"
-msgstr "Mixgħul?"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
+msgstr "Problema fiĹź-Ĺźieda ta' sors ta' aÄĄÄĄornamenti"
 
-#: ../edit-urpm-sources.pl_.c:243
-msgid "Source"
-msgstr "Sors"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
+msgstr ""
+"Stenna ftit, qed nikkuntattja l-mera biex nibda' l-aÄĄÄĄornament ta' pakketti."
 
-#: ../edit-urpm-sources.pl_.c:264 ../rpmdrake_.c:730
-msgid "Remove"
-msgstr "Neħħi"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Sources Manager, and then add a `Security\n"
+"updates' source.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"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"
 
-#: ../edit-urpm-sources.pl_.c:266
-msgid "Edit"
-msgstr "Editja"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Kif tagħşel mera manwalment"
 
-#: ../edit-urpm-sources.pl_.c:268
-msgid "Add..."
-msgstr "Ĺťid..."
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
+msgstr "Kien hemm problema waqt l-aÄĄÄĄornament tal-informazzjoni tal-pakketti"
 
-#: ../edit-urpm-sources.pl_.c:270
-msgid "Update..."
-msgstr "AÄĄÄĄorna..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
+msgstr "Problema fl-aÄĄÄĄornament tas-sors"
 
-#: ../edit-urpm-sources.pl_.c:271
-msgid "Proxy..."
-msgstr "Proxy..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
+msgstr ""
+"Stenna ftit, qed nikkuntattja l-mera biex naÄĄÄĄorna l-informazzjoni tal-"
+"pakketti"
 
-#: ../edit-urpm-sources.pl_.c:274
-msgid "Save and quit"
-msgstr "Ikteb u oħroĥ"
+#: ../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?"
 
-#: ../edit-urpm-sources.pl_.c:275 ../rpmdrake_.c:733
-msgid "Quit"
-msgstr "Oħroĥ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Installation"
+msgstr "Installazzjoni ta' pakketti ta' softwer"
 
-#: ../rpmdrake.pm_.c:93
-msgid "Yes"
-msgstr "Iva"
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, c-format
+msgid "Mandrake Update"
+msgstr "AÄĄÄĄornament Mandrake"
 
-#: ../rpmdrake.pm_.c:95
-msgid "No"
-msgstr "Le"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
+msgstr "Tneħħija ta' pakketti ta' softwer"
 
-#: ../rpmdrake.pm_.c:127
-msgid "Info..."
-msgstr "Info..."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Oħroĥ"
 
-#: ../rpmdrake.pm_.c:180
-msgid "Austria"
-msgstr "Awstrija"
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "Installa"
 
-#: ../rpmdrake.pm_.c:181
-msgid "Australia"
-msgstr "Awstralja"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "Neħħi"
 
-#: ../rpmdrake.pm_.c:182
-msgid "Belgium"
-msgstr "BelÄĄju"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search"
+msgstr "Fittex"
 
-#: ../rpmdrake.pm_.c:183
-msgid "Brazil"
-msgstr "BraĹźil"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "Sib:"
 
-#: ../rpmdrake.pm_.c:184
-msgid "Canada"
-msgstr "Kanada"
+#: ../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?"
 
-#: ../rpmdrake.pm_.c:185
-msgid "Costa Rica"
-msgstr "Costa Rica"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "Xi pakketti jridu jitneħħew"
 
-#: ../rpmdrake.pm_.c:186
-msgid "Czech Republic"
-msgstr "Repubblika Ċeka"
+#: ../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?"
 
-#: ../rpmdrake.pm_.c:187
-msgid "Germany"
-msgstr "Ä ermanja"
+#: ../rpmdrake:1
+#, c-format
+msgid "Too many packages are selected"
+msgstr "Hemm wisq pakketti magħşula"
 
-#: ../rpmdrake.pm_.c:188
-msgid "Danmark"
-msgstr "Danimarka"
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
+msgstr "Informazzjoni massima"
 
-#: ../rpmdrake.pm_.c:189 ../rpmdrake.pm_.c:193
-msgid "Greece"
-msgstr "Greċja"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal information"
+msgstr "Informazzjoni normali"
 
-#: ../rpmdrake.pm_.c:190
-msgid "Spain"
-msgstr "Spanja"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update source(s)"
+msgstr "AÄĄÄĄorna sorsi"
 
-#: ../rpmdrake.pm_.c:191
-msgid "Finland"
-msgstr "Finlandja"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reload the packages list"
+msgstr "ErÄĄa' aqra l-lista ta' pakketti"
 
-#: ../rpmdrake.pm_.c:192
-msgid "France"
-msgstr "Franza"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
+msgstr "Irrisettja l-għaşla"
 
-#: ../rpmdrake.pm_.c:194
-msgid "Israel"
-msgstr "IĹźrael"
+#: ../rpmdrake:1
+#, c-format
+msgid "in files"
+msgstr "fil-fajls"
 
-#: ../rpmdrake.pm_.c:195
-msgid "Italy"
-msgstr "Italja"
+#: ../rpmdrake:1
+#, c-format
+msgid "in descriptions"
+msgstr "fid-deskrizzjonijiet"
 
-#: ../rpmdrake.pm_.c:196
-msgid "Japan"
-msgstr "Ä appun"
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
+msgstr "fl-ismijiet"
 
-#: ../rpmdrake.pm_.c:197
-msgid "Korea"
-msgstr "Korea"
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
+msgstr "skond id-disponibbiltĂ  ta' aÄĄÄĄornament"
 
-#: ../rpmdrake.pm_.c:198
-msgid "Netherlands"
-msgstr "Netherlands"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
+msgstr "skond is-sors"
 
-#: ../rpmdrake.pm_.c:199
-msgid "Norway"
-msgstr "NorveÄĄja"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
+msgstr "skond l-istat tal-għaşla"
 
-#: ../rpmdrake.pm_.c:200
-msgid "Poland"
-msgstr "Polonja"
+#: ../rpmdrake:1
+#, c-format
+msgid "by size"
+msgstr "skond id-daqs"
 
-#: ../rpmdrake.pm_.c:201
-msgid "Portugal"
-msgstr "Portugall"
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
+msgstr "skond il-grupp"
 
-#: ../rpmdrake.pm_.c:202
-msgid "Russia"
-msgstr "Russja"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages,"
+msgstr "Pakketti kollha"
 
-#: ../rpmdrake.pm_.c:203
-msgid "Sweden"
-msgstr "Svezja"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
+msgstr "Pakketti kollha, alfabetiċi"
 
-#: ../rpmdrake.pm_.c:204
-msgid "Taiwan"
-msgstr "Tajwan"
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
+msgstr "Għaşliet ta' Mandrake"
 
-#: ../rpmdrake.pm_.c:205
-msgid "United Kingdom"
-msgstr "Renju Unit"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal updates"
+msgstr "AÄĄÄĄornamenti normali"
 
-#: ../rpmdrake.pm_.c:206
-msgid "China"
-msgstr "Ċina"
+#: ../rpmdrake:1
+#, c-format
+msgid "Bugfixes updates"
+msgstr "Tiswijiet ta' bugs"
 
-#: ../rpmdrake.pm_.c:207 ../rpmdrake.pm_.c:208 ../rpmdrake.pm_.c:209
-#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:261
-msgid "United States"
-msgstr "Stati Uniti"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
+msgstr "AÄĄÄĄornamenti ta' sigurtĂ "
 
-#: ../rpmdrake.pm_.c:274
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
-"Stenna ftit, qed jitnişşlu indirizzi ta' mirja mill-website ta' MandrakeSoft."
+#: ../rpmdrake:1
+#, c-format
+msgid "Description: "
+msgstr "Deskrizzjoni: "
 
-#: ../rpmdrake.pm_.c:280
-msgid "Error during download"
-msgstr "Problema waqt it-tnişşil"
+#: ../rpmdrake:1
+#, c-format
+msgid "Summary: "
+msgstr "Sommarju: "
 
-#: ../rpmdrake.pm_.c:289
-msgid "No mirror"
-msgstr "Ebda mera"
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "Importanza: "
 
-#: ../rpmdrake.pm_.c:307
-msgid "Please choose the desired mirror."
-msgstr "Jekk jogħĥbok agħşel mera li tixtieq."
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake.pm_.c:339 ../rpmdrake_.c:627
-msgid "Update source(s)"
-msgstr "AÄĄÄĄorna sorsi"
+#: ../rpmdrake:1
+#, c-format
+msgid "Size: "
+msgstr "Daqs: "
 
-#: ../rpmdrake.pm_.c:343
-msgid "Select the source(s) you wish to update:"
-msgstr "Agħşel is-sorsi li trid taĥĥorna:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Version: "
+msgstr "VerĹźjoni: "
 
-#: ../rpmdrake.pm_.c:347
-msgid "Update"
-msgstr "AÄĄÄĄorna"
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "Isem: "
 
-#: ../rpmdrake.pm_.c:358
-msgid "Please wait, updating media..."
-msgstr "Stenna ftit, qed jiÄĄu aÄĄÄĄornati l-medji..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "Raĥuni għall-aĥĥornament: "
 
-#: ../rpmdrake_.c:99
-msgid "Other"
-msgstr "Oħrajn"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
+msgstr "Verşjoni nstallata bħalissa: "
 
-#: ../rpmdrake_.c:121 ../rpmdrake_.c:135 ../rpmdrake_.c:227 ../rpmdrake_.c:298
-msgid "(none)"
-msgstr "(ebda)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Source: "
+msgstr "Sors: "
 
-#: ../rpmdrake_.c:141 ../rpmdrake_.c:482 ../rpmdrake_.c:483
+#: ../rpmdrake:1
+#, c-format
 msgid "(Not available)"
 msgstr "(Mhux disponibbli)"
 
-#: ../rpmdrake_.c:151 ../rpmdrake_.c:208
-msgid "Search results"
-msgstr "RiĹźultat tat-tfittxija"
-
-#: ../rpmdrake_.c:151
-msgid "Search results (none)"
-msgstr "RiĹźultat tat-tfittxija (ebda)"
-
-#: ../rpmdrake_.c:161 ../rpmdrake_.c:172
-msgid "Please wait, searching..."
-msgstr "Stenna ftit, qed infittex..."
-
-#: ../rpmdrake_.c:175
-msgid "Stop"
-msgstr "Ieqaf"
-
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-msgid "Addable"
-msgstr "Jistgħu jiĥu mişjuda"
-
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-msgid "Upgradable"
-msgstr "Jistgħu jiĥu aĥĥornati"
-
-#: ../rpmdrake_.c:211
-msgid "Not selected"
-msgstr "Mhux magħşul"
-
-#: ../rpmdrake_.c:211
-msgid "Selected"
-msgstr "Magħşul"
-
-#: ../rpmdrake_.c:240
-msgid "rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake_.c:258 ../rpmdrake_.c:360 ../rpmdrake_.c:362
-msgid "More information on package..."
-msgstr "Işjed tagħrif dwar il-pakkett..."
-
-#: ../rpmdrake_.c:259
-msgid "One of the following packages is needed:"
-msgstr "Wieħed minn dawn il-pakketti huwa meħtieĥ:"
-
-#: ../rpmdrake_.c:259
-msgid "Please choose"
-msgstr "Jekk jogħĥbok agħşel wieħed"
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
+msgstr "Log tal-bidliet:\n"
 
-#: ../rpmdrake_.c:275
-msgid "unknown package "
-msgstr "pakkett mhux magħruf "
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "Fajls:\n"
 
-#: ../rpmdrake_.c:285
-msgid "Please wait, listing packages..."
-msgstr "Stenna ftit, qed jiÄĄu llistjati l-pakketti..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected size: %d MB"
+msgstr "Daqs magħşula: %d MB"
 
-#: ../rpmdrake_.c:300
-msgid "No update"
-msgstr "Ebda aÄĄÄĄornament"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Magħşula: %d MB / Spazju disponibbli: %d MB"
 
-#: ../rpmdrake_.c:353 ../rpmdrake_.c:354
-msgid "More infos"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
 msgstr ""
+"Minħabba d-dipendenzi tagħhom, dawn il-pakketti jridu jitneħħew \n"
+"mill-għaşla issa:\n"
+"\n"
 
-#: ../rpmdrake_.c:355
-#, fuzzy
-msgid "Information on packages"
-msgstr "Işjed tagħrif dwar il-pakkett..."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+msgstr ""
+"Jiddispjaċini, dawn il-pakketti ma jistgħux jiġu magħżula:\n"
+"\n"
 
-#: ../rpmdrake_.c:376
-msgid "Some additional packages need to be removed"
-msgstr "Xi pakketti oħra jridu jitneħħew"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "Xi pakketti ma jistgħux jiĥu nstallati"
 
-#: ../rpmdrake_.c:377
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
 "\n"
 msgstr ""
-"Minħabba d-dipendenzi tagħhom, dawn il-pakketti wkoll iridu jitneħħew:\n"
+"Biex jiÄĄu sodisfatti d-dipendenzi, dawn il-pakketti wkoll iridu\n"
+"jiÄĄu nstallati:\n"
 "\n"
 
-#: ../rpmdrake_.c:383 ../rpmdrake_.c:391
+#: ../rpmdrake:1
+#, c-format
+msgid "Additional packages needed"
+msgstr "Pakketti oħra meħtieĥa"
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "Xi pakketti ma jistgħux jitneħħew"
 
-#: ../rpmdrake_.c:384
-#, fuzzy
+#: ../rpmdrake:1
+#, fuzzy, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -469,589 +644,601 @@ msgstr ""
 "Jiddispjaċini, jekk tneħħi dawn il-pakketti s-sistema ma tibqax taħdem:\n"
 "\n"
 
-#: ../rpmdrake_.c:392 ../rpmdrake_.c:451
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"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 jridu jitneħħew \n"
-"mill-għaşla issa:\n"
+"Minħabba d-dipendenzi tagħhom, dawn il-pakketti wkoll iridu jitneħħew:\n"
 "\n"
 
-#: ../rpmdrake_.c:421
-msgid "Additional packages needed"
-msgstr "Pakketti oħra meħtieĥa"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr "Xi pakketti oħra jridu jitneħħew"
 
-#: ../rpmdrake_.c:422
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
+msgstr "Işjed tagħrif dwar il-pakkett..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Information on packages"
+msgstr "Işjed tagħrif dwar il-pakkett..."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
 msgstr ""
-"Biex jiÄĄu sodisfatti d-dipendenzi, dawn il-pakketti wkoll iridu\n"
-"jiÄĄu nstallati:\n"
-"\n"
 
-#: ../rpmdrake_.c:435
-msgid "Some packages can't be installed"
-msgstr "Xi pakketti ma jistgħux jiĥu nstallati"
+#: ../rpmdrake:1
+#, c-format
+msgid "Addable"
+msgstr "Jistgħu jiĥu mişjuda"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Upgradable"
+msgstr "Jistgħu jiĥu aĥĥornati"
 
-#: ../rpmdrake_.c:436
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
+"The list of updates is void. This 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 ""
-"Jiddispjaċini, dawn il-pakketti ma jistgħux jiġu magħżula:\n"
-"\n"
+"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_.c:450 ../rpmdrake_.c:684
-msgid "Some packages need to be removed"
-msgstr "Xi pakketti jridu jitneħħew"
+#: ../rpmdrake:1
+#, c-format
+msgid "No update"
+msgstr "Ebda aÄĄÄĄornament"
 
-#: ../rpmdrake_.c:472
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Magħşula: %d MB / Spazju disponibbli: %d MB"
+msgid "(none)"
+msgstr "(ebda)"
 
-#: ../rpmdrake_.c:474
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "Daqs magħşula: %d MB"
+msgid "Please wait, listing packages..."
+msgstr "Stenna ftit, qed jiÄĄu llistjati l-pakketti..."
 
-#: ../rpmdrake_.c:482
-msgid "Files:\n"
-msgstr "Fajls:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "unknown package "
+msgstr "pakkett mhux magħruf "
 
-#: ../rpmdrake_.c:483
-msgid "Changelog:\n"
-msgstr "Log tal-bidliet:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Wieħed minn dawn il-pakketti huwa meħtieĥ:"
 
-#: ../rpmdrake_.c:486
-msgid "Source: "
-msgstr "Sors: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please choose"
+msgstr "Jekk jogħĥbok agħşel wieħed"
 
-#: ../rpmdrake_.c:487
-msgid "Currently installed version: "
-msgstr "Verşjoni nstallata bħalissa: "
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:491
-msgid "Reason for update: "
-msgstr "Raĥuni għall-aĥĥornament: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Not selected"
+msgstr "Mhux magħşul"
 
-#: ../rpmdrake_.c:493
-msgid "Name: "
-msgstr "Isem: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected"
+msgstr "Magħşul"
 
-#: ../rpmdrake_.c:494
-msgid "Version: "
-msgstr "VerĹźjoni: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results"
+msgstr "RiĹźultat tat-tfittxija"
 
-#: ../rpmdrake_.c:495
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Stop"
+msgstr "Ieqaf"
 
-#: ../rpmdrake_.c:495
-msgid "Size: "
-msgstr "Daqs: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, searching..."
+msgstr "Stenna ftit, qed infittex..."
 
-#: ../rpmdrake_.c:497
-msgid "Importance: "
-msgstr "Importanza: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
+msgstr "RiĹźultat tat-tfittxija (ebda)"
 
-#: ../rpmdrake_.c:498
-msgid "Summary: "
-msgstr "Sommarju: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Oħrajn"
 
-#: ../rpmdrake_.c:499
-msgid "Description: "
-msgstr "Deskrizzjoni: "
+#: ../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 ""
+"Merħba għall-editur ta' sorsi ta' pakketti!\n"
+"\n"
+"Din l-għodda tgħinek biex tikkonfigura s-sorsi ta' pakketti li tixtieq tuşa "
+"fuq\n"
+"il-kompjuter tiegħek. Dawn ikunu disponibbli biex minnhom tinstalla "
+"pakketti\n"
+"ÄĄodda jew biex taÄĄÄĄorna s-sistema."
 
-#: ../rpmdrake_.c:548
-msgid "Bugfixes updates"
-msgstr "Tiswijiet ta' bugs"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Ikteb u oħroĥ"
 
-#: ../rpmdrake_.c:548
-msgid "Normal updates"
-msgstr "AÄĄÄĄornamenti normali"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy..."
+msgstr "Proxy..."
 
-#: ../rpmdrake_.c:567
-msgid "Mandrake choices"
-msgstr "Għaşliet ta' Mandrake"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
+msgstr "AÄĄÄĄorna..."
 
-#: ../rpmdrake_.c:568
-msgid "All packages, alphabetical"
-msgstr "Pakketti kollha, alfabetiċi"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "Ĺťid..."
 
-#: ../rpmdrake_.c:569
-msgid "All packages,"
-msgstr "Pakketti kollha"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "Editja"
 
-#: ../rpmdrake_.c:592
-msgid "by group"
-msgstr "skond il-grupp"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Source"
+msgstr "Sors"
 
-#: ../rpmdrake_.c:592
-msgid "by size"
-msgstr "skond id-daqs"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
+msgstr "Mixgħul?"
 
-#: ../rpmdrake_.c:593
-msgid "by selection state"
-msgstr "skond l-istat tal-għaşla"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure sources"
+msgstr "Ikkonfigura sorsi"
 
-#: ../rpmdrake_.c:594
-msgid "by source repository"
-msgstr "skond is-sors"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "Password:"
 
-#: ../rpmdrake_.c:594
-msgid "by update availability"
-msgstr "skond id-disponibbiltĂ  ta' aÄĄÄĄornament"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
+msgstr "User:"
 
-#: ../rpmdrake_.c:615
-msgid "in descriptions"
-msgstr "fid-deskrizzjonijiet"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Trid tispeċifika user/password għall-awtenitikazzjoni tal-proxy:"
 
-#: ../rpmdrake_.c:615
-msgid "in files"
-msgstr "fil-fajls"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "Kompjuter tal-proxy:"
 
-#: ../rpmdrake_.c:615
-msgid "in names"
-msgstr "fl-ismijiet"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"Jekk trid proxy, daħħal isem il-kompjuter u opzjonalment port (sintassi: "
+"<kompjuterproxy[:port]>):"
 
-#: ../rpmdrake_.c:626
-msgid "Reload the packages list"
-msgstr "ErÄĄa' aqra l-lista ta' pakketti"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "Ikkonfigura proxies"
 
-#: ../rpmdrake_.c:626
-msgid "Reset the selection"
-msgstr "Irrisettja l-għaşla"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr "Stenna ftit, qed jiÄĄi aÄĄÄĄornat il-medju..."
 
-#: ../rpmdrake_.c:652
-msgid "Maximum information"
-msgstr "Informazzjoni massima"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "Sabiex tikteb il-bidliet, trid iddaħħal id-diska fid-drajv"
 
-#: ../rpmdrake_.c:652
-msgid "Normal information"
-msgstr "Informazzjoni normali"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
+msgstr "Trid iddaħħal id-diska biex tkompli"
 
-#: ../rpmdrake_.c:674
-msgid "Too many packages are selected"
-msgstr "Hemm wisq pakketti magħşula"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save changes"
+msgstr "Ikteb bidliet"
 
-#: ../rpmdrake_.c:720
-msgid "Find:"
-msgstr "Sib:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Direttorju relattiv għas-sintesi jew hdlist:"
 
-#: ../rpmdrake_.c:725
-msgid "Search"
-msgstr "Fittex"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake_.c:731
-msgid "Install"
-msgstr "Installa"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Editing source \"%s\":"
+msgstr "Editja s-sors \"%s\":"
 
-#: ../rpmdrake_.c:738 data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrake Update"
-msgstr "AÄĄÄĄornament Mandrake"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit a source"
+msgstr "Editja sors"
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Installation"
-msgstr "Installazzjoni ta' pakketti ta' softwer"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr "Stenna ftit, qed jitneħħa l-medju..."
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Removal"
-msgstr "Tneħħija ta' pakketti ta' softwer"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, adding medium..."
+msgstr "Stenna ftit, qed jiÄĄi miĹźjud medju..."
 
-#: ../rpmdrake_.c:779
-msgid "Please wait, contacting mirror to update packages information."
-msgstr ""
-"Stenna ftit, qed nikkuntattja l-mera biex naÄĄÄĄorna l-informazzjoni tal-"
-"pakketti"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of source:"
+msgstr "Tip ta' sors:"
 
-#: ../rpmdrake_.c:781
-msgid "Error updating medium"
-msgstr "Problema fl-aÄĄÄĄornament tas-sors"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Adding a source:"
+msgstr "Qed jiÄĄi miĹźjud sors:"
 
-#: ../rpmdrake_.c:782
-msgid "There was an unrecoverable error while updating packages information."
-msgstr "Kien hemm problema waqt l-aÄĄÄĄornament tal-informazzjoni tal-pakketti"
+#: ../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 ""
+"DiÄĄĂ  hemm medju b'dak l-isem, Ĺźgur li trid\n"
+"tibdlu ma' dan?"
 
-#: ../rpmdrake_.c:787
-msgid "How to choose manually your mirror"
-msgstr "Kif tagħşel mera manwalment"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to fill up at least the two first entries."
+msgstr "Trid timla tal-inqas l-ewwel ĹźewÄĄ elementi."
 
-#: ../rpmdrake_.c:795
-msgid "Please wait, contacting mirror to initialize updates packages."
-msgstr ""
-"Stenna ftit, qed nikkuntattja l-mera biex nibda' l-aÄĄÄĄornament ta' pakketti."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "Isem:"
 
-#: ../rpmdrake_.c:798
-msgid "Error adding update medium"
-msgstr "Problema fiĹź-Ĺźieda ta' sors ta' aÄĄÄĄornamenti"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
+msgstr "Login:"
 
-#: ../rpmdrake_.c:829
-msgid "Please wait, finding available packages..."
-msgstr "Stenna ftit, qed insib pakketti disponibbli..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Agħşel mera..."
 
-#: ../rpmdrake_.c:861
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Qed jiÄĄi nspezzjonat %s"
+msgid "Browse..."
+msgstr "Fittex..."
 
-#: ../rpmdrake_.c:880
-#, fuzzy
-msgid "changes:"
-msgstr "Ikteb bidliet"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Direttorju jew punt ta' mmuntar:"
 
-#: ../rpmdrake_.c:884
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Neħħi .%s"
+msgid "Removable device"
+msgstr "Apparat jinħareĥ"
 
-#: ../rpmdrake_.c:886
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Uża .%s bħala fajl prinċipali"
+msgid "HTTP server"
+msgstr "Server HTTP"
 
-#: ../rpmdrake_.c:888
-msgid "Do nothing"
-msgstr "Tagħmel xejn"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "Server FTP"
 
-#: ../rpmdrake_.c:900
-msgid "Installation finished"
-msgstr "Installazzjoni lesta"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path:"
+msgstr "Direttorju: "
 
-#: ../rpmdrake_.c:910
-msgid "Inspect..."
-msgstr "Spezzjona..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "Fajls lokali"
 
-#: ../rpmdrake_.c:925
-msgid "Program missing"
-msgstr "Programm nieqes"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a source"
+msgstr "Qed jiÄĄi miĹźjud sors:"
 
-#: ../rpmdrake_.c:926
-msgid "A required program is missing (grpmi). Check your installation."
-msgstr "Programm essenzjali (grpmi) huwa nieqes. Iċċekkja l-installazzjoni."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
+msgstr "Ma nistax naÄĄÄĄorna medju, se jiÄĄi diĹźabbilit awtomatikament."
 
-#: ../rpmdrake_.c:940
-msgid "Unable to get source packages."
-msgstr "Ma nistax nikseb pakketti sors."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "Ma nistax noħloq medju."
 
-#: ../rpmdrake_.c:941
-msgid "Unable to get source packages, sorry."
-msgstr "Ma nistax nikseb pakketti sors, jiddispjaċini."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, updating media..."
+msgstr "Stenna ftit, qed jiÄĄu aÄĄÄĄornati l-medji..."
 
-#: ../rpmdrake_.c:948
-msgid "Change medium"
-msgstr "Ibdel sors"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
+msgstr "AÄĄÄĄorna"
 
-#: ../rpmdrake_.c:949
+#: ../rpmdrake.pm:1
 #, 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 "Select the source(s) you wish to update:"
+msgstr "Agħşel is-sorsi li trid taĥĥorna:"
 
-#: ../rpmdrake_.c:957
-msgid "Installation failed"
-msgstr "Installazzjoni falliet"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please choose the desired mirror."
+msgstr "Jekk jogħĥbok agħşel mera li tixtieq."
 
-#: ../rpmdrake_.c:958
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
-"Installazzjoni falliet, xi fajls huma neqsin.\n"
-"Jista' jkollok bĹźonn taÄĄÄĄorna d-database tas-sorsi."
+"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_.c:961
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr ""
-"Stenna ftit, qed jitneħħew pakketti biex ikunu jistgħu jiĥu aĥĥornati "
-"oħrajn..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
+msgstr "Ebda mera"
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"There was an error downloading the mirrors list:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
-"L-installazzjoni lestiet; %s.\n"
+"Kien hemm problema waqt it-tnişşil tal-lista ta' mirja:\n"
 "\n"
-"Xi fajls ta' konfigurazzjoni inħolqu bħala \".rpmnew\" jew \".rpmsave\",\n"
-"issa tista' tinspezzjonahom sabiex tieħu azzjoni:"
+"%s\n"
+"In-network, jew il-website ta' MandrakeSoft, tista' ma tkunx \n"
+"disponibbli. ErÄĄa' pprova iĹźjed tard."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "Problema waqt it-tnişşil"
+
+#: ../rpmdrake.pm: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."
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"some packages failed to install\n"
-"correctly"
+"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 ""
-"Xi pakketti ma jistgħux jiĥu \n"
-"nstallati sew"
+"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_.c:983
-msgid "everything was installed correctly"
-msgstr "Kollox ÄĄie nstallat sew"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United States"
+msgstr "Stati Uniti"
 
-#: ../rpmdrake_.c:985
-msgid "Everything installed successfully"
-msgstr "Kollox ÄĄie nstallat."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
+msgstr "Ċina"
 
-#: ../rpmdrake_.c:986
-msgid "All requested packages were installed successfully."
-msgstr "Il-pakketti kollha mitluba ÄĄew installati."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr "Renju Unit"
 
-#: ../rpmdrake_.c:989
-msgid "Everything already installed."
-msgstr "Kollox diÄĄĂ  nstallat"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "Tajwan"
 
-#: ../rpmdrake_.c:990
-msgid "Everything already installed (is this supposed to happen at all?)."
-msgstr "Kollox diÄĄĂ  nstallat"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "Svezja"
 
-#: ../rpmdrake_.c:997
-msgid "Problem during installation"
-msgstr "Problema waqt l-installazzjoni"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
+msgstr "Russja"
 
-#: ../rpmdrake_.c:998
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Inqalgħet problema fl-installazzjoni:\n"
-"\n"
-"%s"
+msgid "Portugal"
+msgstr "Portugall"
 
-#: ../rpmdrake_.c:1012
-msgid "Please wait, reading packages database..."
-msgstr "Stenna ftit, qed jinqara d-database tal-pakketti..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
+msgstr "Polonja"
 
-#: ../rpmdrake_.c:1053
-msgid "Please wait, removing packages..."
-msgstr "Stenna ftit, qed jitneħħew il-pakketti..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
+msgstr "NorveÄĄja"
 
-#: ../rpmdrake_.c:1056
-#, fuzzy
-msgid "Problem during removal"
-msgstr "Problema waqt l-installazzjoni"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
+msgstr "Netherlands"
 
-#: ../rpmdrake_.c:1057
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Inqalgħet problema fl-installazzjoni:\n"
-"\n"
-"%s"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Korea"
+msgstr "Korea"
 
-#: ../rpmdrake_.c:1089
-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
+#, c-format
+msgid "Japan"
+msgstr "Ä appun"
 
-#: ../rpmdrake_.c:1094
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"Merħba għal MandrakeUpdate!\n"
-"\n"
-"Din l-għodda tgħinek tagħşel aĥĥornamenti li trid tinstalla fuq il-\n"
-"kompjuter tiegħek."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Italy"
+msgstr "Italja"
 
-#: ../rpmdrake_.c:1099
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
-msgstr ""
-"Merħba għall-għodda ta' installazzjoni ta' softwer!\n"
-"\n"
-"Is-sistema Mandrake Linux tiÄĄi b'eluf ta' pakketti ta' softwer fuq CDROM\n"
-"jew DVD. Din l-għodda tgħinek tagħşel liema softwer tixtieq tinstalla fuq\n"
-"il-kompjuter tiegħek."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Israel"
+msgstr "IĹźrael"
 
-#: data/rpmdrake-remove.desktop.in.h:1
-msgid "Remove Software"
-msgstr "Neħħi softwer"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Greċja"
 
-#: data/rpmdrake-sources.desktop.in.h:1
-msgid "Software Sources Manager"
-msgstr "ManiÄĄÄĄjar ta' sorsi tas-softwer"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "France"
+msgstr "Franza"
 
-#: data/rpmdrake.desktop.in.h:1
-msgid "Install Software"
-msgstr "Installa softwer"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "Finlandja"
 
-#~ 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.pm:1
+#, c-format
+msgid "Spain"
+msgstr "Spanja"
 
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-#~ "Trid li nkomplu?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
+msgstr "Danimarka"
 
-#~ 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."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr "Ä ermanja"
 
-#~ 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 "Czech Republic"
+msgstr "Repubblika Ċeka"
 
-#~ msgid ""
-#~ "There was an error downloading the mirrors list:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "The network, or MandrakeSoft website, are maybe unavailable.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "Kien hemm problema waqt it-tnişşil tal-lista ta' mirja:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "In-network, jew il-website ta' MandrakeSoft, tista' ma tkunx \n"
-#~ "disponibbli. ErÄĄa' pprova iĹźjed tard."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
-#~ 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 "Canada"
+msgstr "Kanada"
 
-#~ msgid ""
-#~ "The list of updates is void. This 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.pm:1
+#, c-format
+msgid "Brazil"
+msgstr "BraĹźil"
 
-#~ msgid ""
-#~ "Warning: it seems that you are attempting to add so much\n"
-#~ "packages that your filesystem may run out of free diskspace,\n"
-#~ "during or after package installation ; this is particularly\n"
-#~ "dangerous and should be considered with care.\n"
-#~ "\n"
-#~ "Do you really want to install all the selected packages?"
-#~ msgstr ""
-#~ "Twissija: jidher li qed tipprova şşid tant pakketti li l-\n"
-#~ "filesystem tista' timtela waqt jew wara l-installazzjoni\n"
-#~ "tal-pakketti ; dan huwa partikularment perikoluş u għandu\n"
-#~ "jiÄĄi kkunsidrat bl-attenzjoni.\n"
-#~ "\n"
-#~ "ŝgur li trid tinstalla l-pakketti kollha magħşula?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Belgium"
+msgstr "BelÄĄju"
 
-#~ 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?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Australia"
+msgstr "Awstralja"
 
-#~ msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#~ msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
+msgstr "Awstrija"
 
-#~ 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
+#, c-format
+msgid "Info..."
+msgstr "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.pm:1
+#, c-format
+msgid "No"
+msgstr "Le"
 
-#~ 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 ""
-#~ "Inqalgħet problema waqt iş-şieda tas-sors permezz ta' urpmi.\n"
-#~ "\n"
-#~ "Dan jista' jkun minħabba mera temporanjament indisposta, jew meta\n"
-#~ "l-verşjoni ta' Mandrake Linux tiegħek (%s) għadu m'hux / m'għadux \n"
-#~ "sapportit mill-aġġornamenti uffiċjali ta' Mandrake Linux.\n"
-#~ "\n"
-#~ "Trid tipprova mera oħra?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Iva"
+
+#: data/rpmdrake.desktop.in.h:1
+msgid "Install Software"
+msgstr "Installa softwer"
+
+#: data/rpmdrake-remove.desktop.in.h:1
+msgid "Remove Software"
+msgstr "Neħħi softwer"
+
+#: data/rpmdrake-sources.desktop.in.h:1
+msgid "Software Sources Manager"
+msgstr "ManiÄĄÄĄjar ta' sorsi tas-softwer"
+
+#~ 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-*-*-*-*-p-*-iso8859-*,*-r-*"
diff --git a/po/mt.pom b/po/mt.pom
index a33ce985..05fd5e95 100644
--- a/po/mt.pom
+++ b/po/mt.pom
@@ -4,168 +4,172 @@ msgstr "Server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Kompjuter fuq network (klijent)"
+msgid "Office Workstation"
+msgstr "Kompjuter tal-Uffiċċju"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "Servers NFS, SMB, Proxy, ssh"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Programmi tal-uffiċċju: wordprocessors (kword, abiword), spreadsheet "
+"(kspread, gnumeric) eċċ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Uffiċċju"
+msgid "Workstation"
+msgstr "Workstation"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Gnome"
+msgid "Game station"
+msgstr "Logħob"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Għodda għall-Palm Pilot jew Visor"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Programmi ta' divertiment: logħob tal-arcades, karti, strateġija eċċ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Workstation"
+msgid "Multimedia station"
+msgstr "Multimedja"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Firewall/Router"
+msgid "Sound and video playing/editing programs"
+msgstr "Programmi għad-daqq u editjar ta' awdjo u video"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr "Domain Name u Network Information Server"
+msgid "Internet station"
+msgstr "Internet"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
 msgstr ""
-"Programmi tal-uffiċċju: wordprocessors (kword, abiword), spreadsheet "
-"(kspread, gnumeric) eċċ"
+"Sett għodda biex taqra u tibgħat imejl u \"news\", u biex tibbrawşja l-web"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "Għodda relatati mal-awdjo: biex iddoqq mp3 u midi, miksers, eċċ"
+msgid "Network Computer (client)"
+msgstr "Kompjuter fuq network (klijent)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Linux Standard Base. Sapport ta' programmi ta' terzi partiti"
+msgid "Clients for different protocols including ssh"
+msgstr "Klijenti għal protokolli differenti, eş. SSH"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Kotba u \"HOWTO\" dwar il-Linux u Softwer ÄŚieles"
+msgid "Configuration"
+msgstr "Konfigurazzjoni"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "Stazzjon KDE"
+msgid "Tools to ease the configuration of your computer"
+msgstr "Għodda biex tiffaċilita l-konfigurazzjoni tal-kompjuter"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, eċċ"
+msgid "Scientific Workstation"
+msgstr "Xjentifiku"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Multimedja - video"
+msgid "Scientific applications such as gnuplot"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr ""
-"Sett ta' programmi għal imejl, newsgroups, web, trasferiment ta' fajls u chat"
+msgid "Console Tools"
+msgstr "Għodda tal-konsol"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Database"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Edituri, shells, għodda tal-fajls, terminals"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "Server tad-database PostgreSQL jew MySQL"
+msgid "KDE Workstation"
+msgstr "Stazzjon KDE"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Għodda biex tiffaċilita l-konfigurazzjoni tal-kompjuter"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"K Desktop Environment, l-interfaċċja grafika bażi, b'għażla ta' għodda "
+"jakkumpanjawha"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "Multimedja - awdjo"
+msgid "Graphical Environment"
+msgstr "Ambjent Grafiku"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dokumentazzjoni"
+msgid "Gnome Workstation"
+msgstr "Gnome"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Għodda tal-konsol"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr "Ambjent grafiku b' għażla ta' programmi u għodda faċli"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr "Server tal-imejl Postfix, news server Inn"
+msgid "Other Graphical Desktops"
+msgstr "Desktops Grafiċi Oħrajn"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Internet"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, eċċ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Multimedja"
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+msgid "Development"
+msgstr "Ĺťviluppar"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Konfigurazzjoni"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "Libreriji, programmi u fajls għal şviluppar C u C++"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Desktops grafiċi oħrajn (Gnome, IceWM)"
+msgid "Documentation"
+msgstr "Dokumentazzjoni"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
-"K Desktop Environment, l-interfaċċja grafika bażi, b'għażla ta' għodda "
-"jakkumpanjawha"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Kotba u \"HOWTO\" dwar il-Linux u Softwer ÄŚieles"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Ambjent Grafiku"
+msgid "LSB"
+msgstr "LSB"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Linux Standard Base. Sapport ta' programmi ta' terzi partiti"
+
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-msgid "Development"
-msgstr "Ĺťviluppar"
+#: ../../share/compssUsers:999
+msgid "Web/FTP"
+msgstr "Web/FTP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -174,23 +178,33 @@ msgstr "Apache, Pro-ftpd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "Għodda biex toħloq u taħraq CDs"
+msgid "Mail/Groupware/News"
+msgstr "Imejl/Groupware/Newsgroups"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Kompjuter tal-Uffiċċju"
+msgid "Postfix mail server, Inn news server"
+msgstr "Server tal-imejl Postfix, news server Inn"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, eċċ"
+msgid "Database"
+msgstr "Database"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Programmi grafiċi bħal GIMP"
+msgid "PostgreSQL or MySQL database server"
+msgstr "Server tad-database PostgreSQL jew MySQL"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Firewall/Router"
+msgstr "Firewall/Router"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Internet gateway"
+msgstr "Gateway tal-internet"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -199,8 +213,8 @@ msgstr "DNS/NIS "
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "Libreriji, programmi u fajls għal şviluppar C u C++"
+msgid "Domain Name and Network Information Server"
+msgstr "Domain Name u Network Information Server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -209,18 +223,19 @@ msgstr "Kompjuter Server tan-Network"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "Imejl/Groupware/Newsgroups"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "Servers NFS, SMB, Proxy, ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Logħob"
+msgid "Office"
+msgstr "Uffiċċju"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Programmi għad-daqq u editjar ta' video"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr ""
+"Sett ta' programmi għal imejl, newsgroups, web, trasferiment ta' fajls u chat"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -229,76 +244,66 @@ msgstr "Multimedja - grafika"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Programmi ta' divertiment: logħob tal-arcades, karti, strateġija eċċ"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
-"Sett għodda biex taqra u tibgħat imejl u \"news\", u biex tibbrawşja l-web"
+msgid "Graphics programs such as The Gimp"
+msgstr "Programmi grafiċi bħal GIMP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "Finanzi Personali"
+msgid "Multimedia - Sound"
+msgstr "Multimedja - awdjo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr "Ambjent grafiku b' għażla ta' programmi u għodda faċli"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "Għodda relatati mal-awdjo: biex iddoqq mp3 u midi, miksers, eċċ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Klijenti għal protokolli differenti, eş. SSH"
+msgid "Multimedia - Video"
+msgstr "Multimedja - video"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
+msgid "Video players and editors"
+msgstr "Programmi għad-daqq u editjar ta' video"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Gateway tal-internet"
+msgid "Multimedia - CD Burning"
+msgstr "Multimedja - ÄŚruq ta' CDs"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Programmi għad-daqq u editjar ta' awdjo u video"
+msgid "Tools to create and burn CD's"
+msgstr "Għodda biex toħloq u taħraq CDs"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Desktops Grafiċi Oħrajn"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Desktops grafiċi oħrajn (Gnome, IceWM)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Edituri, shells, għodda tal-fajls, terminals"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, eċċ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "Programmi biex timmaniÄĄÄĄja l-finanzi personali"
+msgid "Personal Information Management"
+msgstr "ManiÄĄÄĄjar ta' Informazzjoni Personali"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "ManiÄĄÄĄjar ta' Informazzjoni Personali"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Għodda għall-Palm Pilot jew Visor"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multimedja - ÄŚruq ta' CDs"
+msgid "Personal Finance"
+msgstr "Finanzi Personali"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Xjentifiku"
+msgid "Programs to manage your finances, such as gnucash"
+msgstr "Programmi biex timmaniÄĄÄĄja l-finanzi personali"
 
diff --git a/po/nl.po b/po/nl.po
index da64c851..fa58f3ec 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.4\n"
-"POT-Creation-Date: 2003-01-19 16:57+0100\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\n"
 "PO-Revision-Date: 2002-08-30 13:26+0100\n"
 "Last-Translator: Reinout van Schouwen <reinout@cs.vu.nl>\n"
 "Language-Team: Dutch <vertaling@nl.linux.org>\n"
@@ -14,1062 +14,1249 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl_.c:39
-msgid "Unable to create medium."
-msgstr "Niet in staat medium te creĂŤren"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Is het goed om door te gaan?"
 
-#: ../edit-urpm-sources.pl_.c:40
-msgid "Unable to update medium; it will be automatically disabled."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to the software installation tool!\n"
+"\n"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
 msgstr ""
-"Niet in staat medium te verversen; het wordt automatisch uitgeschakeld."
+"Welkom bij het software-installatieprogramma!\n"
+"\n"
+"Uw Mandrake Linux-systeem wordt geleverd met enkele duizenden\n"
+"softwarepakketten op CD-ROM of DVD. Dit hulpprogramma helpt u\n"
+"met kiezen welke software u op uw computer wilt installeren."
 
-#: ../edit-urpm-sources.pl_.c:51
-#, fuzzy
-msgid "Add a source"
-msgstr "Bezig met toevoegen van bron:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Welkom bij Mandrake Vernieuwingen!\n"
+"\n"
+"Dit hulpprogramma helpt u bij het kiezen van de vernieuwingen dit u op\n"
+"uw computer wilt installeren."
 
-#  Local media
-#: ../edit-urpm-sources.pl_.c:52
-msgid "Local files"
-msgstr "Lokale bestanden"
+#: ../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 ""
+"Welkom bij het software-verwijderprogramma!\n"
+"\n"
+"Dit hulpprogramma helpt u bij het kiezen welke software u van uw\n"
+"computer wilt verwijderen."
 
-#: ../edit-urpm-sources.pl_.c:52
-msgid "Path:"
-msgstr "Pad:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"Er is een probleem opgetreden tijdens de installatie:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:53
-msgid "FTP server"
-msgstr "FTP server"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during removal"
+msgstr "Er is een probleem opgetreden bij het installeren"
 
-#: ../edit-urpm-sources.pl_.c:53 ../edit-urpm-sources.pl_.c:54
-#: ../edit-urpm-sources.pl_.c:56 ../edit-urpm-sources.pl_.c:175
-msgid "URL:"
-msgstr "URL: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages..."
+msgstr "Even geduld, bezig met het verwijderen van pakketten..."
 
-#: ../edit-urpm-sources.pl_.c:54
-msgid "HTTP server"
-msgstr "HTTP server"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
+msgstr "Even geduld, bezig met lezen van pakkettendatabase..."
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Path or mount point:"
-msgstr "Pad of koppelpunt::"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Er is een probleem opgetreden tijdens de installatie:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Removable device"
-msgstr "Verwisselbaar apparaat"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during installation"
+msgstr "Er is een probleem opgetreden bij het installeren"
 
-#: ../edit-urpm-sources.pl_.c:56 ../rpmdrake_.c:548
-msgid "Security updates"
-msgstr "Beveiligingsverbeteringen"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
+msgstr "Alles reeds geĂŻnstalleerd (wordt dit geacht ooit te gebeuren?)"
 
-#: ../edit-urpm-sources.pl_.c:67
-msgid "Browse..."
-msgstr "Bladeren..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed."
+msgstr "Alles reeds geĂŻnstalleerd"
 
-#: ../edit-urpm-sources.pl_.c:69
-msgid "Choose a mirror..."
-msgstr "Kies uw mirror..."
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "Alle gevraagde pakketten zijn succesvol geĂŻnstalleerd."
 
-#: ../edit-urpm-sources.pl_.c:89
-msgid "Login:"
-msgstr "Aanmeldnaam:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr "Alles is succesvol geĂŻnstalleerd"
 
-#: ../edit-urpm-sources.pl_.c:89 ../edit-urpm-sources.pl_.c:215
-msgid "Password:"
-msgstr "Wachtwoord:"
+#: ../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 ""
+"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:"
 
-#: ../edit-urpm-sources.pl_.c:94
-msgid "Name:"
-msgstr "Naam:"
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "Alles is correct geĂŻnstalleerd"
 
-#  The hdlist
-#: ../edit-urpm-sources.pl_.c:96 ../edit-urpm-sources.pl_.c:176
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Relatief pad naar synthesis of hdlist: "
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"some packages failed to install\n"
+"correctly"
+msgstr ""
+"Sommige pakketten kunnen niet\n"
+"correct worden geĂŻnstalleerd"
 
-#: ../edit-urpm-sources.pl_.c:104
-msgid "You need to fill up at least the two first entries."
-msgstr "U dient tenminste de eerste twee velden in te vullen."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages to allow others to be upgraded..."
+msgstr ""
+"Even geduld, bezig met verwijderen van pakketten om andere te kunnen "
+"opwaarderen..."
 
-#: ../edit-urpm-sources.pl_.c:116
-msgid "Adding a source:"
-msgstr "Bezig met toevoegen van bron:"
+#: ../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."
 
-#: ../edit-urpm-sources.pl_.c:117
-msgid "Type of source:"
-msgstr "Brontype:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation failed"
+msgstr "Installatie mislukt"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
+msgstr "Annuleren"
 
-#: ../edit-urpm-sources.pl_.c:121 ../edit-urpm-sources.pl_.c:187
-#: ../edit-urpm-sources.pl_.c:219 ../rpmdrake.pm_.c:97 ../rpmdrake.pm_.c:136
-#: ../rpmdrake.pm_.c:319 ../rpmdrake_.c:353 ../rpmdrake_.c:365
-#: ../rpmdrake_.c:369 ../rpmdrake_.c:916 ../rpmdrake_.c:950
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:180
-#: ../edit-urpm-sources.pl_.c:187 ../edit-urpm-sources.pl_.c:220
-#: ../rpmdrake.pm_.c:319 ../rpmdrake.pm_.c:352 ../rpmdrake_.c:353
-#: ../rpmdrake_.c:950
-msgid "Cancel"
-msgstr "Annuleren"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Voer het medium in met de naam \"%s\" in apparaat [%s]"
 
-#: ../edit-urpm-sources.pl_.c:140
-msgid "Please wait, adding medium..."
-msgstr "Even geduld, bezig met toevoegen medium..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr "Medium veranderen"
 
-#: ../edit-urpm-sources.pl_.c:158
-msgid "Please wait, removing medium..."
-msgstr "Even geduld, bezig met verwijderen van medium..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
+msgstr "Niet in staat bronpakketten op te halen, excuus."
 
-#: ../edit-urpm-sources.pl_.c:169
-msgid "Edit a source"
-msgstr "Een bron bewerken"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages."
+msgstr "Niet in staat bronpakketten op te halen"
 
-#: ../edit-urpm-sources.pl_.c:173
+#: ../rpmdrake:1
 #, c-format
-msgid "Editing source \"%s\":"
-msgstr "Bewerken van bron \"%s\":"
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr "Een vereist programma mist (grpmi). Controleer uw installatie."
 
-#: ../edit-urpm-sources.pl_.c:179
-msgid "Save changes"
-msgstr "Veranderingen opslaan"
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
+msgstr "Programma mist"
 
-#: ../edit-urpm-sources.pl_.c:185
-msgid "You need to insert the medium to continue"
-msgstr "U dient het medium te plaatsen om door te gaan"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
+msgstr "Inspecteren..."
 
-#: ../edit-urpm-sources.pl_.c:186
-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:1
+#, c-format
+msgid "Installation finished"
+msgstr "Installatie voltooid"
 
-#: ../edit-urpm-sources.pl_.c:191
-msgid "Please wait, updating medium..."
-msgstr "Even geduld, bezig met verversen van medium..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
+msgstr "Niets doen"
 
-#: ../edit-urpm-sources.pl_.c:202
-msgid "Configure proxies"
-msgstr "Proxy's configureren"
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
+msgstr ".%s als hoofdbestand gebruiken"
+
+#  Removable media
+#: ../rpmdrake:1
+#, c-format
+msgid "Remove .%s"
+msgstr ".%s verwijderen"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "changes:"
+msgstr "Veranderingen opslaan"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr "Bezig met inspecteren van %s"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, finding available packages..."
+msgstr "Even geduld, bezig met opzoeken van verkrijgbare pakketten..."
 
-#: ../edit-urpm-sources.pl_.c:207
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+"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 ""
-"Indien u een proxy nodig heeft, geef dan de hostnaam en optioneel eenpoort "
-"(syntax: <proxyhost[:port]>):"
+"Er is een fout opgetreden bij het toevoegen van een vernieuwingsmedium via "
+"urpmi.\n"
+"\n"
+"Dit zou veroorzaakt kunnen zijn door een kapotte of tijdelijk onbeschikbare "
+"mirror, of\n"
+"wanneer uw Mandrake Linux-versie (%s) nog niet / niet meer ondersteund wordt "
+"door\n"
+"de officiĂŤle Mandrake Linux vernieuwingen. \n"
+"\n"
+"Wilt u een andere mirror proberen?"
 
-#: ../edit-urpm-sources.pl_.c:209
-msgid "Proxy hostname:"
-msgstr "Proxy-hostnaam:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
+msgstr "Er is een fout opgetreden bij het toevoegen van een vernieuwingsmedium"
 
-#: ../edit-urpm-sources.pl_.c:211
-msgid "You may specify a user/password for the proxy authentication:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
 msgstr ""
-"U kunt een gebruikersnaam/wachtwoord aangeven voor de proxy-aanmelding:"
-
-#: ../edit-urpm-sources.pl_.c:213
-msgid "User:"
-msgstr "Gebruiker"
+"Even geduld, bezig met verbinden met mirror om pakketvernieuwingen te "
+"initialiseren."
 
-#: ../edit-urpm-sources.pl_.c:235
-msgid "Configure sources"
-msgstr "Bronnen configureren"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Sources Manager, and then add a `Security\n"
+"updates' source.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"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 Vernieuwingen."
 
-#: ../edit-urpm-sources.pl_.c:242
-msgid "Enabled?"
-msgstr "Ingeschakeld?"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Hoe u handmatig uw mirror kunt kiezen"
 
-#: ../edit-urpm-sources.pl_.c:243
-msgid "Source"
-msgstr "Bron"
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
+msgstr ""
+"Er is een onherstelbare fout opgetreden bij het verversen van "
+"pakketinformatie."
 
-#  Removable media
-#: ../edit-urpm-sources.pl_.c:264 ../rpmdrake_.c:730
-msgid "Remove"
-msgstr "Verwisselen"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
+msgstr "Er is een fout opgetreden bij het verversen van het medium"
 
-#: ../edit-urpm-sources.pl_.c:266
-msgid "Edit"
-msgstr "Bewerken"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
+msgstr ""
+"Even geduld, bezig met verbinden met mirror om pakketinformatie te verversen"
 
-#: ../edit-urpm-sources.pl_.c:268
-msgid "Add..."
-msgstr "Toevoegen..."
+#: ../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?"
 
-#: ../edit-urpm-sources.pl_.c:270
-msgid "Update..."
-msgstr "Verversen..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Installation"
+msgstr "Softwarepakketten installeren"
 
-#: ../edit-urpm-sources.pl_.c:271
-msgid "Proxy..."
-msgstr "Proxy..."
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, c-format
+msgid "Mandrake Update"
+msgstr "Mandrake Vernieuwingen"
 
-#: ../edit-urpm-sources.pl_.c:274
-msgid "Save and quit"
-msgstr "Opslaan en afsluiten"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
+msgstr "Softwarepakketten verwijderen"
 
-#: ../edit-urpm-sources.pl_.c:275 ../rpmdrake_.c:733
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
 msgid "Quit"
 msgstr "Afsluiten"
 
-#: ../rpmdrake.pm_.c:93
-msgid "Yes"
-msgstr "Ja"
-
-#: ../rpmdrake.pm_.c:95
-msgid "No"
-msgstr "Nee"
-
-#: ../rpmdrake.pm_.c:127
-msgid "Info..."
-msgstr "Info..."
-
-#: ../rpmdrake.pm_.c:180
-msgid "Austria"
-msgstr "Oostenrijk"
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "Installeren"
 
-#: ../rpmdrake.pm_.c:181
-msgid "Australia"
-msgstr "AustraliĂŤ"
+#  Removable media
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "Verwisselen"
 
-#: ../rpmdrake.pm_.c:182
-msgid "Belgium"
-msgstr "BelgiĂŤ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search"
+msgstr "Zoeken"
 
-#: ../rpmdrake.pm_.c:183
-msgid "Brazil"
-msgstr "BraziliĂŤ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "Zoek:"
 
-#: ../rpmdrake.pm_.c:184
-msgid "Canada"
-msgstr "Canada"
+#: ../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?"
 
-#: ../rpmdrake.pm_.c:185
-msgid "Costa Rica"
-msgstr "Costa Rica"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "Enkele pakketten dienen verwijderd te worden"
 
-#: ../rpmdrake.pm_.c:186
-msgid "Czech Republic"
-msgstr "TsjechiĂŤ"
+#: ../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?"
 
-#: ../rpmdrake.pm_.c:187
-msgid "Germany"
-msgstr "Duitsland"
+#: ../rpmdrake:1
+#, c-format
+msgid "Too many packages are selected"
+msgstr "Te veel pakketten zijn geselecteerd"
 
-#: ../rpmdrake.pm_.c:188
-msgid "Danmark"
-msgstr "Denemarken"
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
+msgstr "Maximale informatie"
 
-#: ../rpmdrake.pm_.c:189 ../rpmdrake.pm_.c:193
-msgid "Greece"
-msgstr "Griekenland"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal information"
+msgstr "Normale informatie"
 
-#: ../rpmdrake.pm_.c:190
-msgid "Spain"
-msgstr "Spanje"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update source(s)"
+msgstr "Bron(nen) verversen"
 
-#: ../rpmdrake.pm_.c:191
-msgid "Finland"
-msgstr "Finland"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reload the packages list"
+msgstr "Pakkettenlijst herladen"
 
-#: ../rpmdrake.pm_.c:192
-msgid "France"
-msgstr "Frankrijk"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
+msgstr "Alle selecties opheffen"
 
-#  Use plural for "installed" if your language
-#  * distinguish plural and singular here
-#: ../rpmdrake.pm_.c:194
-msgid "Israel"
-msgstr "IsraĂŤl"
+#  Local media
+#: ../rpmdrake:1
+#, c-format
+msgid "in files"
+msgstr "in bestanden"
 
-#  Use plural for "installed" if your language
-#  * distinguish plural and singular here
-#: ../rpmdrake.pm_.c:195
-msgid "Italy"
-msgstr "ItaliĂŤ"
+#: ../rpmdrake:1
+#, c-format
+msgid "in descriptions"
+msgstr "in omschrijvingen"
 
-#: ../rpmdrake.pm_.c:196
-msgid "Japan"
-msgstr "Japan"
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
+msgstr "in namen"
 
-#: ../rpmdrake.pm_.c:197
-msgid "Korea"
-msgstr "Korea, Republiek"
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
+msgstr "op beschikbaarheid vernieuwingen"
 
-#: ../rpmdrake.pm_.c:198
-msgid "Netherlands"
-msgstr "Nederland"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
+msgstr "op bron"
 
-#: ../rpmdrake.pm_.c:199
-msgid "Norway"
-msgstr "Noorwegen"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
+msgstr "op selectie-status"
 
-#: ../rpmdrake.pm_.c:200
-msgid "Poland"
-msgstr "Polen"
+#: ../rpmdrake:1
+#, c-format
+msgid "by size"
+msgstr "op grootte"
 
-#: ../rpmdrake.pm_.c:201
-msgid "Portugal"
-msgstr "Portugal"
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
+msgstr "op groep"
 
-#: ../rpmdrake.pm_.c:202
-msgid "Russia"
-msgstr "Rusland"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages,"
+msgstr "Alle pakketten,"
 
-#: ../rpmdrake.pm_.c:203
-msgid "Sweden"
-msgstr "Zweden"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
+msgstr "Alle pakketten, alfabetisch"
 
-#: ../rpmdrake.pm_.c:204
-msgid "Taiwan"
-msgstr "Taiwan"
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
+msgstr "Mandrake keuzes"
 
-#: ../rpmdrake.pm_.c:205
-msgid "United Kingdom"
-msgstr "Verenigd Koninkrijk"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal updates"
+msgstr "Gewone vernieuwingen"
 
-#: ../rpmdrake.pm_.c:206
-msgid "China"
-msgstr "China"
+#: ../rpmdrake:1
+#, c-format
+msgid "Bugfixes updates"
+msgstr "Programmareparaties vernieuwingen"
 
-#: ../rpmdrake.pm_.c:207 ../rpmdrake.pm_.c:208 ../rpmdrake.pm_.c:209
-#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:261
-msgid "United States"
-msgstr "Verenigde Staten"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
+msgstr "Beveiligingsverbeteringen"
 
-#: ../rpmdrake.pm_.c:274
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
-"Even geduld, bezig met downloaden van mirror-adressen van de MandrakeSoft "
-"website."
+#: ../rpmdrake:1
+#, c-format
+msgid "Description: "
+msgstr "Beschrijving:"
 
-#: ../rpmdrake.pm_.c:280
-msgid "Error during download"
-msgstr "Er is een fout opgetreden tijdens het downloaden"
+#: ../rpmdrake:1
+#, c-format
+msgid "Summary: "
+msgstr "Samenvatting: "
 
-#: ../rpmdrake.pm_.c:289
-msgid "No mirror"
-msgstr "Geen mirror"
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "Belang: "
 
-#: ../rpmdrake.pm_.c:307
-msgid "Please choose the desired mirror."
-msgstr "Kies de gewenste mirror."
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake.pm_.c:339 ../rpmdrake_.c:627
-msgid "Update source(s)"
-msgstr "Bron(nen) verversen"
+#: ../rpmdrake:1
+#, c-format
+msgid "Size: "
+msgstr "Grootte: "
 
-#: ../rpmdrake.pm_.c:343
-msgid "Select the source(s) you wish to update:"
-msgstr "Selecteer de bron(nen) die u wilt verversen:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Version: "
+msgstr "Versie: "
 
-#: ../rpmdrake.pm_.c:347
-msgid "Update"
-msgstr "Verversen"
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "Naam: "
 
-#: ../rpmdrake.pm_.c:358
-msgid "Please wait, updating media..."
-msgstr "Even geduld, bezig met verversen van media..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "Reden voor vernieuwing: "
 
-#: ../rpmdrake_.c:99
-msgid "Other"
-msgstr "Overige"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
+msgstr "Momenteel geĂŻnstalleerde versie: "
 
-#: ../rpmdrake_.c:121 ../rpmdrake_.c:135 ../rpmdrake_.c:227 ../rpmdrake_.c:298
-msgid "(none)"
-msgstr "(geen)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Source: "
+msgstr "Bron: "
 
-#: ../rpmdrake_.c:141 ../rpmdrake_.c:482 ../rpmdrake_.c:483
+#: ../rpmdrake:1
+#, c-format
 msgid "(Not available)"
 msgstr "(Niet beschikbaar)"
 
-#: ../rpmdrake_.c:151 ../rpmdrake_.c:208
-msgid "Search results"
-msgstr "Zoekresultaat"
-
-#: ../rpmdrake_.c:151
-msgid "Search results (none)"
-msgstr "Zoekresultaat (niets)"
-
-#: ../rpmdrake_.c:161 ../rpmdrake_.c:172
-msgid "Please wait, searching..."
-msgstr "Even geduld, bezig met zoeken..."
-
-#: ../rpmdrake_.c:175
-msgid "Stop"
-msgstr "Stoppen"
-
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-msgid "Addable"
-msgstr "Toevoegbaar"
-
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-msgid "Upgradable"
-msgstr "Opwaardeerbaar"
-
-#: ../rpmdrake_.c:211
-msgid "Not selected"
-msgstr "Ongeselecteerd"
-
-#: ../rpmdrake_.c:211
-msgid "Selected"
-msgstr "Geselecteerd"
-
-#: ../rpmdrake_.c:240
-msgid "rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake_.c:258 ../rpmdrake_.c:360 ../rpmdrake_.c:362
-msgid "More information on package..."
-msgstr "Meer informatie over pakket..."
-
-#: ../rpmdrake_.c:259
-msgid "One of the following packages is needed:"
-msgstr "EĂŠn van de volgende pakketten is benodigd:"
-
-#: ../rpmdrake_.c:259
-msgid "Please choose"
-msgstr "Gelieve te kiezen"
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
+msgstr "Veranderingen-logboek:\n"
 
-#: ../rpmdrake_.c:275
-msgid "unknown package "
-msgstr "onbekend pakket"
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "Bestanden:\n"
 
-#: ../rpmdrake_.c:285
-msgid "Please wait, listing packages..."
-msgstr "Even geduld, bezig met opsommen van pakketten..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected size: %d MB"
+msgstr "Geselecteerde grootte: %d MB"
 
-#: ../rpmdrake_.c:300
-msgid "No update"
-msgstr "Geen vernieuwing"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Geselecteerd: %d MB / Vrije schijfruimte: %d MB"
 
-#: ../rpmdrake_.c:353 ../rpmdrake_.c:354
-msgid "More infos"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
 msgstr ""
+"Vanwege hun afhankelijkheden dienen de volgende pakket(ten)\n"
+"nu gedeselecteerd te worden:\n"
 
-#: ../rpmdrake_.c:355
-#, fuzzy
-msgid "Information on packages"
-msgstr "Meer informatie over pakket..."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+msgstr ""
+"Sorry, maar de volgende pakket(ten) kunnen niet geselecteerd worden:\n"
+"\n"
 
-#: ../rpmdrake_.c:376
-msgid "Some additional packages need to be removed"
-msgstr "Enkele extra pakketten dienen verwijderd te worden"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "Sommige pakketten kunnen niet worden geĂŻnstalleerd"
 
-#: ../rpmdrake_.c:377
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
 "\n"
 msgstr ""
-"Om alle afhankelijkheden te laten kloppen, zullen deze pakket(ten)\n"
-"verwijderd worden:\n"
+"Om aan afhankelijkheden te voldoen, dienen de volgende\n"
+"pakket(ten) ook geĂŻnstalleerd te worden:\n"
 "\n"
 
-#: ../rpmdrake_.c:383 ../rpmdrake_.c:391
+#: ../rpmdrake:1
+#, c-format
+msgid "Additional packages needed"
+msgstr "Extra pakketten benodigd"
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "Sommige pakketten kunnen niet verwijderd worden"
 
-#: ../rpmdrake_.c:384
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake_.c:392 ../rpmdrake_.c:451
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
 "\n"
 msgstr ""
-"Vanwege hun afhankelijkheden dienen de volgende pakket(ten)\n"
-"nu gedeselecteerd te worden:\n"
+"Om alle afhankelijkheden te laten kloppen, zullen deze pakket(ten)\n"
+"verwijderd worden:\n"
+"\n"
 
-#: ../rpmdrake_.c:421
-msgid "Additional packages needed"
-msgstr "Extra pakketten benodigd"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr "Enkele extra pakketten dienen verwijderd te worden"
 
-#: ../rpmdrake_.c:422
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
+msgstr "Meer informatie over pakket..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Information on packages"
+msgstr "Meer informatie over pakket..."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
 msgstr ""
-"Om aan afhankelijkheden te voldoen, dienen de volgende\n"
-"pakket(ten) ook geĂŻnstalleerd te worden:\n"
-"\n"
 
-#: ../rpmdrake_.c:435
-msgid "Some packages can't be installed"
-msgstr "Sommige pakketten kunnen niet worden geĂŻnstalleerd"
+#: ../rpmdrake:1
+#, c-format
+msgid "Addable"
+msgstr "Toevoegbaar"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Upgradable"
+msgstr "Opwaardeerbaar"
 
-#: ../rpmdrake_.c:436
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
+"The list of updates is void. This 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 ""
-"Sorry, maar de volgende pakket(ten) kunnen niet geselecteerd worden:\n"
-"\n"
+"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_.c:450 ../rpmdrake_.c:684
-msgid "Some packages need to be removed"
-msgstr "Enkele pakketten dienen verwijderd te worden"
+#: ../rpmdrake:1
+#, c-format
+msgid "No update"
+msgstr "Geen vernieuwing"
 
-#: ../rpmdrake_.c:472
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Geselecteerd: %d MB / Vrije schijfruimte: %d MB"
+msgid "(none)"
+msgstr "(geen)"
 
-#: ../rpmdrake_.c:474
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "Geselecteerde grootte: %d MB"
+msgid "Please wait, listing packages..."
+msgstr "Even geduld, bezig met opsommen van pakketten..."
 
-#: ../rpmdrake_.c:482
-msgid "Files:\n"
-msgstr "Bestanden:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "unknown package "
+msgstr "onbekend pakket"
 
-#: ../rpmdrake_.c:483
-msgid "Changelog:\n"
-msgstr "Veranderingen-logboek:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "EĂŠn van de volgende pakketten is benodigd:"
 
-#: ../rpmdrake_.c:486
-msgid "Source: "
-msgstr "Bron: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please choose"
+msgstr "Gelieve te kiezen"
 
-#: ../rpmdrake_.c:487
-msgid "Currently installed version: "
-msgstr "Momenteel geĂŻnstalleerde versie: "
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:491
-msgid "Reason for update: "
-msgstr "Reden voor vernieuwing: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Not selected"
+msgstr "Ongeselecteerd"
 
-#: ../rpmdrake_.c:493
-msgid "Name: "
-msgstr "Naam: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected"
+msgstr "Geselecteerd"
 
-#: ../rpmdrake_.c:494
-msgid "Version: "
-msgstr "Versie: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results"
+msgstr "Zoekresultaat"
 
-#: ../rpmdrake_.c:495
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Stop"
+msgstr "Stoppen"
 
-#: ../rpmdrake_.c:495
-msgid "Size: "
-msgstr "Grootte: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, searching..."
+msgstr "Even geduld, bezig met zoeken..."
 
-#: ../rpmdrake_.c:497
-msgid "Importance: "
-msgstr "Belang: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
+msgstr "Zoekresultaat (niets)"
 
-#: ../rpmdrake_.c:498
-msgid "Summary: "
-msgstr "Samenvatting: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Overige"
 
-#: ../rpmdrake_.c:499
-msgid "Description: "
-msgstr "Beschrijving:"
+#: ../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 ""
+"Welkom bij de pakketbron-editor!\n"
+"\n"
+"Dit hulpprogramma helpt u om de pakketbronnen te configureren die u wenst\n"
+"te gebruiken op uw computer. Deze zullen dan beschikbaar zijn om nieuwe\n"
+"softwarepakketten te installeren of om vernieuwingen uit te voeren."
 
-#: ../rpmdrake_.c:548
-msgid "Bugfixes updates"
-msgstr "Programmareparaties vernieuwingen"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Opslaan en afsluiten"
 
-#: ../rpmdrake_.c:548
-msgid "Normal updates"
-msgstr "Gewone vernieuwingen"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy..."
+msgstr "Proxy..."
 
-#: ../rpmdrake_.c:567
-msgid "Mandrake choices"
-msgstr "Mandrake keuzes"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
+msgstr "Verversen..."
 
-#: ../rpmdrake_.c:568
-msgid "All packages, alphabetical"
-msgstr "Alle pakketten, alfabetisch"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "Toevoegen..."
 
-#: ../rpmdrake_.c:569
-msgid "All packages,"
-msgstr "Alle pakketten,"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "Bewerken"
 
-#: ../rpmdrake_.c:592
-msgid "by group"
-msgstr "op groep"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Source"
+msgstr "Bron"
 
-#: ../rpmdrake_.c:592
-msgid "by size"
-msgstr "op grootte"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
+msgstr "Ingeschakeld?"
 
-#: ../rpmdrake_.c:593
-msgid "by selection state"
-msgstr "op selectie-status"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure sources"
+msgstr "Bronnen configureren"
 
-#: ../rpmdrake_.c:594
-msgid "by source repository"
-msgstr "op bron"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "Wachtwoord:"
 
-#: ../rpmdrake_.c:594
-msgid "by update availability"
-msgstr "op beschikbaarheid vernieuwingen"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
+msgstr "Gebruiker"
 
-#: ../rpmdrake_.c:615
-msgid "in descriptions"
-msgstr "in omschrijvingen"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+"U kunt een gebruikersnaam/wachtwoord aangeven voor de proxy-aanmelding:"
 
-#  Local media
-#: ../rpmdrake_.c:615
-msgid "in files"
-msgstr "in bestanden"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "Proxy-hostnaam:"
 
-#: ../rpmdrake_.c:615
-msgid "in names"
-msgstr "in namen"
+#: ../edit-urpm-sources.pl: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]>):"
 
-#: ../rpmdrake_.c:626
-msgid "Reload the packages list"
-msgstr "Pakkettenlijst herladen"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "Proxy's configureren"
 
-#: ../rpmdrake_.c:626
-msgid "Reset the selection"
-msgstr "Alle selecties opheffen"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr "Even geduld, bezig met verversen van medium..."
 
-#: ../rpmdrake_.c:652
-msgid "Maximum information"
-msgstr "Maximale informatie"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+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_.c:652
-msgid "Normal information"
-msgstr "Normale informatie"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
+msgstr "U dient het medium te plaatsen om door te gaan"
 
-#: ../rpmdrake_.c:674
-msgid "Too many packages are selected"
-msgstr "Te veel pakketten zijn geselecteerd"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save changes"
+msgstr "Veranderingen opslaan"
 
-#: ../rpmdrake_.c:720
-msgid "Find:"
-msgstr "Zoek:"
+#  The hdlist
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Relatief pad naar synthesis of hdlist: "
 
-#: ../rpmdrake_.c:725
-msgid "Search"
-msgstr "Zoeken"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL: "
 
-#: ../rpmdrake_.c:731
-msgid "Install"
-msgstr "Installeren"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Editing source \"%s\":"
+msgstr "Bewerken van bron \"%s\":"
 
-#: ../rpmdrake_.c:738 data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrake Update"
-msgstr "Mandrake Vernieuwingen"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit a source"
+msgstr "Een bron bewerken"
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Installation"
-msgstr "Softwarepakketten installeren"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr "Even geduld, bezig met verwijderen van medium..."
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Removal"
-msgstr "Softwarepakketten verwijderen"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, adding medium..."
+msgstr "Even geduld, bezig met toevoegen medium..."
 
-#: ../rpmdrake_.c:779
-msgid "Please wait, contacting mirror to update packages information."
-msgstr ""
-"Even geduld, bezig met verbinden met mirror om pakketinformatie te verversen"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of source:"
+msgstr "Brontype:"
 
-#: ../rpmdrake_.c:781
-msgid "Error updating medium"
-msgstr "Er is een fout opgetreden bij het verversen van het medium"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Adding a source:"
+msgstr "Bezig met toevoegen van bron:"
 
-#: ../rpmdrake_.c:782
-msgid "There was an unrecoverable error while updating packages information."
+#: ../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 ""
-"Er is een onherstelbare fout opgetreden bij het verversen van "
-"pakketinformatie."
+"Er bestaat reeds een medium met die naam, weet u\n"
+"zeker dat u deze wilt vervangen?"
 
-#: ../rpmdrake_.c:787
-msgid "How to choose manually your mirror"
-msgstr "Hoe u handmatig uw mirror kunt kiezen"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to fill up at least the two first entries."
+msgstr "U dient tenminste de eerste twee velden in te vullen."
 
-#: ../rpmdrake_.c:795
-msgid "Please wait, contacting mirror to initialize updates packages."
-msgstr ""
-"Even geduld, bezig met verbinden met mirror om pakketvernieuwingen te "
-"initialiseren."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "Naam:"
 
-#: ../rpmdrake_.c:798
-msgid "Error adding update medium"
-msgstr "Er is een fout opgetreden bij het toevoegen van een vernieuwingsmedium"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
+msgstr "Aanmeldnaam:"
 
-#: ../rpmdrake_.c:829
-msgid "Please wait, finding available packages..."
-msgstr "Even geduld, bezig met opzoeken van verkrijgbare pakketten..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Kies uw mirror..."
 
-#: ../rpmdrake_.c:861
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Bezig met inspecteren van %s"
+msgid "Browse..."
+msgstr "Bladeren..."
 
-#: ../rpmdrake_.c:880
-#, fuzzy
-msgid "changes:"
-msgstr "Veranderingen opslaan"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Pad of koppelpunt::"
 
-#  Removable media
-#: ../rpmdrake_.c:884
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove .%s"
-msgstr ".%s verwijderen"
+msgid "Removable device"
+msgstr "Verwisselbaar apparaat"
 
-#: ../rpmdrake_.c:886
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr ".%s als hoofdbestand gebruiken"
+msgid "HTTP server"
+msgstr "HTTP server"
 
-#: ../rpmdrake_.c:888
-msgid "Do nothing"
-msgstr "Niets doen"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "FTP server"
 
-#: ../rpmdrake_.c:900
-msgid "Installation finished"
-msgstr "Installatie voltooid"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path:"
+msgstr "Pad:"
 
-#: ../rpmdrake_.c:910
-msgid "Inspect..."
-msgstr "Inspecteren..."
+#  Local media
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "Lokale bestanden"
 
-#: ../rpmdrake_.c:925
-msgid "Program missing"
-msgstr "Programma mist"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a source"
+msgstr "Bezig met toevoegen van bron:"
 
-#: ../rpmdrake_.c:926
-msgid "A required program is missing (grpmi). Check your installation."
-msgstr "Een vereist programma mist (grpmi). Controleer uw installatie."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
+msgstr ""
+"Niet in staat medium te verversen; het wordt automatisch uitgeschakeld."
 
-#: ../rpmdrake_.c:940
-msgid "Unable to get source packages."
-msgstr "Niet in staat bronpakketten op te halen"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "Niet in staat medium te creĂŤren"
 
-#: ../rpmdrake_.c:941
-msgid "Unable to get source packages, sorry."
-msgstr "Niet in staat bronpakketten op te halen, excuus."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, updating media..."
+msgstr "Even geduld, bezig met verversen van media..."
 
-#: ../rpmdrake_.c:948
-msgid "Change medium"
-msgstr "Medium veranderen"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
+msgstr "Verversen"
 
-#: ../rpmdrake_.c:949
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Voer het medium in met de naam \"%s\" in apparaat [%s]"
+msgid "Select the source(s) you wish to update:"
+msgstr "Selecteer de bron(nen) die u wilt verversen:"
 
-#: ../rpmdrake_.c:957
-msgid "Installation failed"
-msgstr "Installatie mislukt"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please choose the desired mirror."
+msgstr "Kies de gewenste mirror."
 
-#: ../rpmdrake_.c:958
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
-"Installatie mislukt, sommige bestanden missen.\n"
-"U wilt misschien uw bronnen-database verversen."
+"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_.c:961
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr ""
-"Even geduld, bezig met verwijderen van pakketten om andere te kunnen "
-"opwaarderen..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
+msgstr "Geen mirror"
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"There was an error downloading the mirrors list:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
-"De istallatie is voltooid; %s.\n"
+"Er is een fout opgetreden bij het downloaden van de mirrors-lijst:\n"
 "\n"
-"Sommige configuratiebestanden zijn gecreĂŤerd als `.rpmnew' of `.rpmsave',\n"
-"u kunt er nu enkele inspecteren om zonodig actie te ondernemen:"
+"%s\n"
+"Het netwerk, of de MandrakeSoft-website, zijn wellicht onbereikbaar.\n"
+"Probeert u het later opnieuw."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "Er is een fout opgetreden tijdens het downloaden"
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
+"Even geduld, bezig met downloaden van mirror-adressen van de MandrakeSoft "
+"website."
+
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"some packages failed to install\n"
-"correctly"
+"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 ""
-"Sommige pakketten kunnen niet\n"
-"correct worden geĂŻnstalleerd"
+"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_.c:983
-msgid "everything was installed correctly"
-msgstr "Alles is correct geĂŻnstalleerd"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United States"
+msgstr "Verenigde Staten"
 
-#: ../rpmdrake_.c:985
-msgid "Everything installed successfully"
-msgstr "Alles is succesvol geĂŻnstalleerd"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
+msgstr "China"
 
-#: ../rpmdrake_.c:986
-msgid "All requested packages were installed successfully."
-msgstr "Alle gevraagde pakketten zijn succesvol geĂŻnstalleerd."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr "Verenigd Koninkrijk"
 
-#: ../rpmdrake_.c:989
-msgid "Everything already installed."
-msgstr "Alles reeds geĂŻnstalleerd"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "Taiwan"
 
-#: ../rpmdrake_.c:990
-msgid "Everything already installed (is this supposed to happen at all?)."
-msgstr "Alles reeds geĂŻnstalleerd (wordt dit geacht ooit te gebeuren?)"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "Zweden"
 
-#: ../rpmdrake_.c:997
-msgid "Problem during installation"
-msgstr "Er is een probleem opgetreden bij het installeren"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
+msgstr "Rusland"
 
-#: ../rpmdrake_.c:998
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Er is een probleem opgetreden tijdens de installatie:\n"
-"\n"
-"%s"
+msgid "Portugal"
+msgstr "Portugal"
 
-#: ../rpmdrake_.c:1012
-msgid "Please wait, reading packages database..."
-msgstr "Even geduld, bezig met lezen van pakkettendatabase..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
+msgstr "Polen"
 
-#: ../rpmdrake_.c:1053
-msgid "Please wait, removing packages..."
-msgstr "Even geduld, bezig met het verwijderen van pakketten..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
+msgstr "Noorwegen"
 
-#: ../rpmdrake_.c:1056
-#, fuzzy
-msgid "Problem during removal"
-msgstr "Er is een probleem opgetreden bij het installeren"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
+msgstr "Nederland"
 
-#: ../rpmdrake_.c:1057
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Er is een probleem opgetreden tijdens de installatie:\n"
-"\n"
-"%s"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Korea"
+msgstr "Korea, Republiek"
 
-#: ../rpmdrake_.c:1089
-msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
-msgstr ""
-"Welkom bij het software-verwijderprogramma!\n"
-"\n"
-"Dit hulpprogramma helpt u bij het kiezen welke software u van uw\n"
-"computer wilt verwijderen."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Japan"
+msgstr "Japan"
 
-#: ../rpmdrake_.c:1094
-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 Vernieuwingen!\n"
-"\n"
-"Dit hulpprogramma helpt u bij het kiezen van de vernieuwingen dit u op\n"
-"uw computer wilt installeren."
+#  Use plural for "installed" if your language
+#  * distinguish plural and singular here
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Italy"
+msgstr "ItaliĂŤ"
 
-#: ../rpmdrake_.c:1099
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
-msgstr ""
-"Welkom bij het software-installatieprogramma!\n"
-"\n"
-"Uw Mandrake Linux-systeem wordt geleverd met enkele duizenden\n"
-"softwarepakketten op CD-ROM of DVD. Dit hulpprogramma helpt u\n"
-"met kiezen welke software u op uw computer wilt installeren."
+#  Use plural for "installed" if your language
+#  * distinguish plural and singular here
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Israel"
+msgstr "IsraĂŤl"
 
-#: data/rpmdrake-remove.desktop.in.h:1
-msgid "Remove Software"
-msgstr "Software verwijderen"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Griekenland"
 
-#: data/rpmdrake-sources.desktop.in.h:1
-msgid "Software Sources Manager"
-msgstr "Software Bronnenbeheer"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "France"
+msgstr "Frankrijk"
 
-#: data/rpmdrake.desktop.in.h:1
-msgid "Install Software"
-msgstr "Software installeren"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "Finland"
 
-#~ msgid ""
-#~ "There is already a medium by that name, do you\n"
-#~ "really want to replace it?"
-#~ msgstr ""
-#~ "Er bestaat reeds een medium met die naam, weet u\n"
-#~ "zeker dat u deze wilt vervangen?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "Spanje"
 
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-#~ "Is het goed om door te gaan?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
+msgstr "Denemarken"
 
-#~ 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 ""
-#~ "Welkom bij de pakketbron-editor!\n"
-#~ "\n"
-#~ "Dit hulpprogramma helpt u om de pakketbronnen te configureren die u "
-#~ "wenst\n"
-#~ "te gebruiken op uw computer. Deze zullen dan beschikbaar zijn om nieuwe\n"
-#~ "softwarepakketten te installeren of om vernieuwingen uit te voeren."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr "Duitsland"
 
-#~ 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 "Czech Republic"
+msgstr "TsjechiĂŤ"
 
-#~ 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 ""
-#~ "Er is een fout opgetreden bij het downloaden van de mirrors-lijst:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "Het netwerk, of de MandrakeSoft-website, zijn wellicht onbereikbaar.\n"
-#~ "Probeert u het later opnieuw."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
-#~ 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 "Canada"
+msgstr "Canada"
 
-#~ msgid ""
-#~ "The list of updates is void. This means that either there is\n"
-#~ "no available update for the packages installed on your computer,\n"
-#~ "or you already installed all of them."
-#~ msgstr ""
-#~ "De lijst met vernieuwingen is leeg. Dit betekent dat er ofwel\n"
-#~ "geen vernieuwingen beschikbaar zijn voor de op uw computer\n"
-#~ "geĂŻnstalleerde pakketten, ofwel dat u ze reeds allemaal\n"
-#~ "geĂŻnstalleerd heeft."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
+msgstr "BraziliĂŤ"
 
-#~ msgid ""
-#~ "Warning: it seems that you are attempting to add so much\n"
-#~ "packages that your filesystem may run out of free diskspace,\n"
-#~ "during or after package installation ; this is particularly\n"
-#~ "dangerous and should be considered with care.\n"
-#~ "\n"
-#~ "Do you really want to install all the selected packages?"
-#~ msgstr ""
-#~ "Waarschuwing: het lijkt erop dat u probeert zoveel pakketten\n"
-#~ "toe te voegen dat uw bestandssysteem wel eens vol zou kunnen\n"
-#~ "raken tijdens of na de pakketinstallatie; dit is bijzonder \n"
-#~ "riskant en moet zorgvuldig overwogen worden.\n"
-#~ "\n"
-#~ "Weet u zeker dat u alle geselecteerde pakketten wilt installeren?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Belgium"
+msgstr "BelgiĂŤ"
 
-#~ msgid ""
-#~ "The following packages have to be removed for others to be upgraded:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "De volgende pakketten dienen verwijderd te worden om andere te kunnen "
-#~ "opwaarderen:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Is het goed om door te gaan?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Australia"
+msgstr "AustraliĂŤ"
 
-#~ msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#~ msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
+msgstr "Oostenrijk"
 
-#~ 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.pm:1
+#, c-format
+msgid "Info..."
+msgstr "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 ""
-#~ "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 Vernieuwingen."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
+msgstr "Nee"
 
-#~ 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 ""
-#~ "Er is een fout opgetreden bij het toevoegen van een vernieuwingsmedium "
-#~ "via urpmi.\n"
-#~ "\n"
-#~ "Dit zou veroorzaakt kunnen zijn door een kapotte of tijdelijk "
-#~ "onbeschikbare mirror, of\n"
-#~ "wanneer uw Mandrake Linux-versie (%s) nog niet / niet meer ondersteund "
-#~ "wordt door\n"
-#~ "de officiĂŤle Mandrake Linux vernieuwingen. \n"
-#~ "\n"
-#~ "Wilt u een andere mirror proberen?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Ja"
+
+#: data/rpmdrake.desktop.in.h:1
+msgid "Install Software"
+msgstr "Software installeren"
+
+#: data/rpmdrake-remove.desktop.in.h:1
+msgid "Remove Software"
+msgstr "Software verwijderen"
+
+#: data/rpmdrake-sources.desktop.in.h:1
+msgid "Software Sources Manager"
+msgstr "Software Bronnenbeheer"
+
+#~ 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--*-*-*-*-*,*"
diff --git a/po/nl.pom b/po/nl.pom
index c34e4d6c..2a7570b2 100644
--- a/po/nl.pom
+++ b/po/nl.pom
@@ -4,168 +4,175 @@ msgstr "Server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Netwerk-computer (client)"
+msgid "Office Workstation"
+msgstr "Kantoorwerkstation"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS server, SMB server, Proxy server, ssh server"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Kantoorprogramma's: tekstverwerkers (kword, abiword), rekenbladen (kspread, "
+"gnumeric), PDF-lezers, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Kantoor"
+msgid "Workstation"
+msgstr "Werkstation"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "GNOME Werkstation"
+msgid "Game station"
+msgstr "Game-station"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Gereedschappen voor uw Palm Pilot of uw Visor"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Amusementsprogramma's: arcade, bordspellen, strategie etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Werkstation"
+msgid "Multimedia station"
+msgstr "Multimedia-station"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Firewall/Router"
+msgid "Sound and video playing/editing programs"
+msgstr "Geluids- en video-afspeel- en bewerkingsprogramma's"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr "Domeinnaam en Network Information Server"
+msgid "Internet station"
+msgstr "Internet-station"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
 msgstr ""
-"Kantoorprogramma's: tekstverwerkers (kword, abiword), rekenbladen (kspread, "
-"gnumeric), PDF-lezers, etc"
+"Verzameling programma's om e-post en usenet nieuws mee te lezen en te "
+"schrijven, en om het Web mee door te bladeren"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "Audio-gerelateerde programma's: mp3- of midi afspelen, mengpanelen etc"
+msgid "Network Computer (client)"
+msgstr "Netwerk-computer (client)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Linux Standaard-Basis. Ondersteuning voor toepassingen van derden."
+msgid "Clients for different protocols including ssh"
+msgstr "Clients voor verschillende protcollen waaronder ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Boeken en Howto's over Linux en Vrije Software"
+msgid "Configuration"
+msgstr "Configuratie"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "KDE Werkstation"
+msgid "Tools to ease the configuration of your computer"
+msgstr "Programma's om de configuratie van uw computer te vergemakkelijken"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgid "Scientific Workstation"
+msgstr "Wetenschappelijk werkstation"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Multimedia - Video"
+msgid "Scientific applications such as gnuplot"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr ""
-"Verzameling programma's voor post, nieuws, web, bestandsoverdracht en chatten"
+msgid "Console Tools"
+msgstr "Commandoregel-gereedschappen"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Database"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Editors, shells, bestandsbeheer, terminals"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL of MySQL database-server"
+msgid "KDE Workstation"
+msgstr "KDE Werkstation"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Programma's om de configuratie van uw computer te vergemakkelijken"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"Het K Desktop Environment, de basis-grafische omgeving met een verzameling "
+"van bijbehorende programma's"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "Multimedia - Geluid"
+msgid "Graphical Environment"
+msgstr "Grafische omgeving"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Documentatie"
+msgid "Gnome Workstation"
+msgstr "GNOME Werkstation"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Commandoregel-gereedschappen"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+"Een grafische omgeving met gebruikersvriendelijke verzameling applicaties en "
+"bureaublad-programma's"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr "Postfix post-server, Inn nieuws-server"
+msgid "Other Graphical Desktops"
+msgstr "Andere grafische bureaubladen"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Internet-station"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Multimedia-station"
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+msgid "Development"
+msgstr "Ontwikkeling"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Configuratie"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C and C++ ontwikkelingsbibliotheken, programma's en include-bestanden"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Meer grafische bureaubladen (GNOME, IceWM)"
+msgid "Documentation"
+msgstr "Documentatie"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
-"Het K Desktop Environment, de basis-grafische omgeving met een verzameling "
-"van bijbehorende programma's"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Boeken en Howto's over Linux en Vrije Software"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Grafische omgeving"
+msgid "LSB"
+msgstr "LSB"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Linux Standaard-Basis. Ondersteuning voor toepassingen van derden."
+
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-msgid "Development"
-msgstr "Ontwikkeling"
+#: ../../share/compssUsers:999
+msgid "Web/FTP"
+msgstr "Web/FTP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -174,23 +181,33 @@ msgstr "Apache, Pro-ftpd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "Programma's om CD's mee te creĂŤren en te branden"
+msgid "Mail/Groupware/News"
+msgstr "Post/Groupware/Nieuws"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Kantoor Werkstation"
+msgid "Postfix mail server, Inn news server"
+msgstr "Postfix post-server, Inn nieuws-server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgid "Database"
+msgstr "Database"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Grafische programma's zoals The Gimp"
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL of MySQL database-server"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Firewall/Router"
+msgstr "Firewall/Router"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Internet gateway"
+msgstr "Internet gateway"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -199,8 +216,8 @@ msgstr "DNS/NIS "
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C and C++ ontwikkelingsbibliotheken, programma's en include-bestanden"
+msgid "Domain Name and Network Information Server"
+msgstr "Domeinnaam en Network Information Server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -209,18 +226,19 @@ msgstr "Netwerk-computer server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "Post/Groupware/Nieuws"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS server, SMB server, Proxy server, ssh server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Game-station"
+msgid "Office"
+msgstr "Kantoor"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Video-afspeel- en bewerkingsprogramma's"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr ""
+"Verzameling programma's voor post, nieuws, web, bestandsoverdracht en chatten"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -229,79 +247,66 @@ msgstr "Multimedia - Grafisch"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Amusementsprogramma's: arcade, bordspellen, strategie etc"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
-"Verzameling programma's om e-post en usenet nieuws mee te lezen en te "
-"schrijven, en om het Web mee door te bladeren"
+msgid "Graphics programs such as The Gimp"
+msgstr "Grafische programma's zoals The Gimp"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "Persoonlijke FinanciĂŤn"
+msgid "Multimedia - Sound"
+msgstr "Multimedia - Geluid"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
-"Een grafische omgeving met gebruikersvriendelijke verzameling applicaties en "
-"bureaublad-programma's"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "Audio-gerelateerde programma's: mp3- of midi afspelen, mengpanelen etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Clients voor verschillende protcollen waaronder ssh"
+msgid "Multimedia - Video"
+msgstr "Multimedia - Video"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
+msgid "Video players and editors"
+msgstr "Video-afspeel- en bewerkingsprogramma's"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Internet gateway"
+msgid "Multimedia - CD Burning"
+msgstr "Multimedia - CD branden"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Geluids- en video-afspeel- en bewerkingsprogramma's"
+msgid "Tools to create and burn CD's"
+msgstr "Programma's om CD's mee te creĂŤren en te branden"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Andere grafische bureaubladen"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Meer grafische bureaubladen (GNOME, IceWM)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Editors, shells, bestandsbeheer, terminals"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "Programma's om uw financiĂŤn mee te beheren, zoals gnucash"
+msgid "Personal Information Management"
+msgstr "Persoonlijk Gegevensbeheer"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "Persoonlijk Gegevensbeheer"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Gereedschappen voor uw Palm Pilot of uw Visor"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multimedia - CD branden"
+msgid "Personal Finance"
+msgstr "Persoonlijke FinanciĂŤn"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Wetenschappelijk werkstation"
+msgid "Programs to manage your finances, such as gnucash"
+msgstr "Programma's om uw financiĂŤn mee te beheren, zoals gnucash"
 
diff --git a/po/no.po b/po/no.po
index c7ea0e20..a5ad0774 100644
--- a/po/no.po
+++ b/po/no.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2003-01-19 16:57+0100\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\n"
 "PO-Revision-Date: 2002-02-03 14:16CET\n"
 "Last-Translator: Terje Bjerkelia <terje@bjerkelia.com>\n"
 "Language-Team: Norsk\n"
@@ -16,452 +16,627 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.5\n"
 
-#: ../edit-urpm-sources.pl_.c:39
-msgid "Unable to create medium."
-msgstr "Kan ikke opprette media."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Er det ok ĺ fortsette?"
 
-#: ../edit-urpm-sources.pl_.c:40
-msgid "Unable to update medium; it will be automatically disabled."
-msgstr "Kan ikke oppdatere media, den vil bli automatisk slĺtt av."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to the software installation tool!\n"
+"\n"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
+msgstr ""
+"Velkommen til verktřyet for installering av programvare!\n"
+"\n"
+"Mandrake Linux systemet ditt kommer med flere tusen programvarepakker\n"
+"pĺ CDROM eller DVD. Dette verktřyet hjelper deg ĺ velge hvilken\n"
+"programvare du řnsker ĺ installere pĺ maskinen din."
 
-#: ../edit-urpm-sources.pl_.c:51
-msgid "Add a source"
-msgstr "Legg til en kilde"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Velkommen til MandrakeUpdate!\n"
+"\n"
+"Dette verktřyet vil hjelpe deg ĺ velge oppdateringene du skal installere\n"
+"pĺ maskinen din."
 
-#: ../edit-urpm-sources.pl_.c:52
-msgid "Local files"
-msgstr "Lokale filer"
+#: ../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 ""
+"Velkommen til verktřyet for fjerning av programvare!\n"
+"\n"
+"Dette verktřyet vil hjelpe deg ĺ velge vilken programvare du skal fjerne\n"
+"fra maskinen din."
 
-#: ../edit-urpm-sources.pl_.c:52
-msgid "Path:"
-msgstr "Sti:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"Det var et problem under fjerning av pakker:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:53
-msgid "FTP server"
-msgstr "FTP tjener"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during removal"
+msgstr "Problem under fjerning"
 
-#: ../edit-urpm-sources.pl_.c:53 ../edit-urpm-sources.pl_.c:54
-#: ../edit-urpm-sources.pl_.c:56 ../edit-urpm-sources.pl_.c:175
-msgid "URL:"
-msgstr "URL:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages..."
+msgstr "Vennligst vent, fjerner pakker..."
 
-#: ../edit-urpm-sources.pl_.c:54
-msgid "HTTP server"
-msgstr "HTTP tjener"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
+msgstr "Vennligst vent, leser pakkedatabase..."
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Path or mount point:"
-msgstr "Sti eller monteringspunkt:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Det var et problem under installasjonen:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Removable device"
-msgstr "Fjernbar enhet"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during installation"
+msgstr "Problem under installasjonen"
 
-#: ../edit-urpm-sources.pl_.c:56 ../rpmdrake_.c:548
-msgid "Security updates"
-msgstr "Sikkerhetsoppdateringer"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
+msgstr "Alt er allerede installert (skal dette skje i det hele tatt?)."
 
-#: ../edit-urpm-sources.pl_.c:67
-msgid "Browse..."
-msgstr "Kikke..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed."
+msgstr "Alt er allerede installert."
 
-#: ../edit-urpm-sources.pl_.c:69
-msgid "Choose a mirror..."
-msgstr "Velg et speil..."
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "Alle pakker ble vellykket installert"
 
-#: ../edit-urpm-sources.pl_.c:89
-msgid "Login:"
-msgstr "Logg inn:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr "Alt installert vellykket"
 
-#: ../edit-urpm-sources.pl_.c:89 ../edit-urpm-sources.pl_.c:215
-msgid "Password:"
-msgstr "Passord:"
+#: ../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:"
 
-#: ../edit-urpm-sources.pl_.c:94
-msgid "Name:"
-msgstr "Navn:"
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "alt ble installert korrekt"
 
-#: ../edit-urpm-sources.pl_.c:96 ../edit-urpm-sources.pl_.c:176
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Relativ sti til synthesis/hdlist:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"some packages failed to install\n"
+"correctly"
+msgstr ""
+"Noen pakker kunne ikke installeres\n"
+"korrekt"
 
-#: ../edit-urpm-sources.pl_.c:104
-msgid "You need to fill up at least the two first entries."
-msgstr "Du mĺ fylle opp minst de to fřrste inngangene."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages to allow others to be upgraded..."
+msgstr ""
+"Vennligst vent, fjerner pakker for at andre skal kunne bli oppgradert..."
 
-#: ../edit-urpm-sources.pl_.c:116
-msgid "Adding a source:"
-msgstr "Legger til en kilde:"
+#: ../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."
 
-#: ../edit-urpm-sources.pl_.c:117
-msgid "Type of source:"
-msgstr "Type kilde:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation failed"
+msgstr "Installasjon mislykket"
 
-#: ../edit-urpm-sources.pl_.c:121 ../edit-urpm-sources.pl_.c:187
-#: ../edit-urpm-sources.pl_.c:219 ../rpmdrake.pm_.c:97 ../rpmdrake.pm_.c:136
-#: ../rpmdrake.pm_.c:319 ../rpmdrake_.c:353 ../rpmdrake_.c:365
-#: ../rpmdrake_.c:369 ../rpmdrake_.c:916 ../rpmdrake_.c:950
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:180
-#: ../edit-urpm-sources.pl_.c:187 ../edit-urpm-sources.pl_.c:220
-#: ../rpmdrake.pm_.c:319 ../rpmdrake.pm_.c:352 ../rpmdrake_.c:353
-#: ../rpmdrake_.c:950
-msgid "Cancel"
-msgstr "Avbryt"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Vennligst sett inn media kalt \"%s\" pĺ enhet [%s]"
 
-#: ../edit-urpm-sources.pl_.c:140
-msgid "Please wait, adding medium..."
-msgstr "Vennligst vent, legger til media..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr "Endre media"
 
-#: ../edit-urpm-sources.pl_.c:158
-msgid "Please wait, removing medium..."
-msgstr "Vennligst vent, fjerner media..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
+msgstr "Ikke i stand til ĺ fĺ tak i kildepakker, beklager."
 
-#: ../edit-urpm-sources.pl_.c:169
-msgid "Edit a source"
-msgstr "Rediger en kilde"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages."
+msgstr "Ikke i stand til ĺ fĺ tak i kildepakker."
 
-#: ../edit-urpm-sources.pl_.c:173
+#: ../rpmdrake:1
 #, c-format
-msgid "Editing source \"%s\":"
-msgstr "Rediger kilde \"%s\":"
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr "Et nřdvendig program mangler (grpmi). Sjekk installasjonen din."
 
-#: ../edit-urpm-sources.pl_.c:179
-msgid "Save changes"
-msgstr "Lagrer endringer"
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
+msgstr "Program mangler"
 
-#: ../edit-urpm-sources.pl_.c:185
-msgid "You need to insert the medium to continue"
-msgstr "Du mĺ sette inn mediumet for ĺ fortsette"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
+msgstr "Sjekk..."
 
-#: ../edit-urpm-sources.pl_.c:186
-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:1
+#, c-format
+msgid "Installation finished"
+msgstr "Installasjon ferdig"
 
-#: ../edit-urpm-sources.pl_.c:191
-msgid "Please wait, updating medium..."
-msgstr "Vennligst vent, oppdaterer media..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
+msgstr "Ikke gjřr noe"
 
-#: ../edit-urpm-sources.pl_.c:202
-msgid "Configure proxies"
-msgstr "Konfigurer proxier"
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
+msgstr "Bruk .%s som hovedfil"
 
-#: ../edit-urpm-sources.pl_.c:207
-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
+#, c-format
+msgid "Remove .%s"
+msgstr "Fjern .%s"
 
-#: ../edit-urpm-sources.pl_.c:209
-msgid "Proxy hostname:"
-msgstr "Proxy vertsnavn:"
+#: ../rpmdrake:1
+#, c-format
+msgid "changes:"
+msgstr "endringer:"
 
-#: ../edit-urpm-sources.pl_.c:211
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "Du kan spesifisere en /bruker/passord for proxy autentifiseringen:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr "Sjekker %s"
 
-#: ../edit-urpm-sources.pl_.c:213
-msgid "User:"
-msgstr "Bruker:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, finding available packages..."
+msgstr "Vennligst vent, finner tilgjengelige pakker..."
 
-#: ../edit-urpm-sources.pl_.c:235
-msgid "Configure sources"
-msgstr "Konfigurer kilder"
+#: ../rpmdrake:1
+#, c-format
+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 ""
+"Det oppsto en feil nĺr oppdateringsmediet ble lagt til via urpmi.\n"
+"\n"
+"Dette kan vĺre pga. et řdelagt eller for řyeblikket utilgjengelig speil, "
+"eller\n"
+"din Mandrake Linux versjon (%s) ikke ennĺ er / ikke lenger er střttet av "
+"Mandrake Linux\n"
+"offisiselle oppdateringer.\n"
+"\n"
+"Vil du prřve et annet speil?"
 
-#: ../edit-urpm-sources.pl_.c:242
-msgid "Enabled?"
-msgstr "Slĺtt pĺ?"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
+msgstr "Kunne ikke legge til oppdateringsmedia"
 
-#: ../edit-urpm-sources.pl_.c:243
-msgid "Source"
-msgstr "Kilde"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
+msgstr "Vennligst vent, kontakter speil for ĺ initialisere oppdateringspakker."
 
-#: ../edit-urpm-sources.pl_.c:264 ../rpmdrake_.c:730
-msgid "Remove"
-msgstr "Fjern"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Sources Manager, and then add a `Security\n"
+"updates' source.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"Du kan ogsĺ velge ditt řnskede speil manuelt: for ĺ gjřre dette\n"
+"start Programvare kilde hĺndtereren, og legg sĺ til en `Sikkerhets\n"
+"updateringer' kilde.\n"
+"\n"
+"Start sĺ MandrakeUpdate pĺ nytt."
 
-#: ../edit-urpm-sources.pl_.c:266
-msgid "Edit"
-msgstr "Rediger"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Hvordan velge ditt speil manuelt"
 
-#: ../edit-urpm-sources.pl_.c:268
-msgid "Add..."
-msgstr "Legg til..."
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
+msgstr "Det oppsto en uidentifistert feil ved oppdatering av pakkeinformasjon."
 
-#: ../edit-urpm-sources.pl_.c:270
-msgid "Update..."
-msgstr "Oppdater..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
+msgstr "Feil ved oppdatering av media"
 
-#: ../edit-urpm-sources.pl_.c:271
-msgid "Proxy..."
-msgstr "Proxy..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
+msgstr "Vennligst vent, kontakter speil for ĺ oppdatere pakkeinformasjon."
 
-#: ../edit-urpm-sources.pl_.c:274
-msgid "Save and quit"
-msgstr "Lagre og avslutt"
+#: ../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 ""
+"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?"
 
-#: ../edit-urpm-sources.pl_.c:275 ../rpmdrake_.c:733
-msgid "Quit"
-msgstr "Avslutt"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Installation"
+msgstr "Installasjon av programvarepakker"
 
-#: ../rpmdrake.pm_.c:93
-msgid "Yes"
-msgstr "Ja"
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, c-format
+msgid "Mandrake Update"
+msgstr "Mandrake Update"
 
-#: ../rpmdrake.pm_.c:95
-msgid "No"
-msgstr "Nei"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
+msgstr "Fjerning av programvarepakker"
 
-#: ../rpmdrake.pm_.c:127
-msgid "Info..."
-msgstr "Info..."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Avslutt"
 
-#: ../rpmdrake.pm_.c:180
-msgid "Austria"
-msgstr "Řsterrike"
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "Installer"
 
-#: ../rpmdrake.pm_.c:181
-msgid "Australia"
-msgstr "Australia"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "Fjern"
 
-#: ../rpmdrake.pm_.c:182
-msgid "Belgium"
-msgstr "Belgia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search"
+msgstr "sřk"
 
-#: ../rpmdrake.pm_.c:183
-msgid "Brazil"
-msgstr "Brasil"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "Finn:"
 
-#: ../rpmdrake.pm_.c:184
-msgid "Canada"
-msgstr "Canada"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Fřlgende pakker mĺ fjernes for at andre skal bli oppgradert:\n"
+"\n"
+"%s\n"
+"\n"
+"ER det ok ĺ fortsette?"
 
-#: ../rpmdrake.pm_.c:185
-msgid "Costa Rica"
-msgstr "Costa Rica"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "Noen pakker mĺ fjernes"
 
-#: ../rpmdrake.pm_.c:186
-msgid "Czech Republic"
-msgstr "Sjekkiske Republikk"
+#: ../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?"
 
-#: ../rpmdrake.pm_.c:187
-msgid "Germany"
-msgstr "Tyskland"
+#: ../rpmdrake:1
+#, c-format
+msgid "Too many packages are selected"
+msgstr "For mange pakker er valgt"
 
-#: ../rpmdrake.pm_.c:188
-msgid "Danmark"
-msgstr "Danmark"
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
+msgstr "Maksimum informasjon"
 
-#: ../rpmdrake.pm_.c:189 ../rpmdrake.pm_.c:193
-msgid "Greece"
-msgstr "Hellas"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal information"
+msgstr "Normal informasjon"
 
-#: ../rpmdrake.pm_.c:190
-msgid "Spain"
-msgstr "Spania"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update source(s)"
+msgstr "Oppdaterer kilde(r)"
 
-#: ../rpmdrake.pm_.c:191
-msgid "Finland"
-msgstr "Finland"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reload the packages list"
+msgstr "Last pakkelisten pĺ nytt"
 
-#: ../rpmdrake.pm_.c:192
-msgid "France"
-msgstr "Frankrike"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
+msgstr "Resett valget"
 
-#: ../rpmdrake.pm_.c:194
-msgid "Israel"
-msgstr "Israel"
+#: ../rpmdrake:1
+#, c-format
+msgid "in files"
+msgstr "i filer"
 
-#: ../rpmdrake.pm_.c:195
-msgid "Italy"
-msgstr "Italia"
+#: ../rpmdrake:1
+#, c-format
+msgid "in descriptions"
+msgstr "i beskrivelser"
 
-#: ../rpmdrake.pm_.c:196
-msgid "Japan"
-msgstr "Japan"
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
+msgstr "i navn"
 
-#: ../rpmdrake.pm_.c:197
-msgid "Korea"
-msgstr "Korea"
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
+msgstr "ved oppdateringstilgjengelighet"
 
-#: ../rpmdrake.pm_.c:198
-msgid "Netherlands"
-msgstr "Nederland"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
+msgstr "ved kildelager"
 
-#: ../rpmdrake.pm_.c:199
-msgid "Norway"
-msgstr "Norge"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
+msgstr "ved utvelgelsestilstand"
 
-#: ../rpmdrake.pm_.c:200
-msgid "Poland"
-msgstr "Polen"
+#: ../rpmdrake:1
+#, c-format
+msgid "by size"
+msgstr "ved střrrelse"
 
-#: ../rpmdrake.pm_.c:201
-msgid "Portugal"
-msgstr "Portugal"
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
+msgstr "ved gruppe"
 
-#: ../rpmdrake.pm_.c:202
-msgid "Russia"
-msgstr "Russland"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages,"
+msgstr "Alle pakker,"
 
-#: ../rpmdrake.pm_.c:203
-msgid "Sweden"
-msgstr "Sverige"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
+msgstr "Alle pakker, alfabetisk"
 
-#: ../rpmdrake.pm_.c:204
-msgid "Taiwan"
-msgstr "Taiwan"
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
+msgstr "Mandrake valg"
 
-#: ../rpmdrake.pm_.c:205
-msgid "United Kingdom"
-msgstr "Storbritannia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal updates"
+msgstr "Normale oppdateringer"
 
-#: ../rpmdrake.pm_.c:206
-msgid "China"
-msgstr "Kina"
+#: ../rpmdrake:1
+#, c-format
+msgid "Bugfixes updates"
+msgstr "Bugfix-oppdateringer"
 
-#: ../rpmdrake.pm_.c:207 ../rpmdrake.pm_.c:208 ../rpmdrake.pm_.c:209
-#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:261
-msgid "United States"
-msgstr "USA"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
+msgstr "Sikkerhetsoppdateringer"
 
-#: ../rpmdrake.pm_.c:274
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
-"Vennligst vent, laster ned adresser over speil fra MandrakeSoft website."
+#: ../rpmdrake:1
+#, c-format
+msgid "Description: "
+msgstr "Beskrivelse: "
 
-#: ../rpmdrake.pm_.c:280
-msgid "Error during download"
-msgstr "Feil oppsto under nedlasting"
+#: ../rpmdrake:1
+#, c-format
+msgid "Summary: "
+msgstr "Oppsummering: "
 
-#: ../rpmdrake.pm_.c:289
-msgid "No mirror"
-msgstr "Ingen speil"
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "Viktighet: "
 
-#: ../rpmdrake.pm_.c:307
-msgid "Please choose the desired mirror."
-msgstr "Vennligst velg řnsket speil."
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake.pm_.c:339 ../rpmdrake_.c:627
-msgid "Update source(s)"
-msgstr "Oppdaterer kilde(r)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Size: "
+msgstr "Střrrelse: "
 
-#: ../rpmdrake.pm_.c:343
-msgid "Select the source(s) you wish to update:"
-msgstr "Velg kilden(e) du řnsker ĺ oppdatere:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Version: "
+msgstr "Versjon: "
 
-#: ../rpmdrake.pm_.c:347
-msgid "Update"
-msgstr "Oppdater"
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "Navn: "
 
-#: ../rpmdrake.pm_.c:358
-msgid "Please wait, updating media..."
-msgstr "Vennligst vent, oppdaterer media..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "Grunn til oppdatering: "
 
-#: ../rpmdrake_.c:99
-msgid "Other"
-msgstr "Andre"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
+msgstr "Installert versjon: "
 
-#: ../rpmdrake_.c:121 ../rpmdrake_.c:135 ../rpmdrake_.c:227 ../rpmdrake_.c:298
-msgid "(none)"
-msgstr "(ingen)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Source: "
+msgstr "Kilde: "
 
-#: ../rpmdrake_.c:141 ../rpmdrake_.c:482 ../rpmdrake_.c:483
+#: ../rpmdrake:1
+#, c-format
 msgid "(Not available)"
 msgstr "(Ingen tilgjengelig)"
 
-#: ../rpmdrake_.c:151 ../rpmdrake_.c:208
-msgid "Search results"
-msgstr "Sřkeresultater"
-
-#: ../rpmdrake_.c:151
-msgid "Search results (none)"
-msgstr "Sřkeresultater (ingen)"
-
-#: ../rpmdrake_.c:161 ../rpmdrake_.c:172
-msgid "Please wait, searching..."
-msgstr "Vennligst vent, sřker..."
-
-#: ../rpmdrake_.c:175
-msgid "Stop"
-msgstr "Stopp"
-
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-msgid "Addable"
-msgstr "Kan legge til"
-
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-msgid "Upgradable"
-msgstr "Kan oppgraderes"
-
-#: ../rpmdrake_.c:211
-msgid "Not selected"
-msgstr "Ikke valgt"
-
-#: ../rpmdrake_.c:211
-msgid "Selected"
-msgstr "Valgt"
-
-#: ../rpmdrake_.c:240
-msgid "rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake_.c:258 ../rpmdrake_.c:360 ../rpmdrake_.c:362
-msgid "More information on package..."
-msgstr "Mere informasjon om pakke..."
-
-#: ../rpmdrake_.c:259
-msgid "One of the following packages is needed:"
-msgstr "En av fřlgende pakker behřves:"
-
-#: ../rpmdrake_.c:259
-msgid "Please choose"
-msgstr "Vennligst velg"
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
+msgstr "Changelog:\n"
 
-#: ../rpmdrake_.c:275
-msgid "unknown package "
-msgstr "Ukjent pakke "
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "Filer:\n"
 
-#: ../rpmdrake_.c:285
-msgid "Please wait, listing packages..."
-msgstr "Vennligst vent, lister pakker..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected size: %d MB"
+msgstr "Střrrelse valgte: %d MB"
 
-#: ../rpmdrake_.c:300
-msgid "No update"
-msgstr "Ingen oppdatering"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Valgte: %d MB / Ledig diskplass: %d MB"
 
-#: ../rpmdrake_.c:353 ../rpmdrake_.c:354
-msgid "More infos"
-msgstr "Mere info"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
+msgstr ""
+"Pĺ grunn av disses avhengigheter, mĺ fřlgende pakke(r) velges\n"
+"vekk nĺ:\n"
+"\n"
 
-#: ../rpmdrake_.c:355
-msgid "Information on packages"
-msgstr "Informasjon om pakker"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+msgstr ""
+"Beklager, fřlgende pakke(r) kan ikke velges:\n"
+"\n"
 
-#: ../rpmdrake_.c:376
-msgid "Some additional packages need to be removed"
-msgstr "Noen ytterligere pakker renger ĺ fjernes"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "Noen pakker kan ikke installeres"
 
-#: ../rpmdrake_.c:377
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
 "\n"
 msgstr ""
-"Pĺ grunn av disses avhengigheter, trenger fřlgende pakke(r) ogsĺ\n"
-"ĺ bli fjernet:\n"
+"For ĺ tilfredstille avhengigheter, mĺ fřlgende pakke(r) ogsĺ\n"
+"installeres:\n"
 "\n"
 
-#: ../rpmdrake_.c:383 ../rpmdrake_.c:391
+#: ../rpmdrake:1
+#, c-format
+msgid "Additional packages needed"
+msgstr "Ytterligere pakker trengs"
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "Noen pakker kan ikke fjernes"
 
-#: ../rpmdrake_.c:384
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -469,585 +644,602 @@ msgstr ""
 "Beklager, men fjerning av disse pakkene vil řdelegge systemet ditt:\n"
 "\n"
 
-#: ../rpmdrake_.c:392 ../rpmdrake_.c:451
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
 "\n"
 msgstr ""
-"Pĺ grunn av disses avhengigheter, mĺ fřlgende pakke(r) velges\n"
-"vekk nĺ:\n"
+"Pĺ grunn av disses avhengigheter, trenger fřlgende pakke(r) ogsĺ\n"
+"ĺ bli fjernet:\n"
 "\n"
 
-#: ../rpmdrake_.c:421
-msgid "Additional packages needed"
-msgstr "Ytterligere pakker trengs"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr "Noen ytterligere pakker renger ĺ fjernes"
 
-#: ../rpmdrake_.c:422
-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
+msgid "More information on package..."
+msgstr "Mere informasjon om pakke..."
 
-#: ../rpmdrake_.c:435
-msgid "Some packages can't be installed"
-msgstr "Noen pakker kan ikke installeres"
+#: ../rpmdrake:1
+#, c-format
+msgid "Information on packages"
+msgstr "Informasjon om pakker"
 
-#: ../rpmdrake_.c:436
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
+msgstr "Mere info"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Addable"
+msgstr "Kan legge til"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Upgradable"
+msgstr "Kan oppgraderes"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
+"The list of updates is void. This 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 ""
-"Beklager, fřlgende pakke(r) kan ikke velges:\n"
-"\n"
+"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_.c:450 ../rpmdrake_.c:684
-msgid "Some packages need to be removed"
-msgstr "Noen pakker mĺ fjernes"
+#: ../rpmdrake:1
+#, c-format
+msgid "No update"
+msgstr "Ingen oppdatering"
 
-#: ../rpmdrake_.c:472
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Valgte: %d MB / Ledig diskplass: %d MB"
+msgid "(none)"
+msgstr "(ingen)"
 
-#: ../rpmdrake_.c:474
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "Střrrelse valgte: %d MB"
+msgid "Please wait, listing packages..."
+msgstr "Vennligst vent, lister pakker..."
 
-#: ../rpmdrake_.c:482
-msgid "Files:\n"
-msgstr "Filer:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "unknown package "
+msgstr "Ukjent pakke "
 
-#: ../rpmdrake_.c:483
-msgid "Changelog:\n"
-msgstr "Changelog:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "En av fřlgende pakker behřves:"
 
-#: ../rpmdrake_.c:486
-msgid "Source: "
-msgstr "Kilde: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please choose"
+msgstr "Vennligst velg"
 
-#: ../rpmdrake_.c:487
-msgid "Currently installed version: "
-msgstr "Installert versjon: "
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:491
-msgid "Reason for update: "
-msgstr "Grunn til oppdatering: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Not selected"
+msgstr "Ikke valgt"
 
-#: ../rpmdrake_.c:493
-msgid "Name: "
-msgstr "Navn: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected"
+msgstr "Valgt"
 
-#: ../rpmdrake_.c:494
-msgid "Version: "
-msgstr "Versjon: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results"
+msgstr "Sřkeresultater"
 
-#: ../rpmdrake_.c:495
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Stop"
+msgstr "Stopp"
 
-#: ../rpmdrake_.c:495
-msgid "Size: "
-msgstr "Střrrelse: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, searching..."
+msgstr "Vennligst vent, sřker..."
 
-#: ../rpmdrake_.c:497
-msgid "Importance: "
-msgstr "Viktighet: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
+msgstr "Sřkeresultater (ingen)"
 
-#: ../rpmdrake_.c:498
-msgid "Summary: "
-msgstr "Oppsummering: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Andre"
 
-#: ../rpmdrake_.c:499
-msgid "Description: "
-msgstr "Beskrivelse: "
+#: ../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 ""
+"Velkommen til pakkekilde redigereren!\n"
+"\n"
+"Dette verktřyet vil hjelpe deg ĺ konfigurere pakkekildene du řnsker ĺ bruke "
+"pĺ\n"
+"maskinen din. De vil da bli tilgjengelige til ĺ installere ny "
+"programvarepakke\n"
+"eller ĺ utfřre oppdateringer."
 
-#: ../rpmdrake_.c:548
-msgid "Bugfixes updates"
-msgstr "Bugfix-oppdateringer"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Lagre og avslutt"
 
-#: ../rpmdrake_.c:548
-msgid "Normal updates"
-msgstr "Normale oppdateringer"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy..."
+msgstr "Proxy..."
 
-#: ../rpmdrake_.c:567
-msgid "Mandrake choices"
-msgstr "Mandrake valg"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
+msgstr "Oppdater..."
 
-#: ../rpmdrake_.c:568
-msgid "All packages, alphabetical"
-msgstr "Alle pakker, alfabetisk"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "Legg til..."
 
-#: ../rpmdrake_.c:569
-msgid "All packages,"
-msgstr "Alle pakker,"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "Rediger"
 
-#: ../rpmdrake_.c:592
-msgid "by group"
-msgstr "ved gruppe"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Source"
+msgstr "Kilde"
 
-#: ../rpmdrake_.c:592
-msgid "by size"
-msgstr "ved střrrelse"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
+msgstr "Slĺtt pĺ?"
 
-#: ../rpmdrake_.c:593
-msgid "by selection state"
-msgstr "ved utvelgelsestilstand"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure sources"
+msgstr "Konfigurer kilder"
 
-#: ../rpmdrake_.c:594
-msgid "by source repository"
-msgstr "ved kildelager"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "Passord:"
 
-#: ../rpmdrake_.c:594
-msgid "by update availability"
-msgstr "ved oppdateringstilgjengelighet"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
+msgstr "Bruker:"
 
-#: ../rpmdrake_.c:615
-msgid "in descriptions"
-msgstr "i beskrivelser"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Du kan spesifisere en /bruker/passord for proxy autentifiseringen:"
 
-#: ../rpmdrake_.c:615
-msgid "in files"
-msgstr "i filer"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "Proxy vertsnavn:"
 
-#: ../rpmdrake_.c:615
-msgid "in names"
-msgstr "i navn"
+#: ../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]>):"
 
-#: ../rpmdrake_.c:626
-msgid "Reload the packages list"
-msgstr "Last pakkelisten pĺ nytt"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "Konfigurer proxier"
 
-#: ../rpmdrake_.c:626
-msgid "Reset the selection"
-msgstr "Resett valget"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr "Vennligst vent, oppdaterer media..."
 
-#: ../rpmdrake_.c:652
-msgid "Maximum information"
-msgstr "Maksimum informasjon"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "For ĺ kunne lagre endringene mĺ du settee inn et medium i stasjonen."
 
-#: ../rpmdrake_.c:652
-msgid "Normal information"
-msgstr "Normal informasjon"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
+msgstr "Du mĺ sette inn mediumet for ĺ fortsette"
 
-#: ../rpmdrake_.c:674
-msgid "Too many packages are selected"
-msgstr "For mange pakker er valgt"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save changes"
+msgstr "Lagrer endringer"
 
-#: ../rpmdrake_.c:720
-msgid "Find:"
-msgstr "Finn:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Relativ sti til synthesis/hdlist:"
 
-#: ../rpmdrake_.c:725
-msgid "Search"
-msgstr "sřk"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake_.c:731
-msgid "Install"
-msgstr "Installer"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Editing source \"%s\":"
+msgstr "Rediger kilde \"%s\":"
 
-#: ../rpmdrake_.c:738 data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrake Update"
-msgstr "Mandrake Update"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit a source"
+msgstr "Rediger en kilde"
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Installation"
-msgstr "Installasjon av programvarepakker"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr "Vennligst vent, fjerner media..."
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Removal"
-msgstr "Fjerning av programvarepakker"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, adding medium..."
+msgstr "Vennligst vent, legger til media..."
 
-#: ../rpmdrake_.c:779
-msgid "Please wait, contacting mirror to update packages information."
-msgstr "Vennligst vent, kontakter speil for ĺ oppdatere pakkeinformasjon."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of source:"
+msgstr "Type kilde:"
 
-#: ../rpmdrake_.c:781
-msgid "Error updating medium"
-msgstr "Feil ved oppdatering av media"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Adding a source:"
+msgstr "Legger til en kilde:"
 
-#: ../rpmdrake_.c:782
-msgid "There was an unrecoverable error while updating packages information."
-msgstr "Det oppsto en uidentifistert feil ved oppdatering av pakkeinformasjon."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"Det er allerede et media med det navnet, vil du\n"
+"virkelig bytte det ut?"
 
-#: ../rpmdrake_.c:787
-msgid "How to choose manually your mirror"
-msgstr "Hvordan velge ditt speil manuelt"
+#: ../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_.c:795
-msgid "Please wait, contacting mirror to initialize updates packages."
-msgstr "Vennligst vent, kontakter speil for ĺ initialisere oppdateringspakker."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "Navn:"
 
-#: ../rpmdrake_.c:798
-msgid "Error adding update medium"
-msgstr "Kunne ikke legge til oppdateringsmedia"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
+msgstr "Logg inn:"
 
-#: ../rpmdrake_.c:829
-msgid "Please wait, finding available packages..."
-msgstr "Vennligst vent, finner tilgjengelige pakker..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Velg et speil..."
 
-#: ../rpmdrake_.c:861
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Sjekker %s"
+msgid "Browse..."
+msgstr "Kikke..."
 
-#: ../rpmdrake_.c:880
-msgid "changes:"
-msgstr "endringer:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Sti eller monteringspunkt:"
 
-#: ../rpmdrake_.c:884
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Fjern .%s"
+msgid "Removable device"
+msgstr "Fjernbar enhet"
 
-#: ../rpmdrake_.c:886
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Bruk .%s som hovedfil"
+msgid "HTTP server"
+msgstr "HTTP tjener"
 
-#: ../rpmdrake_.c:888
-msgid "Do nothing"
-msgstr "Ikke gjřr noe"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "FTP tjener"
 
-#: ../rpmdrake_.c:900
-msgid "Installation finished"
-msgstr "Installasjon ferdig"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path:"
+msgstr "Sti:"
 
-#: ../rpmdrake_.c:910
-msgid "Inspect..."
-msgstr "Sjekk..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "Lokale filer"
 
-#: ../rpmdrake_.c:925
-msgid "Program missing"
-msgstr "Program mangler"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add a source"
+msgstr "Legg til en kilde"
 
-#: ../rpmdrake_.c:926
-msgid "A required program is missing (grpmi). Check your installation."
-msgstr "Et nřdvendig program mangler (grpmi). Sjekk installasjonen din."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
+msgstr "Kan ikke oppdatere media, den vil bli automatisk slĺtt av."
 
-#: ../rpmdrake_.c:940
-msgid "Unable to get source packages."
-msgstr "Ikke i stand til ĺ fĺ tak i kildepakker."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "Kan ikke opprette media."
 
-#: ../rpmdrake_.c:941
-msgid "Unable to get source packages, sorry."
-msgstr "Ikke i stand til ĺ fĺ tak i kildepakker, beklager."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, updating media..."
+msgstr "Vennligst vent, oppdaterer media..."
 
-#: ../rpmdrake_.c:948
-msgid "Change medium"
-msgstr "Endre media"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
+msgstr "Oppdater"
 
-#: ../rpmdrake_.c:949
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Vennligst sett inn media kalt \"%s\" pĺ enhet [%s]"
+msgid "Select the source(s) you wish to update:"
+msgstr "Velg kilden(e) du řnsker ĺ oppdatere:"
 
-#: ../rpmdrake_.c:957
-msgid "Installation failed"
-msgstr "Installasjon mislykket"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please choose the desired mirror."
+msgstr "Vennligst velg řnsket speil."
 
-#: ../rpmdrake_.c:958
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
-"Installasjon mislykket, noen filer mangler.\n"
-"Du vil kanskje oppdatere din kildedatabase."
+"Jeg kan ikke finne noen passende speil.\n"
+"\n"
+"Det kan vćre mange ĺrsaker til dette problemet; den mest vanlige er\n"
+"nĺr arkitekturen til prosessoren din ikke er střttet\n"
+"av Mandrake Linux offisielle oppdateringer."
 
-#: ../rpmdrake_.c:961
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr ""
-"Vennligst vent, fjerner pakker for at andre skal kunne bli oppgradert..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
+msgstr "Ingen speil"
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"There was an error downloading the mirrors list:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
-"Installasjonen er ferdig; %s.\n"
+"Det oppsto en feil ved nedlasting av liste over speil:\n"
 "\n"
-"Noen konfigureringsfiler ble opprettet som `.rpmnew' ellr `.rpmsave',\n"
-"du kan no sjekke noen for ĺ utfřre noen handlinger:"
+"%s\n"
+"Nettverket, eller MandrakeSoft website, er kanskje ikke tilgjengelig.\n"
+"Vennligst prřv igjen senere."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "Feil oppsto under nedlasting"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
+"Vennligst vent, laster ned adresser over speil fra MandrakeSoft website."
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"some packages failed to install\n"
-"correctly"
+"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 ""
-"Noen pakker kunne ikke installeres\n"
-"korrekt"
+"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_.c:983
-msgid "everything was installed correctly"
-msgstr "alt ble installert korrekt"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United States"
+msgstr "USA"
 
-#: ../rpmdrake_.c:985
-msgid "Everything installed successfully"
-msgstr "Alt installert vellykket"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
+msgstr "Kina"
 
-#: ../rpmdrake_.c:986
-msgid "All requested packages were installed successfully."
-msgstr "Alle pakker ble vellykket installert"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr "Storbritannia"
 
-#: ../rpmdrake_.c:989
-msgid "Everything already installed."
-msgstr "Alt er allerede installert."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "Taiwan"
 
-#: ../rpmdrake_.c:990
-msgid "Everything already installed (is this supposed to happen at all?)."
-msgstr "Alt er allerede installert (skal dette skje i det hele tatt?)."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "Sverige"
 
-#: ../rpmdrake_.c:997
-msgid "Problem during installation"
-msgstr "Problem under installasjonen"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
+msgstr "Russland"
 
-#: ../rpmdrake_.c:998
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Det var et problem under installasjonen:\n"
-"\n"
-"%s"
+msgid "Portugal"
+msgstr "Portugal"
 
-#: ../rpmdrake_.c:1012
-msgid "Please wait, reading packages database..."
-msgstr "Vennligst vent, leser pakkedatabase..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
+msgstr "Polen"
 
-#: ../rpmdrake_.c:1053
-msgid "Please wait, removing packages..."
-msgstr "Vennligst vent, fjerner pakker..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
+msgstr "Norge"
 
-#: ../rpmdrake_.c:1056
-msgid "Problem during removal"
-msgstr "Problem under fjerning"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
+msgstr "Nederland"
 
-#: ../rpmdrake_.c:1057
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Det var et problem under fjerning av pakker:\n"
-"\n"
-"%s"
+msgid "Korea"
+msgstr "Korea"
 
-#: ../rpmdrake_.c:1089
-msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
-msgstr ""
-"Velkommen til verktřyet for fjerning av programvare!\n"
-"\n"
-"Dette verktřyet vil hjelpe deg ĺ velge vilken programvare du skal fjerne\n"
-"fra maskinen din."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Japan"
+msgstr "Japan"
 
-#: ../rpmdrake_.c:1094
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"Velkommen til MandrakeUpdate!\n"
-"\n"
-"Dette verktřyet vil hjelpe deg ĺ velge oppdateringene du skal installere\n"
-"pĺ maskinen din."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Italy"
+msgstr "Italia"
 
-#: ../rpmdrake_.c:1099
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
-msgstr ""
-"Velkommen til verktřyet for installering av programvare!\n"
-"\n"
-"Mandrake Linux systemet ditt kommer med flere tusen programvarepakker\n"
-"pĺ CDROM eller DVD. Dette verktřyet hjelper deg ĺ velge hvilken\n"
-"programvare du řnsker ĺ installere pĺ maskinen din."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Israel"
+msgstr "Israel"
 
-#: data/rpmdrake-remove.desktop.in.h:1
-msgid "Remove Software"
-msgstr "Fjerner programvare"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Hellas"
 
-#: data/rpmdrake-sources.desktop.in.h:1
-msgid "Software Sources Manager"
-msgstr "Programvare kilde hĺndterer"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "France"
+msgstr "Frankrike"
 
-#: data/rpmdrake.desktop.in.h:1
-msgid "Install Software"
-msgstr "Installer programvare"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "Finland"
 
-#~ msgid ""
-#~ "There is already a medium by that name, do you\n"
-#~ "really want to replace it?"
-#~ msgstr ""
-#~ "Det er allerede et media med det navnet, vil du\n"
-#~ "virkelig bytte det ut?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "Spania"
 
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-#~ "Er det ok ĺ fortsette?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
+msgstr "Danmark"
 
-#~ 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."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr "Tyskland"
 
-#~ 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 ""
-#~ "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.pm:1
+#, c-format
+msgid "Czech Republic"
+msgstr "Sjekkiske Republikk"
 
-#~ msgid ""
-#~ "There was an error downloading the mirrors list:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "The network, or MandrakeSoft website, are maybe unavailable.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "Det oppsto en feil ved nedlasting av liste over speil:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "Nettverket, eller MandrakeSoft website, er kanskje ikke tilgjengelig.\n"
-#~ "Vennligst prřv igjen senere."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
-#~ 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 ""
-#~ "Jeg kan ikke finne noen passende speil.\n"
-#~ "\n"
-#~ "Det kan vćre mange ĺrsaker til dette problemet; den mest vanlige er\n"
-#~ "nĺr arkitekturen til prosessoren din ikke er střttet\n"
-#~ "av Mandrake Linux offisielle oppdateringer."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Canada"
+msgstr "Canada"
 
-#~ msgid ""
-#~ "The list of updates is void. This means that either there is\n"
-#~ "no available update for the packages installed on your computer,\n"
-#~ "or you already installed all of them."
-#~ msgstr ""
-#~ "Listen over oppdateringer er tom. Dette betyr enten at det ikke er\n"
-#~ "noen tilgjengelige oppdateringer for pakkene som er installert pĺ\n"
-#~ "din maskin, eller at du allerede har installert alle sammen."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
+msgstr "Brasil"
 
-#~ msgid ""
-#~ "Warning: it seems that you are attempting to add so much\n"
-#~ "packages that your filesystem may run out of free diskspace,\n"
-#~ "during or after package installation ; this is particularly\n"
-#~ "dangerous and should be considered with care.\n"
-#~ "\n"
-#~ "Do you really want to install all the selected packages?"
-#~ msgstr ""
-#~ "Advarsel: det ser ut til at du forsřker ĺ legge til sĺ mange\n"
-#~ "pakker at filsystemet ditt ikke har nok ledig diskplass\n"
-#~ "under eller etter pakkeinstallasjon ; dette er spesielt\n"
-#~ "farlig břr gjřres med forsiktighet.\n"
-#~ "\n"
-#~ "Řnsker du virkelig ĺ installere alle valgte pakker?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Belgium"
+msgstr "Belgia"
 
-#~ msgid ""
-#~ "The following packages have to be removed for others to be upgraded:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "Fřlgende pakker mĺ fjernes for at andre skal bli oppgradert:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "ER det ok ĺ fortsette?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Australia"
+msgstr "Australia"
 
-#~ msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#~ msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
+msgstr "Řsterrike"
 
-#~ 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
+#, c-format
+msgid "Info..."
+msgstr "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 ""
-#~ "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
+#, c-format
+msgid "No"
+msgstr "Nei"
 
-#~ 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 ""
-#~ "Det oppsto en feil nĺr oppdateringsmediet ble lagt til via urpmi.\n"
-#~ "\n"
-#~ "Dette kan vĺre pga. et řdelagt eller for řyeblikket utilgjengelig speil, "
-#~ "eller\n"
-#~ "din Mandrake Linux versjon (%s) ikke ennĺ er / ikke lenger er střttet av "
-#~ "Mandrake Linux\n"
-#~ "offisiselle oppdateringer.\n"
-#~ "\n"
-#~ "Vil du prřve et annet speil?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Ja"
+
+#: data/rpmdrake.desktop.in.h:1
+msgid "Install Software"
+msgstr "Installer programvare"
+
+#: data/rpmdrake-remove.desktop.in.h:1
+msgid "Remove Software"
+msgstr "Fjerner programvare"
+
+#: data/rpmdrake-sources.desktop.in.h:1
+msgid "Software Sources Manager"
+msgstr "Programvare kilde hĺndterer"
+
+#~ 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--*-*-*-*-*,*"
diff --git a/po/no.pom b/po/no.pom
index 0350d21c..9e78c46b 100644
--- a/po/no.pom
+++ b/po/no.pom
@@ -4,166 +4,174 @@ msgstr "Tjener"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Nettverksmaskin (klient)"
+msgid "Office Workstation"
+msgstr "Kontor og arbeidsmaskin"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS-tjener, SMB-tjener, Proxy-tjener, SSH-tjener"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Kontorprogrammer: tekstbehandlere (kword, abiword), regneark (kspread, "
+"gnumeric), pdf fremvisere etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Office"
+msgid "Workstation"
+msgstr "Arbeidstasjon"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Gnome arbeidstasjon"
+msgid "Game station"
+msgstr "Spillstasjon"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Verktřy for din Palm Pilot eller din Visor"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Underholdningsprogrammer: arkade, bordspill, strategi etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Arbeidstasjon"
+msgid "Multimedia station"
+msgstr "Multimediastasjon"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Server, Brannmur/ruter"
+msgid "Sound and video playing/editing programs"
+msgstr "Lyd og bilde avspilling/redigeringsprogrammer"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr "Tjener for domenenavn og nettverksinformasjon"
+msgid "Internet station"
+msgstr "Internettstasjon"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
 msgstr ""
-"Kontorprogrammer: tekstbehandlere (kword, abiword), regneark (kspread, "
-"gnumeric), pdf fremvisere etc"
+"Sett med verktřy for ĺ lese og sende e-post og nyheter (pine, mutt, tin...) "
+"og for se pĺ webben"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "Lydrelaterte verktřy: mp3 eller midi-spillere, miksere etc."
+msgid "Network Computer (client)"
+msgstr "Nettverksmaskin (klient)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr ""
+msgid "Clients for different protocols including ssh"
+msgstr "Klienter for forskjellige protokoller inkludert ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Břker og howto's om Linux og fri programvare"
+msgid "Configuration"
+msgstr "Konfigurasjon"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "KDE arbeidstasjon"
+msgid "Tools to ease the configuration of your computer"
+msgstr "Verktřy for ĺ forenkle konfigurasjonen pĺ maskinen din"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm etc"
+msgid "Scientific Workstation"
+msgstr "Vitenskaplig arbeidsstasjon"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Multimedia - Video"
+msgid "Scientific applications such as gnuplot"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr "Sett med verktřy for e-post, nyheter, web, filoverfřring og chat"
+msgid "Console Tools"
+msgstr "Konsollverktřy"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Database"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Redigerere, skall, filverktřy, terminaler"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL eller MySQL database tjener"
+msgid "KDE Workstation"
+msgstr "KDE arbeidstasjon"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Verktřy for ĺ forenkle konfigurasjonen pĺ maskinen din"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"K Desktop Environment, basis grafikkmiljř med en samling av passende verktřy"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "Multimedia - Lyd"
+msgid "Graphical Environment"
+msgstr "Grafisk miljř"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dokumentasjon"
+msgid "Gnome Workstation"
+msgstr "Gnome arbeidstasjon"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Konsollverktřy"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+"Et grafisk miljř med et brukervennlig sett med applikasjoner og skrivebords- "
+"verktřy"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr "Postfix posttjener, Inn nyhetstjener"
+msgid "Other Graphical Desktops"
+msgstr "Andre grafiske skrivebord"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Internettstasjon"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Multimediastasjon"
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+msgid "Development"
+msgstr "Utvikling"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Konfigurasjon"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C og C++ utviklingsbibliotek, programmer og include filer"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Mere grafiske skrivebord (Gnome, IceWM)"
+msgid "Documentation"
+msgstr "Dokumentasjon"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
-"K Desktop Environment, basis grafikkmiljř med en samling av passende verktřy"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Břker og howto's om Linux og fri programvare"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Grafisk miljř"
+msgid "LSB"
+msgstr "LSB"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Linux Standard Base. Tredjeparts programvarestřtte"
+
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-msgid "Development"
-msgstr "Utvikling"
+#: ../../share/compssUsers:999
+msgid "Web/FTP"
+msgstr "Web/FTP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -172,23 +180,33 @@ msgstr "Apache og Pro-ftpd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "Verktřy for ĺ opprette og brenne CD'er"
+msgid "Mail/Groupware/News"
+msgstr "Server, Mail/Gruppevare/News"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Kontor og arbeidsmaskin"
+msgid "Postfix mail server, Inn news server"
+msgstr "Postfix posttjener, Inn nyhetstjener"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm etc"
+msgid "Database"
+msgstr "Database"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Grafiske programmer sĺ som Gimp"
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL eller MySQL database tjener"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Firewall/Router"
+msgstr "Server, Brannmur/ruter"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Internet gateway"
+msgstr "Internett-gateway"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -197,8 +215,8 @@ msgstr "DNS/NIS"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C og C++ utviklingsbibliotek, programmer og include filer"
+msgid "Domain Name and Network Information Server"
+msgstr "Tjener for domenenavn og nettverksinformasjon"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -207,18 +225,18 @@ msgstr "Nettverk datamaskintjener"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "Server, Mail/Gruppevare/News"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS-tjener, SMB-tjener, Proxy-tjener, SSH-tjener"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Spillstasjon"
+msgid "Office"
+msgstr "Office"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Videospillere og redigerere"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr "Sett med verktřy for e-post, nyheter, web, filoverfřring og chat"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -227,79 +245,66 @@ msgstr "Multimedia - Grafikk"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Underholdningsprogrammer: arkade, bordspill, strategi etc"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
-"Sett med verktřy for ĺ lese og sende e-post og nyheter (pine, mutt, tin...) "
-"og for se pĺ webben"
+msgid "Graphics programs such as The Gimp"
+msgstr "Grafiske programmer sĺ som Gimp"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "Personlig finans"
+msgid "Multimedia - Sound"
+msgstr "Multimedia - Lyd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
-"Et grafisk miljř med et brukervennlig sett med applikasjoner og skrivebords- "
-"verktřy"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "Lydrelaterte verktřy: mp3 eller midi-spillere, miksere etc."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Klienter for forskjellige protokoller inkludert ssh"
+msgid "Multimedia - Video"
+msgstr "Multimedia - Video"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "LSB"
-msgstr ""
+msgid "Video players and editors"
+msgstr "Videospillere og redigerere"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Internett-gateway"
+msgid "Multimedia - CD Burning"
+msgstr "Multimedia - CD-brenning"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Lyd og bilde avspilling/redigeringsprogrammer"
+msgid "Tools to create and burn CD's"
+msgstr "Verktřy for ĺ opprette og brenne CD'er"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Andre grafiske skrivebord"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Mere grafiske skrivebord (Gnome, IceWM)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Redigerere, skall, filverktřy, terminaler"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "Programmer for ĺ hĺndtere dine finanser, sĺ som gnucash"
+msgid "Personal Information Management"
+msgstr "Personling informasjonshĺndtering"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "Personling informasjonshĺndtering"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Verktřy for din Palm Pilot eller din Visor"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multimedia - CD-brenning"
+msgid "Personal Finance"
+msgstr "Personlig finans"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Vitenskaplig arbeidsstasjon"
+msgid "Programs to manage your finances, such as gnucash"
+msgstr "Programmer for ĺ hĺndtere dine finanser, sĺ som gnucash"
 
diff --git a/po/pl.po b/po/pl.po
index 1bc81abd..f997977b 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-01-19 16:57+0100\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\n"
 "PO-Revision-Date: 2002-12-30 22:13+0100\n"
 "Last-Translator: Arkadiusz Lipiec <alipiec@elka.pw.edu.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -14,451 +14,601 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl_.c:39
-msgid "Unable to create medium."
-msgstr "Nie można utworzyć nośnika."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:40
-msgid "Unable to update medium; it will be automatically disabled."
-msgstr "Nie można zaktualizować nośnika; zostanie automatycznie wyłączony."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to the software installation tool!\n"
+"\n"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
+msgstr ""
+"Witaj w narzędziu instalacji oprogramowania!\n"
+"\n"
+"Twój system Mandrake Linux został dostarczony z kilkoma tysiącami\n"
+"pakietów oprogramowania na płycie CD lub DVD. To narzędzie pomoże ci\n"
+"wybrać pakiety, które można zainstalować na komputerze."
 
-#: ../edit-urpm-sources.pl_.c:51
-msgid "Add a source"
-msgstr "Dodawanie źródła"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Witaj w MandrakeUpdate!\n"
+"\n"
+"To narzędzie pomoże ci wybrać aktualizacje, które możesz chcieć\n"
+"zainstalować na tym komputerze."
 
-#: ../edit-urpm-sources.pl_.c:52
-msgid "Local files"
-msgstr "Lokalne pliki"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to the software removal tool!\n"
+"\n"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
+msgstr ""
+"Witaj w narzędziu usuwania oprogramowania!\n"
+"\n"
+"To narzędzie pomoże ci wybrać programy, które mogą zostać usunięte\n"
+"z komputera."
 
-#: ../edit-urpm-sources.pl_.c:52
-msgid "Path:"
-msgstr "Ścieżka:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"Podczas usuwania poniższych pakietów wystąpił problem:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:53
-msgid "FTP server"
-msgstr "Serwer FTP"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during removal"
+msgstr "Problem podczas usuwania"
 
-#: ../edit-urpm-sources.pl_.c:53 ../edit-urpm-sources.pl_.c:54
-#: ../edit-urpm-sources.pl_.c:56 ../edit-urpm-sources.pl_.c:175
-msgid "URL:"
-msgstr "URL:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages..."
+msgstr "Proszę czekać, usuwanie pakietów..."
 
-#: ../edit-urpm-sources.pl_.c:54
-msgid "HTTP server"
-msgstr "Serwer HTTP"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
+msgstr "Proszę czekać, odczytywanie bazy danych pakietów..."
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Path or mount point:"
-msgstr "Ścieżka lub punkt montowania:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Podczas instalacji wystąpił problem:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Removable device"
-msgstr "Napęd wymienny"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during installation"
+msgstr "Problem podczas instalacji"
 
-#: ../edit-urpm-sources.pl_.c:56 ../rpmdrake_.c:548
-msgid "Security updates"
-msgstr "Aktualizacje z dziedziny bezpieczeństwa"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
+msgstr ""
+"Wszystko zostało już zainstalowane (czy rzeczywiście taki był\n"
+"zamierzony efekt?)."
 
-#: ../edit-urpm-sources.pl_.c:67
-msgid "Browse..."
-msgstr "Przeglądaj..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed."
+msgstr "Wszystko zostało już zainstalowane."
 
-#: ../edit-urpm-sources.pl_.c:69
-msgid "Choose a mirror..."
-msgstr "Wybierz serwer zwierciadlany..."
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "Wszystkie żądane pakiety zostały pomyślnie zainstalowane."
 
-#: ../edit-urpm-sources.pl_.c:89
-msgid "Login:"
-msgstr "Login:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr "Wszystko zostało pomyślnie zainstalowane"
 
-#: ../edit-urpm-sources.pl_.c:89 ../edit-urpm-sources.pl_.c:215
-msgid "Password:"
-msgstr "Hasło:"
+#: ../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 ""
+"Zakończono instalację; %s.\n"
+"\n"
+"Pewne pliki konfiguracyjne zostały utworzone jako `.rpmnew' or `.rpmsave',\n"
+"Można je sprawdzić aby podjąć odpowiednie działanie:"
 
-#: ../edit-urpm-sources.pl_.c:94
-msgid "Name:"
-msgstr "Nazwa:"
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "wszystko zostało pomyślnie zainstalowane"
 
-#: ../edit-urpm-sources.pl_.c:96 ../edit-urpm-sources.pl_.c:176
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Względna ścieżka do pliku syntezy/hdlist:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"some packages failed to install\n"
+"correctly"
+msgstr ""
+"niektóre pakiety nie mogą zostać\n"
+" zainstalowane prawidłowo"
 
-#: ../edit-urpm-sources.pl_.c:104
-msgid "You need to fill up at least the two first entries."
-msgstr "Należy wypełnić co najmniej dwa pierwsze pola."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages to allow others to be upgraded..."
+msgstr "Proszę czekać, usuwanie pakietów w celu umożliwienia aktualizacji..."
 
-#: ../edit-urpm-sources.pl_.c:116
-msgid "Adding a source:"
-msgstr "Dodawanie źródła:"
+#: ../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 zachdzić potrzeba aktualizacji bazy danych źródeł."
 
-#: ../edit-urpm-sources.pl_.c:117
-msgid "Type of source:"
-msgstr "Rodzaj źródła:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation failed"
+msgstr "Instalacja zakończona niepowodzeniem"
 
-#: ../edit-urpm-sources.pl_.c:121 ../edit-urpm-sources.pl_.c:187
-#: ../edit-urpm-sources.pl_.c:219 ../rpmdrake.pm_.c:97 ../rpmdrake.pm_.c:136
-#: ../rpmdrake.pm_.c:319 ../rpmdrake_.c:353 ../rpmdrake_.c:365
-#: ../rpmdrake_.c:369 ../rpmdrake_.c:916 ../rpmdrake_.c:950
+#: ../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"
 
-#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:180
-#: ../edit-urpm-sources.pl_.c:187 ../edit-urpm-sources.pl_.c:220
-#: ../rpmdrake.pm_.c:319 ../rpmdrake.pm_.c:352 ../rpmdrake_.c:353
-#: ../rpmdrake_.c:950
-msgid "Cancel"
-msgstr "Anuluj"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Wsuń nośnik oznaczony \"%s\" do urządzenia [%s]"
 
-#: ../edit-urpm-sources.pl_.c:140
-msgid "Please wait, adding medium..."
-msgstr "Proszę czekać, dodawanie nośnika..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr "Zmień nośnik"
 
-#: ../edit-urpm-sources.pl_.c:158
-msgid "Please wait, removing medium..."
-msgstr "Proszę czekać, usuwanie nośnika..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
+msgstr "Niestety, nie można pobrać pakietów źródłowych."
 
-#: ../edit-urpm-sources.pl_.c:169
-msgid "Edit a source"
-msgstr "Modyfikuj Źródło"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages."
+msgstr "Nie można pobrać pakietów źródłowych."
 
-#: ../edit-urpm-sources.pl_.c:173
+#: ../rpmdrake:1
 #, c-format
-msgid "Editing source \"%s\":"
-msgstr "Modyfikowanie Źródła \"%s\":"
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr "Brak wymaganego programu (grpmi). Sprawdź swoją instalację."
 
-#: ../edit-urpm-sources.pl_.c:179
-msgid "Save changes"
-msgstr "Zapisz zmiany"
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
+msgstr "Brak programu"
 
-#: ../edit-urpm-sources.pl_.c:185
-msgid "You need to insert the medium to continue"
-msgstr "Włóż nośnik, aby kontynuować"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
+msgstr "Sprawdzaj..."
 
-#: ../edit-urpm-sources.pl_.c:186
-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
+#, c-format
+msgid "Installation finished"
+msgstr "Instalacja zakończona"
 
-#: ../edit-urpm-sources.pl_.c:191
-msgid "Please wait, updating medium..."
-msgstr "Proszę czekać, aktualizacja nośnika..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
+msgstr "Nic nie rĂłb"
 
-#: ../edit-urpm-sources.pl_.c:202
-msgid "Configure proxies"
-msgstr "Konfiguracja serwera proxy"
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
+msgstr "UĹźyj .%s jako plik podstawowy"
 
-#: ../edit-urpm-sources.pl_.c:207
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
-msgstr ""
-"Jeśli potrzebujesz proxy, wpisz nazwę komputera oraz opcjonalnie port "
-"(składnia: <proxyhost[:port]>):"
+#: ../rpmdrake:1
+#, c-format
+msgid "Remove .%s"
+msgstr "Usuń %s"
 
-#: ../edit-urpm-sources.pl_.c:209
-msgid "Proxy hostname:"
-msgstr "Serwer proxy:"
+#: ../rpmdrake:1
+#, c-format
+msgid "changes:"
+msgstr "zmiany:"
 
-#: ../edit-urpm-sources.pl_.c:211
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "Możesz podać użytkownika/hasło dla proxy:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr "Sprawdzanie %s"
 
-#: ../edit-urpm-sources.pl_.c:213
-msgid "User:"
-msgstr "UĹźytkownik:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, finding available packages..."
+msgstr "Proszę czekać, wyszukiwanie dostępnych pakietów..."
 
-#: ../edit-urpm-sources.pl_.c:235
-msgid "Configure sources"
-msgstr "Konfiguracja źródeł"
+#: ../rpmdrake:1
+#, c-format
+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 ""
 
-#: ../edit-urpm-sources.pl_.c:242
-msgid "Enabled?"
-msgstr "Włączone?"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
+msgstr "Błąd podczas dodawania nośnika aktualizacyjnego"
 
-#: ../edit-urpm-sources.pl_.c:243
-msgid "Source"
-msgstr "Źródło"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
+msgstr ""
+"Proszę czekać, nawiązywanie połączenia z serwerem zwierciadlanym\n"
+"w celu inicjacji pakietĂłw aktualizacyjnych."
 
-#: ../edit-urpm-sources.pl_.c:264 ../rpmdrake_.c:730
-msgid "Remove"
-msgstr "Usuń"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Sources Manager, and then add a `Security\n"
+"updates' source.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:266
-msgid "Edit"
-msgstr "Modyfikuj"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Sposób ręcznego wyboru serwera zwierciadlanego"
 
-#: ../edit-urpm-sources.pl_.c:268
-msgid "Add..."
-msgstr "Dodaj..."
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
+msgstr ""
+"Wystąpił nieodwracalny błąd podczas aktualizacji informacji o pakietach."
 
-#: ../edit-urpm-sources.pl_.c:270
-msgid "Update..."
-msgstr "Aktualizuj..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
+msgstr "Błąd podczas aktualizacji nośnika"
 
-#: ../edit-urpm-sources.pl_.c:271
-msgid "Proxy..."
-msgstr "Proxy..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
+msgstr ""
+"Proszę czekać, nawiązywanie połączenia z serwerem zwierciadlanym\n"
+"w celu pobrania informacji o nowych pakietach."
 
-#: ../edit-urpm-sources.pl_.c:274
-msgid "Save and quit"
-msgstr "Zapisz i zakończ"
+#: ../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 ""
 
-#: ../edit-urpm-sources.pl_.c:275 ../rpmdrake_.c:733
-msgid "Quit"
-msgstr "Zakończ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Installation"
+msgstr "Instalacja pakietĂłw oprogramowania"
 
-#: ../rpmdrake.pm_.c:93
-msgid "Yes"
-msgstr "Tak"
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, c-format
+msgid "Mandrake Update"
+msgstr "Aktualizacja Mandrake"
 
-#: ../rpmdrake.pm_.c:95
-msgid "No"
-msgstr "Nie"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
+msgstr "Usuwanie pakietĂłw oprogramowania"
 
-#: ../rpmdrake.pm_.c:127
-msgid "Info..."
-msgstr "Info..."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Zakończ"
 
-#: ../rpmdrake.pm_.c:180
-msgid "Austria"
-msgstr "Austria"
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "Zainstaluj"
 
-#: ../rpmdrake.pm_.c:181
-msgid "Australia"
-msgstr "Australia"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "Usuń"
 
-#: ../rpmdrake.pm_.c:182
-msgid "Belgium"
-msgstr "Belgia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search"
+msgstr "Wyszukaj"
 
-#: ../rpmdrake.pm_.c:183
-msgid "Brazil"
-msgstr "Brazylia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "ZnajdĹş:"
 
-#: ../rpmdrake.pm_.c:184
-msgid "Canada"
-msgstr "Kanada"
+#: ../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 ""
 
-#: ../rpmdrake.pm_.c:185
-msgid "Costa Rica"
-msgstr "Kostaryka"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "Niektóre pakiety muszą zostać usunięte"
 
-#: ../rpmdrake.pm_.c:186
-msgid "Czech Republic"
-msgstr "Czechy"
+#: ../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 ""
 
-#: ../rpmdrake.pm_.c:187
-msgid "Germany"
-msgstr "Niemcy"
+#: ../rpmdrake:1
+#, c-format
+msgid "Too many packages are selected"
+msgstr "Wybrano zbyt wiele pakietĂłw"
 
-#: ../rpmdrake.pm_.c:188
-msgid "Danmark"
-msgstr "Dania"
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
+msgstr "Maksimum informacji"
 
-#: ../rpmdrake.pm_.c:189 ../rpmdrake.pm_.c:193
-msgid "Greece"
-msgstr "Grecja"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal information"
+msgstr "Podstawowe informacje"
 
-#: ../rpmdrake.pm_.c:190
-msgid "Spain"
-msgstr "Hiszpania"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update source(s)"
+msgstr "Aktualizacja nośnika(-ów)"
 
-#: ../rpmdrake.pm_.c:191
-msgid "Finland"
-msgstr "Finlandia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reload the packages list"
+msgstr "Przeładuj listę pakietów"
 
-#: ../rpmdrake.pm_.c:192
-msgid "France"
-msgstr "Francja"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
+msgstr "Usuń zaznaczenie"
 
-#: ../rpmdrake.pm_.c:194
-msgid "Israel"
-msgstr "Izrael"
+#: ../rpmdrake:1
+#, c-format
+msgid "in files"
+msgstr "w plikach"
 
-#: ../rpmdrake.pm_.c:195
-msgid "Italy"
-msgstr "Włochy"
+#: ../rpmdrake:1
+#, c-format
+msgid "in descriptions"
+msgstr "w opisach"
 
-#: ../rpmdrake.pm_.c:196
-msgid "Japan"
-msgstr "Japonia"
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
+msgstr "w nazwach"
 
-#: ../rpmdrake.pm_.c:197
-msgid "Korea"
-msgstr "Korea"
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
+msgstr "według dostępności aktualizacji"
 
-#: ../rpmdrake.pm_.c:198
-msgid "Netherlands"
-msgstr "Holandia"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
+msgstr "według repozytorium źródłowego"
 
-#: ../rpmdrake.pm_.c:199
-msgid "Norway"
-msgstr "Norwegia"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
+msgstr "według stanu zaznaczenia"
 
-#: ../rpmdrake.pm_.c:200
-msgid "Poland"
-msgstr "Polska"
+#: ../rpmdrake:1
+#, c-format
+msgid "by size"
+msgstr "według rozmiaru"
 
-#: ../rpmdrake.pm_.c:201
-msgid "Portugal"
-msgstr "Portugalia"
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
+msgstr "według grupy"
 
-#: ../rpmdrake.pm_.c:202
-msgid "Russia"
-msgstr "Rosja"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages,"
+msgstr "Wszystkie pakiety,"
 
-#: ../rpmdrake.pm_.c:203
-msgid "Sweden"
-msgstr "Szwecja"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
+msgstr "Wszystkie pakiety, alfabetycznie"
 
-#: ../rpmdrake.pm_.c:204
-msgid "Taiwan"
-msgstr "Tajwan"
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
+msgstr "Lista wyboru Mandrake"
 
-#: ../rpmdrake.pm_.c:205
-msgid "United Kingdom"
-msgstr "Wielka Brytania"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal updates"
+msgstr "Zwykłe aktualizacje"
 
-#: ../rpmdrake.pm_.c:206
-msgid "China"
-msgstr "Chiny"
+#: ../rpmdrake:1
+#, c-format
+msgid "Bugfixes updates"
+msgstr "Aktualizacje poprawiające błędy"
 
-#: ../rpmdrake.pm_.c:207 ../rpmdrake.pm_.c:208 ../rpmdrake.pm_.c:209
-#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:261
-msgid "United States"
-msgstr "Stany Zjednoczone"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
+msgstr "Aktualizacje z dziedziny bezpieczeństwa"
 
-#: ../rpmdrake.pm_.c:274
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr "Proszę czekać, pobieranie adresów serwerów zwierciadlanych."
+#: ../rpmdrake:1
+#, c-format
+msgid "Description: "
+msgstr "Opis:"
 
-#: ../rpmdrake.pm_.c:280
-msgid "Error during download"
-msgstr "Błąd podczas pobierania"
+#: ../rpmdrake:1
+#, c-format
+msgid "Summary: "
+msgstr "Podsumowanie: "
 
-#: ../rpmdrake.pm_.c:289
-msgid "No mirror"
-msgstr "Brak serwerĂłw zwierciadlanych"
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "Ważność: "
 
-#: ../rpmdrake.pm_.c:307
-msgid "Please choose the desired mirror."
-msgstr "Wybierz serwer zwierciadlany."
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake.pm_.c:339 ../rpmdrake_.c:627
-msgid "Update source(s)"
-msgstr "Aktualizacja nośnika(-ów)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Size: "
+msgstr "Rozmiar: "
 
-#: ../rpmdrake.pm_.c:343
-msgid "Select the source(s) you wish to update:"
-msgstr "Wybierz źródła(-o) do aktualizacji:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Version: "
+msgstr "Wersja: "
 
-#: ../rpmdrake.pm_.c:347
-msgid "Update"
-msgstr "Aktualizuj"
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "Nazwa: "
 
-#: ../rpmdrake.pm_.c:358
-msgid "Please wait, updating media..."
-msgstr "Proszę czekać, aktualizacja nośnika..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "Przyczyna uaktualnienia:"
 
-#: ../rpmdrake_.c:99
-msgid "Other"
-msgstr "Inne"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
+msgstr "Aktualnie zainstalowana wersja:"
 
-#: ../rpmdrake_.c:121 ../rpmdrake_.c:135 ../rpmdrake_.c:227 ../rpmdrake_.c:298
-msgid "(none)"
-msgstr "(brak)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Source: "
+msgstr "Źródło: "
 
-#: ../rpmdrake_.c:141 ../rpmdrake_.c:482 ../rpmdrake_.c:483
+#: ../rpmdrake:1
+#, c-format
 msgid "(Not available)"
 msgstr "(Niedostępne)"
 
-#: ../rpmdrake_.c:151 ../rpmdrake_.c:208
-msgid "Search results"
-msgstr "Wyniki wyszukiwania"
-
-#: ../rpmdrake_.c:151
-msgid "Search results (none)"
-msgstr "Wyniki wyszukiwania (brak)"
-
-#: ../rpmdrake_.c:161 ../rpmdrake_.c:172
-msgid "Please wait, searching..."
-msgstr "Proszę czekać, wyszukiwanie..."
-
-#: ../rpmdrake_.c:175
-msgid "Stop"
-msgstr "Zatrzymaj"
-
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-msgid "Addable"
-msgstr "Dodawalne"
-
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-msgid "Upgradable"
-msgstr "Aktualizowalne"
-
-#: ../rpmdrake_.c:211
-msgid "Not selected"
-msgstr "Nie wybrane"
-
-#: ../rpmdrake_.c:211
-msgid "Selected"
-msgstr "Wybrane"
-
-#: ../rpmdrake_.c:240
-msgid "rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake_.c:258 ../rpmdrake_.c:360 ../rpmdrake_.c:362
-msgid "More information on package..."
-msgstr "Więcej informacji o pakiecie..."
-
-#: ../rpmdrake_.c:259
-msgid "One of the following packages is needed:"
-msgstr "Wymagany jest jeden z poniĹźszych pakietĂłw:"
-
-#: ../rpmdrake_.c:259
-msgid "Please choose"
-msgstr "Proszę wybrać"
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
+msgstr "Dziennik zmian:\n"
 
-#: ../rpmdrake_.c:275
-msgid "unknown package "
-msgstr "nieznany pakiet "
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "PlikĂłw:\n"
 
-#: ../rpmdrake_.c:285
-msgid "Please wait, listing packages..."
-msgstr "Proszę czekać, wypisywanie pakietów..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected size: %d MB"
+msgstr "Wybrany rozmiar: %d MB"
 
-#: ../rpmdrake_.c:300
-msgid "No update"
-msgstr "Brak aktualizacji"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Wybranych: %d MB / Miejsce na dysku: %d MB"
 
-#: ../rpmdrake_.c:353 ../rpmdrake_.c:354
-msgid "More infos"
-msgstr "Więcej informacji"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
+msgstr ""
+"Z powodu swoich zależności, poniższe pakiety muszą zostać\n"
+"teraz odznaczone:\n"
+"\n"
 
-#: ../rpmdrake_.c:355
-msgid "Information on packages"
-msgstr "Informacje o pakietach"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+msgstr ""
+"Niestety, poniższe pakiety nie mogą zostać zaznaczone:\n"
+"\n"
 
-#: ../rpmdrake_.c:376
-msgid "Some additional packages need to be removed"
-msgstr "Zostanie usuniętych kilka dodatkowych pakietów"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "Niektóre pakiety nie mogą zostać zainstalowane"
 
-#: ../rpmdrake_.c:377
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
 "\n"
 msgstr ""
-"Z powodu swoich zależności, poniższe pakiety także muszą zostać\n"
-"usunięte:\n"
+"Aby spełnić zależności, poniższe pakiety także muszą\n"
+"zostać zainstalowane:\n"
 "\n"
 
-#: ../rpmdrake_.c:383 ../rpmdrake_.c:391
+#: ../rpmdrake:1
+#, c-format
+msgid "Additional packages needed"
+msgstr "Wymagane są dodatkowe pakiety"
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "Niektóre pakiety nie mogą zostać usunięte"
 
-#: ../rpmdrake_.c:384
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -466,424 +616,564 @@ msgstr ""
 "Niestety, usunięcie tych pakietów może spowodować uszkodzenie systemu:\n"
 "\n"
 
-#: ../rpmdrake_.c:392 ../rpmdrake_.c:451
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"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 muszą zostać\n"
-"teraz odznaczone:\n"
+"Z powodu swoich zależności, poniższe pakiety także muszą zostać\n"
+"usunięte:\n"
 "\n"
 
-#: ../rpmdrake_.c:421
-msgid "Additional packages needed"
-msgstr "Wymagane są dodatkowe pakiety"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr "Zostanie usuniętych kilka dodatkowych pakietów"
 
-#: ../rpmdrake_.c:422
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
-msgstr ""
-"Aby spełnić zależności, poniższe pakiety także muszą\n"
-"zostać zainstalowane:\n"
-"\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
+msgstr "Więcej informacji o pakiecie..."
 
-#: ../rpmdrake_.c:435
-msgid "Some packages can't be installed"
-msgstr "Niektóre pakiety nie mogą zostać zainstalowane"
+#: ../rpmdrake:1
+#, c-format
+msgid "Information on packages"
+msgstr "Informacje o pakietach"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
+msgstr "Więcej informacji"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Addable"
+msgstr "Dodawalne"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Upgradable"
+msgstr "Aktualizowalne"
 
-#: ../rpmdrake_.c:436
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
+"The list of updates is void. This 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 ""
-"Niestety, poniższe pakiety nie mogą zostać zaznaczone:\n"
-"\n"
 
-#: ../rpmdrake_.c:450 ../rpmdrake_.c:684
-msgid "Some packages need to be removed"
-msgstr "Niektóre pakiety muszą zostać usunięte"
+#: ../rpmdrake:1
+#, c-format
+msgid "No update"
+msgstr "Brak aktualizacji"
 
-#: ../rpmdrake_.c:472
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Wybranych: %d MB / Miejsce na dysku: %d MB"
+msgid "(none)"
+msgstr "(brak)"
 
-#: ../rpmdrake_.c:474
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "Wybrany rozmiar: %d MB"
+msgid "Please wait, listing packages..."
+msgstr "Proszę czekać, wypisywanie pakietów..."
 
-#: ../rpmdrake_.c:482
-msgid "Files:\n"
-msgstr "PlikĂłw:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "unknown package "
+msgstr "nieznany pakiet "
 
-#: ../rpmdrake_.c:483
-msgid "Changelog:\n"
-msgstr "Dziennik zmian:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Wymagany jest jeden z poniĹźszych pakietĂłw:"
 
-#: ../rpmdrake_.c:486
-msgid "Source: "
-msgstr "Źródło: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please choose"
+msgstr "Proszę wybrać"
 
-#: ../rpmdrake_.c:487
-msgid "Currently installed version: "
-msgstr "Aktualnie zainstalowana wersja:"
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:491
-msgid "Reason for update: "
-msgstr "Przyczyna uaktualnienia:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Not selected"
+msgstr "Nie wybrane"
 
-#: ../rpmdrake_.c:493
-msgid "Name: "
-msgstr "Nazwa: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected"
+msgstr "Wybrane"
 
-#: ../rpmdrake_.c:494
-msgid "Version: "
-msgstr "Wersja: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results"
+msgstr "Wyniki wyszukiwania"
 
-#: ../rpmdrake_.c:495
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Stop"
+msgstr "Zatrzymaj"
 
-#: ../rpmdrake_.c:495
-msgid "Size: "
-msgstr "Rozmiar: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, searching..."
+msgstr "Proszę czekać, wyszukiwanie..."
 
-#: ../rpmdrake_.c:497
-msgid "Importance: "
-msgstr "Ważność: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
+msgstr "Wyniki wyszukiwania (brak)"
 
-#: ../rpmdrake_.c:498
-msgid "Summary: "
-msgstr "Podsumowanie: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Inne"
 
-#: ../rpmdrake_.c:499
-msgid "Description: "
-msgstr "Opis:"
+#: ../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_.c:548
-msgid "Bugfixes updates"
-msgstr "Aktualizacje poprawiające błędy"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Zapisz i zakończ"
 
-#: ../rpmdrake_.c:548
-msgid "Normal updates"
-msgstr "Zwykłe aktualizacje"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy..."
+msgstr "Proxy..."
 
-#: ../rpmdrake_.c:567
-msgid "Mandrake choices"
-msgstr "Lista wyboru Mandrake"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
+msgstr "Aktualizuj..."
 
-#: ../rpmdrake_.c:568
-msgid "All packages, alphabetical"
-msgstr "Wszystkie pakiety, alfabetycznie"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "Dodaj..."
 
-#: ../rpmdrake_.c:569
-msgid "All packages,"
-msgstr "Wszystkie pakiety,"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "Modyfikuj"
 
-#: ../rpmdrake_.c:592
-msgid "by group"
-msgstr "według grupy"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Source"
+msgstr "Źródło"
 
-#: ../rpmdrake_.c:592
-msgid "by size"
-msgstr "według rozmiaru"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
+msgstr "Włączone?"
 
-#: ../rpmdrake_.c:593
-msgid "by selection state"
-msgstr "według stanu zaznaczenia"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure sources"
+msgstr "Konfiguracja źródeł"
 
-#: ../rpmdrake_.c:594
-msgid "by source repository"
-msgstr "według repozytorium źródłowego"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "Hasło:"
 
-#: ../rpmdrake_.c:594
-msgid "by update availability"
-msgstr "według dostępności aktualizacji"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
+msgstr "UĹźytkownik:"
 
-#: ../rpmdrake_.c:615
-msgid "in descriptions"
-msgstr "w opisach"
+#: ../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 proxy:"
 
-#: ../rpmdrake_.c:615
-msgid "in files"
-msgstr "w plikach"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "Serwer proxy:"
 
-#: ../rpmdrake_.c:615
-msgid "in names"
-msgstr "w nazwach"
+#: ../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_.c:626
-msgid "Reload the packages list"
-msgstr "Przeładuj listę pakietów"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "Konfiguracja serwera proxy"
 
-#: ../rpmdrake_.c:626
-msgid "Reset the selection"
-msgstr "Usuń zaznaczenie"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr "Proszę czekać, aktualizacja nośnika..."
 
-#: ../rpmdrake_.c:652
-msgid "Maximum information"
-msgstr "Maksimum informacji"
+#: ../edit-urpm-sources.pl: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."
 
-#: ../rpmdrake_.c:652
-msgid "Normal information"
-msgstr "Podstawowe informacje"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
+msgstr "Włóż nośnik, aby kontynuować"
 
-#: ../rpmdrake_.c:674
-msgid "Too many packages are selected"
-msgstr "Wybrano zbyt wiele pakietĂłw"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save changes"
+msgstr "Zapisz zmiany"
 
-#: ../rpmdrake_.c:720
-msgid "Find:"
-msgstr "ZnajdĹş:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Względna ścieżka do pliku syntezy/hdlist:"
 
-#: ../rpmdrake_.c:725
-msgid "Search"
-msgstr "Wyszukaj"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake_.c:731
-msgid "Install"
-msgstr "Zainstaluj"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Editing source \"%s\":"
+msgstr "Modyfikowanie Źródła \"%s\":"
 
-#: ../rpmdrake_.c:738 data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrake Update"
-msgstr "Aktualizacja Mandrake"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit a source"
+msgstr "Modyfikuj Źródło"
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Installation"
-msgstr "Instalacja pakietĂłw oprogramowania"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr "Proszę czekać, usuwanie nośnika..."
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Removal"
-msgstr "Usuwanie pakietĂłw oprogramowania"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, adding medium..."
+msgstr "Proszę czekać, dodawanie nośnika..."
 
-#: ../rpmdrake_.c:779
-msgid "Please wait, contacting mirror to update packages information."
-msgstr ""
-"Proszę czekać, nawiązywanie połączenia z serwerem zwierciadlanym\n"
-"w celu pobrania informacji o nowych pakietach."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of source:"
+msgstr "Rodzaj źródła:"
 
-#: ../rpmdrake_.c:781
-msgid "Error updating medium"
-msgstr "Błąd podczas aktualizacji nośnika"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Adding a source:"
+msgstr "Dodawanie źródła:"
 
-#: ../rpmdrake_.c:782
-msgid "There was an unrecoverable error while updating packages information."
+#: ../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 ""
-"Wystąpił nieodwracalny błąd podczas aktualizacji informacji o pakietach."
 
-#: ../rpmdrake_.c:787
-msgid "How to choose manually your mirror"
-msgstr "Sposób ręcznego wyboru serwera zwierciadlanego"
+#: ../edit-urpm-sources.pl: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."
 
-#: ../rpmdrake_.c:795
-msgid "Please wait, contacting mirror to initialize updates packages."
-msgstr ""
-"Proszę czekać, nawiązywanie połączenia z serwerem zwierciadlanym\n"
-"w celu inicjacji pakietĂłw aktualizacyjnych."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "Nazwa:"
 
-#: ../rpmdrake_.c:798
-msgid "Error adding update medium"
-msgstr "Błąd podczas dodawania nośnika aktualizacyjnego"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
+msgstr "Login:"
 
-#: ../rpmdrake_.c:829
-msgid "Please wait, finding available packages..."
-msgstr "Proszę czekać, wyszukiwanie dostępnych pakietów..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Wybierz serwer zwierciadlany..."
 
-#: ../rpmdrake_.c:861
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Sprawdzanie %s"
+msgid "Browse..."
+msgstr "Przeglądaj..."
 
-#: ../rpmdrake_.c:880
-msgid "changes:"
-msgstr "zmiany:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Ścieżka lub punkt montowania:"
 
-#: ../rpmdrake_.c:884
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Usuń %s"
+msgid "Removable device"
+msgstr "Napęd wymienny"
 
-#: ../rpmdrake_.c:886
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "UĹźyj .%s jako plik podstawowy"
+msgid "HTTP server"
+msgstr "Serwer HTTP"
 
-#: ../rpmdrake_.c:888
-msgid "Do nothing"
-msgstr "Nic nie rĂłb"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "Serwer FTP"
 
-#: ../rpmdrake_.c:900
-msgid "Installation finished"
-msgstr "Instalacja zakończona"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path:"
+msgstr "Ścieżka:"
 
-#: ../rpmdrake_.c:910
-msgid "Inspect..."
-msgstr "Sprawdzaj..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "Lokalne pliki"
 
-#: ../rpmdrake_.c:925
-msgid "Program missing"
-msgstr "Brak programu"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add a source"
+msgstr "Dodawanie źródła"
 
-#: ../rpmdrake_.c:926
-msgid "A required program is missing (grpmi). Check your installation."
-msgstr "Brak wymaganego programu (grpmi). Sprawdź swoją instalację."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
+msgstr "Nie można zaktualizować nośnika; zostanie automatycznie wyłączony."
 
-#: ../rpmdrake_.c:940
-msgid "Unable to get source packages."
-msgstr "Nie można pobrać pakietów źródłowych."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "Nie można utworzyć nośnika."
 
-#: ../rpmdrake_.c:941
-msgid "Unable to get source packages, sorry."
-msgstr "Niestety, nie można pobrać pakietów źródłowych."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, updating media..."
+msgstr "Proszę czekać, aktualizacja nośnika..."
 
-#: ../rpmdrake_.c:948
-msgid "Change medium"
-msgstr "Zmień nośnik"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
+msgstr "Aktualizuj"
 
-#: ../rpmdrake_.c:949
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Wsuń nośnik oznaczony \"%s\" do urządzenia [%s]"
+msgid "Select the source(s) you wish to update:"
+msgstr "Wybierz źródła(-o) do aktualizacji:"
 
-#: ../rpmdrake_.c:957
-msgid "Installation failed"
-msgstr "Instalacja zakończona niepowodzeniem"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please choose the desired mirror."
+msgstr "Wybierz serwer zwierciadlany."
 
-#: ../rpmdrake_.c:958
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
-"Instalacja nie powiodła się, brak niektórych plików.\n"
-"Może zachdzić potrzeba aktualizacji bazy danych źródeł."
 
-#: ../rpmdrake_.c:961
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr "Proszę czekać, usuwanie pakietów w celu umożliwienia aktualizacji..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
+msgstr "Brak serwerĂłw zwierciadlanych"
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"There was an error downloading the mirrors list:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
-"Zakończono instalację; %s.\n"
-"\n"
-"Pewne pliki konfiguracyjne zostały utworzone jako `.rpmnew' or `.rpmsave',\n"
-"Można je sprawdzić aby podjąć odpowiednie działanie:"
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "Błąd podczas pobierania"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "Proszę czekać, pobieranie adresów serwerów zwierciadlanych."
+
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"some packages failed to install\n"
-"correctly"
+"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 ""
-"niektóre pakiety nie mogą zostać\n"
-" zainstalowane prawidłowo"
 
-#: ../rpmdrake_.c:983
-msgid "everything was installed correctly"
-msgstr "wszystko zostało pomyślnie zainstalowane"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United States"
+msgstr "Stany Zjednoczone"
 
-#: ../rpmdrake_.c:985
-msgid "Everything installed successfully"
-msgstr "Wszystko zostało pomyślnie zainstalowane"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
+msgstr "Chiny"
 
-#: ../rpmdrake_.c:986
-msgid "All requested packages were installed successfully."
-msgstr "Wszystkie żądane pakiety zostały pomyślnie zainstalowane."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr "Wielka Brytania"
 
-#: ../rpmdrake_.c:989
-msgid "Everything already installed."
-msgstr "Wszystko zostało już zainstalowane."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "Tajwan"
 
-#: ../rpmdrake_.c:990
-msgid "Everything already installed (is this supposed to happen at all?)."
-msgstr ""
-"Wszystko zostało już zainstalowane (czy rzeczywiście taki był\n"
-"zamierzony efekt?)."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "Szwecja"
 
-#: ../rpmdrake_.c:997
-msgid "Problem during installation"
-msgstr "Problem podczas instalacji"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
+msgstr "Rosja"
 
-#: ../rpmdrake_.c:998
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Podczas instalacji wystąpił problem:\n"
-"\n"
-"%s"
+msgid "Portugal"
+msgstr "Portugalia"
 
-#: ../rpmdrake_.c:1012
-msgid "Please wait, reading packages database..."
-msgstr "Proszę czekać, odczytywanie bazy danych pakietów..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
+msgstr "Polska"
 
-#: ../rpmdrake_.c:1053
-msgid "Please wait, removing packages..."
-msgstr "Proszę czekać, usuwanie pakietów..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
+msgstr "Norwegia"
 
-#: ../rpmdrake_.c:1056
-msgid "Problem during removal"
-msgstr "Problem podczas usuwania"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
+msgstr "Holandia"
 
-#: ../rpmdrake_.c:1057
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Podczas usuwania poniższych pakietów wystąpił problem:\n"
-"\n"
-"%s"
+msgid "Korea"
+msgstr "Korea"
 
-#: ../rpmdrake_.c:1089
-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 "Japan"
+msgstr "Japonia"
 
-#: ../rpmdrake_.c:1094
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"Witaj w MandrakeUpdate!\n"
-"\n"
-"To narzędzie pomoże ci wybrać aktualizacje, które możesz chcieć\n"
-"zainstalować na tym komputerze."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Italy"
+msgstr "Włochy"
 
-#: ../rpmdrake_.c:1099
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
-msgstr ""
-"Witaj w narzędziu instalacji oprogramowania!\n"
-"\n"
-"Twój system Mandrake Linux został dostarczony z kilkoma tysiącami\n"
-"pakietów oprogramowania na płycie CD lub DVD. To narzędzie pomoże ci\n"
-"wybrać pakiety, które można zainstalować na komputerze."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Israel"
+msgstr "Izrael"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Grecja"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "France"
+msgstr "Francja"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "Finlandia"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "Hiszpania"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
+msgstr "Dania"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr "Niemcy"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
+msgstr "Czechy"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Costa Rica"
+msgstr "Kostaryka"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Canada"
+msgstr "Kanada"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
+msgstr "Brazylia"
+
+#: ../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 "Austria"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Info..."
+msgstr "Info..."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
+msgstr "Nie"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Tak"
+
+#: data/rpmdrake.desktop.in.h:1
+msgid "Install Software"
+msgstr "Instalacja oprogramowania"
 
 #: data/rpmdrake-remove.desktop.in.h:1
 msgid "Remove Software"
@@ -892,7 +1182,3 @@ msgstr "Usuwanie oprogramowania"
 #: data/rpmdrake-sources.desktop.in.h:1
 msgid "Software Sources Manager"
 msgstr "Menedżer źródeł oprogramowania"
-
-#: data/rpmdrake.desktop.in.h:1
-msgid "Install Software"
-msgstr "Instalacja oprogramowania"
diff --git a/po/pl.pom b/po/pl.pom
index 2b8ef436..bffdde22 100644
--- a/po/pl.pom
+++ b/po/pl.pom
@@ -4,166 +4,174 @@ msgstr "Serwer"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "WWW/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Komputer sieciowy (klient)"
+msgid "Office Workstation"
+msgstr "Komputer biurowy"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "Serwery NFS, SMB, SSH, oraz serwer pośredniczący"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Programy biurowe: procesory tekstu (kword, abiword), arkusze kalkulacyjne "
+"(kspread, gnumeric), przeglądarki pdf, itp."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Biuro"
+msgid "Workstation"
+msgstr "Stacja robocza"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Stacja robocza z Gnome"
+msgid "Game station"
+msgstr "Komputer do gier"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Narzędzia do Palm Pilota lub Visior"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Programy rozrywkowe: zręcznościowe, planszowe, strategiczne, itp."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Stacja robocza"
+msgid "Multimedia station"
+msgstr "Korzystanie z multimediĂłw"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Zapora sieciowa/Router"
+msgid "Sound and video playing/editing programs"
+msgstr "Programy do odtwarzania/edycji dźwięku i video"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr "Serwer systemu DNS"
+msgid "Internet station"
+msgstr "Korzystanie z Internetu"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
 msgstr ""
-"Programy biurowe: procesory tekstu (kword, abiword), arkusze kalkulacyjne "
-"(kspread, gnumeric), przeglądarki pdf, itp."
+"Zestaw narzędzi do czytania i wysyłania poczty i grup dyskusyjnych (pin, "
+"mutt, tin) oraz przeglądania sieci Web"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "Dźwięk: odtwarzacze mp3 i midi, miksery, itp."
+msgid "Network Computer (client)"
+msgstr "Komputer sieciowy (klient)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Podstawa standardu Linuksa. Obsługa aplikacji ze źródeł trzecich"
+msgid "Clients for different protocols including ssh"
+msgstr "Programy klientów dla różnych protokołów, w tym ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Podręczniki i HOWTO dotyczące Linuksa i otwartego oprogramowania"
+msgid "Configuration"
+msgstr "Konfiguracja"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "Stacja robocza z KDE"
+msgid "Tools to ease the configuration of your computer"
+msgstr "Narzędzia ułatwiające konfigurację komputera"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, itp"
+msgid "Scientific Workstation"
+msgstr "Stacja robocza dla naukowca"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Multimedia - Video"
+msgid "Scientific applications such as gnuplot"
+msgstr "Aplikacje naukowe takie jak np. gnuplot"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr "Zestawy narzędzi dla poczty, WWW, przesyłania plików i chat"
+msgid "Console Tools"
+msgstr "Narzędzia dla konsoli"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Bazy danych"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Edytory, powłoki, narzędzia plikowe, terminale"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "Serwery baz danych PostgreSQL lub  MySQL"
+msgid "KDE Workstation"
+msgstr "Stacja robocza z KDE"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Narzędzia ułatwiające konfigurację komputera"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"KDE - podstawowe środowisko graficzne wraz z zestawem towarzyszących narzędzi"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "Multimedia - Dźwięk"
+msgid "Graphical Environment"
+msgstr "Środowisko graficzne"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dokumentacja"
+msgid "Gnome Workstation"
+msgstr "Stacja robocza z Gnome"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Narzędzia dla konsoli"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+"Środowisko graficzne z przyjaznymi dla użytkownika zestawami aplikacji i "
+"narzędzi"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr "Serwer pocztowy Postfix, serwer grup dyskusyjnych Inn"
+msgid "Other Graphical Desktops"
+msgstr "Inne pulpity graficzne"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Korzystanie z Internetu"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, itp"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Korzystanie z multimediĂłw"
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+msgid "Development"
+msgstr "Programowanie"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Konfiguracja"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "Biblioteki do programowania w C i C++, programy i pliki nagłówkowe"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Więcej pulpitów graficznych (Gnome, IceWM)"
+msgid "Documentation"
+msgstr "Dokumentacja"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
-"KDE - podstawowe środowisko graficzne wraz z zestawem towarzyszących narzędzi"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Podręczniki i HOWTO dotyczące Linuksa i otwartego oprogramowania"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Środowisko graficzne"
+msgid "LSB"
+msgstr "LSB"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Podstawa standardu Linuksa. Obsługa aplikacji ze źródeł trzecich"
+
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-msgid "Development"
-msgstr "Programowanie"
+#: ../../share/compssUsers:999
+msgid "Web/FTP"
+msgstr "WWW/FTP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -172,23 +180,33 @@ msgstr "Apache oraz Pro-ftpd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "Narzędzia do tworzenia i nagrywania CD"
+msgid "Mail/Groupware/News"
+msgstr "Poczta/Narzędzia pracy grupowej/News"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Komputer biurowy"
+msgid "Postfix mail server, Inn news server"
+msgstr "Serwer pocztowy Postfix, serwer grup dyskusyjnych Inn"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, itp."
+msgid "Database"
+msgstr "Bazy danych"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Programy graficzne, np. Gimp"
+msgid "PostgreSQL or MySQL database server"
+msgstr "Serwery baz danych PostgreSQL lub  MySQL"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Firewall/Router"
+msgstr "Zapora sieciowa/Router"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Internet gateway"
+msgstr "Bramka do Internetu"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -197,8 +215,8 @@ msgstr "DNS/NIS "
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "Biblioteki do programowania w C i C++, programy i pliki nagłówkowe"
+msgid "Domain Name and Network Information Server"
+msgstr "Serwer systemu DNS"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -207,18 +225,18 @@ msgstr "Serwer sieciowy"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "Poczta/Narzędzia pracy grupowej/News"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "Serwery NFS, SMB, SSH, oraz serwer pośredniczący"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Komputer do gier"
+msgid "Office"
+msgstr "Biuro"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Odtwarzacze i edytory video"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr "Zestawy narzędzi dla poczty, WWW, przesyłania plików i chat"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -227,78 +245,66 @@ msgstr "Multimedia - Grafika"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Programy rozrywkowe: zręcznościowe, planszowe, strategiczne, itp."
+msgid "Graphics programs such as The Gimp"
+msgstr "Programy graficzne, np. Gimp"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
-"Zestaw narzędzi do czytania i wysyłania poczty i grup dyskusyjnych (pin, "
-"mutt, tin) oraz przeglądania sieci Web"
+msgid "Multimedia - Sound"
+msgstr "Multimedia - Dźwięk"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "Finanse osobiste"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "Dźwięk: odtwarzacze mp3 i midi, miksery, itp."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
-"Środowisko graficzne z przyjaznymi dla użytkownika zestawami aplikacji i "
-"narzędzi"
+msgid "Multimedia - Video"
+msgstr "Multimedia - Video"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Programy klientów dla różnych protokołów, w tym ssh"
+msgid "Video players and editors"
+msgstr "Odtwarzacze i edytory video"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
+msgid "Multimedia - CD Burning"
+msgstr "Multimedia - Nagrywanie płyt CD"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Bramka do Internetu"
+msgid "Tools to create and burn CD's"
+msgstr "Narzędzia do tworzenia i nagrywania CD"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Programy do odtwarzania/edycji dźwięku i video"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Więcej pulpitów graficznych (Gnome, IceWM)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Inne pulpity graficzne"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, itp."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Edytory, powłoki, narzędzia plikowe, terminale"
+msgid "Personal Information Management"
+msgstr "Zarządzanie osobistymi informacjami"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "Programy do zarządzania finansami, np gnucash"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Narzędzia do Palm Pilota lub Visior"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "Zarządzanie osobistymi informacjami"
+msgid "Personal Finance"
+msgstr "Finanse osobiste"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multimedia - Nagrywanie płyt CD"
+msgid "Programs to manage your finances, such as gnucash"
+msgstr "Programy do zarządzania finansami, np gnucash"
 
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Stacja robocza dla naukowca"
diff --git a/po/pt.po b/po/pt.po
index 194fe54c..27ec3678 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-pt\n"
-"POT-Creation-Date: 2003-02-12 14:24+0100\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\n"
 "PO-Revision-Date: 2003-02-11 20:53+0100\n"
 "Last-Translator: Fernando Ribeiro <fa.ribeiro(at)gmx.net>\n"
 "Language-Team: Portugal\n"
@@ -20,1042 +20,1234 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
 
-#: ../edit-urpm-sources.pl_.c:43
-msgid "Unable to create medium."
-msgstr "Impossível criar o média."
-
-#: ../edit-urpm-sources.pl_.c:44
-msgid "Unable to update medium; it will be automatically disabled."
-msgstr "Impossível actualizar o média, irá ser automaticamente desactivado."
-
-#: ../edit-urpm-sources.pl_.c:54
-msgid "Add a source"
-msgstr "Adicionar uma fonte"
-
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Local files"
-msgstr "Ficheiros Locais"
-
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Path:"
-msgstr "Caminho:"
-
-#: ../edit-urpm-sources.pl_.c:56
-msgid "FTP server"
-msgstr "Servidor FTP"
-
-#: ../edit-urpm-sources.pl_.c:56 ../edit-urpm-sources.pl_.c:57
-#: ../edit-urpm-sources.pl_.c:59 ../edit-urpm-sources.pl_.c:187
-msgid "URL:"
-msgstr "URL:"
-
-#: ../edit-urpm-sources.pl_.c:57
-msgid "HTTP server"
-msgstr "Servidor HTTP"
-
-#: ../edit-urpm-sources.pl_.c:58
-msgid "Path or mount point:"
-msgstr "Caminho ou ponto de montagem:"
-
-#: ../edit-urpm-sources.pl_.c:58
-msgid "Removable device"
-msgstr "Dispositivo amovível"
-
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:550
-msgid "Security updates"
-msgstr "Actualizaçőes de segurança"
-
-#: ../edit-urpm-sources.pl_.c:70
-msgid "Browse..."
-msgstr "Navegar..."
-
-#: ../edit-urpm-sources.pl_.c:72
-msgid "Choose a mirror..."
-msgstr "Escolha um mirror..."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Posso continuar?"
 
-#: ../edit-urpm-sources.pl_.c:92
-msgid "Login:"
-msgstr "Login:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to the software installation tool!\n"
+"\n"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
+msgstr ""
+"Seja bem-vindo ŕ ferramenta de instalaçăo de programas!\n"
+"\n"
+"O seu sistema Linux Mandrake vem com várias centenas de pacotes de\n"
+"programas nos CDROM ou DVD. Esta ferramenta vai ajudá-lo a escolher\n"
+"quais os programas que deseja instalar no seu computador."
 
-#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:231
-msgid "Password:"
-msgstr "Senha:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Seja bem-vindo ao MandrakeUpdate!\n"
+"\n"
+"Esta ferramenta vai ajudá-lo a escolher quais as actualizaçőes que deseja\n"
+"instalar no seu computador."
 
-#: ../edit-urpm-sources.pl_.c:97
-msgid "Name:"
-msgstr "Nome:"
+#: ../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 ""
+"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."
 
-#: ../edit-urpm-sources.pl_.c:99 ../edit-urpm-sources.pl_.c:188
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Caminho relativo para síntese/hdlist:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"Houve um problema durante a remoçăo dos pacotes:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:107
-msgid "You need to fill up at least the two first entries."
-msgstr "Necessita preencher pelo menos as duas primeiras entradas."
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during removal"
+msgstr "Problema durante a remoçăo"
 
-#: ../edit-urpm-sources.pl_.c:120
-msgid "Adding a source:"
-msgstr "A adicionar uma fonte:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages..."
+msgstr "Por favor aguarde, a remover os pacotes..."
 
-#: ../edit-urpm-sources.pl_.c:121
-msgid "Type of source:"
-msgstr "Tipo de fonte:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
+msgstr "Por favor aguarde, a ler a base de dados dos pacotes..."
 
-#: ../edit-urpm-sources.pl_.c:125 ../edit-urpm-sources.pl_.c:202
-#: ../edit-urpm-sources.pl_.c:235 ../rpmdrake.pm_.c:100 ../rpmdrake.pm_.c:139
-#: ../rpmdrake.pm_.c:322 ../rpmdrake_.c:355 ../rpmdrake_.c:367
-#: ../rpmdrake_.c:371 ../rpmdrake_.c:918 ../rpmdrake_.c:953
-msgid "Ok"
-msgstr "Ok"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Houve um problema durante a instalaçăo:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:140 ../edit-urpm-sources.pl_.c:196
-#: ../edit-urpm-sources.pl_.c:202 ../edit-urpm-sources.pl_.c:242
-#: ../rpmdrake.pm_.c:322 ../rpmdrake.pm_.c:355 ../rpmdrake_.c:355
-#: ../rpmdrake_.c:953
-msgid "Cancel"
-msgstr "Cancelar"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during installation"
+msgstr "Problema durante a instalaçăo"
 
-#: ../edit-urpm-sources.pl_.c:147
-msgid "Please wait, adding medium..."
-msgstr "Por favor aguarde, a adicionar o média..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
+msgstr "Já está tudo instalado (será que isto deveria acontecer?)."
 
-#: ../edit-urpm-sources.pl_.c:168
-msgid "Please wait, removing medium..."
-msgstr "Por favor aguarde, a remover o média..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed."
+msgstr "Já está tudo instalado."
 
-#: ../edit-urpm-sources.pl_.c:181
-msgid "Edit a source"
-msgstr "Editar a fonte"
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "Todos os pacotes pedidos foram instalados com sucesso."
 
-#: ../edit-urpm-sources.pl_.c:185
+#: ../rpmdrake:1
 #, c-format
-msgid "Editing source \"%s\":"
-msgstr "Ediçăo da fonte \"%s\":"
+msgid "Everything installed successfully"
+msgstr "Tudo foi instalou com sucesso"
 
-#: ../edit-urpm-sources.pl_.c:191
-msgid "Save changes"
-msgstr "Gravar alteraçőes"
+#: ../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 ""
+"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:"
 
-#: ../edit-urpm-sources.pl_.c:200
-msgid "You need to insert the medium to continue"
-msgstr "Necessita inserir o média para continuar"
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "Tudo foi instalado correctamente"
 
-#: ../edit-urpm-sources.pl_.c:201
+#: ../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_.c:206
-msgid "Please wait, updating medium..."
-msgstr "Por favor aguarde, a actualizar o média..."
+"some packages failed to install\n"
+"correctly"
+msgstr ""
+"alguns pacotes năo puderam ser\n"
+"instalados correctamente"
 
-#: ../edit-urpm-sources.pl_.c:217
-msgid "Configure proxies"
-msgstr "Configurar os proxies"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages to allow others to be upgraded..."
+msgstr ""
+"Por favor aguarde, a remover os pacotes para permitir a actualizaçăo dos "
+"outros..."
 
-#: ../edit-urpm-sources.pl_.c:223
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
 msgstr ""
-"Se precisa de um proxy, escreva o nome do servidor e em opçăo a porta "
-"(sintaxe <servidorproxy[:porta]>):"
+"A instalaçăo falhou, falta alguns ficheiros.\n"
+"Talvez queira actualizar a base de dados das suas fontes."
 
-#: ../edit-urpm-sources.pl_.c:225
-msgid "Proxy hostname:"
-msgstr "Nome do servidor proxy:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation failed"
+msgstr "A instalaçăo falhou"
 
-#: ../edit-urpm-sources.pl_.c:227
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "Pode indicar um utilizador/senha para a autenticaçăo no proxy :"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
+msgstr "Cancelar"
 
-#: ../edit-urpm-sources.pl_.c:229
-msgid "User:"
-msgstr "Utilizador:"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "Ok"
 
-#: ../edit-urpm-sources.pl_.c:255
-msgid "Configure sources"
-msgstr "Configurar as fontes"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Por favor insira o média chamado \"%s\" no dispositivo [%s]"
 
-#: ../edit-urpm-sources.pl_.c:262
-msgid "Enabled?"
-msgstr "Activado?"
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr "Mudar o média"
 
-#: ../edit-urpm-sources.pl_.c:263
-msgid "Source"
-msgstr "Fonte"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
+msgstr "Impossível descarregar os pacotes da fonte, lamento."
 
-#: ../edit-urpm-sources.pl_.c:286 ../rpmdrake_.c:732
-msgid "Remove"
-msgstr "Remover"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages."
+msgstr "Impossível descarregar os pacotes da fonte"
 
-#: ../edit-urpm-sources.pl_.c:288
-msgid "Edit"
-msgstr "Editar"
+#: ../rpmdrake:1
+#, c-format
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr "Falta um programa necessário (grpmi). Verifique a sua instalaçăo."
 
-#: ../edit-urpm-sources.pl_.c:290
-msgid "Add..."
-msgstr "Adicionar..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
+msgstr "Falta um programa"
 
-#: ../edit-urpm-sources.pl_.c:292
-msgid "Update..."
-msgstr "Actualizar..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
+msgstr "Inspeccionar..."
 
-#: ../edit-urpm-sources.pl_.c:293
-msgid "Proxy..."
-msgstr "Proxy..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation finished"
+msgstr "A instalaçăo acabou"
 
-#: ../edit-urpm-sources.pl_.c:296
-msgid "Save and quit"
-msgstr "Gravar e sair"
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
+msgstr "Năo fazer nada"
 
-#: ../edit-urpm-sources.pl_.c:297 ../rpmdrake_.c:735
-msgid "Quit"
-msgstr "Sair"
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
+msgstr "Utilizar .%s como ficheiro principal"
 
-#: ../rpmdrake.pm_.c:96
-msgid "Yes"
-msgstr "Sim"
+#: ../rpmdrake:1
+#, c-format
+msgid "Remove .%s"
+msgstr "Remover %s"
 
-#: ../rpmdrake.pm_.c:98
-msgid "No"
-msgstr "Năo"
+#: ../rpmdrake:1
+#, c-format
+msgid "changes:"
+msgstr "mudanças:"
 
-#: ../rpmdrake.pm_.c:130
-msgid "Info..."
-msgstr "Informaçăo..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr "A inspeccionar %s"
 
-#: ../rpmdrake.pm_.c:183
-msgid "Austria"
-msgstr "Áustria"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, finding available packages..."
+msgstr "Por favor aguarde, a procurar os pacotes disponíveis..."
 
-#: ../rpmdrake.pm_.c:184
-msgid "Australia"
-msgstr "Austrália"
+#: ../rpmdrake:1
+#, c-format
+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 ""
+"Houve um erro ao adicionar o média de actualizaçăo com urpmi.\n"
+"\n"
+"Isto pode ser devido a um problema temporário do espelho, ou\n"
+"ao facto da sua versăo de Mandrake Linux (%s) ainda/já năo ser\n"
+"suportada pelas Actualizacoes Oficiais da Mandrake\n"
+"Linux.\n"
+"\n"
+"Deseja tentar com outro espelho?"
 
-#: ../rpmdrake.pm_.c:185
-msgid "Belgium"
-msgstr "Bélgica"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
+msgstr "Erro ao adicionar o média de actualizaçăo"
 
-#: ../rpmdrake.pm_.c:186
-msgid "Brazil"
-msgstr "Brasil"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
+msgstr ""
+"Por favor aguarde, a contactar o mirror para inicializar as actualizaçőes de "
+"pacotes."
 
-#: ../rpmdrake.pm_.c:187
-msgid "Canada"
-msgstr "Canada"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Sources Manager, and then add a `Security\n"
+"updates' source.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"Também pode escolher o servidor espelho desejado manualmente : para\n"
+"isso, lance o Gestor de Fontes de Programas, e adicione uma fonte\n"
+"de 'Actualizaçőes de Segurança'.\n"
+"\n"
+"Depois, relance MandrakeUpdate."
 
-#: ../rpmdrake.pm_.c:188
-msgid "Costa Rica"
-msgstr "Costa Rica"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Como escolher manualmente o seu mirror"
 
-#: ../rpmdrake.pm_.c:189
-msgid "Czech Republic"
-msgstr "Republica Checa"
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
+msgstr "Houve um erro irrecuperável ao actualizar as informaçőes dos pacotes."
 
-#: ../rpmdrake.pm_.c:190
-msgid "Germany"
-msgstr "Alemanha"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
+msgstr "Erro ao actualizar o média"
 
-#: ../rpmdrake.pm_.c:191
-msgid "Danmark"
-msgstr "Dinamarca"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
+msgstr ""
+"Por favor aguarde, a contactar o mirror para actualizar as informaçőes dos "
+"pacotes."
 
-#: ../rpmdrake.pm_.c:192 ../rpmdrake.pm_.c:196
-msgid "Greece"
-msgstr "Grécia"
+#: ../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_.c:193
-msgid "Spain"
-msgstr "Espanha"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Installation"
+msgstr "Instalar Pacotes de Programas"
 
-#: ../rpmdrake.pm_.c:194
-msgid "Finland"
-msgstr "Finlândia"
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, c-format
+msgid "Mandrake Update"
+msgstr "Actualizaçőes Mandrake"
 
-#: ../rpmdrake.pm_.c:195
-msgid "France"
-msgstr "França"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
+msgstr "Remover Pacotes de Programas"
 
-#: ../rpmdrake.pm_.c:197
-msgid "Israel"
-msgstr "Israel"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Sair"
 
-#: ../rpmdrake.pm_.c:198
-msgid "Italy"
-msgstr "Itália"
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "Instalar"
 
-#: ../rpmdrake.pm_.c:199
-msgid "Japan"
-msgstr "Japăo"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "Remover"
 
-#: ../rpmdrake.pm_.c:200
-msgid "Korea"
-msgstr "Coreia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search"
+msgstr "Procurar"
 
-#: ../rpmdrake.pm_.c:201
-msgid "Netherlands"
-msgstr "Holanda"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "Procurar:"
 
-#: ../rpmdrake.pm_.c:202
-msgid "Norway"
-msgstr "Noruega"
+#: ../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?"
 
-#: ../rpmdrake.pm_.c:203
-msgid "Poland"
-msgstr "Polónia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "Alguns pacotes necessitamser removidos"
 
-#: ../rpmdrake.pm_.c:204
-msgid "Portugal"
-msgstr "Portugal"
+#: ../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 ?"
 
-#: ../rpmdrake.pm_.c:205
-msgid "Russia"
-msgstr "Rússia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Too many packages are selected"
+msgstr "Demasiados pacotes seleccionados"
 
-#: ../rpmdrake.pm_.c:206
-msgid "Sweden"
-msgstr "Suécia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
+msgstr "Informaçőes completas"
 
-#: ../rpmdrake.pm_.c:207
-msgid "Taiwan"
-msgstr "Taiwan"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal information"
+msgstr "Informaçőes normais"
 
-#: ../rpmdrake.pm_.c:208
-msgid "United Kingdom"
-msgstr "Reino Unido"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update source(s)"
+msgstr "Actualizar fonte(s)"
 
-#: ../rpmdrake.pm_.c:209
-msgid "China"
-msgstr "China"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reload the packages list"
+msgstr "Recarregar a lista dos pacotes"
 
-#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:211 ../rpmdrake.pm_.c:212
-#: ../rpmdrake.pm_.c:213 ../rpmdrake.pm_.c:264
-msgid "United States"
-msgstr "Estados Unidos"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
+msgstr "Inicializar a selecçăo"
 
-#: ../rpmdrake.pm_.c:277
-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
+#, c-format
+msgid "in files"
+msgstr "nos ficheiros"
 
-#: ../rpmdrake.pm_.c:283
-msgid "Error during download"
-msgstr "Erro durante a descarga"
+#: ../rpmdrake:1
+#, c-format
+msgid "in descriptions"
+msgstr "nas descriçőes"
 
-#: ../rpmdrake.pm_.c:292
-msgid "No mirror"
-msgstr "Nenhum mirror"
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
+msgstr "nos nomes"
 
-#: ../rpmdrake.pm_.c:310
-msgid "Please choose the desired mirror."
-msgstr "Por favor escolha o mirror desejado."
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
+msgstr "por disponibilidade de actualizaçăo"
 
-#: ../rpmdrake.pm_.c:342 ../rpmdrake_.c:629
-msgid "Update source(s)"
-msgstr "Actualizar fonte(s)"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
+msgstr "por fonte"
 
-#: ../rpmdrake.pm_.c:346
-msgid "Select the source(s) you wish to update:"
-msgstr "Seleccione as fontes que deseja actualizar:"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
+msgstr "por estado de selecçăo"
 
-#: ../rpmdrake.pm_.c:350
-msgid "Update"
-msgstr "Actualizar"
+#: ../rpmdrake:1
+#, c-format
+msgid "by size"
+msgstr "por tamanho"
 
-#: ../rpmdrake.pm_.c:360
-msgid "Please wait, updating media..."
-msgstr "Por favor aguarde, a actualizar o média..."
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
+msgstr "por grupo"
 
-#: ../rpmdrake_.c:101
-msgid "Other"
-msgstr "Outro"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages,"
+msgstr "Todos os pacotes,"
 
-#: ../rpmdrake_.c:123 ../rpmdrake_.c:137 ../rpmdrake_.c:229 ../rpmdrake_.c:300
-msgid "(none)"
-msgstr "(nenhum)"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
+msgstr "Todos os pacotes, alfabeticamente"
 
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:484 ../rpmdrake_.c:485
-msgid "(Not available)"
-msgstr "(Năo disponível)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
+msgstr "Selecçăo da Mandrake"
 
-#: ../rpmdrake_.c:153 ../rpmdrake_.c:210
-msgid "Search results"
-msgstr "Resultados da Pesquisa"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal updates"
+msgstr "Actualizaçőes normais"
 
-#: ../rpmdrake_.c:153
-msgid "Search results (none)"
-msgstr "Resultados da Pesquisa (nenhum)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Bugfixes updates"
+msgstr "Actualizaçőes de Correcçăo de Erros"
 
-#: ../rpmdrake_.c:163 ../rpmdrake_.c:174
-msgid "Please wait, searching..."
-msgstr "Por favor aguarde, a procurar..."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
+msgstr "Actualizaçőes de segurança"
 
-#: ../rpmdrake_.c:177
-msgid "Stop"
-msgstr "Parar"
+#: ../rpmdrake:1
+#, c-format
+msgid "Description: "
+msgstr "Descriçăo: "
 
-#: ../rpmdrake_.c:211 ../rpmdrake_.c:321
-msgid "Addable"
-msgstr "Instalar"
+#: ../rpmdrake:1
+#, c-format
+msgid "Summary: "
+msgstr "Resumo: "
 
-#: ../rpmdrake_.c:211 ../rpmdrake_.c:321
-msgid "Upgradable"
-msgstr "Actualizar"
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "Importância: "
 
-#: ../rpmdrake_.c:213
-msgid "Not selected"
-msgstr "Năo selecionado"
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake_.c:213
-msgid "Selected"
-msgstr "Selecionado"
+#: ../rpmdrake:1
+#, c-format
+msgid "Size: "
+msgstr "Tamanho: "
 
-#: ../rpmdrake_.c:242
-msgid "rpmdrake"
-msgstr "rpmdrake"
+#: ../rpmdrake:1
+#, c-format
+msgid "Version: "
+msgstr "Versăo: "
 
-#: ../rpmdrake_.c:260 ../rpmdrake_.c:362 ../rpmdrake_.c:364
-msgid "More information on package..."
-msgstr "Mais informaçăo sobre o pacote..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "Nome: "
 
-#: ../rpmdrake_.c:261
-msgid "One of the following packages is needed:"
-msgstr "Um dos pacotes seguintes é preciso:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "Motivo de actualizaçăo: "
 
-#: ../rpmdrake_.c:261
-msgid "Please choose"
-msgstr "Por favor escolha"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
+msgstr "Versăo actualmente instalada: "
 
-#: ../rpmdrake_.c:277
-msgid "unknown package "
-msgstr "pacote desconhecido "
+#: ../rpmdrake:1
+#, c-format
+msgid "Source: "
+msgstr "Fonte: "
 
-#: ../rpmdrake_.c:287
-msgid "Please wait, listing packages..."
-msgstr "Por favor aguarde, a listar os pacotes..."
+#: ../rpmdrake:1
+#, c-format
+msgid "(Not available)"
+msgstr "(Năo disponível)"
 
-#: ../rpmdrake_.c:302
-msgid "No update"
-msgstr "Nenhuma actualizaçăo"
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
+msgstr "Evoluçăo:\n"
 
-#: ../rpmdrake_.c:355 ../rpmdrake_.c:356
-msgid "More infos"
-msgstr "Mais informaçőes"
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "Ficheiros:\n"
 
-#: ../rpmdrake_.c:357
-msgid "Information on packages"
-msgstr "Informaçăo sobre os pacotes..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected size: %d MB"
+msgstr "Tamanho da selecçăo: %d MB"
 
-#: ../rpmdrake_.c:378
-msgid "Some additional packages need to be removed"
-msgstr "Alguns pacotes adicionais necessitam ser apagados"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Selecçăo: %d MB / Espaço disponível no disco: %d MB"
 
-#: ../rpmdrake_.c:379
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"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 também\n"
-"necessitam ser removidos:\n"
+"Por forma a satisfazer as dependęncias,estes pacotes devem ser\n"
+"deseleccionados agora:\n"
 "\n"
 
-#: ../rpmdrake_.c:385 ../rpmdrake_.c:393
-msgid "Some packages can't be removed"
-msgstr "Alguns pacotes năo podem ser removidos"
-
-#: ../rpmdrake_.c:386
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Removing these packages would break your system, sorry:\n"
+"Sorry, the following package(s) can't be selected:\n"
 "\n"
 msgstr ""
-"Lamento, mas a remoçăo estes pacotes arruinará o seu sistema :\n"
+"Lamento, os pacotes seguintes năo podem ser seleccionados:\n"
 "\n"
 
-#: ../rpmdrake_.c:394 ../rpmdrake_.c:453
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "Alguns pacotes năo podem ser instalados"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
 "\n"
 msgstr ""
 "Por forma a satisfazer as dependęncias,estes pacotes devem ser\n"
-"deseleccionados agora:\n"
+"instalados:\n"
 "\n"
 
-#: ../rpmdrake_.c:423
+#: ../rpmdrake:1
+#, c-format
 msgid "Additional packages needed"
 msgstr "Pacotes adicionais necessários"
 
-#: ../rpmdrake_.c:424
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be removed"
+msgstr "Alguns pacotes năo podem ser removidos"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
+"Removing these packages would break your system, sorry:\n"
 "\n"
 msgstr ""
-"Por forma a satisfazer as dependęncias,estes pacotes devem ser\n"
-"instalados:\n"
+"Lamento, mas a remoçăo estes pacotes arruinará o seu sistema :\n"
 "\n"
 
-#: ../rpmdrake_.c:437
-msgid "Some packages can't be installed"
-msgstr "Alguns pacotes năo podem ser instalados"
-
-#: ../rpmdrake_.c:438
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
 "\n"
 msgstr ""
-"Lamento, os pacotes seguintes năo podem ser seleccionados:\n"
+"Por forma a satisfazer as dependęncias,estes pacotes também\n"
+"necessitam ser removidos:\n"
 "\n"
 
-#: ../rpmdrake_.c:452 ../rpmdrake_.c:686
-msgid "Some packages need to be removed"
-msgstr "Alguns pacotes necessitamser removidos"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr "Alguns pacotes adicionais necessitam ser apagados"
 
-#: ../rpmdrake_.c:474
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Selecçăo: %d MB / Espaço disponível no disco: %d MB"
+msgid "More information on package..."
+msgstr "Mais informaçăo sobre o pacote..."
 
-#: ../rpmdrake_.c:476
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "Tamanho da selecçăo: %d MB"
+msgid "Information on packages"
+msgstr "Informaçăo sobre os pacotes..."
 
-#: ../rpmdrake_.c:484
-msgid "Files:\n"
-msgstr "Ficheiros:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
+msgstr "Mais informaçőes"
 
-#: ../rpmdrake_.c:485
-msgid "Changelog:\n"
-msgstr "Evoluçăo:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "Addable"
+msgstr "Instalar"
 
-#: ../rpmdrake_.c:488
-msgid "Source: "
-msgstr "Fonte: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Upgradable"
+msgstr "Actualizar"
 
-#: ../rpmdrake_.c:489
-msgid "Currently installed version: "
-msgstr "Versăo actualmente instalada: "
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"The list of updates is void. This means that either there is\n"
+"no available update for the packages installed on your computer,\n"
+"or you already installed all of them."
+msgstr ""
+"A lista das actualizaçőes está vazia. Isto significa que ou\n"
+"năo há actualizaçőes para os pacotes instalados no seu\n"
+"computador, ou vocę já as instalou todas."
 
-#: ../rpmdrake_.c:493
-msgid "Reason for update: "
-msgstr "Motivo de actualizaçăo: "
+#: ../rpmdrake:1
+#, c-format
+msgid "No update"
+msgstr "Nenhuma actualizaçăo"
 
-#: ../rpmdrake_.c:495
-msgid "Name: "
-msgstr "Nome: "
+#: ../rpmdrake:1
+#, c-format
+msgid "(none)"
+msgstr "(nenhum)"
 
-#: ../rpmdrake_.c:496
-msgid "Version: "
-msgstr "Versăo: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, listing packages..."
+msgstr "Por favor aguarde, a listar os pacotes..."
 
-#: ../rpmdrake_.c:497
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "unknown package "
+msgstr "pacote desconhecido "
 
-#: ../rpmdrake_.c:497
-msgid "Size: "
-msgstr "Tamanho: "
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Um dos pacotes seguintes é preciso:"
 
-#: ../rpmdrake_.c:499
-msgid "Importance: "
-msgstr "Importância: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please choose"
+msgstr "Por favor escolha"
 
-#: ../rpmdrake_.c:500
-msgid "Summary: "
-msgstr "Resumo: "
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:501
-msgid "Description: "
-msgstr "Descriçăo: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Not selected"
+msgstr "Năo selecionado"
 
-#: ../rpmdrake_.c:550
-msgid "Bugfixes updates"
-msgstr "Actualizaçőes de Correcçăo de Erros"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected"
+msgstr "Selecionado"
 
-#: ../rpmdrake_.c:550
-msgid "Normal updates"
-msgstr "Actualizaçőes normais"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results"
+msgstr "Resultados da Pesquisa"
 
-#: ../rpmdrake_.c:569
-msgid "Mandrake choices"
-msgstr "Selecçăo da Mandrake"
+#: ../rpmdrake:1
+#, c-format
+msgid "Stop"
+msgstr "Parar"
 
-#: ../rpmdrake_.c:570
-msgid "All packages, alphabetical"
-msgstr "Todos os pacotes, alfabeticamente"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, searching..."
+msgstr "Por favor aguarde, a procurar..."
 
-#: ../rpmdrake_.c:571
-msgid "All packages,"
-msgstr "Todos os pacotes,"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
+msgstr "Resultados da Pesquisa (nenhum)"
 
-#: ../rpmdrake_.c:594
-msgid "by group"
-msgstr "por grupo"
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Outro"
 
-#: ../rpmdrake_.c:594
-msgid "by size"
-msgstr "por tamanho"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"Welcome to the packages source editor!\n"
+"\n"
+"This tool will help you configure the packages sources you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"Seja Bem-vindo ao editor de fontes de pacotes!\n"
+"\n"
+"Esta ferramenta vai ajudá-lo a escolher as fontes de pacotes que deseja\n"
+"utilizar no seu computador. Elas estarăo entăo disponíveis para instalar\n"
+"novos programas ou para fazer actualizaçőes."
 
-#: ../rpmdrake_.c:595
-msgid "by selection state"
-msgstr "por estado de selecçăo"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Gravar e sair"
 
-#: ../rpmdrake_.c:596
-msgid "by source repository"
-msgstr "por fonte"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy..."
+msgstr "Proxy..."
 
-#: ../rpmdrake_.c:596
-msgid "by update availability"
-msgstr "por disponibilidade de actualizaçăo"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
+msgstr "Actualizar..."
 
-#: ../rpmdrake_.c:617
-msgid "in descriptions"
-msgstr "nas descriçőes"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "Adicionar..."
 
-#: ../rpmdrake_.c:617
-msgid "in files"
-msgstr "nos ficheiros"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "Editar"
 
-#: ../rpmdrake_.c:617
-msgid "in names"
-msgstr "nos nomes"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Source"
+msgstr "Fonte"
 
-#: ../rpmdrake_.c:628
-msgid "Reload the packages list"
-msgstr "Recarregar a lista dos pacotes"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
+msgstr "Activado?"
 
-#: ../rpmdrake_.c:628
-msgid "Reset the selection"
-msgstr "Inicializar a selecçăo"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure sources"
+msgstr "Configurar as fontes"
 
-#: ../rpmdrake_.c:654
-msgid "Maximum information"
-msgstr "Informaçőes completas"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "Senha:"
 
-#: ../rpmdrake_.c:654
-msgid "Normal information"
-msgstr "Informaçőes normais"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
+msgstr "Utilizador:"
 
-#: ../rpmdrake_.c:676
-msgid "Too many packages are selected"
-msgstr "Demasiados pacotes seleccionados"
+#: ../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 :"
 
-#: ../rpmdrake_.c:722
-msgid "Find:"
-msgstr "Procurar:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "Nome do servidor proxy:"
 
-#: ../rpmdrake_.c:727
-msgid "Search"
-msgstr "Procurar"
+#: ../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 precisa de um proxy, escreva o nome do servidor e em opçăo a porta "
+"(sintaxe <servidorproxy[:porta]>):"
 
-#: ../rpmdrake_.c:733
-msgid "Install"
-msgstr "Instalar"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "Configurar os proxies"
 
-#: ../rpmdrake_.c:740 data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrake Update"
-msgstr "Actualizaçőes Mandrake"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr "Por favor aguarde, a actualizar o média..."
 
-#: ../rpmdrake_.c:740
-msgid "Software Packages Installation"
-msgstr "Instalar Pacotes de Programas"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "Para gravar as mudanças, necessita inserir o média no leitor."
 
-#: ../rpmdrake_.c:740
-msgid "Software Packages Removal"
-msgstr "Remover Pacotes de Programas"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
+msgstr "Necessita inserir o média para continuar"
 
-#: ../rpmdrake_.c:781
-msgid "Please wait, contacting mirror to update packages information."
-msgstr ""
-"Por favor aguarde, a contactar o mirror para actualizar as informaçőes dos "
-"pacotes."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save changes"
+msgstr "Gravar alteraçőes"
 
-#: ../rpmdrake_.c:783
-msgid "Error updating medium"
-msgstr "Erro ao actualizar o média"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Caminho relativo para síntese/hdlist:"
 
-#: ../rpmdrake_.c:784
-msgid "There was an unrecoverable error while updating packages information."
-msgstr "Houve um erro irrecuperável ao actualizar as informaçőes dos pacotes."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake_.c:789
-msgid "How to choose manually your mirror"
-msgstr "Como escolher manualmente o seu mirror"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Editing source \"%s\":"
+msgstr "Ediçăo da fonte \"%s\":"
 
-#: ../rpmdrake_.c:797
-msgid "Please wait, contacting mirror to initialize updates packages."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit a source"
+msgstr "Editar a fonte"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr "Por favor aguarde, a remover o média..."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, adding medium..."
+msgstr "Por favor aguarde, a adicionar o média..."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of source:"
+msgstr "Tipo de fonte:"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Adding a source:"
+msgstr "A adicionar uma fonte:"
+
+#: ../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 ""
-"Por favor aguarde, a contactar o mirror para inicializar as actualizaçőes de "
-"pacotes."
+"Já existe um média com este nome, quere\n"
+"substituir-lo mesmo?"
 
-#: ../rpmdrake_.c:800
-msgid "Error adding update medium"
-msgstr "Erro ao adicionar o média de actualizaçăo"
+#: ../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."
 
-#: ../rpmdrake_.c:831
-msgid "Please wait, finding available packages..."
-msgstr "Por favor aguarde, a procurar os pacotes disponíveis..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "Nome:"
 
-#: ../rpmdrake_.c:863
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "A inspeccionar %s"
+msgid "Login:"
+msgstr "Login:"
 
-#: ../rpmdrake_.c:882
-msgid "changes:"
-msgstr "mudanças:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Escolha um mirror..."
 
-#: ../rpmdrake_.c:886
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Remover %s"
+msgid "Browse..."
+msgstr "Navegar..."
 
-#: ../rpmdrake_.c:888
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Utilizar .%s como ficheiro principal"
+msgid "Path or mount point:"
+msgstr "Caminho ou ponto de montagem:"
 
-#: ../rpmdrake_.c:890
-msgid "Do nothing"
-msgstr "Năo fazer nada"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Removable device"
+msgstr "Dispositivo amovível"
 
-#: ../rpmdrake_.c:902
-msgid "Installation finished"
-msgstr "A instalaçăo acabou"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "HTTP server"
+msgstr "Servidor HTTP"
 
-#: ../rpmdrake_.c:912
-msgid "Inspect..."
-msgstr "Inspeccionar..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "Servidor FTP"
 
-#: ../rpmdrake_.c:927
-msgid "Program missing"
-msgstr "Falta um programa"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path:"
+msgstr "Caminho:"
 
-#: ../rpmdrake_.c:928
-msgid "A required program is missing (grpmi). Check your installation."
-msgstr "Falta um programa necessário (grpmi). Verifique a sua instalaçăo."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "Ficheiros Locais"
 
-#: ../rpmdrake_.c:942
-msgid "Unable to get source packages."
-msgstr "Impossível descarregar os pacotes da fonte"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add a source"
+msgstr "Adicionar uma fonte"
 
-#: ../rpmdrake_.c:943
-msgid "Unable to get source packages, sorry."
-msgstr "Impossível descarregar os pacotes da fonte, lamento."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
+msgstr "Impossível actualizar o média, irá ser automaticamente desactivado."
 
-#: ../rpmdrake_.c:951
-msgid "Change medium"
-msgstr "Mudar o média"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "Impossível criar o média."
 
-#: ../rpmdrake_.c:952
+#: ../rpmdrake.pm:1
 #, 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 "Please wait, updating media..."
+msgstr "Por favor aguarde, a actualizar o média..."
 
-#: ../rpmdrake_.c:960
-msgid "Installation failed"
-msgstr "A instalaçăo falhou"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
+msgstr "Actualizar"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Select the source(s) you wish to update:"
+msgstr "Seleccione as fontes que deseja actualizar:"
 
-#: ../rpmdrake_.c:961
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please choose the desired mirror."
+msgstr "Por favor escolha o mirror desejado."
+
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
-"A instalaçăo falhou, falta alguns ficheiros.\n"
-"Talvez queira actualizar a base de dados das suas fontes."
+"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_.c:964
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr ""
-"Por favor aguarde, a remover os pacotes para permitir a actualizaçăo dos "
-"outros..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
+msgstr "Nenhum mirror"
 
-#: ../rpmdrake_.c:985
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"There was an error downloading the mirrors list:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
-"A instalaçăo acabou; %s.\n"
+"Houve um erro ao descarregar a lista dos espelhos:\n"
 "\n"
-"Alguns ficheiros de configuraçăo foram criados como `.rpmnew' ou\n"
-"`.rpmsave', pode agora verificá-los para agir em conformidade:"
+"%s\n"
+"A rede, ou o servidor da MandrakeSoft, podem estar desligados.\n"
+"Por favor tente outra vez mais tarde."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "Erro durante a descarga"
 
-#: ../rpmdrake_.c:985
+#: ../rpmdrake.pm: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."
+
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"some packages failed to install\n"
-"correctly"
+"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 ""
-"alguns pacotes năo puderam ser\n"
-"instalados correctamente"
+"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_.c:986
-msgid "everything was installed correctly"
-msgstr "Tudo foi instalado correctamente"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United States"
+msgstr "Estados Unidos"
 
-#: ../rpmdrake_.c:988
-msgid "Everything installed successfully"
-msgstr "Tudo foi instalou com sucesso"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
+msgstr "China"
 
-#: ../rpmdrake_.c:989
-msgid "All requested packages were installed successfully."
-msgstr "Todos os pacotes pedidos foram instalados com sucesso."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr "Reino Unido"
 
-#: ../rpmdrake_.c:992
-msgid "Everything already installed."
-msgstr "Já está tudo instalado."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "Taiwan"
 
-#: ../rpmdrake_.c:993
-msgid "Everything already installed (is this supposed to happen at all?)."
-msgstr "Já está tudo instalado (será que isto deveria acontecer?)."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "Suécia"
 
-#: ../rpmdrake_.c:1000
-msgid "Problem during installation"
-msgstr "Problema durante a instalaçăo"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
+msgstr "Rússia"
 
-#: ../rpmdrake_.c:1001
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Houve um problema durante a instalaçăo:\n"
-"\n"
-"%s"
+msgid "Portugal"
+msgstr "Portugal"
 
-#: ../rpmdrake_.c:1015
-msgid "Please wait, reading packages database..."
-msgstr "Por favor aguarde, a ler a base de dados dos pacotes..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
+msgstr "Polónia"
 
-#: ../rpmdrake_.c:1056
-msgid "Please wait, removing packages..."
-msgstr "Por favor aguarde, a remover os pacotes..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
+msgstr "Noruega"
 
-#: ../rpmdrake_.c:1059
-msgid "Problem during removal"
-msgstr "Problema durante a remoçăo"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
+msgstr "Holanda"
 
-#: ../rpmdrake_.c:1060
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Houve um problema durante a remoçăo dos pacotes:\n"
-"\n"
-"%s"
+msgid "Korea"
+msgstr "Coreia"
 
-#: ../rpmdrake_.c:1092
-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
+#, c-format
+msgid "Japan"
+msgstr "Japăo"
 
-#: ../rpmdrake_.c:1097
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"Seja bem-vindo ao MandrakeUpdate!\n"
-"\n"
-"Esta ferramenta vai ajudá-lo a escolher quais as actualizaçőes que deseja\n"
-"instalar no seu computador."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Italy"
+msgstr "Itália"
 
-#: ../rpmdrake_.c:1102
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
-msgstr ""
-"Seja bem-vindo ŕ ferramenta de instalaçăo de programas!\n"
-"\n"
-"O seu sistema Linux Mandrake vem com várias centenas de pacotes de\n"
-"programas nos CDROM ou DVD. Esta ferramenta vai ajudá-lo a escolher\n"
-"quais os programas que deseja instalar no seu computador."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Israel"
+msgstr "Israel"
 
-#: data/rpmdrake-remove.desktop.in.h:1
-msgid "Remove Software"
-msgstr "Remover Programas"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Grécia"
 
-#: data/rpmdrake-sources.desktop.in.h:1
-msgid "Software Sources Manager"
-msgstr "Gestor de Fontes de Programas"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "France"
+msgstr "França"
 
-#: data/rpmdrake.desktop.in.h:1
-msgid "Install Software"
-msgstr "Instalar Programas"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "Finlândia"
 
-#~ 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.pm:1
+#, c-format
+msgid "Spain"
+msgstr "Espanha"
 
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-#~ "Posso continuar?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
+msgstr "Dinamarca"
 
-#~ 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."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr "Alemanha"
 
-#~ 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 "Czech Republic"
+msgstr "Republica Checa"
 
-#~ 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 ""
-#~ "Houve um erro ao descarregar a lista dos espelhos:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "A rede, ou o servidor da MandrakeSoft, podem estar desligados.\n"
-#~ "Por favor tente outra vez mais tarde."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
-#~ 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 "Canada"
+msgstr "Canada"
 
-#~ msgid ""
-#~ "The list of updates is void. This means that either there is\n"
-#~ "no available update for the packages installed on your computer,\n"
-#~ "or you already installed all of them."
-#~ msgstr ""
-#~ "A lista das actualizaçőes está vazia. Isto significa que ou\n"
-#~ "năo há actualizaçőes para os pacotes instalados no seu\n"
-#~ "computador, ou vocę já as instalou todas."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
+msgstr "Brasil"
 
-#~ msgid ""
-#~ "Warning: it seems that you are attempting to add so much\n"
-#~ "packages that your filesystem may run out of free diskspace,\n"
-#~ "during or after package installation ; this is particularly\n"
-#~ "dangerous and should be considered with care.\n"
-#~ "\n"
-#~ "Do you really want to install all the selected packages?"
-#~ msgstr ""
-#~ "atençăo : parece que está adicionando tantos pacotes que o\n"
-#~ "seu sistema de ficheiros vai faltar de espaço, durante ou\n"
-#~ "depois da instalaçăo ; isto é muito perigoso e deveria ser\n"
-#~ "considerado com atençăo.\n"
-#~ "\n"
-#~ "Deseja mesmo assim instalar todos os pacotes seleccionados ?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Belgium"
+msgstr "Bélgica"
 
-#~ msgid ""
-#~ "The following packages have to be removed for others to be upgraded:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "Os pacotes seguintes tęm de ser apagados para que os outros sejam "
-#~ "actualizados:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Posso continuar?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Australia"
+msgstr "Austrália"
 
-#~ msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#~ msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
+msgstr "Áustria"
 
-#~ 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
+#, c-format
+msgid "Info..."
+msgstr "Informaçăo..."
 
-#~ 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."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
+msgstr "Năo"
 
-#~ 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 ""
-#~ "Houve um erro ao adicionar o média de actualizaçăo com urpmi.\n"
-#~ "\n"
-#~ "Isto pode ser devido a um problema temporário do espelho, ou\n"
-#~ "ao facto da sua versăo de Mandrake Linux (%s) ainda/já năo ser\n"
-#~ "suportada pelas Actualizacoes Oficiais da Mandrake\n"
-#~ "Linux.\n"
-#~ "\n"
-#~ "Deseja tentar com outro espelho?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Sim"
+
+#: data/rpmdrake.desktop.in.h:1
+msgid "Install Software"
+msgstr "Instalar Programas"
+
+#: data/rpmdrake-remove.desktop.in.h:1
+msgid "Remove Software"
+msgstr "Remover Programas"
+
+#: data/rpmdrake-sources.desktop.in.h:1
+msgid "Software Sources Manager"
+msgstr "Gestor de Fontes de Programas"
+
+#~ 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--*-*-*-*-*,*"
diff --git a/po/pt.pom b/po/pt.pom
index 288baca7..9d6762ae 100644
--- a/po/pt.pom
+++ b/po/pt.pom
@@ -4,169 +4,176 @@ msgstr "Servidor"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Computador de Rede (cliente)"
+msgid "Office Workstation"
+msgstr "Estaçăo de Trabalho de Escritório"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "Servidor NFS, Servidor SMB, Servidor Proxy, Servidor SSH"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Programas de Escritório: texto (kword, abiword), folhas de cálculo (kspread, "
+"gnumeric), visualizadores pdf, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Escritório"
+msgid "Workstation"
+msgstr "Estaçăo de Trabalho"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Estaçăo de Trabalho Gnome"
+msgid "Game station"
+msgstr "Estaçăo de Jogo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Ferramentas para o seu Palm Pilot ou Visor"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Programas de divertimento: arcada, tabuleiros, estratégia, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Estaçăo de Trabalho"
+msgid "Multimedia station"
+msgstr "Estaçăo Multimédia"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Firewall/Router"
+msgid "Sound and video playing/editing programs"
+msgstr "Aplicaçőes de som e vídeo reproduçăo/ediçăo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr "Servidor de Nome do Domínio e Informaçăo de Rede"
+msgid "Internet station"
+msgstr "Estaçăo de Internet"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
 msgstr ""
-"Programas de Escritório: texto (kword, abiword), folhas de cálculo (kspread, "
-"gnumeric), visualizadores pdf, etc"
+"Conjunto de ferramentas para ler e enviar correio electrónico e news (pine, "
+"mutt, tin...) e para navegar na Web"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "Ferramentas para áudio: reprodutores mp3 ou midi, misturadores, etc"
+msgid "Network Computer (client)"
+msgstr "Computador de Rede (cliente)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Base Padrăo Linux (LSB). Suporte de aplicaçőes exteriores."
+msgid "Clients for different protocols including ssh"
+msgstr "Clientes para diferentes protocolos incluindo ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Livros e Howto's sobre o Linux e Software Livre"
+msgid "Configuration"
+msgstr "Configuraçăo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "Estaçăo de Trabalho KDE"
+msgid "Tools to ease the configuration of your computer"
+msgstr "Ferramentas para facilitar a configuraçăo do seu computador"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgid "Scientific Workstation"
+msgstr "Estaçăo de Trabalho Científica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Multimédia - Vídeo"
+msgid "Scientific applications such as gnuplot"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr ""
-"Conjunto de ferramentas para correio electrónico, news, web, transferęncia "
-"de ficheiros e chat"
+msgid "Console Tools"
+msgstr "Ferramentas de terminal"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Base de Dados"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Editores, linhas de comando, ferramentas de ficheiro, terminais"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "Servidor de Bases de Dados PostgreSQL ou MySQL"
+msgid "KDE Workstation"
+msgstr "Estaçăo de Trabalho KDE"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Ferramentas para facilitar a configuraçăo do seu computador"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"O K Desktop Environment, o ambiente gráfico básico com a colecçăo de "
+"ferramentas que o acompanham"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "Multimédia - Som"
+msgid "Graphical Environment"
+msgstr "Ambiente Gráfico"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Documentaçăo"
+msgid "Gnome Workstation"
+msgstr "Estaçăo de Trabalho Gnome"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Ferramentas de terminal"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+"Um ambiente gráfico com um conjunto de aplicaçőes e ferramentas de ambiente "
+"de trabalho fáceis de usar"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr "Postfix servidor de correio, Inn servidor de news "
+msgid "Other Graphical Desktops"
+msgstr "Outros Ambientes de Trabalho Gráficos"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Estaçăo de Internet"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Estaçăo Multimédia"
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+msgid "Development"
+msgstr "Desenvolvimento"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Configuraçăo"
+msgid "C and C++ development libraries, programs and include files"
+msgstr ""
+"C e C++ bibliotecas de desenvolvimento, programas e ficheiros 'include'"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Mais Ambientes de Trabalho Gráficos (Gnome, IceWM)"
+msgid "Documentation"
+msgstr "Documentaçăo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
-"O K Desktop Environment, o ambiente gráfico básico com a colecçăo de "
-"ferramentas que o acompanham"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Livros e Howto's sobre o Linux e Software Livre"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Ambiente Gráfico"
+msgid "LSB"
+msgstr "LSB"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Base Padrăo Linux (LSB). Suporte de aplicaçőes exteriores."
+
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-msgid "Development"
-msgstr "Desenvolvimento"
+#: ../../share/compssUsers:999
+msgid "Web/FTP"
+msgstr "Web/FTP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -175,23 +182,33 @@ msgstr "Apache e Pro-ftpd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "Ferramentas para criar e gravar CD"
+msgid "Mail/Groupware/News"
+msgstr "Mail/Groupware/News"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Estaçăo de Trabalho de Escritório"
+msgid "Postfix mail server, Inn news server"
+msgstr "Postfix servidor de correio, Inn servidor de news "
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgid "Database"
+msgstr "Base de Dados"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Aplicaçőes para gráficos como o O Gimp"
+msgid "PostgreSQL or MySQL database server"
+msgstr "Servidor de Bases de Dados PostgreSQL ou MySQL"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Firewall/Router"
+msgstr "Firewall/Router"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Internet gateway"
+msgstr "Ponte Internet"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -200,9 +217,8 @@ msgstr "DNS/NIS "
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr ""
-"C e C++ bibliotecas de desenvolvimento, programas e ficheiros 'include'"
+msgid "Domain Name and Network Information Server"
+msgstr "Servidor de Nome do Domínio e Informaçăo de Rede"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -211,18 +227,20 @@ msgstr "Computador de Rede Servidor"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "Mail/Groupware/News"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "Servidor NFS, Servidor SMB, Servidor Proxy, Servidor SSH"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Estaçăo de Jogo"
+msgid "Office"
+msgstr "Escritório"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Reprodutores de Vídeo e editores"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr ""
+"Conjunto de ferramentas para correio electrónico, news, web, transferęncia "
+"de ficheiros e chat"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -231,79 +249,66 @@ msgstr "Multimédia - Gráficos"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Programas de divertimento: arcada, tabuleiros, estratégia, etc"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
-"Conjunto de ferramentas para ler e enviar correio electrónico e news (pine, "
-"mutt, tin...) e para navegar na Web"
+msgid "Graphics programs such as The Gimp"
+msgstr "Aplicaçőes para gráficos como o O Gimp"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "Finanças Pessoais"
+msgid "Multimedia - Sound"
+msgstr "Multimédia - Som"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
-"Um ambiente gráfico com um conjunto de aplicaçőes e ferramentas de ambiente "
-"de trabalho fáceis de usar"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "Ferramentas para áudio: reprodutores mp3 ou midi, misturadores, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Clientes para diferentes protocolos incluindo ssh"
+msgid "Multimedia - Video"
+msgstr "Multimédia - Vídeo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
+msgid "Video players and editors"
+msgstr "Reprodutores de Vídeo e editores"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Ponte Internet"
+msgid "Multimedia - CD Burning"
+msgstr "Multimédia - Gravaçăo de CDs"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Aplicaçőes de som e vídeo reproduçăo/ediçăo"
+msgid "Tools to create and burn CD's"
+msgstr "Ferramentas para criar e gravar CD"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Outros Ambientes de Trabalho Gráficos"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Mais Ambientes de Trabalho Gráficos (Gnome, IceWM)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Editores, linhas de comando, ferramentas de ficheiro, terminais"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "Programas para gerir as suas finanças, como o gnucash"
+msgid "Personal Information Management"
+msgstr "Gestăo de Informaçőes Pessoais"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "Gestăo de Informaçőes Pessoais"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Ferramentas para o seu Palm Pilot ou Visor"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multimédia - Gravaçăo de CDs"
+msgid "Personal Finance"
+msgstr "Finanças Pessoais"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Estaçăo de Trabalho Científica"
+msgid "Programs to manage your finances, such as gnucash"
+msgstr "Programas para gerir as suas finanças, como o gnucash"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 1e6b5726..c62ec29e 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.4\n"
-"POT-Creation-Date: 2003-02-19 23:07+0100\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\n"
 "PO-Revision-Date: 2003-01-23 18:11-0300\n"
 "Last-Translator: Andrei Bosco Bezerra Torres <andrei_bosco@yahoo.com.br>\n"
 "Language-Team: Brazilian Portuguese\n"
@@ -17,1041 +17,1231 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl_.c:43
-msgid "Unable to create medium."
-msgstr "Incapaz de criar a mídia."
-
-#: ../edit-urpm-sources.pl_.c:44
-msgid "Unable to update medium; it will be automatically disabled."
-msgstr "Incapaz de atualizar a mídia; Será automaticamente desabilitado"
-
-#: ../edit-urpm-sources.pl_.c:54
-msgid "Add a source"
-msgstr "Adicione uma fonte:"
-
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Local files"
-msgstr "Arquivos locais"
-
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Path:"
-msgstr "Caminho:"
-
-#: ../edit-urpm-sources.pl_.c:56
-msgid "FTP server"
-msgstr "Servidor FTP"
-
-#: ../edit-urpm-sources.pl_.c:56 ../edit-urpm-sources.pl_.c:57
-#: ../edit-urpm-sources.pl_.c:59 ../edit-urpm-sources.pl_.c:187
-msgid "URL:"
-msgstr "URL:"
-
-#: ../edit-urpm-sources.pl_.c:57
-msgid "HTTP server"
-msgstr "Servidor HTTP"
-
-#: ../edit-urpm-sources.pl_.c:58
-msgid "Path or mount point:"
-msgstr "Caminho ou ponto de montagem:"
-
-#: ../edit-urpm-sources.pl_.c:58
-msgid "Removable device"
-msgstr "Dispositivo removível"
-
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:550
-msgid "Security updates"
-msgstr "Atualizaçőes de segurança"
-
-#: ../edit-urpm-sources.pl_.c:70
-msgid "Browse..."
-msgstr "Procurar..."
-
-#: ../edit-urpm-sources.pl_.c:72
-msgid "Choose a mirror..."
-msgstr "Escolha um servidor..."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Está pronto para continuar?"
 
-#: ../edit-urpm-sources.pl_.c:92
-msgid "Login:"
-msgstr "Login:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to the software installation tool!\n"
+"\n"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
+msgstr ""
+"Bem vindo ao Instalador de Software!\n"
+"\n"
+"O Mandrake Linux possui milhares de pacotes de software\n"
+"no CDROM ou DVD. Esta ferramenta irá ajudar na escolha de softwares\n"
+"que vocę deseja instalar."
 
-#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:231
-msgid "Password:"
-msgstr "Senha:"
+#: ../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 ""
+"Bem vindo ao MandrakeUpdate!\n"
+"\n"
+"Esta ferramenta irá ajudar na atualizaçăo do seu sistema."
 
-#: ../edit-urpm-sources.pl_.c:97
-msgid "Name:"
-msgstr "Nome:"
+#: ../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."
 
-# Translation needs reworking
-#: ../edit-urpm-sources.pl_.c:99 ../edit-urpm-sources.pl_.c:188
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Caminho relativo para synthesis/hdlist: "
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"Ocorreu um problema durante a remoçăo de pacotes:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:107
-msgid "You need to fill up at least the two first entries."
-msgstr "Vocę precisa preencher pelo menos os dois primeiros campos"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during removal"
+msgstr "Problema durante a remoçăo"
 
-#: ../edit-urpm-sources.pl_.c:120
-msgid "Adding a source:"
-msgstr "Adicionando uma fonte:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages..."
+msgstr "Aguarde, removendo pacotes..."
 
-#: ../edit-urpm-sources.pl_.c:121
-msgid "Type of source:"
-msgstr "Tipo de fonte:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
+msgstr "Aguarde, lendo banco de dados de pacotes..."
 
-#: ../edit-urpm-sources.pl_.c:125 ../edit-urpm-sources.pl_.c:202
-#: ../edit-urpm-sources.pl_.c:235 ../rpmdrake.pm_.c:100 ../rpmdrake.pm_.c:139
-#: ../rpmdrake.pm_.c:322 ../rpmdrake_.c:355 ../rpmdrake_.c:367
-#: ../rpmdrake_.c:371 ../rpmdrake_.c:917 ../rpmdrake_.c:952
-msgid "Ok"
-msgstr "Ok"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Ocorreu um problema durante a instalaçăo:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:140 ../edit-urpm-sources.pl_.c:196
-#: ../edit-urpm-sources.pl_.c:202 ../edit-urpm-sources.pl_.c:242
-#: ../rpmdrake.pm_.c:322 ../rpmdrake.pm_.c:355 ../rpmdrake_.c:355
-#: ../rpmdrake_.c:952
-msgid "Cancel"
-msgstr "Cancelar"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during installation"
+msgstr "Problema durante a instalaçăo"
 
-#: ../edit-urpm-sources.pl_.c:147
-msgid "Please wait, adding medium..."
-msgstr "Aguarde, adicionando mídia..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
+msgstr "Tudo já foi instaldo. (supőe-se que seja válido para todos?)"
 
-#: ../edit-urpm-sources.pl_.c:168
-msgid "Please wait, removing medium..."
-msgstr "Aguarde, removendo mídia..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed."
+msgstr "Tudo já foi instalado."
 
-#: ../edit-urpm-sources.pl_.c:181
-msgid "Edit a source"
-msgstr "Editar fontes"
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "Todos os pacotes requisitados foram instalados com sucesso."
 
-#: ../edit-urpm-sources.pl_.c:185
+#: ../rpmdrake:1
 #, c-format
-msgid "Editing source \"%s\":"
-msgstr "Editando fonte \"%s\":"
+msgid "Everything installed successfully"
+msgstr "Tudo foi instalado com sucesso"
 
-#: ../edit-urpm-sources.pl_.c:191
-msgid "Save changes"
-msgstr "Salvar alteraçőes"
+#: ../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 ""
+"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:"
 
-#: ../edit-urpm-sources.pl_.c:200
-msgid "You need to insert the medium to continue"
-msgstr "Vocę precisa inserir a mídia para continuar"
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "Tudo foi instalado corretamente"
 
-#: ../edit-urpm-sources.pl_.c:201
+#: ../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_.c:206
-msgid "Please wait, updating medium..."
-msgstr "Aguarde, atualizando mídia..."
+"some packages failed to install\n"
+"correctly"
+msgstr "a instalaçăo de alguns pacotes falhou"
 
-#: ../edit-urpm-sources.pl_.c:217
-msgid "Configure proxies"
-msgstr "Configurar proxy"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages to allow others to be upgraded..."
+msgstr "Aguarde, removendo pacotes para permitir outras atualizaçőes..."
 
-#: ../edit-urpm-sources.pl_.c:223
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
 msgstr ""
-"Se vocę precisar de um proxy, informe o hostname e com opcional a porta "
-"(sintaxe: <servidorproxy[:porta]>):"
+"Instalaçăo falhou, alguns arquivos estăo faltando.\n"
+"Vocę pode atualizar a sua lista de fontes."
 
-#: ../edit-urpm-sources.pl_.c:225
-msgid "Proxy hostname:"
-msgstr "Servidor proxy:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation failed"
+msgstr "Instalaçăo falhou"
 
-#: ../edit-urpm-sources.pl_.c:227
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "Vocę pode especificar um usuário e senha para autenticaçăo no proxy:"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
+msgstr "Cancelar"
 
-#: ../edit-urpm-sources.pl_.c:229
-msgid "User:"
-msgstr "Usuário:"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "Ok"
 
-#: ../edit-urpm-sources.pl_.c:255
-msgid "Configure sources"
-msgstr "Configurar fontes"
+#: ../rpmdrake:1
+#, 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]"
 
-#: ../edit-urpm-sources.pl_.c:262
-msgid "Enabled?"
-msgstr "Habilitar?"
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr "Alterando mídia"
 
-#: ../edit-urpm-sources.pl_.c:263
-msgid "Source"
-msgstr "Fonte"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
+msgstr "Năo foi possível obter fontes de pacotes."
 
-#: ../edit-urpm-sources.pl_.c:286 ../rpmdrake_.c:731
-msgid "Remove"
-msgstr "Remover"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages."
+msgstr "Năo foi possível obter fontes de pocotes."
 
-#: ../edit-urpm-sources.pl_.c:288
-msgid "Edit"
-msgstr "Editar"
+#: ../rpmdrake:1
+#, c-format
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr "Um programa necessário está faltando (grpmi). Confira sua instalaçăo."
 
-#: ../edit-urpm-sources.pl_.c:290
-msgid "Add..."
-msgstr "Adicionar..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
+msgstr "Faltando programa"
 
-#: ../edit-urpm-sources.pl_.c:292
-msgid "Update..."
-msgstr "Atualizar..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
+msgstr "Verificando..."
 
-#: ../edit-urpm-sources.pl_.c:293
-msgid "Proxy..."
-msgstr "Proxy..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation finished"
+msgstr "Instalaçăo concluída"
 
-#: ../edit-urpm-sources.pl_.c:296
-msgid "Save and quit"
-msgstr "Salvar e sair"
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
+msgstr "Ficar parado"
 
-#: ../edit-urpm-sources.pl_.c:297 ../rpmdrake_.c:734
-msgid "Quit"
-msgstr "Sair"
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
+msgstr "Utilize .%s como arquivo principal"
 
-#: ../rpmdrake.pm_.c:96
-msgid "Yes"
-msgstr "Sim"
+#: ../rpmdrake:1
+#, c-format
+msgid "Remove .%s"
+msgstr "Remover .%s"
 
-#: ../rpmdrake.pm_.c:98
-msgid "No"
-msgstr "Năo"
+#: ../rpmdrake:1
+#, c-format
+msgid "changes:"
+msgstr "mudanças:"
 
-#: ../rpmdrake.pm_.c:130
-msgid "Info..."
-msgstr "Informaçăo..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr "Verificando %s"
 
-#: ../rpmdrake.pm_.c:183
-msgid "Austria"
-msgstr "Áustria"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, finding available packages..."
+msgstr "Aguarde, procurando pacotes disponíveis..."
 
-#: ../rpmdrake.pm_.c:184
-msgid "Australia"
-msgstr "Austrália"
+#: ../rpmdrake:1
+#, c-format
+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 ""
+"Ocorreu um erro durante a adiçăo da mídia de atualizaçăo via urpmi.\n"
+"\n"
+"Isto pode ser devido ŕ indisponibilidade temporária do servidor, ou entăo\n"
+"a sua versăo (%s) do Mandrake Linux ainda năo é ou năo é mais suportada pela "
+"Atualizaçăo Oficial\n"
+"do Mandrake Linux.\n"
+"\n"
+"Vocę deseja tentar outro servidor?"
 
-#: ../rpmdrake.pm_.c:185
-msgid "Belgium"
-msgstr "Bélgica"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
+msgstr "Erro ao adicionar mídia de atualizaçăo"
 
-#: ../rpmdrake.pm_.c:186
-msgid "Brazil"
-msgstr "Brasil"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
+msgstr ""
+"Aguarde, conectando ao servidor para iniciar a atualizaçăo dos pacotes."
 
-#: ../rpmdrake.pm_.c:187
-msgid "Canada"
-msgstr "Canadá"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Sources Manager, and then add a `Security\n"
+"updates' source.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"Vocę também pode selecionar o servidor espelho manualmente: para fazer "
+"isso,\n"
+"inicie o Gerenciador de fontes de Software (Software Sources Manager),\n"
+"e entăo adicone uma fonte de 'Atualizaçőes de segurança'.\n"
+"\n"
+"E por fim reinicie o MandrakeUpdate."
 
-#: ../rpmdrake.pm_.c:188
-msgid "Costa Rica"
-msgstr "Costa Rica"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Como selecionar manualmente o seu servidor espelho"
 
-#: ../rpmdrake.pm_.c:189
-msgid "Czech Republic"
-msgstr "República Checa"
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
+msgstr "Ocorreu um erro irrecuperável ao atualizar as informaçőes dos pacotes."
 
-#: ../rpmdrake.pm_.c:190
-msgid "Germany"
-msgstr "Alemanha"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
+msgstr "Erro ao atualizar mídia"
 
-#: ../rpmdrake.pm_.c:191
-msgid "Danmark"
-msgstr "Dinamarca"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
+msgstr ""
+"Aguarde, conectando ao servidor para atualizar a informaçăo dos pacotes"
 
-#: ../rpmdrake.pm_.c:192 ../rpmdrake.pm_.c:196
-msgid "Greece"
-msgstr "Grécia"
+#: ../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.pm_.c:193
-msgid "Spain"
-msgstr "Espanha"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Installation"
+msgstr "Instalador de pacotes"
 
-#: ../rpmdrake.pm_.c:194
-msgid "Finland"
-msgstr "Finlândia"
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, c-format
+msgid "Mandrake Update"
+msgstr "Mandrake Update"
 
-#: ../rpmdrake.pm_.c:195
-msgid "France"
-msgstr "França"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
+msgstr "Gerenciador de Softwares"
 
-#: ../rpmdrake.pm_.c:197
-msgid "Israel"
-msgstr "Israel"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Sair"
 
-#: ../rpmdrake.pm_.c:198
-msgid "Italy"
-msgstr "Itália"
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "Instalar"
 
-#: ../rpmdrake.pm_.c:199
-msgid "Japan"
-msgstr "Japăo"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "Remover"
 
-#: ../rpmdrake.pm_.c:200
-msgid "Korea"
-msgstr "Coréia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search"
+msgstr "Procurar"
 
-#: ../rpmdrake.pm_.c:201
-msgid "Netherlands"
-msgstr "Países baixos"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "Localizar:"
 
-#: ../rpmdrake.pm_.c:202
-msgid "Norway"
-msgstr "Noruega"
+#: ../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?"
 
-#: ../rpmdrake.pm_.c:203
-msgid "Poland"
-msgstr "Polônia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "Alguns pacotes precisam ser removidos"
 
-#: ../rpmdrake.pm_.c:204
-msgid "Portugal"
-msgstr "Portugal"
+#: ../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?"
 
-#: ../rpmdrake.pm_.c:205
-msgid "Russia"
-msgstr "Rússia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Too many packages are selected"
+msgstr "Muitos pacotes foram selecionados"
 
-#: ../rpmdrake.pm_.c:206
-msgid "Sweden"
-msgstr "Suíça"
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
+msgstr "Informaçăo máxima"
 
-#: ../rpmdrake.pm_.c:207
-msgid "Taiwan"
-msgstr "Taiwan"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal information"
+msgstr "Informaçőes normais"
 
-#: ../rpmdrake.pm_.c:208
-msgid "United Kingdom"
-msgstr "Inglaterra"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update source(s)"
+msgstr "Atualizar fonte(s)"
 
-#: ../rpmdrake.pm_.c:209
-msgid "China"
-msgstr "China"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reload the packages list"
+msgstr "Recarregue a lista de pacotes"
 
-#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:211 ../rpmdrake.pm_.c:212
-#: ../rpmdrake.pm_.c:213 ../rpmdrake.pm_.c:264
-msgid "United States"
-msgstr "Estados Unidos"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
+msgstr "Reiniciando a seleçăo"
 
-#: ../rpmdrake.pm_.c:277
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
-"Aguarde, fazendo download da lista de servidores do site da MandrakeSoft."
+#: ../rpmdrake:1
+#, c-format
+msgid "in files"
+msgstr "nos arquivos"
 
-#: ../rpmdrake.pm_.c:283
-msgid "Error during download"
-msgstr "Erro durante download"
+#: ../rpmdrake:1
+#, c-format
+msgid "in descriptions"
+msgstr "nas descriçőes"
 
-#: ../rpmdrake.pm_.c:292
-msgid "No mirror"
-msgstr "Nenhum servidor"
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
+msgstr "nos nomes"
 
-#: ../rpmdrake.pm_.c:310
-msgid "Please choose the desired mirror."
-msgstr "Escolha o servidor desejado."
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
+msgstr "por disponibilidade de atualizaçăo"
 
-#: ../rpmdrake.pm_.c:342 ../rpmdrake_.c:629
-msgid "Update source(s)"
-msgstr "Atualizar fonte(s)"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
+msgstr "por servidor"
 
-#: ../rpmdrake.pm_.c:346
-msgid "Select the source(s) you wish to update:"
-msgstr "Escolha a fonte(s) que deseja atualizar:"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
+msgstr "por estado de seleçăo"
 
-#: ../rpmdrake.pm_.c:350
-msgid "Update"
-msgstr "Atualizar"
+#: ../rpmdrake:1
+#, c-format
+msgid "by size"
+msgstr "por tamanho"
 
-#: ../rpmdrake.pm_.c:360
-msgid "Please wait, updating media..."
-msgstr "Aguarde, atualizando mídia"
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
+msgstr "por grupo"
 
-#: ../rpmdrake_.c:101
-msgid "Other"
-msgstr "Outro"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages,"
+msgstr "Todos os pacotes,"
 
-#: ../rpmdrake_.c:123 ../rpmdrake_.c:137 ../rpmdrake_.c:229 ../rpmdrake_.c:300
-msgid "(none)"
-msgstr "(nenhum)"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
+msgstr "Todos os pacotes, alfabeticamente"
 
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:484 ../rpmdrake_.c:485
-msgid "(Not available)"
-msgstr "(Indisponível)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
+msgstr "Recomendaçăo do Mandrake"
 
-#: ../rpmdrake_.c:153 ../rpmdrake_.c:210
-msgid "Search results"
-msgstr "Resultados da busca"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal updates"
+msgstr "Atualizaçőes normais"
 
-#: ../rpmdrake_.c:153
-msgid "Search results (none)"
-msgstr "Resultados da busca (nenhum)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Bugfixes updates"
+msgstr "Atualizaçőes para correçăo de erros"
 
-#: ../rpmdrake_.c:163 ../rpmdrake_.c:174
-msgid "Please wait, searching..."
-msgstr "Aguarde,  procurando..."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
+msgstr "Atualizaçőes de segurança"
 
-#: ../rpmdrake_.c:177
-msgid "Stop"
-msgstr "Parar"
+#: ../rpmdrake:1
+#, c-format
+msgid "Description: "
+msgstr "Descriçăo: "
 
-#: ../rpmdrake_.c:211 ../rpmdrake_.c:321
-msgid "Addable"
-msgstr "instalável"
+#: ../rpmdrake:1
+#, c-format
+msgid "Summary: "
+msgstr "Resumo: "
 
-#: ../rpmdrake_.c:211 ../rpmdrake_.c:321
-msgid "Upgradable"
-msgstr "Atualizável"
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "Importância: "
 
-#: ../rpmdrake_.c:213
-msgid "Not selected"
-msgstr "Năo selecionado"
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake_.c:213
-msgid "Selected"
-msgstr "Selecionado"
+#: ../rpmdrake:1
+#, c-format
+msgid "Size: "
+msgstr "Tamanho: "
 
-#: ../rpmdrake_.c:242
-msgid "rpmdrake"
-msgstr "rpmdrake"
+#: ../rpmdrake:1
+#, c-format
+msgid "Version: "
+msgstr "Versăo: "
 
-#: ../rpmdrake_.c:260 ../rpmdrake_.c:362 ../rpmdrake_.c:364
-msgid "More information on package..."
-msgstr "Mais informaçőes no pacote..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "Nome: "
 
-#: ../rpmdrake_.c:261
-msgid "One of the following packages is needed:"
-msgstr "Um dos seguintes pacotes é necessário"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "Razăo para atualizaçăo:"
 
-#: ../rpmdrake_.c:261
-msgid "Please choose"
-msgstr "Por favor escolha"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
+msgstr "Versăo instalada atualmente: "
 
-#: ../rpmdrake_.c:277
-msgid "unknown package "
-msgstr "Pacote desconhecido"
+#: ../rpmdrake:1
+#, c-format
+msgid "Source: "
+msgstr "Fonte: "
 
-#: ../rpmdrake_.c:287
-msgid "Please wait, listing packages..."
-msgstr "Aguarde, listando pacotes..."
+#: ../rpmdrake:1
+#, c-format
+msgid "(Not available)"
+msgstr "(Indisponível)"
 
-#: ../rpmdrake_.c:302
-msgid "No update"
-msgstr "Sem atualizaçăo"
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
+msgstr "Histórico de atualizaçőes:\n"
 
-#: ../rpmdrake_.c:355 ../rpmdrake_.c:356
-msgid "More infos"
-msgstr "Mais informaçőes"
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "Arquivos:\n"
 
-#: ../rpmdrake_.c:357
-msgid "Information on packages"
-msgstr "Informaçăo sobre os pacotes"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected size: %d MB"
+msgstr "Tamanho selecionado: %d MB"
 
-#: ../rpmdrake_.c:378
-msgid "Some additional packages need to be removed"
-msgstr "Alguns pacotes adicionais precisam ser removidos"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Selecionado: %d MB / Espaço disponível: %d MB"
 
-#: ../rpmdrake_.c:379
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
 msgstr ""
-"Para satisfazer todas as dependęncias, o(s) seguinte(s) pacote(s) também\n"
-"precisam ser removidos:\n"
+"Devido ŕs dependęncias, o(s) seguinte(s) pacote(s) precisam\n"
+"ser desselecionados:\n"
 "\n"
 
-#: ../rpmdrake_.c:385 ../rpmdrake_.c:393
-msgid "Some packages can't be removed"
-msgstr "Alguns pacotes năo podem ser removidos"
-
-#: ../rpmdrake_.c:386
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Removing these packages would break your system, sorry:\n"
+"Sorry, the following package(s) can't be selected:\n"
 "\n"
 msgstr ""
-"A remoçăo desses pacotes estragaria o seu sistema, desculpa:\n"
+"Desculpe, o(s) seguinte(s) pacote(s) năo podem ser selecionados:\n"
 "\n"
 
-#: ../rpmdrake_.c:394 ../rpmdrake_.c:453
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "Alguns pacotes năo podem ser instalados"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
 "\n"
 msgstr ""
-"Devido ŕs dependęncias, o(s) seguinte(s) pacote(s) precisam\n"
-"ser desselecionados:\n"
+"Para satisfazer as dependęncias, o(s) seguinte(s) pacote(s) precisam\n"
+"ser instalados:\n"
 "\n"
 
-#: ../rpmdrake_.c:423
+#: ../rpmdrake:1
+#, c-format
 msgid "Additional packages needed"
 msgstr "Pacotes adicionais săo necessários"
 
-#: ../rpmdrake_.c:424
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be removed"
+msgstr "Alguns pacotes năo podem ser removidos"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
+"Removing these packages would break your system, sorry:\n"
 "\n"
 msgstr ""
-"Para satisfazer as dependęncias, o(s) seguinte(s) pacote(s) precisam\n"
-"ser instalados:\n"
+"A remoçăo desses pacotes estragaria o seu sistema, desculpa:\n"
 "\n"
 
-#: ../rpmdrake_.c:437
-msgid "Some packages can't be installed"
-msgstr "Alguns pacotes năo podem ser instalados"
-
-#: ../rpmdrake_.c:438
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
 "\n"
 msgstr ""
-"Desculpe, o(s) seguinte(s) pacote(s) năo podem ser selecionados:\n"
+"Para satisfazer todas as dependęncias, o(s) seguinte(s) pacote(s) também\n"
+"precisam ser removidos:\n"
 "\n"
 
-#: ../rpmdrake_.c:452 ../rpmdrake_.c:686
-msgid "Some packages need to be removed"
-msgstr "Alguns pacotes precisam ser removidos"
-
-#: ../rpmdrake_.c:474
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Selecionado: %d MB / Espaço disponível: %d MB"
+msgid "Some additional packages need to be removed"
+msgstr "Alguns pacotes adicionais precisam ser removidos"
 
-#: ../rpmdrake_.c:476
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "Tamanho selecionado: %d MB"
-
-#: ../rpmdrake_.c:484
-msgid "Files:\n"
-msgstr "Arquivos:\n"
-
-#: ../rpmdrake_.c:485
-msgid "Changelog:\n"
-msgstr "Histórico de atualizaçőes:\n"
+msgid "More information on package..."
+msgstr "Mais informaçőes no pacote..."
 
-#: ../rpmdrake_.c:488
-msgid "Source: "
-msgstr "Fonte: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Information on packages"
+msgstr "Informaçăo sobre os pacotes"
 
-#: ../rpmdrake_.c:489
-msgid "Currently installed version: "
-msgstr "Versăo instalada atualmente: "
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
+msgstr "Mais informaçőes"
 
-#: ../rpmdrake_.c:493
-msgid "Reason for update: "
-msgstr "Razăo para atualizaçăo:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Addable"
+msgstr "instalável"
 
-#: ../rpmdrake_.c:495
-msgid "Name: "
-msgstr "Nome: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Upgradable"
+msgstr "Atualizável"
 
-#: ../rpmdrake_.c:496
-msgid "Version: "
-msgstr "Versăo: "
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"The list of updates is void. This means that either there is\n"
+"no available update for the packages installed on your computer,\n"
+"or you already installed all of them."
+msgstr ""
+"A lista 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_.c:497
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "No update"
+msgstr "Sem atualizaçăo"
 
-#: ../rpmdrake_.c:497
-msgid "Size: "
-msgstr "Tamanho: "
+#: ../rpmdrake:1
+#, c-format
+msgid "(none)"
+msgstr "(nenhum)"
 
-#: ../rpmdrake_.c:499
-msgid "Importance: "
-msgstr "Importância: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, listing packages..."
+msgstr "Aguarde, listando pacotes..."
 
-#: ../rpmdrake_.c:500
-msgid "Summary: "
-msgstr "Resumo: "
+#: ../rpmdrake:1
+#, c-format
+msgid "unknown package "
+msgstr "Pacote desconhecido"
 
-#: ../rpmdrake_.c:501
-msgid "Description: "
-msgstr "Descriçăo: "
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Um dos seguintes pacotes é necessário"
 
-#: ../rpmdrake_.c:550
-msgid "Bugfixes updates"
-msgstr "Atualizaçőes para correçăo de erros"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please choose"
+msgstr "Por favor escolha"
 
-#: ../rpmdrake_.c:550
-msgid "Normal updates"
-msgstr "Atualizaçőes normais"
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:569
-msgid "Mandrake choices"
-msgstr "Recomendaçăo do Mandrake"
+#: ../rpmdrake:1
+#, c-format
+msgid "Not selected"
+msgstr "Năo selecionado"
 
-#: ../rpmdrake_.c:570
-msgid "All packages, alphabetical"
-msgstr "Todos os pacotes, alfabeticamente"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected"
+msgstr "Selecionado"
 
-#: ../rpmdrake_.c:571
-msgid "All packages,"
-msgstr "Todos os pacotes,"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results"
+msgstr "Resultados da busca"
 
-#: ../rpmdrake_.c:594
-msgid "by group"
-msgstr "por grupo"
+#: ../rpmdrake:1
+#, c-format
+msgid "Stop"
+msgstr "Parar"
 
-#: ../rpmdrake_.c:594
-msgid "by size"
-msgstr "por tamanho"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, searching..."
+msgstr "Aguarde,  procurando..."
 
-#: ../rpmdrake_.c:595
-msgid "by selection state"
-msgstr "por estado de seleçăo"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
+msgstr "Resultados da busca (nenhum)"
 
-#: ../rpmdrake_.c:596
-msgid "by source repository"
-msgstr "por servidor"
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Outro"
 
-#: ../rpmdrake_.c:596
-msgid "by update availability"
-msgstr "por disponibilidade de atualizaçăo"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"Welcome to the packages source editor!\n"
+"\n"
+"This tool will help you configure the packages sources you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"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_.c:617
-msgid "in descriptions"
-msgstr "nas descriçőes"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Salvar e sair"
 
-#: ../rpmdrake_.c:617
-msgid "in files"
-msgstr "nos arquivos"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy..."
+msgstr "Proxy..."
 
-#: ../rpmdrake_.c:617
-msgid "in names"
-msgstr "nos nomes"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
+msgstr "Atualizar..."
 
-#: ../rpmdrake_.c:628
-msgid "Reload the packages list"
-msgstr "Recarregue a lista de pacotes"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "Adicionar..."
 
-#: ../rpmdrake_.c:628
-msgid "Reset the selection"
-msgstr "Reiniciando a seleçăo"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "Editar"
 
-#: ../rpmdrake_.c:654
-msgid "Maximum information"
-msgstr "Informaçăo máxima"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Source"
+msgstr "Fonte"
 
-#: ../rpmdrake_.c:654
-msgid "Normal information"
-msgstr "Informaçőes normais"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
+msgstr "Habilitar?"
 
-#: ../rpmdrake_.c:676
-msgid "Too many packages are selected"
-msgstr "Muitos pacotes foram selecionados"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure sources"
+msgstr "Configurar fontes"
 
-#: ../rpmdrake_.c:721
-msgid "Find:"
-msgstr "Localizar:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "Senha:"
 
-#: ../rpmdrake_.c:726
-msgid "Search"
-msgstr "Procurar"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
+msgstr "Usuário:"
 
-#: ../rpmdrake_.c:732
-msgid "Install"
-msgstr "Instalar"
+#: ../edit-urpm-sources.pl: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:"
 
-#: ../rpmdrake_.c:739 data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrake Update"
-msgstr "Mandrake Update"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "Servidor proxy:"
 
-#: ../rpmdrake_.c:739
-msgid "Software Packages Installation"
-msgstr "Instalador de pacotes"
+#: ../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 vocę precisar de um proxy, informe o hostname e com opcional a porta "
+"(sintaxe: <servidorproxy[:porta]>):"
 
-#: ../rpmdrake_.c:739
-msgid "Software Packages Removal"
-msgstr "Gerenciador de Softwares"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "Configurar proxy"
 
-#: ../rpmdrake_.c:780
-msgid "Please wait, contacting mirror to update packages information."
-msgstr ""
-"Aguarde, conectando ao servidor para atualizar a informaçăo dos pacotes"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr "Aguarde, atualizando mídia..."
 
-#: ../rpmdrake_.c:782
-msgid "Error updating medium"
-msgstr "Erro ao atualizar mídia"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "Para salvar as alteraçőes, vocę precisa inserir a mídia no drive."
 
-#: ../rpmdrake_.c:783
-msgid "There was an unrecoverable error while updating packages information."
-msgstr "Ocorreu um erro irrecuperável ao atualizar as informaçőes dos pacotes."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
+msgstr "Vocę precisa inserir a mídia para continuar"
 
-#: ../rpmdrake_.c:788
-msgid "How to choose manually your mirror"
-msgstr "Como selecionar manualmente o seu servidor espelho"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save changes"
+msgstr "Salvar alteraçőes"
 
-#: ../rpmdrake_.c:796
-msgid "Please wait, contacting mirror to initialize updates packages."
-msgstr ""
-"Aguarde, conectando ao servidor para iniciar a atualizaçăo dos pacotes."
+# Translation needs reworking
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Caminho relativo para synthesis/hdlist: "
 
-#: ../rpmdrake_.c:799
-msgid "Error adding update medium"
-msgstr "Erro ao adicionar mídia de atualizaçăo"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake_.c:830
-msgid "Please wait, finding available packages..."
-msgstr "Aguarde, procurando pacotes disponíveis..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Editing source \"%s\":"
+msgstr "Editando fonte \"%s\":"
 
-#: ../rpmdrake_.c:862
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Verificando %s"
+msgid "Edit a source"
+msgstr "Editar fontes"
 
-#: ../rpmdrake_.c:881
-msgid "changes:"
-msgstr "mudanças:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr "Aguarde, removendo mídia..."
 
-#: ../rpmdrake_.c:885
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Remover .%s"
+msgid "Please wait, adding medium..."
+msgstr "Aguarde, adicionando mídia..."
 
-#: ../rpmdrake_.c:887
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Utilize .%s como arquivo principal"
+msgid "Type of source:"
+msgstr "Tipo de fonte:"
 
-#: ../rpmdrake_.c:889
-msgid "Do nothing"
-msgstr "Ficar parado"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Adding a source:"
+msgstr "Adicionando uma fonte:"
 
-#: ../rpmdrake_.c:901
-msgid "Installation finished"
-msgstr "Instalaçăo concluída"
+#: ../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 ""
+"Já existe um meio com este nome, vocę\n"
+"realmente quer substituir?"
 
-#: ../rpmdrake_.c:911
-msgid "Inspect..."
-msgstr "Verificando..."
+#: ../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_.c:926
-msgid "Program missing"
-msgstr "Faltando programa"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "Nome:"
 
-#: ../rpmdrake_.c:927
-msgid "A required program is missing (grpmi). Check your installation."
-msgstr "Um programa necessário está faltando (grpmi). Confira sua instalaçăo."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
+msgstr "Login:"
 
-#: ../rpmdrake_.c:941
-msgid "Unable to get source packages."
-msgstr "Năo foi possível obter fontes de pocotes."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Escolha um servidor..."
 
-#: ../rpmdrake_.c:942
-msgid "Unable to get source packages, sorry."
-msgstr "Năo foi possível obter fontes de pacotes."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Browse..."
+msgstr "Procurar..."
 
-#: ../rpmdrake_.c:950
-msgid "Change medium"
-msgstr "Alterando mídia"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Caminho ou ponto de montagem:"
 
-#: ../rpmdrake_.c:951
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Por favaor insira a mídia com nome \"%s\" no drive [%s]"
+msgid "Removable device"
+msgstr "Dispositivo removível"
 
-#: ../rpmdrake_.c:959
-msgid "Installation failed"
-msgstr "Instalaçăo falhou"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "HTTP server"
+msgstr "Servidor HTTP"
 
-#: ../rpmdrake_.c:960
-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."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "Servidor FTP"
 
-#: ../rpmdrake_.c:963
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr "Aguarde, removendo pacotes para permitir outras atualizaçőes..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path:"
+msgstr "Caminho:"
 
-#: ../rpmdrake_.c:985
+#: ../edit-urpm-sources.pl: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 ""
-"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:"
+msgid "Local files"
+msgstr "Arquivos locais"
 
-#: ../rpmdrake_.c:985
-msgid ""
-"some packages failed to install\n"
-"correctly"
-msgstr "a instalaçăo de alguns pacotes falhou"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add a source"
+msgstr "Adicione uma fonte:"
 
-#: ../rpmdrake_.c:986
-msgid "everything was installed correctly"
-msgstr "Tudo foi instalado corretamente"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
+msgstr "Incapaz de atualizar a mídia; Será automaticamente desabilitado"
 
-#: ../rpmdrake_.c:988
-msgid "Everything installed successfully"
-msgstr "Tudo foi instalado com sucesso"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "Incapaz de criar a mídia."
 
-#: ../rpmdrake_.c:989
-msgid "All requested packages were installed successfully."
-msgstr "Todos os pacotes requisitados foram instalados com sucesso."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, updating media..."
+msgstr "Aguarde, atualizando mídia"
 
-#: ../rpmdrake_.c:993
-msgid "Everything already installed."
-msgstr "Tudo já foi instalado."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
+msgstr "Atualizar"
 
-#: ../rpmdrake_.c:994
-msgid "Everything already installed (is this supposed to happen at all?)."
-msgstr "Tudo já foi instaldo. (supőe-se que seja válido para todos?)"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Select the source(s) you wish to update:"
+msgstr "Escolha a fonte(s) que deseja atualizar:"
 
-#: ../rpmdrake_.c:1001
-msgid "Problem during installation"
-msgstr "Problema durante a instalaçăo"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please choose the desired mirror."
+msgstr "Escolha o servidor desejado."
 
-#: ../rpmdrake_.c:1002
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"There was a problem during the installation:\n"
+"I can't find any suitable mirror.\n"
 "\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 ""
-"Ocorreu um problema durante a instalaçăo:\n"
+"Năo encontrei servidor apropriado.\n"
 "\n"
-"%s"
-
-#: ../rpmdrake_.c:1016
-msgid "Please wait, reading packages database..."
-msgstr "Aguarde, lendo banco de dados de pacotes..."
-
-#: ../rpmdrake_.c:1057
-msgid "Please wait, removing packages..."
-msgstr "Aguarde, removendo pacotes..."
+"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_.c:1060
-msgid "Problem during removal"
-msgstr "Problema durante a remoçăo"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
+msgstr "Nenhum servidor"
 
-#: ../rpmdrake_.c:1061
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
+"There was an error downloading the mirrors list:\n"
 "\n"
-"%s"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
-"Ocorreu um problema durante a remoçăo de pacotes:\n"
+"Ocorreu um erro durante o download da lista de servidores:\n"
 "\n"
-"%s"
+"%s\n"
+"A sua conexăo com a internet ou o site da MandrakeSoft, podem estar "
+"indisponíveis no momento.\n"
+"Por favor tente mais tarde."
 
-#: ../rpmdrake_.c:1093
-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 "Error during download"
+msgstr "Erro durante download"
 
-#: ../rpmdrake_.c:1098
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
-"Bem vindo ao MandrakeUpdate!\n"
-"\n"
-"Esta ferramenta irá ajudar na atualizaçăo do seu sistema."
+"Aguarde, fazendo download da lista de servidores do site da MandrakeSoft."
 
-#: ../rpmdrake_.c:1103
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"Welcome to the software installation tool!\n"
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
 "\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
+"Is it ok to continue?"
 msgstr ""
-"Bem vindo ao Instalador de Software!\n"
+"Eu preciso contactar o site da MandrakeSoft para pegar a lista de "
+"servidores.\n"
+"Certifique-se está atualmente conectado ŕ Internet.\n"
 "\n"
-"O Mandrake Linux possui milhares de pacotes de software\n"
-"no CDROM ou DVD. Esta ferramenta irá ajudar na escolha de softwares\n"
-"que vocę deseja instalar."
+"Deseja continuar?"
 
-#: data/rpmdrake-remove.desktop.in.h:1
-msgid "Remove Software"
-msgstr "Remover software"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United States"
+msgstr "Estados Unidos"
 
-#: data/rpmdrake-sources.desktop.in.h:1
-msgid "Software Sources Manager"
-msgstr "Gerenciador de fontes de Software"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
+msgstr "China"
 
-#: data/rpmdrake.desktop.in.h:1
-msgid "Install Software"
-msgstr "Instalar software"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr "Inglaterra"
 
-#~ 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.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "Taiwan"
 
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-#~ "Está pronto para continuar?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "Suíça"
 
-#~ 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
+#, c-format
+msgid "Russia"
+msgstr "Rússia"
 
-#~ 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 "Portugal"
+msgstr "Portugal"
 
-#~ msgid ""
-#~ "There was an error downloading the mirrors list:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "The network, or MandrakeSoft website, are maybe unavailable.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "Ocorreu um erro durante o download da lista de servidores:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "A sua conexăo com a internet ou o site da MandrakeSoft, podem estar "
-#~ "indisponíveis no momento.\n"
-#~ "Por favor tente mais tarde."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
+msgstr "Polônia"
 
-#~ 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 "Norway"
+msgstr "Noruega"
 
-#~ msgid ""
-#~ "The list of updates is void. This 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.pm:1
+#, c-format
+msgid "Netherlands"
+msgstr "Países baixos"
 
-#~ msgid ""
-#~ "Warning: it seems that you are attempting to add so much\n"
-#~ "packages that your filesystem may run out of free diskspace,\n"
-#~ "during or after package installation ; this is particularly\n"
-#~ "dangerous and should be considered with care.\n"
-#~ "\n"
-#~ "Do you really want to install all the selected packages?"
-#~ msgstr ""
-#~ "Cuidado: parece que vocę está tentando adicionar muitos\n"
-#~ "pacotes. O seu sistema poderá rodar com falta de espaço,\n"
-#~ "durante ou depois da instalaçăo. Isto é perigoso e vocę \n"
-#~ "precisa tomar cuidado.\n"
-#~ "\n"
-#~ "Vocę realmente quer instalar todos os pacotes selecionados?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Korea"
+msgstr "Coréia"
 
-#~ 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?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Japan"
+msgstr "Japăo"
 
-#~ msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#~ msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Italy"
+msgstr "Itália"
 
-#~ 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.pm:1
+#, c-format
+msgid "Israel"
+msgstr "Israel"
 
-#~ 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."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Grécia"
 
-#~ 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 ""
-#~ "Ocorreu um erro durante a adiçăo da mídia de atualizaçăo via urpmi.\n"
-#~ "\n"
-#~ "Isto pode ser devido ŕ indisponibilidade temporária do servidor, ou "
-#~ "entăo\n"
-#~ "a sua versăo (%s) do Mandrake Linux ainda năo é ou năo é mais suportada "
-#~ "pela Atualizaçăo Oficial\n"
-#~ "do Mandrake Linux.\n"
-#~ "\n"
-#~ "Vocę deseja tentar outro servidor?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "France"
+msgstr "França"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "Finlândia"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "Espanha"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
+msgstr "Dinamarca"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr "Alemanha"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
+msgstr "República Checa"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Costa Rica"
+msgstr "Costa Rica"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Canada"
+msgstr "Canadá"
+
+#: ../rpmdrake.pm:1
+#, 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
+#, c-format
+msgid "Info..."
+msgstr "Informaçăo..."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
+msgstr "Năo"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Sim"
+
+#: data/rpmdrake.desktop.in.h:1
+msgid "Install Software"
+msgstr "Instalar software"
+
+#: data/rpmdrake-remove.desktop.in.h:1
+msgid "Remove Software"
+msgstr "Remover software"
+
+#: data/rpmdrake-sources.desktop.in.h:1
+msgid "Software Sources Manager"
+msgstr "Gerenciador de fontes de Software"
+
+#~ 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--*-*-*-*-*,*"
diff --git a/po/pt_BR.pom b/po/pt_BR.pom
index 41ca68b1..b981523e 100644
--- a/po/pt_BR.pom
+++ b/po/pt_BR.pom
@@ -4,195 +4,210 @@ msgstr "servidor"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Servidor, Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Computador de rede (cliente)"
+msgid "Office Workstation"
+msgstr "Estaçăo de Trabalho de Escritório"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "Servidor NFS, servidor SMB, servidor Proxy, servidor SSH"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Programas de escritório: processadores de texto (kword, abiword), tabelas "
+"(kspread, gnumeric), visualizadores pdf, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Escritório"
+msgid "Workstation"
+msgstr "Estaçăo de Trabalho"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Estaçăo de Trabalho Gnome"
+msgid "Game station"
+msgstr "Estaçăo de Jogos"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Ferramentas para o seu Palm Pilot e seu Visor"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Programas de divertimento: arcade, estratégia, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Estaçăo de Trabalho"
+msgid "Multimedia station"
+msgstr "Estaçăo de Multimídia"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Servidor, Firewall/Roteador"
+msgid "Sound and video playing/editing programs"
+msgstr "Programas editores/tocadores de som e vídeo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr "Nome do Domínio e Servidor de Informaçăo da Rede"
+msgid "Internet station"
+msgstr "Estaçăo de Internet"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
 msgstr ""
-"Programas de escritório: processadores de texto (kword, abiword), tabelas "
-"(kspread, gnumeric), visualizadores pdf, etc"
+"Conjunto de ferramentas para ler e enviar mensagem e notícias (pine, mutt, "
+"tin...) e para navegar na Web"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr ""
-"Ferramentas relacionadas ŕ áudio: tocadores de mp3 ou midi, mixers, etc"
+msgid "Network Computer (client)"
+msgstr "Computador de rede (cliente)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr ""
+msgid "Clients for different protocols including ssh"
+msgstr "Clientes para protocolos diferentes incluindo ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Livros e Howto's sobre Linux e Software Livre"
+msgid "Configuration"
+msgstr "Configuraçăo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "Estaçăo de Trabalho KDE"
+msgid "Tools to ease the configuration of your computer"
+msgstr "Ferramentas para facilitar a configuraçăo do seu computador"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgid "Scientific Workstation"
+msgstr "Estaçăo de Trabalho Científica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Multimídia - Vídeo"
+msgid "Scientific applications such as gnuplot"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr ""
-"Conjunto de ferramentas para mensagens, notícias, web, transferęncias de "
-"arquivos e bate-papo"
+msgid "Console Tools"
+msgstr "Ferramentas do Console"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Servidor, Bancos de dados"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Editores, shells, ferramentas de arquivos, terminais"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "Servidor de banco de dados PostgreSQL ou MySQL"
+msgid "KDE Workstation"
+msgstr "Estaçăo de Trabalho KDE"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Ferramentas para facilitar a configuraçăo do seu computador"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"O K Desktop Environment, o ambiente gráfico básico acompanhando de uma "
+"coleçăo de ferramentas"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "Multimídia - Som"
+msgid "Graphical Environment"
+msgstr "Ambiente Gráfico"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Documentaçăo"
+msgid "Gnome Workstation"
+msgstr "Estaçăo de Trabalho Gnome"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Ferramentas do Console"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+"Um ambiente gráfico com um conjunto de aplicativos e ferramenas de desktop "
+"amigáveis"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr "Servidor de mensagens postfiz, servidor de notícias Inn"
+msgid "Other Graphical Desktops"
+msgstr "Outros Desktops Gráficos"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Estaçăo de Internet"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Estaçăo de Multimídia"
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+msgid "Development"
+msgstr "Desenvolvimento"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Configuraçăo"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "Bibliotecas de desenvolvimento C e C++, programas e arquivos include"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Mais Desktops Gráficos (Gnome, IceWM)"
+msgid "Documentation"
+msgstr "Documentaçăo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
-"O K Desktop Environment, o ambiente gráfico básico acompanhando de uma "
-"coleçăo de ferramentas"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Livros e Howto's sobre Linux e Software Livre"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Ambiente Gráfico"
+msgid "LSB"
+msgstr "LSB"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Linux Standard Base: suporte a aplicativos de terceiros"
+
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-msgid "Development"
-msgstr "Desenvolvimento"
+#: ../../share/compssUsers:999
+msgid "Web/FTP"
+msgstr "Web/FTP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Apache, Pro-ftpd"
-msgstr "Apache e Pro-ftpd"
+msgstr "Apache; Pro-ftpd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "Ferramentas para criar e gravar CD's"
+msgid "Mail/Groupware/News"
+msgstr "Correio/Groupware/News"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Estaçăo de Trabalho de Escritório"
+msgid "Postfix mail server, Inn news server"
+msgstr "Servidor de mensagens Postfix, servidor de notícias Inn"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgid "Database"
+msgstr "Bancos de dados"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Programas gráficos como o The Gimp"
+msgid "PostgreSQL or MySQL database server"
+msgstr "Servidor de banco de dados PostgreSQL ou MySQL"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Firewall/Router"
+msgstr "Firewall/Roteador"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Internet gateway"
+msgstr "Internet Gateway"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -201,8 +216,8 @@ msgstr "DNS/NIS"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "Bibliotecas de desenvolvimento C e C++, programas e arquivos include"
+msgid "Domain Name and Network Information Server"
+msgstr "Nome do Domínio e Servidor de Informaçăo da Rede"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -211,18 +226,20 @@ msgstr "Servidor de Rede"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "Servidor, Correio/Groupware/News"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "Servidor NFS, servidor SMB, servidor Proxy, servidor SSH"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Estaçăo de Jogos"
+msgid "Office"
+msgstr "Escritório"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Editor e visualizadores de Vídeo"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr ""
+"Conjunto de ferramentas para mensagens, notícias, web, transferęncias de "
+"arquivos e bate-papo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -231,79 +248,67 @@ msgstr "Multimídia - Gráficos"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Programas de divertimento: arcade, estratégia, etc"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
-"Conjunto de ferramentas para ler e enviar mensagem e notícias (pine, mutt, "
-"tin...) e para navegar na Web"
+msgid "Graphics programs such as The Gimp"
+msgstr "Programas gráficos como o The Gimp"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "Finança Pessoal"
+msgid "Multimedia - Sound"
+msgstr "Multimídia - Som"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
 msgstr ""
-"Um ambiente gráfico com um conjunto de aplicativos e ferramenas de desktop "
-"amigáveis"
+"Ferramentas relacionadas ŕ áudio: tocadores de mp3 ou midi, mixers, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Clientes para protocolos diferentes incluindo ssh"
+msgid "Multimedia - Video"
+msgstr "Multimídia - Vídeo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "LSB"
-msgstr ""
+msgid "Video players and editors"
+msgstr "Editor e visualizadores de Vídeo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Internet Gateway"
+msgid "Multimedia - CD Burning"
+msgstr "Multimídia - Gravaçăo de CD"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Programas editores/tocadores de som e vídeo"
+msgid "Tools to create and burn CD's"
+msgstr "Ferramentas para criar e gravar CD's"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Outros Desktops Gráficos"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Mais Desktops Gráficos (Gnome, IceWM)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Editores, shells, ferramentas de arquivos, terminais"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "Programas para gerenciar seu dinheiro, como o gnucash"
+msgid "Personal Information Management"
+msgstr "Gereciador de Informaçăo Pessoal"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "Gereciador de Informaçăo Pessoal"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Ferramentas para o seu Palm Pilot e seu Visor"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multimídia - Gravaçăo de CD"
+msgid "Personal Finance"
+msgstr "Finança Pessoal"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Estaçăo de Trabalho Científica"
+msgid "Programs to manage your finances, such as gnucash"
+msgstr "Programas para gerenciar seu dinheiro, como o gnucash"
 
diff --git a/po/ro.po b/po/ro.po
index e3e95315..e6bb22eb 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2003-01-24 16:31+0100\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\n"
 "PO-Revision-Date: 2003-01-25 00:34+0200\n"
 "Last-Translator: Ovidiu Constantin <ovidiu.constantin@gmx.net>\n"
 "Language-Team: Romanian <rtfs-project@sourceforge.net>\n"
@@ -17,453 +17,638 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../edit-urpm-sources.pl_.c:39
-msgid "Unable to create medium."
-msgstr "Nu pot creea mediul."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Pot continua?"
 
-#: ../edit-urpm-sources.pl_.c:40
-msgid "Unable to update medium; it will be automatically disabled."
-msgstr "Nu pot actualiza mediul, el va fi dezactivat automat."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to the software installation tool!\n"
+"\n"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
+msgstr ""
+"Bun venit la utilitarul de instalare a programelor!\n"
+"\n"
+"Sistemul Mandrake Linux vine cu mai multe mii de pachete de programe pe "
+"CDROM sau DVD.\n"
+"Acest utilitar vă va ajuta să alegeţi programele pe care doriţi \n"
+"să le instalaţi pe calculatorul dvs."
 
-#: ../edit-urpm-sources.pl_.c:50
-msgid "Add a source"
-msgstr "Adaugă o sursă"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Bun venit la MandrakeUpdate!\n"
+"\n"
+"Acest utilitar vă va ajuta să alegeţi programele de pe calculatorul dvs pe "
+"care doriţi \n"
+"să le actualizaţi ."
 
-#: ../edit-urpm-sources.pl_.c:51
-msgid "Local files"
-msgstr "Fişiere locale"
+#: ../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 ""
+"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."
 
-#: ../edit-urpm-sources.pl_.c:51
-msgid "Path:"
-msgstr "Cale:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"A apărut o problemă în timpul dezinstalării pachetelor:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:52
-msgid "FTP server"
-msgstr "Server FTP"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during removal"
+msgstr "Problemă în timpul ştergerii"
 
-#: ../edit-urpm-sources.pl_.c:52 ../edit-urpm-sources.pl_.c:53
-#: ../edit-urpm-sources.pl_.c:55 ../edit-urpm-sources.pl_.c:183
-msgid "URL:"
-msgstr "URL: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages..."
+msgstr "Vă rog să aşteptaţi, şterg pachetele..."
 
-#: ../edit-urpm-sources.pl_.c:53
-msgid "HTTP server"
-msgstr "Server HTTP"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
+msgstr "Vă rog să aşteptaţi, citesc baza de date a pachetelelor..."
 
-#: ../edit-urpm-sources.pl_.c:54
-msgid "Path or mount point:"
-msgstr "Calea sau punctul de montare: "
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"A apărut o problemă în timpul instalării:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:54
-msgid "Removable device"
-msgstr "Dispozitiv detaşabil"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during installation"
+msgstr "Problemă în timpul instalării"
 
-#: ../edit-urpm-sources.pl_.c:55 ../rpmdrake_.c:548
-msgid "Security updates"
-msgstr "Actualizări ale sistemului de securitate"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
+msgstr ""
+"Toate pachetele sunt deja instalate (ar trebui să se întâmple vreodată?)."
 
-#: ../edit-urpm-sources.pl_.c:66
-msgid "Browse..."
-msgstr "Răsfoieşte..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed."
+msgstr "Toate pachetele sunt deja instalate."
 
-#: ../edit-urpm-sources.pl_.c:68
-msgid "Choose a mirror..."
-msgstr "Selectare server oglindă..."
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "Toate pachetele cerute au fost instalate cu succes."
 
-#: ../edit-urpm-sources.pl_.c:88
-msgid "Login:"
-msgstr "Logare:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr "Totul a fost instalat cu succes"
 
-#: ../edit-urpm-sources.pl_.c:88 ../edit-urpm-sources.pl_.c:227
-msgid "Password:"
-msgstr "Parola:"
+#: ../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 ""
+"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:"
 
-#: ../edit-urpm-sources.pl_.c:93
-msgid "Name:"
-msgstr "Nume:"
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "Totul a fost instalat cu succes"
 
-#: ../edit-urpm-sources.pl_.c:95 ../edit-urpm-sources.pl_.c:184
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Calea relativă la synthesis sau hdlist:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"some packages failed to install\n"
+"correctly"
+msgstr ""
+"Unele pachetele nu au putut fi instalate\n"
+"corect."
 
-#: ../edit-urpm-sources.pl_.c:103
-msgid "You need to fill up at least the two first entries."
-msgstr "Trebuie să completaţi cel puţin primele două intrări."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages to allow others to be upgraded..."
+msgstr ""
+"Vă rog să aşteptaţi, şterg pachetele pentru a permite altora să fie "
+"actualizate..."
 
-#: ../edit-urpm-sources.pl_.c:116
-msgid "Adding a source:"
-msgstr "Adaug sursa:"
+#: ../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."
 
-#: ../edit-urpm-sources.pl_.c:117
-msgid "Type of source:"
-msgstr "Tipul sursei:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation failed"
+msgstr "Instalare eşuată"
 
-#: ../edit-urpm-sources.pl_.c:121 ../edit-urpm-sources.pl_.c:198
-#: ../edit-urpm-sources.pl_.c:231 ../rpmdrake.pm_.c:100 ../rpmdrake.pm_.c:139
-#: ../rpmdrake.pm_.c:322 ../rpmdrake_.c:353 ../rpmdrake_.c:365
-#: ../rpmdrake_.c:369 ../rpmdrake_.c:916 ../rpmdrake_.c:950
+#: ../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"
 
-#: ../edit-urpm-sources.pl_.c:136 ../edit-urpm-sources.pl_.c:192
-#: ../edit-urpm-sources.pl_.c:198 ../edit-urpm-sources.pl_.c:238
-#: ../rpmdrake.pm_.c:322 ../rpmdrake.pm_.c:355 ../rpmdrake_.c:353
-#: ../rpmdrake_.c:950
-msgid "Cancel"
-msgstr "Renunţă"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Vă rog să introduceţi mediul numit \"%s\" în dispozitivul [%s]"
 
-#: ../edit-urpm-sources.pl_.c:143
-msgid "Please wait, adding medium..."
-msgstr "Vă rog să aşteptaţi, adaug mediul..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr "Schimbă mediul"
 
-#: ../edit-urpm-sources.pl_.c:164
-msgid "Please wait, removing medium..."
-msgstr "Vă rog să aşteptaţi, şterg mediul..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
+msgstr "Regret, nu pot prelua pachetele sursă."
 
-#: ../edit-urpm-sources.pl_.c:177
-msgid "Edit a source"
-msgstr "Editare surse"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages."
+msgstr "Nu pot prelua pachetele sursă."
 
-#: ../edit-urpm-sources.pl_.c:181
+#: ../rpmdrake:1
 #, c-format
-msgid "Editing source \"%s\":"
-msgstr "Editez sursa \"%s\":"
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr "Un program absolut necesar lipseşte (grpmi).  Verificaţi instalarea."
 
-#: ../edit-urpm-sources.pl_.c:187
-msgid "Save changes"
-msgstr "Salvează schimbările"
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
+msgstr "Program lipsă"
 
-#: ../edit-urpm-sources.pl_.c:196
-msgid "You need to insert the medium to continue"
-msgstr "Trebuie să introduceţi mediul pentru a continua"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
+msgstr "Inspectez..."
 
-#: ../edit-urpm-sources.pl_.c:197
-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:1
+#, c-format
+msgid "Installation finished"
+msgstr "Instalare terminată"
 
-#: ../edit-urpm-sources.pl_.c:202
-msgid "Please wait, updating medium..."
-msgstr "Vă rog să aşteptaţi, actualizez mediul..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
+msgstr "Nu fă nimic"
 
-#: ../edit-urpm-sources.pl_.c:213
-msgid "Configure proxies"
-msgstr "Configurare proxy-uri"
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
+msgstr "Foloseşte .%s ca fişier principal"
 
-#: ../edit-urpm-sources.pl_.c:219
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
-msgstr ""
-"Dacă e nevoie de proxy, introduceţi numele gazdei şi opţional un port "
-"(sintaxă: <gazdăproxy[:port]>):"
+#: ../rpmdrake:1
+#, c-format
+msgid "Remove .%s"
+msgstr "Şterg .%s"
 
-#: ../edit-urpm-sources.pl_.c:221
-msgid "Proxy hostname:"
-msgstr "Nume gazdă proxy:"
+#: ../rpmdrake:1
+#, c-format
+msgid "changes:"
+msgstr "schimbări:"
 
-#: ../edit-urpm-sources.pl_.c:223
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "Puteţi specifica un utilizator/parolă pentru autentificarea la proxy:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr "Inspectez %s"
 
-#: ../edit-urpm-sources.pl_.c:225
-msgid "User:"
-msgstr "Utilizator:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, finding available packages..."
+msgstr "Vă rog să aşteptaţi, caut pachetele disponibile..."
 
-#: ../edit-urpm-sources.pl_.c:251
-msgid "Configure sources"
-msgstr "Configurare surse"
+#: ../rpmdrake:1
+#, c-format
+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 ""
+"A fost detectată o eroare în timpul adăugării mediului de actualizare via "
+"urpmi.\n"
+"\n"
+"Aceasta poate fi datorită unui server indisponibil temporar, sau dacă "
+"versiunea\n"
+"dvs. a Mandrake Linux (%s) nu (mai) este (încă) suportată de\n"
+"actualizările oficiale Mandrake Linux.\n"
+"\n"
+"Doriţi să încercaţi alt server oglindă?"
 
-#: ../edit-urpm-sources.pl_.c:258
-msgid "Enabled?"
-msgstr "Activat?"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
+msgstr "Eroare la adăugarea mediului de actualizare"
 
-#: ../edit-urpm-sources.pl_.c:259
-msgid "Source"
-msgstr "Sursă"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
+msgstr ""
+"Vă rog să aşteptaţi, contactez serverul oglindă pentru iniţializarea "
+"actualizării pachetelor."
 
-#: ../edit-urpm-sources.pl_.c:282 ../rpmdrake_.c:730
-msgid "Remove"
-msgstr "Şterge"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Sources Manager, and then add a `Security\n"
+"updates' source.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"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."
 
-#: ../edit-urpm-sources.pl_.c:284
-msgid "Edit"
-msgstr "Editează"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Cum să selectaţi manual serverul oglindă"
 
-#: ../edit-urpm-sources.pl_.c:286
-msgid "Add..."
-msgstr "Adaugă..."
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
+msgstr ""
+"A fost detectată o eroare majoră în timpul actualizării informaţiei "
+"pachetelor."
 
-#: ../edit-urpm-sources.pl_.c:288
-msgid "Update..."
-msgstr "Actualizează..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
+msgstr "Eroare la actualizarea mediului"
 
-#: ../edit-urpm-sources.pl_.c:289
-msgid "Proxy..."
-msgstr "Proxy..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
+msgstr ""
+"Vă rog să aşteptaţi, contactez serverul oglindă pentru actualizarea "
+"informaţiei pachetelor."
 
-#: ../edit-urpm-sources.pl_.c:292
-msgid "Save and quit"
-msgstr "Salvare şi ieşire"
+#: ../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?"
 
-#: ../edit-urpm-sources.pl_.c:293 ../rpmdrake_.c:733
-msgid "Quit"
-msgstr "Ieşire"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Installation"
+msgstr "Instalare pachete Software"
 
-#: ../rpmdrake.pm_.c:96
-msgid "Yes"
-msgstr "Da"
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, c-format
+msgid "Mandrake Update"
+msgstr "Actualizare Mandrake"
 
-#: ../rpmdrake.pm_.c:98
-msgid "No"
-msgstr "Nu"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
+msgstr "Ştergere pachete Software"
 
-#: ../rpmdrake.pm_.c:130
-msgid "Info..."
-msgstr "Informaţii... "
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Ieşire"
 
-#: ../rpmdrake.pm_.c:183
-msgid "Austria"
-msgstr "Austria"
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "Instalează"
 
-#: ../rpmdrake.pm_.c:184
-msgid "Australia"
-msgstr "Australia"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "Şterge"
 
-#: ../rpmdrake.pm_.c:185
-msgid "Belgium"
-msgstr "Belgia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search"
+msgstr "Căutare"
 
-#: ../rpmdrake.pm_.c:186
-msgid "Brazil"
-msgstr "Brazilia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "Caută:"
 
-#: ../rpmdrake.pm_.c:187
-msgid "Canada"
-msgstr "Canada"
+#: ../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?"
 
-#: ../rpmdrake.pm_.c:188
-msgid "Costa Rica"
-msgstr "Costa Rica"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "Unele pachete trebuie şterse"
 
-#: ../rpmdrake.pm_.c:189
-msgid "Czech Republic"
-msgstr "Cehia"
+#: ../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?"
 
-#: ../rpmdrake.pm_.c:190
-msgid "Germany"
-msgstr "Germania"
+#: ../rpmdrake:1
+#, c-format
+msgid "Too many packages are selected"
+msgstr "Sunt selectate prea multe pachete"
 
-#: ../rpmdrake.pm_.c:191
-msgid "Danmark"
-msgstr "Danemarca"
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
+msgstr "Informaţii maximale"
 
-#: ../rpmdrake.pm_.c:192 ../rpmdrake.pm_.c:196
-msgid "Greece"
-msgstr "Grecia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal information"
+msgstr "Informaţii normale"
 
-#: ../rpmdrake.pm_.c:193
-msgid "Spain"
-msgstr "Spania"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update source(s)"
+msgstr "Actualizare surse"
 
-#: ../rpmdrake.pm_.c:194
-msgid "Finland"
-msgstr "Finlanda"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reload the packages list"
+msgstr "Reîncarcă lista pachetelor"
 
-#: ../rpmdrake.pm_.c:195
-msgid "France"
-msgstr "Franţa"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
+msgstr "Resetează selecţia"
 
-#: ../rpmdrake.pm_.c:197
-msgid "Israel"
-msgstr "Israel"
+#: ../rpmdrake:1
+#, c-format
+msgid "in files"
+msgstr "în fişiere "
 
-#: ../rpmdrake.pm_.c:198
-msgid "Italy"
-msgstr "Italia"
+#: ../rpmdrake:1
+#, c-format
+msgid "in descriptions"
+msgstr "în descrieri"
 
-#: ../rpmdrake.pm_.c:199
-msgid "Japan"
-msgstr "Japonia"
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
+msgstr "în nume"
 
-#: ../rpmdrake.pm_.c:200
-msgid "Korea"
-msgstr "Coreea"
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
+msgstr "după disponibilitatea actualizării"
 
-#: ../rpmdrake.pm_.c:201
-msgid "Netherlands"
-msgstr "Olanda"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
+msgstr "după sursă"
 
-#: ../rpmdrake.pm_.c:202
-msgid "Norway"
-msgstr "Norvegia"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
+msgstr "după stare selecţie"
 
-#: ../rpmdrake.pm_.c:203
-msgid "Poland"
-msgstr "Polonia"
+#: ../rpmdrake:1
+#, c-format
+msgid "by size"
+msgstr "după mărime"
 
-#: ../rpmdrake.pm_.c:204
-msgid "Portugal"
-msgstr "Portugalia"
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
+msgstr "după grup"
 
-#: ../rpmdrake.pm_.c:205
-msgid "Russia"
-msgstr "Rusia"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages,"
+msgstr "Toate pachetele,"
 
-#: ../rpmdrake.pm_.c:206
-msgid "Sweden"
-msgstr "Suedia"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
+msgstr "Toate pachetele, alfabetic"
 
-#: ../rpmdrake.pm_.c:207
-msgid "Taiwan"
-msgstr "Taiwan"
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
+msgstr "Opţiuni Mandrake"
 
-#: ../rpmdrake.pm_.c:208
-msgid "United Kingdom"
-msgstr "Marea Britanie"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal updates"
+msgstr "Actualizări normale"
 
-#: ../rpmdrake.pm_.c:209
-msgid "China"
-msgstr "China"
+#: ../rpmdrake:1
+#, c-format
+msgid "Bugfixes updates"
+msgstr "Actualizări pentru corectarea erorilor"
 
-#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:211 ../rpmdrake.pm_.c:212
-#: ../rpmdrake.pm_.c:213 ../rpmdrake.pm_.c:264
-msgid "United States"
-msgstr "Statele Unite"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
+msgstr "Actualizări ale sistemului de securitate"
 
-#: ../rpmdrake.pm_.c:277
-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
+#, c-format
+msgid "Description: "
+msgstr "Descriere:"
 
-#: ../rpmdrake.pm_.c:283
-msgid "Error during download"
-msgstr "Eroare în timpul descărcării"
+#: ../rpmdrake:1
+#, c-format
+msgid "Summary: "
+msgstr "Sumar: "
 
-#: ../rpmdrake.pm_.c:292
-msgid "No mirror"
-msgstr "Nu există servere oglindă"
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "Importanţă: "
 
-#: ../rpmdrake.pm_.c:310
-msgid "Please choose the desired mirror."
-msgstr "Vă rog să selectaţi serverul oglindă dorit."
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake.pm_.c:342 ../rpmdrake_.c:627
-msgid "Update source(s)"
-msgstr "Actualizare surse"
+#: ../rpmdrake:1
+#, c-format
+msgid "Size: "
+msgstr "Mărime: "
 
-#: ../rpmdrake.pm_.c:346
-msgid "Select the source(s) you wish to update:"
-msgstr "Selectaţi sursele de actualizat:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Version: "
+msgstr "Versiune: "
 
-#: ../rpmdrake.pm_.c:350
-msgid "Update"
-msgstr "Actualizează"
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "Nume: "
 
-#: ../rpmdrake.pm_.c:360
-msgid "Please wait, updating media..."
-msgstr "Vă rog să aşteptaţi, actualizez mediul..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "Motivul actualizării:"
 
-#: ../rpmdrake_.c:99
-msgid "Other"
-msgstr "Diverse"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
+msgstr "Versiunea instalată curent:"
 
-#: ../rpmdrake_.c:121 ../rpmdrake_.c:135 ../rpmdrake_.c:227 ../rpmdrake_.c:298
-msgid "(none)"
-msgstr "(nimic)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Source: "
+msgstr "Sursă: "
 
-#: ../rpmdrake_.c:141 ../rpmdrake_.c:482 ../rpmdrake_.c:483
+#: ../rpmdrake:1
+#, c-format
 msgid "(Not available)"
 msgstr "(Indisponibil)"
 
-#: ../rpmdrake_.c:151 ../rpmdrake_.c:208
-msgid "Search results"
-msgstr "Rezultatele căutării"
-
-#: ../rpmdrake_.c:151
-msgid "Search results (none)"
-msgstr "Rezultatele căutării (nimic)"
-
-#: ../rpmdrake_.c:161 ../rpmdrake_.c:172
-msgid "Please wait, searching..."
-msgstr "Vă rog să aşteptaţi, caut..."
-
-#: ../rpmdrake_.c:175
-msgid "Stop"
-msgstr "Opreşte"
-
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-msgid "Addable"
-msgstr "Disponibile pt. adăugare"
-
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-msgid "Upgradable"
-msgstr "Actualizabile"
-
-#: ../rpmdrake_.c:211
-msgid "Not selected"
-msgstr "Neselectate"
-
-#: ../rpmdrake_.c:211
-msgid "Selected"
-msgstr "Selectate"
-
-#: ../rpmdrake_.c:240
-msgid "rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake_.c:258 ../rpmdrake_.c:360 ../rpmdrake_.c:362
-msgid "More information on package..."
-msgstr "Mai multe informaţii despre pachet..."
-
-#: ../rpmdrake_.c:259
-msgid "One of the following packages is needed:"
-msgstr "Unul din următoarele pachete e necesar:"
-
-#: ../rpmdrake_.c:259
-msgid "Please choose"
-msgstr "Vă rog să alegeţi"
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
+msgstr "Jurnal schimbări:\n"
 
-#: ../rpmdrake_.c:275
-msgid "unknown package "
-msgstr "pachet necunoscut"
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "Fişiere:\n"
 
-#: ../rpmdrake_.c:285
-msgid "Please wait, listing packages..."
-msgstr "Vă rog să aşteptaţi, listez pachetele..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected size: %d MB"
+msgstr "Mărime selecţie: %d MB"
 
-#: ../rpmdrake_.c:300
-msgid "No update"
-msgstr "Nu sunt actualizări"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Selectat: %d MB / Spaţiu liber pe disc: %d MB"
 
-#: ../rpmdrake_.c:353 ../rpmdrake_.c:354
-msgid "More infos"
-msgstr "Mai multe informaţii"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
+msgstr ""
+"Datorită dependenţelor lor, următoarele pachete trebuie\n"
+"deselectate acum:\n"
+"\n"
 
-#: ../rpmdrake_.c:355
-msgid "Information on packages"
-msgstr "Informaţii despre pachete"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+msgstr ""
+"Regret, următoarele pachete nu pot fi selectate:\n"
+"\n"
 
-#: ../rpmdrake_.c:376
-msgid "Some additional packages need to be removed"
-msgstr "Trebuie şterse unele pachete adiţionale"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "Unele pachetele nu pot fi instalate"
 
-#: ../rpmdrake_.c:377
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
 "\n"
 msgstr ""
-"Datorită dependenţelor lor,\n"
-"următoarele pachete trebuie de asemenea şterse:\n"
+"Pentru satisfacerea dependenţelor, următoarele pachete \n"
+"trebuie de asemenea instalate\n"
 "\n"
 
-#: ../rpmdrake_.c:383 ../rpmdrake_.c:391
+#: ../rpmdrake:1
+#, c-format
+msgid "Additional packages needed"
+msgstr "Pachete adiţionale necesare"
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "Unele pachetele nu pot fi şterse"
 
-#: ../rpmdrake_.c:384
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -471,428 +656,592 @@ msgstr ""
 "Ştergerea acestor pachete ar corupe sistemul, îmi pare rău:\n"
 "\n"
 
-#: ../rpmdrake_.c:392 ../rpmdrake_.c:451
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
 "\n"
 msgstr ""
-"Datorită dependenţelor lor, următoarele pachete trebuie\n"
-"deselectate acum:\n"
+"Datorită dependenţelor lor,\n"
+"următoarele pachete trebuie de asemenea şterse:\n"
 "\n"
 
-#: ../rpmdrake_.c:421
-msgid "Additional packages needed"
-msgstr "Pachete adiţionale necesare"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr "Trebuie şterse unele pachete adiţionale"
 
-#: ../rpmdrake_.c:422
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
-msgstr ""
-"Pentru satisfacerea dependenţelor, următoarele pachete \n"
-"trebuie de asemenea instalate\n"
-"\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
+msgstr "Mai multe informaţii despre pachet..."
 
-#: ../rpmdrake_.c:435
-msgid "Some packages can't be installed"
-msgstr "Unele pachetele nu pot fi instalate"
+#: ../rpmdrake:1
+#, c-format
+msgid "Information on packages"
+msgstr "Informaţii despre pachete"
 
-#: ../rpmdrake_.c:436
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
+msgstr "Mai multe informaţii"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Addable"
+msgstr "Disponibile pt. adăugare"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Upgradable"
+msgstr "Actualizabile"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
+"The list of updates is void. This 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 ""
-"Regret, următoarele pachete nu pot fi selectate:\n"
-"\n"
+"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_.c:450 ../rpmdrake_.c:684
-msgid "Some packages need to be removed"
-msgstr "Unele pachete trebuie şterse"
+#: ../rpmdrake:1
+#, c-format
+msgid "No update"
+msgstr "Nu sunt actualizări"
 
-#: ../rpmdrake_.c:472
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Selectat: %d MB / Spaţiu liber pe disc: %d MB"
+msgid "(none)"
+msgstr "(nimic)"
 
-#: ../rpmdrake_.c:474
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "Mărime selecţie: %d MB"
+msgid "Please wait, listing packages..."
+msgstr "Vă rog să aşteptaţi, listez pachetele..."
 
-#: ../rpmdrake_.c:482
-msgid "Files:\n"
-msgstr "Fişiere:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "unknown package "
+msgstr "pachet necunoscut"
 
-#: ../rpmdrake_.c:483
-msgid "Changelog:\n"
-msgstr "Jurnal schimbări:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Unul din următoarele pachete e necesar:"
 
-#: ../rpmdrake_.c:486
-msgid "Source: "
-msgstr "Sursă: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please choose"
+msgstr "Vă rog să alegeţi"
 
-#: ../rpmdrake_.c:487
-msgid "Currently installed version: "
-msgstr "Versiunea instalată curent:"
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:491
-msgid "Reason for update: "
-msgstr "Motivul actualizării:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Not selected"
+msgstr "Neselectate"
 
-#: ../rpmdrake_.c:493
-msgid "Name: "
-msgstr "Nume: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected"
+msgstr "Selectate"
 
-#: ../rpmdrake_.c:494
-msgid "Version: "
-msgstr "Versiune: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results"
+msgstr "Rezultatele căutării"
 
-#: ../rpmdrake_.c:495
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Stop"
+msgstr "Opreşte"
 
-#: ../rpmdrake_.c:495
-msgid "Size: "
-msgstr "Mărime: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, searching..."
+msgstr "Vă rog să aşteptaţi, caut..."
 
-#: ../rpmdrake_.c:497
-msgid "Importance: "
-msgstr "Importanţă: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
+msgstr "Rezultatele căutării (nimic)"
 
-#: ../rpmdrake_.c:498
-msgid "Summary: "
-msgstr "Sumar: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Diverse"
 
-#: ../rpmdrake_.c:499
-msgid "Description: "
-msgstr "Descriere:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"Welcome to the packages source editor!\n"
+"\n"
+"This tool will help you configure the packages sources you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"Bun venit la editorul surselor de pachete!\n"
+"\n"
+"Acest utilitar vă a ajuta să configuraţi sursele de pachete soft pe care\n"
+"doriţi să le utilizaţi pe calculatorul dvs. Ele vor fi apoi disponibile "
+"pentru \n"
+"instalare de soft nou sau actualizare."
 
-#: ../rpmdrake_.c:548
-msgid "Bugfixes updates"
-msgstr "Actualizări pentru corectarea erorilor"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Salvare şi ieşire"
 
-#: ../rpmdrake_.c:548
-msgid "Normal updates"
-msgstr "Actualizări normale"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy..."
+msgstr "Proxy..."
 
-#: ../rpmdrake_.c:567
-msgid "Mandrake choices"
-msgstr "Opţiuni Mandrake"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
+msgstr "Actualizează..."
 
-#: ../rpmdrake_.c:568
-msgid "All packages, alphabetical"
-msgstr "Toate pachetele, alfabetic"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "Adaugă..."
 
-#: ../rpmdrake_.c:569
-msgid "All packages,"
-msgstr "Toate pachetele,"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "Editează"
 
-#: ../rpmdrake_.c:592
-msgid "by group"
-msgstr "după grup"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Source"
+msgstr "Sursă"
 
-#: ../rpmdrake_.c:592
-msgid "by size"
-msgstr "după mărime"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
+msgstr "Activat?"
 
-#: ../rpmdrake_.c:593
-msgid "by selection state"
-msgstr "după stare selecţie"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure sources"
+msgstr "Configurare surse"
 
-#: ../rpmdrake_.c:594
-msgid "by source repository"
-msgstr "după sursă"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "Parola:"
 
-#: ../rpmdrake_.c:594
-msgid "by update availability"
-msgstr "după disponibilitatea actualizării"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
+msgstr "Utilizator:"
 
-#: ../rpmdrake_.c:615
-msgid "in descriptions"
-msgstr "în descrieri"
+#: ../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:"
 
-#: ../rpmdrake_.c:615
-msgid "in files"
-msgstr "în fişiere "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "Nume gazdă proxy:"
 
-#: ../rpmdrake_.c:615
-msgid "in names"
-msgstr "în nume"
+#: ../edit-urpm-sources.pl: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]>):"
 
-#: ../rpmdrake_.c:626
-msgid "Reload the packages list"
-msgstr "Reîncarcă lista pachetelor"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "Configurare proxy-uri"
 
-#: ../rpmdrake_.c:626
-msgid "Reset the selection"
-msgstr "Resetează selecţia"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr "Vă rog să aşteptaţi, actualizez mediul..."
 
-#: ../rpmdrake_.c:652
-msgid "Maximum information"
-msgstr "Informaţii maximale"
+#: ../edit-urpm-sources.pl: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."
 
-#: ../rpmdrake_.c:652
-msgid "Normal information"
-msgstr "Informaţii normale"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
+msgstr "Trebuie să introduceţi mediul pentru a continua"
 
-#: ../rpmdrake_.c:674
-msgid "Too many packages are selected"
-msgstr "Sunt selectate prea multe pachete"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save changes"
+msgstr "Salvează schimbările"
 
-#: ../rpmdrake_.c:720
-msgid "Find:"
-msgstr "Caută:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Calea relativă la synthesis sau hdlist:"
 
-#: ../rpmdrake_.c:725
-msgid "Search"
-msgstr "Căutare"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL: "
 
-#: ../rpmdrake_.c:731
-msgid "Install"
-msgstr "Instalează"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Editing source \"%s\":"
+msgstr "Editez sursa \"%s\":"
 
-#: ../rpmdrake_.c:738 data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrake Update"
-msgstr "Actualizare Mandrake"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit a source"
+msgstr "Editare surse"
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Installation"
-msgstr "Instalare pachete Software"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr "Vă rog să aşteptaţi, şterg mediul..."
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Removal"
-msgstr "Ştergere pachete Software"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, adding medium..."
+msgstr "Vă rog să aşteptaţi, adaug mediul..."
 
-#: ../rpmdrake_.c:779
-msgid "Please wait, contacting mirror to update packages information."
-msgstr ""
-"Vă rog să aşteptaţi, contactez serverul oglindă pentru actualizarea "
-"informaţiei pachetelor."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of source:"
+msgstr "Tipul sursei:"
 
-#: ../rpmdrake_.c:781
-msgid "Error updating medium"
-msgstr "Eroare la actualizarea mediului"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Adding a source:"
+msgstr "Adaug sursa:"
 
-#: ../rpmdrake_.c:782
-msgid "There was an unrecoverable error while updating packages information."
+#: ../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 ""
-"A fost detectată o eroare majoră în timpul actualizării informaţiei "
-"pachetelor."
+"Există deja un mediu cu acel nume,\n"
+"chiar doriţi să îl înlocuiţi?"
 
-#: ../rpmdrake_.c:787
-msgid "How to choose manually your mirror"
-msgstr "Cum să selectaţi manual serverul 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."
 
-#: ../rpmdrake_.c:795
-msgid "Please wait, contacting mirror to initialize updates packages."
-msgstr ""
-"Vă rog să aşteptaţi, contactez serverul oglindă pentru iniţializarea "
-"actualizării pachetelor."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "Nume:"
 
-#: ../rpmdrake_.c:798
-msgid "Error adding update medium"
-msgstr "Eroare la adăugarea mediului de actualizare"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
+msgstr "Logare:"
 
-#: ../rpmdrake_.c:829
-msgid "Please wait, finding available packages..."
-msgstr "Vă rog să aşteptaţi, caut pachetele disponibile..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Selectare server oglindă..."
 
-#: ../rpmdrake_.c:861
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Inspectez %s"
+msgid "Browse..."
+msgstr "Răsfoieşte..."
 
-#: ../rpmdrake_.c:880
-msgid "changes:"
-msgstr "schimbări:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Calea sau punctul de montare: "
 
-#: ../rpmdrake_.c:884
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Şterg .%s"
+msgid "Removable device"
+msgstr "Dispozitiv detaşabil"
 
-#: ../rpmdrake_.c:886
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Foloseşte .%s ca fişier principal"
+msgid "HTTP server"
+msgstr "Server HTTP"
 
-#: ../rpmdrake_.c:888
-msgid "Do nothing"
-msgstr "Nu fă nimic"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "Server FTP"
 
-#: ../rpmdrake_.c:900
-msgid "Installation finished"
-msgstr "Instalare terminată"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path:"
+msgstr "Cale:"
 
-#: ../rpmdrake_.c:910
-msgid "Inspect..."
-msgstr "Inspectez..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "Fişiere locale"
 
-#: ../rpmdrake_.c:925
-msgid "Program missing"
-msgstr "Program lipsă"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add a source"
+msgstr "Adaugă o sursă"
 
-#: ../rpmdrake_.c:926
-msgid "A required program is missing (grpmi). Check your installation."
-msgstr "Un program absolut necesar lipseşte (grpmi).  Verificaţi instalarea."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
+msgstr "Nu pot actualiza mediul, el va fi dezactivat automat."
 
-#: ../rpmdrake_.c:940
-msgid "Unable to get source packages."
-msgstr "Nu pot prelua pachetele sursă."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "Nu pot creea mediul."
 
-#: ../rpmdrake_.c:941
-msgid "Unable to get source packages, sorry."
-msgstr "Regret, nu pot prelua pachetele sursă."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, updating media..."
+msgstr "Vă rog să aşteptaţi, actualizez mediul..."
 
-#: ../rpmdrake_.c:948
-msgid "Change medium"
-msgstr "Schimbă mediul"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
+msgstr "Actualizează"
 
-#: ../rpmdrake_.c:949
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Vă rog să introduceţi mediul numit \"%s\" în dispozitivul [%s]"
+msgid "Select the source(s) you wish to update:"
+msgstr "Selectaţi sursele de actualizat:"
 
-#: ../rpmdrake_.c:957
-msgid "Installation failed"
-msgstr "Instalare eşuată"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please choose the desired mirror."
+msgstr "Vă rog să selectaţi serverul oglindă dorit."
 
-#: ../rpmdrake_.c:958
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
-"Instalare nereuşită, unele fişiere lipsesc.\n"
-"Probabil ar trebui să actualizaţi baza de date a surselor."
+"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_.c:961
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr ""
-"Vă rog să aşteptaţi, şterg pachetele pentru a permite altora să fie "
-"actualizate..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
+msgstr "Nu există servere oglindă"
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"There was an error downloading the mirrors list:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
-"Instalarea s-a terminat; %s.\n"
+"A apărut o eroare în timpul descărcării listei serverelor oglindă:\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:"
+"%s\n"
+"Probabil reţeaua sau situl Web al MandrakeSoft nu sunt disponibile.\n"
+"Vă rog să încercaţi din nou mai târziu."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "Eroare în timpul descărcării"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
+"Vă rog să aşteptaţi, descarc adresele serverelor oglindă de pe situl "
+"MandrakeSoft."
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"some packages failed to install\n"
-"correctly"
+"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 ""
-"Unele pachetele nu au putut fi instalate\n"
-"corect."
+"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_.c:983
-msgid "everything was installed correctly"
-msgstr "Totul a fost instalat cu succes"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United States"
+msgstr "Statele Unite"
 
-#: ../rpmdrake_.c:985
-msgid "Everything installed successfully"
-msgstr "Totul a fost instalat cu succes"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
+msgstr "China"
 
-#: ../rpmdrake_.c:986
-msgid "All requested packages were installed successfully."
-msgstr "Toate pachetele cerute au fost instalate cu succes."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr "Marea Britanie"
 
-#: ../rpmdrake_.c:989
-msgid "Everything already installed."
-msgstr "Toate pachetele sunt deja instalate."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "Taiwan"
 
-#: ../rpmdrake_.c:990
-msgid "Everything already installed (is this supposed to happen at all?)."
-msgstr ""
-"Toate pachetele sunt deja instalate (ar trebui să se întâmple vreodată?)."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "Suedia"
 
-#: ../rpmdrake_.c:997
-msgid "Problem during installation"
-msgstr "Problemă în timpul instalării"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
+msgstr "Rusia"
 
-#: ../rpmdrake_.c:998
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"A apărut o problemă în timpul instalării:\n"
-"\n"
-"%s"
+msgid "Portugal"
+msgstr "Portugalia"
 
-#: ../rpmdrake_.c:1012
-msgid "Please wait, reading packages database..."
-msgstr "Vă rog să aşteptaţi, citesc baza de date a pachetelelor..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
+msgstr "Polonia"
 
-#: ../rpmdrake_.c:1053
-msgid "Please wait, removing packages..."
-msgstr "Vă rog să aşteptaţi, şterg pachetele..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
+msgstr "Norvegia"
 
-#: ../rpmdrake_.c:1056
-msgid "Problem during removal"
-msgstr "Problemă în timpul ştergerii"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
+msgstr "Olanda"
 
-#: ../rpmdrake_.c:1057
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"A apărut o problemă în timpul dezinstalării pachetelor:\n"
-"\n"
-"%s"
+msgid "Korea"
+msgstr "Coreea"
 
-#: ../rpmdrake_.c:1089
-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 "Japan"
+msgstr "Japonia"
 
-#: ../rpmdrake_.c:1094
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"Bun venit la MandrakeUpdate!\n"
-"\n"
-"Acest utilitar vă va ajuta să alegeţi programele de pe calculatorul dvs pe "
-"care doriţi \n"
-"să le actualizaţi ."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Italy"
+msgstr "Italia"
 
-#: ../rpmdrake_.c:1099
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
-msgstr ""
-"Bun venit la utilitarul de instalare a programelor!\n"
-"\n"
-"Sistemul Mandrake Linux vine cu mai multe mii de pachete de programe pe "
-"CDROM sau DVD.\n"
-"Acest utilitar vă va ajuta să alegeţi programele pe care doriţi \n"
-"să le instalaţi pe calculatorul dvs."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Israel"
+msgstr "Israel"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Grecia"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "France"
+msgstr "Franţa"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "Finlanda"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "Spania"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
+msgstr "Danemarca"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr "Germania"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
+msgstr "Cehia"
+
+#: ../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 "Brazilia"
+
+#: ../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 "Austria"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Info..."
+msgstr "Informaţii... "
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
+msgstr "Nu"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Da"
+
+#: data/rpmdrake.desktop.in.h:1
+msgid "Install Software"
+msgstr "Instalare programe"
 
 #: data/rpmdrake-remove.desktop.in.h:1
 msgid "Remove Software"
@@ -902,166 +1251,8 @@ msgstr "Ştergere programe"
 msgid "Software Sources Manager"
 msgstr "Administrator surse de programe"
 
-#: data/rpmdrake.desktop.in.h:1
-msgid "Install Software"
-msgstr "Instalare programe"
-
-#~ 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 ""
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-#~ "Pot continua?"
-
-#~ msgid ""
-#~ "Welcome to the packages source editor!\n"
-#~ "\n"
-#~ "This tool will help you configure the packages sources you wish to use "
-#~ "on\n"
-#~ "your computer. They will then be available to install new software "
-#~ "package\n"
-#~ "or to perform updates."
-#~ msgstr ""
-#~ "Bun venit la editorul surselor de pachete!\n"
-#~ "\n"
-#~ "Acest utilitar vă a ajuta să configuraţi sursele de pachete soft pe care\n"
-#~ "doriţi să le utilizaţi pe calculatorul dvs. Ele vor fi apoi disponibile "
-#~ "pentru \n"
-#~ "instalare de soft nou sau actualizare."
-
-#~ msgid ""
-#~ "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 ""
-#~ "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 ""
-#~ "A apărut o eroare în timpul descărcării listei serverelor oglindă:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "Probabil reţeaua sau situl Web al MandrakeSoft nu sunt disponibile.\n"
-#~ "Vă rog să încercaţi din nou mai târziu."
-
-#~ 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 ""
-#~ "The list of updates is void. This 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 ""
-#~ "Warning: it seems that you are attempting to add so much\n"
-#~ "packages that your filesystem may 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 ""
-#~ "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 "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
 #~ msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
 
-#~ 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 ""
-#~ "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 ""
-#~ "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 ""
-#~ "A fost detectată o eroare în timpul adăugării mediului de actualizare via "
-#~ "urpmi.\n"
-#~ "\n"
-#~ "Aceasta poate fi datorită unui server indisponibil temporar, sau dacă "
-#~ "versiunea\n"
-#~ "dvs. a Mandrake Linux (%s) nu (mai) este (încă) suportată de\n"
-#~ "actualizările oficiale Mandrake Linux.\n"
-#~ "\n"
-#~ "Doriţi să încercaţi alt server oglindă?"
-
 #~ msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
 #~ msgstr "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
diff --git a/po/ro.pom b/po/ro.pom
index 4402297d..7eee49f4 100644
--- a/po/ro.pom
+++ b/po/ro.pom
@@ -4,166 +4,172 @@ msgstr "Server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Calculator în reţea (client)"
+msgid "Office Workstation"
+msgstr "Staţie de lucru de birou"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "Server NFS, SMB, Proxy, SSH"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Programe gen Office: procesoare de text (kword, abiword), calcul tabelar "
+"(kspread, gnumeric), vizualizatoare de fişiere pdf etc."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Birou"
+msgid "Workstation"
+msgstr "Staţie de lucru"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Staţie de lucru Gnome"
+msgid "Game station"
+msgstr "Staţie de lucru pt. jocuri"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Unelte pentru Palm Pilot sau Visor"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Programe de amuzament: arcade, boards, strategie etc."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Staţie de lucru"
+msgid "Multimedia station"
+msgstr "Staţie de lucru multimedia"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Firewall/Router"
+msgid "Sound and video playing/editing programs"
+msgstr "Programe de editare/redare pt. sunet şi video"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr "Server nume de domeniu (DNS) şi NIS"
+msgid "Internet station"
+msgstr "Staţie de lucru în Internet"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
 msgstr ""
-"Programe gen Office: procesoare de text (kword, abiword), calcul tabelar "
-"(kspread, gnumeric), vizualizatoare de fişiere pdf etc."
+"Set de unelte pt. citire/trimitere poştă şi ştiri (pine, mutt, tin...) şi "
+"navigare pe Web"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "Unelte audio: playere de mp3 sau midi, mixere etc."
+msgid "Network Computer (client)"
+msgstr "Calculator în reţea (client)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Baza standard Linux. Sprijin pentru aplicaţii ale altora."
+msgid "Clients for different protocols including ssh"
+msgstr "Clienţi pt. diverse protocoale, inclusiv ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Cărţi şi HowTo despre Linux şi programele libere"
+msgid "Configuration"
+msgstr "Configuraţie"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "Staţie de lucru KDE"
+msgid "Tools to ease the configuration of your computer"
+msgstr "Unelete pentru uşurarea configurării calculatorului dvs."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgid "Scientific Workstation"
+msgstr "Staţie de lucru ştiinţifică"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Multimedia - Video"
+msgid "Scientific applications such as gnuplot"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr "Unelte pentru poştă, ştiri, Web, transfer de fişiere şi chat"
+msgid "Console Tools"
+msgstr "Unelte consolă"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Baze de date"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Editoare, interpretoare, terminale, unelte fişiere"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "Server de baze de date MySQL sau PostgreSQL"
+msgid "KDE Workstation"
+msgstr "Staţie de lucru KDE"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Unelete pentru uşurarea configurării calculatorului dvs."
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"Mediul de birou K, mediul grafic de bază cu o colecţie de unelte asociate"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "Multimedia - Sunet"
+msgid "Graphical Environment"
+msgstr "Mediu Grafic"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Documentaţie"
+msgid "Gnome Workstation"
+msgstr "Staţie de lucru Gnome"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Unelte consolă"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr "Un mediu grafic cu un set de aplicaţii prietenoase şi unelte de birou"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr "Server de mail Postfix, server de ştiri Inn"
+msgid "Other Graphical Desktops"
+msgstr "Alte desktopuri grafice"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Staţie de lucru în Internet"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Staţie de lucru multimedia"
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+msgid "Development"
+msgstr "Dezvoltare"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Configuraţie"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "Biblioteci de dezvoltare C şi C++, programe şi fişiere include"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Alte desktopuri grafice (Gnome, IceWM)"
+msgid "Documentation"
+msgstr "Documentaţie"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
-"Mediul de birou K, mediul grafic de bază cu o colecţie de unelte asociate"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Cărţi şi HowTo despre Linux şi programele libere"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Mediu Grafic"
+msgid "LSB"
+msgstr "LSB"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Baza standard Linux. Sprijin pentru aplicaţii ale altora."
+
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-msgid "Development"
-msgstr "Dezvoltare"
+#: ../../share/compssUsers:999
+msgid "Web/FTP"
+msgstr "Web/FTP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -172,23 +178,33 @@ msgstr "Apache, Pro-ftpd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "Unelte pt. crearea şi inscripţionarea CD-urilor"
+msgid "Mail/Groupware/News"
+msgstr "Poştă/Programe de lucru în grup/Ştiri"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Staţie de lucru de birou"
+msgid "Postfix mail server, Inn news server"
+msgstr "Server de mail Postfix, server de ştiri Inn"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgid "Database"
+msgstr "Baze de date"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Programe de grafică (de ex. The Gimp)"
+msgid "PostgreSQL or MySQL database server"
+msgstr "Server de baze de date MySQL sau PostgreSQL"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Firewall/Router"
+msgstr "Firewall/Router"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Internet gateway"
+msgstr "Gateway Internet"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -197,8 +213,8 @@ msgstr "DNS/NIS "
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "Biblioteci de dezvoltare C şi C++, programe şi fişiere include"
+msgid "Domain Name and Network Information Server"
+msgstr "Server nume de domeniu (DNS) şi NIS"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -207,18 +223,18 @@ msgstr "Server în reţea"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "Poştă/Programe de lucru în grup/Ştiri"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "Server NFS, SMB, Proxy, SSH"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Staţie de lucru pt. jocuri"
+msgid "Office"
+msgstr "Birou"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Editoare şi playere video"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr "Unelte pentru poştă, ştiri, Web, transfer de fişiere şi chat"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -227,77 +243,66 @@ msgstr "Multimedia - Grafică"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Programe de amuzament: arcade, boards, strategie etc."
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
-"Set de unelte pt. citire/trimitere poştă şi ştiri (pine, mutt, tin...) şi "
-"navigare pe Web"
+msgid "Graphics programs such as The Gimp"
+msgstr "Programe de grafică (de ex. The Gimp)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "Finanţe personale"
+msgid "Multimedia - Sound"
+msgstr "Multimedia - Sunet"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr "Un mediu grafic cu un set de aplicaţii prietenoase şi unelte de birou"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "Unelte audio: playere de mp3 sau midi, mixere etc."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Clienţi pt. diverse protocoale, inclusiv ssh"
+msgid "Multimedia - Video"
+msgstr "Multimedia - Video"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
+msgid "Video players and editors"
+msgstr "Editoare şi playere video"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Gateway Internet"
+msgid "Multimedia - CD Burning"
+msgstr "Multimedia - Gravare CD-uri"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Programe de editare/redare pt. sunet şi video"
+msgid "Tools to create and burn CD's"
+msgstr "Unelte pt. crearea şi inscripţionarea CD-urilor"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Alte desktopuri grafice"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Alte desktopuri grafice (Gnome, IceWM)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Editoare, interpretoare, terminale, unelte fişiere"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "Programe pentru administrarea banilor, ca gnucash"
+msgid "Personal Information Management"
+msgstr "Administrator informaţii personale (PIM)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "Administrator informaţii personale (PIM)"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Unelte pentru Palm Pilot sau Visor"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multimedia - Gravare CD-uri"
+msgid "Personal Finance"
+msgstr "Finanţe personale"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Staţie de lucru ştiinţifică"
+msgid "Programs to manage your finances, such as gnucash"
+msgstr "Programe pentru administrarea banilor, ca gnucash"
 
diff --git a/po/rpmdrake.pot b/po/rpmdrake.pot
index 854b78c1..b4f20634 100644
--- a/po/rpmdrake.pot
+++ b/po/rpmdrake.pot
@@ -1,3 +1,9 @@
+# #-#-#-#-#  rpmdrake_tmp.pot (PACKAGE VERSION)  #-#-#-#-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+# #-#-#-#-#  desktopstuff.pot (PACKAGE VERSION)  #-#-#-#-#
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
@@ -6,8 +12,18 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  rpmdrake_tmp.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8-bit\n"
+"#-#-#-#-#  desktopstuff.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-02-19 23:07+0100\n"
+"POT-Creation-Date: 2003-02-21 00:27+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,826 +31,1117 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl_.c:43
-msgid "Unable to create medium."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:44
-msgid "Unable to update medium; it will be automatically disabled."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to the software installation tool!\n"
+"\n"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:54
-msgid "Add a source"
+#: ../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 ""
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Local files"
+#: ../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_.c:55
-msgid "Path:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:56
-msgid "FTP server"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during removal"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:56 ../edit-urpm-sources.pl_.c:57
-#: ../edit-urpm-sources.pl_.c:59 ../edit-urpm-sources.pl_.c:187
-msgid "URL:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:57
-msgid "HTTP server"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:58
-msgid "Path or mount point:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:58
-msgid "Removable device"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during installation"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:550
-msgid "Security updates"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:70
-msgid "Browse..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:72
-msgid "Choose a mirror..."
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:92
-msgid "Login:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:231
-msgid "Password:"
+#: ../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 ""
 
-#: ../edit-urpm-sources.pl_.c:97
-msgid "Name:"
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:99 ../edit-urpm-sources.pl_.c:188
-msgid "Relative path to synthesis/hdlist:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"some packages failed to install\n"
+"correctly"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:107
-msgid "You need to fill up at least the two first entries."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages to allow others to be upgraded..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:120
-msgid "Adding a source:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:121
-msgid "Type of source:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation failed"
+msgstr ""
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:125 ../edit-urpm-sources.pl_.c:202
-#: ../edit-urpm-sources.pl_.c:235 ../rpmdrake.pm_.c:100 ../rpmdrake.pm_.c:139
-#: ../rpmdrake.pm_.c:322 ../rpmdrake_.c:355 ../rpmdrake_.c:367
-#: ../rpmdrake_.c:371 ../rpmdrake_.c:917 ../rpmdrake_.c:952
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
 msgid "Ok"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:140 ../edit-urpm-sources.pl_.c:196
-#: ../edit-urpm-sources.pl_.c:202 ../edit-urpm-sources.pl_.c:242
-#: ../rpmdrake.pm_.c:322 ../rpmdrake.pm_.c:355 ../rpmdrake_.c:355
-#: ../rpmdrake_.c:952
-msgid "Cancel"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:147
-msgid "Please wait, adding medium..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:168
-msgid "Please wait, removing medium..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:181
-msgid "Edit a source"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:185
+#: ../rpmdrake:1
 #, c-format
-msgid "Editing source \"%s\":"
+msgid "A required program is missing (grpmi). Check your installation."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:191
-msgid "Save changes"
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:200
-msgid "You need to insert the medium to continue"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation finished"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Remove .%s"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "changes:"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, finding available packages..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:201
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
+"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 ""
 
-#: ../edit-urpm-sources.pl_.c:206
-msgid "Please wait, updating medium..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:217
-msgid "Configure proxies"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:223
+#: ../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 ""
 
-#: ../edit-urpm-sources.pl_.c:225
-msgid "Proxy hostname:"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:227
-msgid "You may specify a user/password for the proxy authentication:"
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:229
-msgid "User:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:255
-msgid "Configure sources"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:262
-msgid "Enabled?"
+#: ../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 ""
 
-#: ../edit-urpm-sources.pl_.c:263
-msgid "Source"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Installation"
+msgstr ""
+
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, c-format
+msgid "Mandrake Update"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
+msgstr ""
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:286 ../rpmdrake_.c:731
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
 msgid "Remove"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:288
-msgid "Edit"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:290
-msgid "Add..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:292
-msgid "Update..."
+#: ../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 ""
 
-#: ../edit-urpm-sources.pl_.c:293
-msgid "Proxy..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:296
-msgid "Save and quit"
+#: ../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 ""
 
-#: ../edit-urpm-sources.pl_.c:297 ../rpmdrake_.c:734
-msgid "Quit"
+#: ../rpmdrake:1
+#, c-format
+msgid "Too many packages are selected"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:96
-msgid "Yes"
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:98
-msgid "No"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal information"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:130
-msgid "Info..."
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update source(s)"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:183
-msgid "Austria"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reload the packages list"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:184
-msgid "Australia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:185
-msgid "Belgium"
+#: ../rpmdrake:1
+#, c-format
+msgid "in files"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:186
-msgid "Brazil"
+#: ../rpmdrake:1
+#, c-format
+msgid "in descriptions"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:187
-msgid "Canada"
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:188
-msgid "Costa Rica"
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:189
-msgid "Czech Republic"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:190
-msgid "Germany"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:191
-msgid "Danmark"
+#: ../rpmdrake:1
+#, c-format
+msgid "by size"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:192 ../rpmdrake.pm_.c:196
-msgid "Greece"
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:193
-msgid "Spain"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages,"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:194
-msgid "Finland"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:195
-msgid "France"
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:197
-msgid "Israel"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal updates"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:198
-msgid "Italy"
+#: ../rpmdrake:1
+#, c-format
+msgid "Bugfixes updates"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:199
-msgid "Japan"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:200
-msgid "Korea"
+#: ../rpmdrake:1
+#, c-format
+msgid "Description: "
 msgstr ""
 
-#: ../rpmdrake.pm_.c:201
-msgid "Netherlands"
+#: ../rpmdrake:1
+#, c-format
+msgid "Summary: "
 msgstr ""
 
-#: ../rpmdrake.pm_.c:202
-msgid "Norway"
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
 msgstr ""
 
-#: ../rpmdrake.pm_.c:203
-msgid "Poland"
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:204
-msgid "Portugal"
+#: ../rpmdrake:1
+#, c-format
+msgid "Size: "
 msgstr ""
 
-#: ../rpmdrake.pm_.c:205
-msgid "Russia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Version: "
 msgstr ""
 
-#: ../rpmdrake.pm_.c:206
-msgid "Sweden"
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
 msgstr ""
 
-#: ../rpmdrake.pm_.c:207
-msgid "Taiwan"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
 msgstr ""
 
-#: ../rpmdrake.pm_.c:208
-msgid "United Kingdom"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
 msgstr ""
 
-#: ../rpmdrake.pm_.c:209
-msgid "China"
+#: ../rpmdrake:1
+#, c-format
+msgid "Source: "
 msgstr ""
 
-#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:211 ../rpmdrake.pm_.c:212
-#: ../rpmdrake.pm_.c:213 ../rpmdrake.pm_.c:264
-msgid "United States"
+#: ../rpmdrake:1
+#, c-format
+msgid "(Not available)"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:277
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:283
-msgid "Error during download"
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:292
-msgid "No mirror"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected size: %d MB"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:310
-msgid "Please choose the desired mirror."
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:342 ../rpmdrake_.c:629
-msgid "Update source(s)"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:346
-msgid "Select the source(s) you wish to update:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:350
-msgid "Update"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be installed"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:360
-msgid "Please wait, updating media..."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
 msgstr ""
 
-#: ../rpmdrake_.c:101
-msgid "Other"
+#: ../rpmdrake:1
+#, c-format
+msgid "Additional packages needed"
 msgstr ""
 
-#: ../rpmdrake_.c:123 ../rpmdrake_.c:137 ../rpmdrake_.c:229 ../rpmdrake_.c:300
-msgid "(none)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be removed"
 msgstr ""
 
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:484 ../rpmdrake_.c:485
-msgid "(Not available)"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
 msgstr ""
 
-#: ../rpmdrake_.c:153 ../rpmdrake_.c:210
-msgid "Search results"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
 msgstr ""
 
-#: ../rpmdrake_.c:153
-msgid "Search results (none)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some additional packages need to be removed"
 msgstr ""
 
-#: ../rpmdrake_.c:163 ../rpmdrake_.c:174
-msgid "Please wait, searching..."
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
 msgstr ""
 
-#: ../rpmdrake_.c:177
-msgid "Stop"
+#: ../rpmdrake:1
+#, c-format
+msgid "Information on packages"
 msgstr ""
 
-#: ../rpmdrake_.c:211 ../rpmdrake_.c:321
+#. -PO: Keep it short, this is gonna be on a button
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Addable"
 msgstr ""
 
-#: ../rpmdrake_.c:211 ../rpmdrake_.c:321
+#: ../rpmdrake:1
+#, c-format
 msgid "Upgradable"
 msgstr ""
 
-#: ../rpmdrake_.c:213
-msgid "Not selected"
+#: ../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_.c:213
-msgid "Selected"
+#: ../rpmdrake:1
+#, c-format
+msgid "No update"
 msgstr ""
 
-#: ../rpmdrake_.c:242
-msgid "rpmdrake"
+#: ../rpmdrake:1
+#, c-format
+msgid "(none)"
 msgstr ""
 
-#: ../rpmdrake_.c:260 ../rpmdrake_.c:362 ../rpmdrake_.c:364
-msgid "More information on package..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, listing packages..."
 msgstr ""
 
-#: ../rpmdrake_.c:261
-msgid "One of the following packages is needed:"
+#: ../rpmdrake:1
+#, c-format
+msgid "unknown package "
 msgstr ""
 
-#: ../rpmdrake_.c:261
-msgid "Please choose"
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
 msgstr ""
 
-#: ../rpmdrake_.c:277
-msgid "unknown package "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please choose"
 msgstr ""
 
-#: ../rpmdrake_.c:287
-msgid "Please wait, listing packages..."
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
 msgstr ""
 
-#: ../rpmdrake_.c:302
-msgid "No update"
+#: ../rpmdrake:1
+#, c-format
+msgid "Not selected"
 msgstr ""
 
-#: ../rpmdrake_.c:355 ../rpmdrake_.c:356
-msgid "More infos"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected"
 msgstr ""
 
-#: ../rpmdrake_.c:357
-msgid "Information on packages"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results"
 msgstr ""
 
-#: ../rpmdrake_.c:378
-msgid "Some additional packages need to be removed"
+#: ../rpmdrake:1
+#, c-format
+msgid "Stop"
 msgstr ""
 
-#: ../rpmdrake_.c:379
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, searching..."
 msgstr ""
 
-#: ../rpmdrake_.c:385 ../rpmdrake_.c:393
-msgid "Some packages can't be removed"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
 msgstr ""
 
-#: ../rpmdrake_.c:386
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
 msgstr ""
 
-#: ../rpmdrake_.c:394 ../rpmdrake_.c:453
+#: ../edit-urpm-sources.pl:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"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_.c:423
-msgid "Additional packages needed"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
 msgstr ""
 
-#: ../rpmdrake_.c:424
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy..."
 msgstr ""
 
-#: ../rpmdrake_.c:437
-msgid "Some packages can't be installed"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
 msgstr ""
 
-#: ../rpmdrake_.c:438
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
 msgstr ""
 
-#: ../rpmdrake_.c:452 ../rpmdrake_.c:686
-msgid "Some packages need to be removed"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
 msgstr ""
 
-#: ../rpmdrake_.c:474
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
+msgid "Source"
 msgstr ""
 
-#: ../rpmdrake_.c:476
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected size: %d MB"
+msgid "Enabled?"
 msgstr ""
 
-#: ../rpmdrake_.c:484
-msgid "Files:\n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure sources"
 msgstr ""
 
-#: ../rpmdrake_.c:485
-msgid "Changelog:\n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
 msgstr ""
 
-#: ../rpmdrake_.c:488
-msgid "Source: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
 msgstr ""
 
-#: ../rpmdrake_.c:489
-msgid "Currently installed version: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 
-#: ../rpmdrake_.c:493
-msgid "Reason for update: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
 msgstr ""
 
-#: ../rpmdrake_.c:495
-msgid "Name: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
 msgstr ""
 
-#: ../rpmdrake_.c:496
-msgid "Version: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
 msgstr ""
 
-#: ../rpmdrake_.c:497
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "%s KB"
+msgid "Please wait, updating medium..."
 msgstr ""
 
-#: ../rpmdrake_.c:497
-msgid "Size: "
+#: ../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_.c:499
-msgid "Importance: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
 msgstr ""
 
-#: ../rpmdrake_.c:500
-msgid "Summary: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save changes"
 msgstr ""
 
-#: ../rpmdrake_.c:501
-msgid "Description: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
 msgstr ""
 
-#: ../rpmdrake_.c:550
-msgid "Bugfixes updates"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
 msgstr ""
 
-#: ../rpmdrake_.c:550
-msgid "Normal updates"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Editing source \"%s\":"
 msgstr ""
 
-#: ../rpmdrake_.c:569
-msgid "Mandrake choices"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit a source"
 msgstr ""
 
-#: ../rpmdrake_.c:570
-msgid "All packages, alphabetical"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
 msgstr ""
 
-#: ../rpmdrake_.c:571
-msgid "All packages,"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, adding medium..."
 msgstr ""
 
-#: ../rpmdrake_.c:594
-msgid "by group"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of source:"
 msgstr ""
 
-#: ../rpmdrake_.c:594
-msgid "by size"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Adding a source:"
 msgstr ""
 
-#: ../rpmdrake_.c:595
-msgid "by selection state"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 msgstr ""
 
-#: ../rpmdrake_.c:596
-msgid "by source repository"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to fill up at least the two first entries."
 msgstr ""
 
-#: ../rpmdrake_.c:596
-msgid "by update availability"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
 msgstr ""
 
-#: ../rpmdrake_.c:617
-msgid "in descriptions"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
 msgstr ""
 
-#: ../rpmdrake_.c:617
-msgid "in files"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
 msgstr ""
 
-#: ../rpmdrake_.c:617
-msgid "in names"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Browse..."
 msgstr ""
 
-#: ../rpmdrake_.c:628
-msgid "Reload the packages list"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
 msgstr ""
 
-#: ../rpmdrake_.c:628
-msgid "Reset the selection"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Removable device"
 msgstr ""
 
-#: ../rpmdrake_.c:654
-msgid "Maximum information"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "HTTP server"
 msgstr ""
 
-#: ../rpmdrake_.c:654
-msgid "Normal information"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
 msgstr ""
 
-#: ../rpmdrake_.c:676
-msgid "Too many packages are selected"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path:"
 msgstr ""
 
-#: ../rpmdrake_.c:721
-msgid "Find:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
 msgstr ""
 
-#: ../rpmdrake_.c:726
-msgid "Search"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add a source"
 msgstr ""
 
-#: ../rpmdrake_.c:732
-msgid "Install"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
 msgstr ""
 
-#: ../rpmdrake_.c:739 data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrake Update"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to create medium."
 msgstr ""
 
-#: ../rpmdrake_.c:739
-msgid "Software Packages Installation"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, updating media..."
 msgstr ""
 
-#: ../rpmdrake_.c:739
-msgid "Software Packages Removal"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
 msgstr ""
 
-#: ../rpmdrake_.c:780
-msgid "Please wait, contacting mirror to update packages information."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Select the source(s) you wish to update:"
 msgstr ""
 
-#: ../rpmdrake_.c:782
-msgid "Error updating medium"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please choose the desired mirror."
 msgstr ""
 
-#: ../rpmdrake_.c:783
-msgid "There was an unrecoverable error while updating packages information."
+#: ../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_.c:788
-msgid "How to choose manually your mirror"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
 msgstr ""
 
-#: ../rpmdrake_.c:796
-msgid "Please wait, contacting mirror to initialize updates packages."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid ""
+"There was an error downloading the mirrors list:\n"
+"\n"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
 
-#: ../rpmdrake_.c:799
-msgid "Error adding update medium"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
 msgstr ""
 
-#: ../rpmdrake_.c:830
-msgid "Please wait, finding available packages..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
 
-#: ../rpmdrake_.c:862
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Inspecting %s"
+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_.c:881
-msgid "changes:"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United States"
 msgstr ""
 
-#: ../rpmdrake_.c:885
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Remove .%s"
+msgid "China"
 msgstr ""
 
-#: ../rpmdrake_.c:887
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Use .%s as main file"
+msgid "United Kingdom"
 msgstr ""
 
-#: ../rpmdrake_.c:889
-msgid "Do nothing"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
 msgstr ""
 
-#: ../rpmdrake_.c:901
-msgid "Installation finished"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
 msgstr ""
 
-#: ../rpmdrake_.c:911
-msgid "Inspect..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
 msgstr ""
 
-#: ../rpmdrake_.c:926
-msgid "Program missing"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Portugal"
 msgstr ""
 
-#: ../rpmdrake_.c:927
-msgid "A required program is missing (grpmi). Check your installation."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
 msgstr ""
 
-#: ../rpmdrake_.c:941
-msgid "Unable to get source packages."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
 msgstr ""
 
-#: ../rpmdrake_.c:942
-msgid "Unable to get source packages, sorry."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
 msgstr ""
 
-#: ../rpmdrake_.c:950
-msgid "Change medium"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Korea"
 msgstr ""
 
-#: ../rpmdrake_.c:951
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+msgid "Japan"
 msgstr ""
 
-#: ../rpmdrake_.c:959
-msgid "Installation failed"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Italy"
 msgstr ""
 
-#: ../rpmdrake_.c:960
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Israel"
 msgstr ""
 
-#: ../rpmdrake_.c:963
-msgid "Please wait, removing packages to allow others to be upgraded..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
 msgstr ""
 
-#: ../rpmdrake_.c:985
+#: ../rpmdrake.pm: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 "France"
 msgstr ""
 
-#: ../rpmdrake_.c:985
-msgid ""
-"some packages failed to install\n"
-"correctly"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
 msgstr ""
 
-#: ../rpmdrake_.c:986
-msgid "everything was installed correctly"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
 msgstr ""
 
-#: ../rpmdrake_.c:988
-msgid "Everything installed successfully"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
 msgstr ""
 
-#: ../rpmdrake_.c:989
-msgid "All requested packages were installed successfully."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
 msgstr ""
 
-#: ../rpmdrake_.c:993
-msgid "Everything already installed."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
 msgstr ""
 
-#: ../rpmdrake_.c:994
-msgid "Everything already installed (is this supposed to happen at all?)."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Costa Rica"
 msgstr ""
 
-#: ../rpmdrake_.c:1001
-msgid "Problem during installation"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Canada"
 msgstr ""
 
-#: ../rpmdrake_.c:1002
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
+msgid "Brazil"
 msgstr ""
 
-#: ../rpmdrake_.c:1016
-msgid "Please wait, reading packages database..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Belgium"
 msgstr ""
 
-#: ../rpmdrake_.c:1057
-msgid "Please wait, removing packages..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Australia"
 msgstr ""
 
-#: ../rpmdrake_.c:1060
-msgid "Problem during removal"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
 msgstr ""
 
-#: ../rpmdrake_.c:1061
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
+msgid "Info..."
 msgstr ""
 
-#: ../rpmdrake_.c:1093
-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."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
 msgstr ""
 
-#: ../rpmdrake_.c:1098
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
 msgstr ""
 
-#: ../rpmdrake_.c:1103
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
+#: data/rpmdrake.desktop.in.h:1
+msgid "Install Software"
 msgstr ""
 
 #: data/rpmdrake-remove.desktop.in.h:1
@@ -844,7 +1151,3 @@ msgstr ""
 #: data/rpmdrake-sources.desktop.in.h:1
 msgid "Software Sources Manager"
 msgstr ""
-
-#: data/rpmdrake.desktop.in.h:1
-msgid "Install Software"
-msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 06f83806..241e7659 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2003-01-23 12:22+0100\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\n"
 "PO-Revision-Date: 2000-11-27 16:24+0200\n"
 "Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
 "Language-Team: Russian\n"
@@ -16,1040 +16,1232 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl_.c:39
-msgid "Unable to create medium."
-msgstr "îĹ×ĎÚÍĎÖÎĎ ÓĎÚÄÁÔŘ ÎÁËĎĐÉÔĹĚŘ."
-
-#: ../edit-urpm-sources.pl_.c:40
-msgid "Unable to update medium; it will be automatically disabled."
-msgstr "îĹ×ĎÚÍĎÖÎĎ ĎÂÎĎ×ÉÔŘ ÎÁËĎĐÉÔĹĚŘ, ĎÎ ÂŐÄĹÔ Á×ÔĎÍÁÔÉŢĹÓËÉ ĎÔËĚŔŢĹÎ."
-
-#: ../edit-urpm-sources.pl_.c:50
-msgid "Add a source"
-msgstr "äĎÂÁ×ÉÔŘ ÎÁËĎĐÉÔĹĚŘ"
-
-#: ../edit-urpm-sources.pl_.c:51
-msgid "Local files"
-msgstr "ěĎËÁĚŘÎŮĹ ĆÁĘĚŮ"
-
-#: ../edit-urpm-sources.pl_.c:51
-msgid "Path:"
-msgstr "đŐÔŘ:"
-
-#: ../edit-urpm-sources.pl_.c:52
-msgid "FTP server"
-msgstr "FTP-ÓĹŇ×ĹŇ"
-
-#: ../edit-urpm-sources.pl_.c:52 ../edit-urpm-sources.pl_.c:53
-#: ../edit-urpm-sources.pl_.c:55 ../edit-urpm-sources.pl_.c:183
-msgid "URL:"
-msgstr "URL:"
-
-#: ../edit-urpm-sources.pl_.c:53
-msgid "HTTP server"
-msgstr "HTTP-ÓĹŇ×ĹŇ"
-
-#: ../edit-urpm-sources.pl_.c:54
-msgid "Path or mount point:"
-msgstr "đŐÔŘ ÉĚÉ ÔĎŢËÁ ÍĎÎÔÉŇĎ×ÁÎÉŃ:"
-
-#: ../edit-urpm-sources.pl_.c:54
-msgid "Removable device"
-msgstr "óßĹÍÎĎĹ ŐÓÔŇĎĘÓÔ×Ď"
-
-#: ../edit-urpm-sources.pl_.c:55 ../rpmdrake_.c:548
-msgid "Security updates"
-msgstr "ďÂÎĎ×ĚĹÎÉŃ ĐĎ ÂĹÚĎĐÁÓÎĎÓÔÉ"
-
-#: ../edit-urpm-sources.pl_.c:66
-msgid "Browse..."
-msgstr "îÁĘÔÉ..."
-
-#: ../edit-urpm-sources.pl_.c:68
-msgid "Choose a mirror..."
-msgstr "÷ŮÂĹŇÉÔĹ ÚĹŇËÁĚĎ..."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"÷ÓĹ × ĐĎŇŃÄËĹ? íĎÖÎĎ ĐŇĎÄĎĚÖÁÔŘ?"
 
-#: ../edit-urpm-sources.pl_.c:88
-msgid "Login:"
-msgstr "ěĎÇÉÎ:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to the software installation tool!\n"
+"\n"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
+msgstr ""
+"äĎÂŇĎ ĐĎÖÁĚĎ×ÁÔŘ × ÉÎÓÔŇŐÍĹÎÔ ŐÓÔÁÎĎ×ËÉ ĐŇĎÇŇÁÍÍÎĎÇĎ ĎÂĹÓĐĹŢĹÎÉŃ!\n"
+"\n"
+"÷ÁŰÁ ÓÉÓÔĹÍÁ Mandrake Linux ĐĎÓÔÁ×ĚŃĹÔÓŃ Ó ÎĹÓËĎĚŘËÉÍÉ ÔŮÓŃŢÁÍÉ ĐÁËĹÔĎ×\n"
+"ĐŇĎÇŇÁÍÍÎĎÇĎ ĎÂĹÓĐĹŢĹÎÉŃ ÎÁ CDROM É DVD. üÔĎÔ ÉÎÓÔŇŐÍĹÎÔ ĐĎÍĎÖĹÔ ×ÁÍ\n"
+"×ŮÂŇÁÔŘ ĐŇĎÇŇÁÍÍÎĎĹ ĎÂĹÓĐĹŢĹÎÉŃ ÄĚŃ ŐÓÔÁÎĎ×ËÉ ÎÁ ×ÁŰ ËĎÍĐŘŔÔĹŇ."
 
-#: ../edit-urpm-sources.pl_.c:88 ../edit-urpm-sources.pl_.c:227
-msgid "Password:"
-msgstr "đÁŇĎĚŘ:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"äĎÂŇĎ ĐĎÖÁĚĎ×ÁÔŘ × MandrakeUpdate!\n"
+"\n"
+"üÔĎÔ ÉÎÓÔŇŐÍĹÎÔ ĐĎÍĎÖĹÔ ×ÁÍ ×ŮÂŇÁÔŘ ĎÂÎĎ×ĚĹÎÉŃ ÄĚŃ ŐÓÔÁÎĎ×ËÉ ÎÁ ×Á\n"
+"ËĎÍĐŘŔÔĹŇ."
 
-#: ../edit-urpm-sources.pl_.c:93
-msgid "Name:"
-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"
+"ËĎÍĐŘŔÔĹŇÁ."
 
-#: ../edit-urpm-sources.pl_.c:95 ../edit-urpm-sources.pl_.c:184
-msgid "Relative path to synthesis/hdlist:"
-msgstr "ďÔÎĎÓÉÔĹĚŘÎŮĘ ĐŐÔŘ Ë synthesis/hdlist: "
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"đŇÉ ŐÄÁĚĹÎÉÉ ĐÁËĹÔĎ× ×ĎÚÎÉËĚÁ ĐŇĎÂĚĹÍÁ:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:103
-msgid "You need to fill up at least the two first entries."
-msgstr "÷ÁÍ ÎĹĎÂČĎÄÉÍĎ ÚÁĐĎĚÎÉÔŘ ĐĎ ËŇÁĘÎĹĘ ÍĹŇĹ Ä×Á ĐĹŇ×ŮČ ĐŐÎËÔÁ."
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during removal"
+msgstr "đŇĎÂĚĹÍÁ ×Ď ×ŇĹÍŃ ŐÄÁĚĹÎÉŃ"
 
-#: ../edit-urpm-sources.pl_.c:116
-msgid "Adding a source:"
-msgstr "äĎÂÁ×ĚĹÎÉĹ ÎÁËĎĐÉÔĹĚŃ:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages..."
+msgstr "đĎÄĎÖÄÉÔĹ, ĐĎÖÁĚŐĘÓÔÁ, ŐÄÁĚŃŔÔÓŃ ĐÁËĹÔŮ..."
 
-#: ../edit-urpm-sources.pl_.c:117
-msgid "Type of source:"
-msgstr "ôÉĐ ÎÁËĎĐÉÔĹĚŃ:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
+msgstr "đĎÄĎÖÄÉÔĹ, ĐĎÖÁĚŐĘÓÔÁ, ĐŇĎÉÚ×ĎÄÉÔÓŃ ŢÔĹÎÉĹ ÉÚ ÂÁÚŮ ÄÁÎÎŮČ..."
 
-#: ../edit-urpm-sources.pl_.c:121 ../edit-urpm-sources.pl_.c:198
-#: ../edit-urpm-sources.pl_.c:231 ../rpmdrake.pm_.c:97 ../rpmdrake.pm_.c:136
-#: ../rpmdrake.pm_.c:319 ../rpmdrake_.c:353 ../rpmdrake_.c:365
-#: ../rpmdrake_.c:369 ../rpmdrake_.c:916 ../rpmdrake_.c:950
-msgid "Ok"
-msgstr "ďë"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"đŇÉ ŐÓÔÁÎĎ×ËĹ ×ĎÚÎÉËĚÁ ĐŇĎÂĚĹÍÁ:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:136 ../edit-urpm-sources.pl_.c:192
-#: ../edit-urpm-sources.pl_.c:198 ../edit-urpm-sources.pl_.c:238
-#: ../rpmdrake.pm_.c:319 ../rpmdrake.pm_.c:352 ../rpmdrake_.c:353
-#: ../rpmdrake_.c:950
-msgid "Cancel"
-msgstr "ďÔÍĹÎÁ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during installation"
+msgstr "đŇĎÂĚĹÍÁ ×Ď ×ŇĹÍŃ ŐÓÔÁÎĎ×ËÉ"
 
-#: ../edit-urpm-sources.pl_.c:143
-msgid "Please wait, adding medium..."
-msgstr "đĎÖÁĚŐĘÓÔÁ, ĐĎÄĎÖÄÉÔĹ, ÄĎÂÁ×ĚŃĹÔÓŃ ÎÁËĎĐÉÔĹĚŘ..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
+msgstr "÷ÓĹ ŐÖĹ ŐÓÔÁÎĎ×ĚĹÎĎ (ÜÔĎ ×ĎĎÂÝĹ ÓĚŐŢÁĹÔÓŃ?)."
 
-#: ../edit-urpm-sources.pl_.c:164
-msgid "Please wait, removing medium..."
-msgstr "đĎÖÁĚŐĘÓÔÁ, ĐĎÄĎÖÄÉÔĹ, ŐÄÁĚŃĹÔÓŃ ÎÁËĎĐÉÔĹĚŘ..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed."
+msgstr "÷ÓĹ ŐÖĹ ŐÓÔÁÎĎ×ĚĹÎĎ."
 
-#: ../edit-urpm-sources.pl_.c:177
-msgid "Edit a source"
-msgstr "ňĹÄÁËÔÉŇĎ×ÁÔŘ ÎÁËĎĐÉÔĹĚŘ"
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "÷ÓĹ ÚÁĐŇĎŰĹÎÎŮĹ ĐÁËĹÔŮ ÂŮĚÉ ŐÓĐĹŰÎĎ ŐÓÔÁÎĎ×ĚĹÎŮ."
 
-#: ../edit-urpm-sources.pl_.c:181
+#: ../rpmdrake:1
 #, c-format
-msgid "Editing source \"%s\":"
-msgstr "ňĹÄÁËÔÉŇĎ×ÁÎÉĹ ÎÁËĎĐÉÔĹĚŃ \"%s\":"
+msgid "Everything installed successfully"
+msgstr "÷ÓĹ ŐÓĐĹŰÎĎ ŐÓÔÁÎĎ×ĚĹÎĎ."
 
-#: ../edit-urpm-sources.pl_.c:187
-msgid "Save changes"
-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"
+"ÔĹĐĹŇŘ ×Ů ÍĎÖĹÔĹ ĐĎÄŇĎÂÎĎ ÉÚŐŢÉÔŘ ÎĹËÔĎŇŮĹ ÄĹĘÓÔ×ÉŃ:"
 
-#: ../edit-urpm-sources.pl_.c:196
-msgid "You need to insert the medium to continue"
-msgstr "÷ÁÍ ÎĹĎÂČĎÄÉÍĎ ×ÓÔÁ×ÉÔŘ ÎÁËĎĐÉÔĹĚŘ ÄĚŃ ĐŇĎÄĎĚÖĹÎÉŃ"
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "×ÓĹ ÂŮĚĎ ŐÓĐĹŰÎĎ ŐÓÔÁÎĎ×ĚĹÎĎ"
 
-#: ../edit-urpm-sources.pl_.c:197
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
+"some packages failed to install\n"
+"correctly"
 msgstr ""
-"ţÔĎÂŮ ÓĎČŇÁÎÉÔŘ ÉÚÍĹÎĹÎÉŃ, ×ÁÍ ÎĹĎÂČĎÄÉÍĎ ×ÓÔÁ×ÉÔŘ × ĐŇÉ×ĎÄ ÎÁËĎĐÉÔĹĚŘ."
-
-#: ../edit-urpm-sources.pl_.c:202
-msgid "Please wait, updating medium..."
-msgstr "đĎÖÁĚŐĘÓÔÁ, ĐĎÄĎÖÄÉÔĹ, ĎÂÎĎ×ĚŃĹÔÓŃ ÎÁËĎĐÉÔĹĚŘ..."
+"ŐÓÔÁÎĎ×ËÁ ÎĹËĎÔĎŇŮČ ĐÁËĹÔĎ×\n"
+"ÚÁ×ĹŇŰÉĚÁÓŘ ÎĹŐÄÁŢĹĘ"
 
-#: ../edit-urpm-sources.pl_.c:213
-msgid "Configure proxies"
-msgstr "îÁÓÔŇĎÉÔŘ ĐŇĎËÓÉ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages to allow others to be upgraded..."
+msgstr ""
+"đĎÄĎÖÄÉÔĹ, ĐĎÖÁĚŐĘÓÔÁ, ŐÄÁĚŃŔÔÓŃ ĐÁËĹÔŮ, ŢÔĎÂŮ ÄŇŐÇÉĹ ÍĎÇĚÉ ÂŮÔŘ ĎÂÎĎ×ĚĹÎŮ..."
 
-#: ../edit-urpm-sources.pl_.c:219
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
 msgstr ""
-"ĺÓĚÉ ×ÁÍ ÎŐÖĹÎ ĐŇĎËÓÉ, ××ĹÄÉÔĹ ÉÍŃ ČĎÓÔÁ É ĐŇÉ ÎĹĎÂČĎÄÉÍĎÓÔÉ ĐĎŇÔ "
-"(ÓÉÎÔÁËÓÉÓ: ČĎÓÔ_ĐŇĎËÓÉ[:ĐĎŇÔ])"
+"őÓÔÁÎĎ×ËÁ ÂŮĚÁ ĐŇĹŇ×ÁÎÁ, ĎÔÓŐÔÓÔ×ŐŔÔ ÎĹËĎÔĎŇŮĹ ĆÁĘĚŮ.\n"
+"÷ÁÍ ÍĎÖĹÔ ĐĎÎÁÄĎÂÉÔŘÓŃ ĎÂÎĎ×ÉÔŘ Ó×ĎŔ ÂÁÚŐ ÄÁÎÎŮČ ÎÁËĎĐÉÔĹĚĹĘ."
 
-#: ../edit-urpm-sources.pl_.c:221
-msgid "Proxy hostname:"
-msgstr "éÍŃ ČĎÓÔÁ ĐŇĎËÓÉ:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation failed"
+msgstr "őÓÔÁÎĎ×ËÁ ÂŮĚÁ ĐŇĹŇ×ÁÎÁ"
 
-#: ../edit-urpm-sources.pl_.c:223
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "÷Ů ÍĎÖĹÔĹ ŐËÁÚÁÔŘ ĐĎĚŘÚĎ×ÁÔĹĚŃ/ĐÁŇĎĚŘ ÄĚŃ ÁŐÔĹÎÔÉĆÉËÁĂÉÉ ÎÁ ĐŇĎËÓÉ:"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
+msgstr "ďÔÍĹÎÁ"
 
-#: ../edit-urpm-sources.pl_.c:225
-msgid "User:"
-msgstr "đĎĚŘÚĎ×ÁÔĹĚŘ:"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "ďë"
 
-#: ../edit-urpm-sources.pl_.c:251
-msgid "Configure sources"
-msgstr "îÁÓÔŇĎÉÔŘ ÎÁËĎĐÉÔĹĚÉ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "đĎÖÁĚŐĘÓÔÁ, ×ÓÔÁ×ŘÔĹ ÎÁËĎĐÉÔĹĚŘ Ó ÉÍĹÎĹÍ \"%s\" × ŐÓÔŇĎĘÓÔ×Ď [%s]"
 
-#: ../edit-urpm-sources.pl_.c:258
-msgid "Enabled?"
-msgstr "÷ËĚŔŢĹÎ?"
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr "éÚÍĹÎÉÔŘ ÎÁËĎĐÉÔĹĚŘ"
 
-#: ../edit-urpm-sources.pl_.c:259
-msgid "Source"
-msgstr "îÁËĎĐÉÔĹĚŘ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
+msgstr "éÚ×ÉÎÉÔĹ, ÎĹ×ĎÚÍĎÖÎĎ ĐĎĚŐŢÉÔŘ ÎÁËĎĐÉÔĹĚŘ Ó ĐÁËĹÔÁÍÉ."
 
-#: ../edit-urpm-sources.pl_.c:282 ../rpmdrake_.c:730
-msgid "Remove"
-msgstr "őÄÁĚÉÔŘ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages."
+msgstr "îĹ×ĎÚÍĎÖÎĎ ĐĎĚŐŢÉÔŘ ÎÁËĎĐÉÔĹĚŘ Ó ĐÁËĹÔÁÍÉ."
 
-#: ../edit-urpm-sources.pl_.c:284
-msgid "Edit"
-msgstr "ňĹÄÁËÔÉŇĎ×ÁÔŘ"
+#: ../rpmdrake:1
+#, c-format
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr "ďÔÓŐÔÓÔ×ŐĹÔ ÔŇĹÂŐĹÍÁŃ ĐŇĎÇŇÁÍÍÁ (grpmi). đŇĎ×ĹŇŘÔĹ Ó×ĎŔ ŐÓÔÁÎĎ×ËŐ."
 
-#: ../edit-urpm-sources.pl_.c:286
-msgid "Add..."
-msgstr "äĎÂÁ×ÉÔŘ..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
+msgstr "đŇĎÇŇÁÍÍÁ ĎÔÓŐÔÓÔ×ŐĹÔ"
 
-#: ../edit-urpm-sources.pl_.c:288
-msgid "Update..."
-msgstr "ďÂÎĎ×ÉÔŘ..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
+msgstr "éÚŐŢĹÎÉĹ..."
 
-#: ../edit-urpm-sources.pl_.c:289
-msgid "Proxy..."
-msgstr "đŇĎËÓÉ..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation finished"
+msgstr "őÓÔÁÎĎ×ËÁ ÚÁ×ĹŇŰĹÎÁ"
 
-#: ../edit-urpm-sources.pl_.c:292
-msgid "Save and quit"
-msgstr "óĎČŇÁÎÉÔŘ É ×ŮĘÔÉ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
+msgstr "îÉŢĹÇĹ ÎĹ ÄĹĚÁÔŘ"
 
-#: ../edit-urpm-sources.pl_.c:293 ../rpmdrake_.c:733
-msgid "Quit"
-msgstr "÷ŮĘÔÉ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
+msgstr "éÓĐĎĚŘÚĎ×ÁÔŘ .%s × ËÁŢĹÓÔ×Ĺ ÇĚÁ×ÎĎÇĎ ĆÁĘĚÁ"
 
-#: ../rpmdrake.pm_.c:93
-msgid "Yes"
-msgstr "äÁ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Remove .%s"
+msgstr "őÄÁĚÉÔŘ .%s"
 
-#: ../rpmdrake.pm_.c:95
-msgid "No"
-msgstr "îĹÔ"
+#: ../rpmdrake:1
+#, c-format
+msgid "changes:"
+msgstr "ÉÚÍĹÎĹÎÉŃ:"
 
-#: ../rpmdrake.pm_.c:127
-msgid "Info..."
-msgstr "éÎĆĎŇÍÁĂÉŃ..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr "éÚŐŢÁĹÔÓŃ %s"
 
-#: ../rpmdrake.pm_.c:180
-msgid "Austria"
-msgstr "á×ÓÔŇÉŃ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, finding available packages..."
+msgstr "đĎÄĎÖÄÉÔĹ, ĐĎÖÁĚŐĘÓÔÁ, ×ŮĐĎĚÎŃĹÔÓŃ ĐĎÉÓË ÄĎÓÔŐĐÎŮČ ĐÁËĹÔĎ×..."
 
-#: ../rpmdrake.pm_.c:181
-msgid "Australia"
-msgstr "á×ÓÔŇÁĚÉŃ"
+#: ../rpmdrake:1
+#, c-format
+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 ""
+"đŇĎÉÚĎŰĚÁ ĎŰÉÂËÁ ĐŇÉ ÄĎÂÁ×ĚĹÎÉÉ ÎÁËĎĐÉÔĹĚŃ Ó ĎÂÎĎ×ĚĹÎÉŃÍÉ ŢĹŇĹÚ urpmi.\n"
+"\n"
+"üÔĎ ÍĎÖĹÔ ÂŮÔŘ ÉÚ-ÚÁ ÎĹ×ĹŇÎĎÇĎ ÉĚÉ ×ŇĹÍĹÎÎĎ ÎĹÄĎÓÔŐĐÎĎÇĎ ÚĹŇËÁĚÁ ÉĚÉ \n"
+"× ÓĚŐŢÁĹ, ĹÓĚÉ ×ĹŇÓÉŃ ×ÁŰĹÇĎ Mandrake Linux (%s) ĹÝĹ/ŐÖĹ ÎĹ\n"
+"ĐĎÄÄĹŇÖÉ×ÁĹÔÓŃ Mandrake Linux Official Updates.\n"
+"\n"
+"öĹĚÁĹÔĹ ĐĎĐŇĎÂĎ×ÁÔŘ ÄŇŐÇĎĹ ÚĹŇËÁĚĎ?"
 
-#: ../rpmdrake.pm_.c:182
-msgid "Belgium"
-msgstr "âĹĚŘÇÉŃ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
+msgstr "ďŰÉÂËÁ ĐŇÉ ÄĎÂÁ×ĚĹÎÉÉ ÎÁËĎĐÉÔĹĚŃ Ó ĎÂÎĎ×ĚĹÎÉŃÍÉ"
 
-#: ../rpmdrake.pm_.c:183
-msgid "Brazil"
-msgstr "âŇÁÚÉĚÉŃ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
+msgstr ""
+"đĎÖÁĚŐĘÓÔÁ, ĐĎÄĎÖÄÉÔĹ, ŐÓÔÁÎÁ×ĚÉ×ÁĹÔÓŃ ÓĎĹÄÉÎĹÎÉĹ Ó ÚĹŇËÁĚĎÍ, ŢÔĎÂŮ "
+"ÉÎÉĂÉÁĚÉÚÉŇĎ×ÁÔŘ ĐÁËĹÔŮ Ó ĎÂÎĎ×ĚĹÎÉŃÍÉ."
 
-#: ../rpmdrake.pm_.c:184
-msgid "Canada"
-msgstr "ëÁÎÁÄÁ"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Sources Manager, and then add a `Security\n"
+"updates' source.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"÷Ů ÔÁËÖĹ ÍĎÖĹÔĹ ×ŮÂŇÁÔŘ Ó×ĎĹ ÚĹŇËÁĚĎ ×ŇŐŢÎŐŔ: ÄĚŃ ÜÔĎÇĎ\n"
+"ÚÁĐŐÓÔÉÔĹ íĹÎĹÄÖĹŇ ÉÓÔĎŢÎÉËĎ× ĐŇĎÇŇÁÍÍÎĎÇĎ ĎÂĹÓĐĹŢĹÎÉŃ, Á ÚÁÔĹÍ\n"
+"ÄĎÂÁ×ŘÔĹ ÉÓÔĎŢÎÉË `ďÂÎĎ×ĚĹÎÉŃ ĐĎ ÂĹÚĎĐÁÓÎĎÓÔÉ'.\n"
+"\n"
+"úÁÔĹÍ, ĐĹŇĹÚÁĐŐÓÔÉÔĹ MandrakeUpdate."
 
-#: ../rpmdrake.pm_.c:185
-msgid "Costa Rica"
-msgstr "ëĎÓÔÁ-ňÉËÁ"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "ëÁË ×ŇŐŢÎŐŔ ×ŮÂŇÁÔŘ Ó×ĎĹ ÚĹŇËÁĚĎ"
 
-#: ../rpmdrake.pm_.c:186
-msgid "Czech Republic"
-msgstr "ţĹŰÓËÁŃ ňĹÓĐŐÂĚÉËÁ"
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
+msgstr "đŇĎÉÚĎŰĚÁ ÎĹŐÓÔŇÁÎÉÍÁŃ ĎŰÉÂËÁ ĐŇÉ ĎÂÎĎ×ĚĹÎÉÉ ÉÎĆĎŇÍÁĂÉÉ Ď ĐÁËĹÔÁČ."
 
-#: ../rpmdrake.pm_.c:187
-msgid "Germany"
-msgstr "çĹŇÍÁÎÉŃ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
+msgstr "ďŰÉÂËÁ ĐŇÉ ĎÂÎĎ×ĚĹÎÉÉ ÎÁËĎĐÉÔĹĚŃ"
 
-#: ../rpmdrake.pm_.c:188
-msgid "Danmark"
-msgstr "äÁÎÉŃ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
+msgstr ""
+"đĎÖÁĚŐĘÓÔÁ, ĐĎÄĎÖÄÉÔĹ, ŐÓÔÁÎÁ×ĚÉ×ÁĹÔÓŃ ÓĎĹÄÉÎĹÎÉĹ Ó ÚĹŇËÁĚĎÍ, ŢÔĎÂŮ ĎÂÎĎ×ÉÔŘ "
+"ÉÎĆĎŇÍÁĂÉŔ Ď ĐÁËĹÔÁČ."
 
-#: ../rpmdrake.pm_.c:189 ../rpmdrake.pm_.c:193
-msgid "Greece"
-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_.c:190
-msgid "Spain"
-msgstr "éÓĐÁÎÉŃ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Installation"
+msgstr "őÓÔÁÎĎ×ËÁ ĐÁËĹÔĎ× ĐŇĎÇŇÁÍÍÎĎÇĎ ĎÂĹÓĐĹŢĹÎÉŃ"
 
-#: ../rpmdrake.pm_.c:191
-msgid "Finland"
-msgstr "ćÉÎĚŃÎÄÉŃ"
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, c-format
+msgid "Mandrake Update"
+msgstr "ďÂÎĎ×ĚĹÎÉĹ Mandrake"
 
-#: ../rpmdrake.pm_.c:192
-msgid "France"
-msgstr "ćŇÁÎĂÉŃ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
+msgstr "őÄÁĚĹÎÉĹ ĐÁËĹÔĎ× ĐŇĎÇŇÁÍÍÎĎÇĎ ĎÂĹÓĐĹŢĹÎÉŃ"
 
-#: ../rpmdrake.pm_.c:194
-msgid "Israel"
-msgstr "éÚŇÁÉĚŘ"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "÷ŮĘÔÉ"
 
-#: ../rpmdrake.pm_.c:195
-msgid "Italy"
-msgstr "éÔÁĚÉŃ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "őÓÔÁÎĎ×ÉÔŘ"
 
-#: ../rpmdrake.pm_.c:196
-msgid "Japan"
-msgstr "ńĐĎÎÉŃ"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "őÄÁĚÉÔŘ"
 
-#: ../rpmdrake.pm_.c:197
-msgid "Korea"
-msgstr "ëĎŇĹŃ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search"
+msgstr "đĎÉÓË"
 
-#: ../rpmdrake.pm_.c:198
-msgid "Netherlands"
-msgstr "îÉÄĹŇĚÁÎÄŮ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "îÁĘÔÉ:"
 
-#: ../rpmdrake.pm_.c:199
-msgid "Norway"
-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"
+"÷ÓĹ × ĐĎŇŃÄËĹ? íĎÖÎĎ ĐŇĎÄĎĚÖÁÔŘ?"
 
-#: ../rpmdrake.pm_.c:200
-msgid "Poland"
-msgstr "đĎĚŘŰÁ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "îĹËĎÔĎŇŮĹ ĐÁËĹÔŮ ÄĎĚÖÎŮ ÂŮÔŘ ŐÄÁĚĹÎŮ"
 
-#: ../rpmdrake.pm_.c:201
-msgid "Portugal"
-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"
+"×Ů ÄĹĘÓÔ×ÉÔĹĚŘÎĎ ČĎÔÉÔĹ ŐÓÔÁÎĎ×ÉÔŘ ×ÓĹ ×ŮÂŇÁÎÎŮĹ ĐÁËĹÔŮ?"
 
-#: ../rpmdrake.pm_.c:202
-msgid "Russia"
-msgstr "ňĎÓÓÉŃ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Too many packages are selected"
+msgstr "÷ŮÂŇÁÎĎ ÓĚÉŰËĎÍ ÍÎĎÇĎ ĐÁËĹÔĎ×"
 
-#: ../rpmdrake.pm_.c:203
-msgid "Sweden"
-msgstr "ű×ĹĂÉŃ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
+msgstr "íÁËÓÉÍŐÍ ÉÎĆĎŇÍÁĂÉÉ"
 
-#: ../rpmdrake.pm_.c:204
-msgid "Taiwan"
-msgstr "ôÁĘ×ÁÎŘ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal information"
+msgstr "óÔÁÎÄÁŇÔÎÁŃ ÉÎĆĎŇÍÁĂÉŃ"
 
-#: ../rpmdrake.pm_.c:205
-msgid "United Kingdom"
-msgstr "ďÂßĹÄÉÎĹÎÎĎĹ ëĎŇĎĚĹ×ÓÔ×Ď"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update source(s)"
+msgstr "ďÂÎĎ×ÉÔŘ ÎÁËĎĐÉÔĹĚŘ(É)"
 
-#: ../rpmdrake.pm_.c:206
-msgid "China"
-msgstr "ëÉÔÁĘ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reload the packages list"
+msgstr "đĹŇĹÚÁÇŇŐÚÉÔŘ ÓĐÉÓĎË ĐÁËĹÔĎ×"
 
-#: ../rpmdrake.pm_.c:207 ../rpmdrake.pm_.c:208 ../rpmdrake.pm_.c:209
-#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:261
-msgid "United States"
-msgstr "óĎĹÄÉÎĹÎÎŮĹ űÔÁÔŮ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
+msgstr "óÂŇĎÓÉÔŘ ×ŮÂĎŇ"
 
-#: ../rpmdrake.pm_.c:274
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
-"đĎÖÁĚŐĘÓÔÁ, ĐĎÄĎÖÄÉÔĹ, ÓËÁŢÉ×ÁŔÔÓŃ ÁÄŇĹÓÁ ÚĹŇËÁĚ Ó ×ĹÂ-ÓÁĘÔÁ\n"
-"MandrakeSoft"
+#: ../rpmdrake:1
+#, c-format
+msgid "in files"
+msgstr "ĐĎ ĆÁĘĚÁÍ"
 
-#: ../rpmdrake.pm_.c:280
-msgid "Error during download"
-msgstr "ďŰÉÂËÁ ×Ď ×ŇĹÍŃ ÓËÁŢÉ×ÁÎÉŃ"
+#: ../rpmdrake:1
+#, c-format
+msgid "in descriptions"
+msgstr "ĐĎ ĎĐÉÓÁÎÉŃÍ"
 
-#: ../rpmdrake.pm_.c:289
-msgid "No mirror"
-msgstr "îĹÔ ÚĹŇËÁĚÁ"
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
+msgstr "ĐĎ ÉÍĹÎÁÍ"
 
-#: ../rpmdrake.pm_.c:307
-msgid "Please choose the desired mirror."
-msgstr "đĎÖÁĚŐĘÓÔÁ, ×ŮÂĹŇÉÔĹ ÖĹĚÁĹÍĎĹ ÚĹŇËÁĚĎ."
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
+msgstr "ĐĎ ÄĎÓÔŐĐÎĎÓÔÉ ĎÂÎĎ×ĚĹÎÉĘ"
 
-#: ../rpmdrake.pm_.c:339 ../rpmdrake_.c:627
-msgid "Update source(s)"
-msgstr "ďÂÎĎ×ÉÔŘ ÎÁËĎĐÉÔĹĚŘ(É)"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
+msgstr "ĐĎ ÉÓÔĎŢÎÉËŐ"
 
-#: ../rpmdrake.pm_.c:343
-msgid "Select the source(s) you wish to update:"
-msgstr "÷ŮÂĹŇÉÔĹ ÎÁËĎĐÉÔĹĚŘ(É), ËĎÔĎŇŮĘ ×Ů ČĎÔÉÔĹ ĎÂÎĎ×ÉÔŘ:"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
+msgstr "ĐĎ ÓĎÓÔĎŃÎÉŔ ×ŮÂĎŇÁ"
 
-#: ../rpmdrake.pm_.c:347
-msgid "Update"
-msgstr "ďÂÎĎ×ÉÔŘ"
+#: ../rpmdrake:1
+#, c-format
+msgid "by size"
+msgstr "ĐĎ ŇÁÚÍĹŇŐ"
 
-#: ../rpmdrake.pm_.c:357
-msgid "Please wait, updating media..."
-msgstr "đĎÖÁĚŐĘÓÔÁ, ĐĎÄĎÖÄÉÔĹ, ĎÂÎĎ×ĚŃĹÔÓŃ ÎÁËĎĐÉÔĹĚŘ..."
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
+msgstr "ĐĎ ÇŇŐĐĐÁÍ"
 
-#: ../rpmdrake_.c:99
-msgid "Other"
-msgstr "äŇŐÇĎĹ"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages,"
+msgstr "÷ÓĹ ĐÁËĹÔŮ"
 
-#: ../rpmdrake_.c:121 ../rpmdrake_.c:135 ../rpmdrake_.c:227 ../rpmdrake_.c:298
-msgid "(none)"
-msgstr "(ÎĹÔ)"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
+msgstr "÷ÓĹ ĐÁËĹÔŮ, ĐĎ ÁĚĆÁ×ÉÔŐ"
 
-#: ../rpmdrake_.c:141 ../rpmdrake_.c:482 ../rpmdrake_.c:483
-msgid "(Not available)"
-msgstr "(îĹÄĎÓÔŐĐĹÎ)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
+msgstr "÷ŮÂĎŇ Mandrake"
 
-#: ../rpmdrake_.c:151 ../rpmdrake_.c:208
-msgid "Search results"
-msgstr "ňĹÚŐĚŘÔÁÔŮ ĐĎÉÓËÁ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal updates"
+msgstr "îĎŇÍÁĚŘÎŮĹ ĎÂÎĎ×ĚĹÎÉŃ"
 
-#: ../rpmdrake_.c:151
-msgid "Search results (none)"
-msgstr "ňĹÚŐĚŘÔÁÔŮ ĐĎÉÓËÁ (ÎĹÔ)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Bugfixes updates"
+msgstr "ďÂÎĎ×ĚĹÎÉŃ ÂÁÇĆÉËÓĎ×"
 
-#: ../rpmdrake_.c:161 ../rpmdrake_.c:172
-msgid "Please wait, searching..."
-msgstr "đĎÖÁĚŐĘÓÔÁ, ĐĎÄĎÖÄÉÔĹ, ×ŮĐĎĚÎŃĹÔÓŃ ĐĎÉÓË..."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
+msgstr "ďÂÎĎ×ĚĹÎÉŃ ĐĎ ÂĹÚĎĐÁÓÎĎÓÔÉ"
 
-#: ../rpmdrake_.c:175
-msgid "Stop"
-msgstr "ďÓÔÁÎĎ×ÉÔŘ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Description: "
+msgstr "ďĐÉÓÁÎÉĹ:"
 
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-msgid "Addable"
-msgstr "íĎÖÎĎ ÄĎÂÁ×ÉÔŘ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Summary: "
+msgstr "éÔĎÇ: "
 
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-msgid "Upgradable"
-msgstr "íĎÖÎĎ ĎÂÎĎ×ÉÔŘ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "÷ÁÖÎĎÓÔŘ: "
 
-#: ../rpmdrake_.c:211
-msgid "Not selected"
-msgstr "îĹ ×ŮÂŇÁÎÎŮĹ"
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s ëâ"
 
-#: ../rpmdrake_.c:211
-msgid "Selected"
-msgstr "÷ŮÂŇÁÎÎŮĹ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Size: "
+msgstr "ňÁÚÍĹŇ: "
 
-#: ../rpmdrake_.c:240
-msgid "rpmdrake"
-msgstr "rpmdrake"
+#: ../rpmdrake:1
+#, c-format
+msgid "Version: "
+msgstr "÷ĹŇÓÉŃ:"
 
-#: ../rpmdrake_.c:258 ../rpmdrake_.c:360 ../rpmdrake_.c:362
-msgid "More information on package..."
-msgstr "äĎĐĎĚÎÉÔĹĚŘÎÁŃ ÉÎĆĎŇÍÁĂÉŃ Ď ĐÁËĹÔĹ..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "îÁÚ×ÁÎÉĹ: "
 
-#: ../rpmdrake_.c:259
-msgid "One of the following packages is needed:"
-msgstr "îŐÖĹÎ ĎÄÉÎ ÉÚ ÓĚĹÄŐŔÝÉČ ĐÁËĹÔĎ×"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "đŇÉŢÉÎÁ ĎÂÎĎ×ĚĹÎÉŃ:"
 
-#: ../rpmdrake_.c:259
-msgid "Please choose"
-msgstr "đĎÖÁĚŐĘÓÔÁ, ×ŮÂĹŇÉÔĹ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
+msgstr "őÓÔÁÎĎ×ĚĹÎÎÁŃ ×ĹŇÓÉŃ:"
 
-#: ../rpmdrake_.c:275
-msgid "unknown package "
-msgstr "ÎĹÉÚ×ĹÓÔÎŮĘ ĐÁËĹÔ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Source: "
+msgstr "îÁËĎĐÉÔĹĚŘ: "
 
-#: ../rpmdrake_.c:285
-msgid "Please wait, listing packages..."
-msgstr "đĎÖÁĚŐĘÓÔÁ, ĐĎÄĎÖÄÉÔĹ, ÓĎÓÔÁ×ĚŃĹÔÓŃ ÓĐÉÓĎË ĐÁËĹÔĎ×..."
+#: ../rpmdrake:1
+#, c-format
+msgid "(Not available)"
+msgstr "(îĹÄĎÓÔŐĐĹÎ)"
 
-#: ../rpmdrake_.c:300
-msgid "No update"
-msgstr "ďÂÎĎ×ĚĹÎÉĘ ÎĹÔ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
+msgstr "Changelog:\n"
 
-#: ../rpmdrake_.c:353 ../rpmdrake_.c:354
-msgid "More infos"
-msgstr "äĎĐ. ÉÎĆĎŇÍÁĂÉŃ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "ćÁĘĚŮ:\n"
 
-#: ../rpmdrake_.c:355
-msgid "Information on packages"
-msgstr "éÎĆĎŇÍÁĂÉŃ Ď ĐÁËĹÔÁČ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected size: %d MB"
+msgstr "÷ŮÂŇÁÎÎŮĘ ŇÁÚÍĹŇ: %d íâ"
 
-#: ../rpmdrake_.c:376
-msgid "Some additional packages need to be removed"
-msgstr "îĹËĎÔĎŇŮĹ ÄĎĐĎĚÎÉÔĹĚŘÎŮĹ ĐÁËĹÔŮ ÄĎĚÖÎŮ ÂŮÔŘ ŐÄÁĚĹÎŮ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "÷ŮÂŇÁÎĎ: %d íâ / ó×ĎÂĎÄÎĎ ÎÁ ÄÉÓËĹ: %d íâ"
 
-#: ../rpmdrake_.c:377
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
 msgstr ""
-"óĚĹÄŐŔÝÉĹ ĐÁËĹÔŮ ÔÁËÖĹ ÄĎĚÖÎŮ ÂŮÔŘ ŐÄÁĚĹÎŮ\n"
+"óĚĹÄŐŔÝÉĹ ĐÁËĹÔŮ ÎĹ ÍĎÇŐÔ ÂŮÔŘ ×ŮÂŇÁÎŮ\n"
 "ÄĚŃ ŐÄĎ×ĚĹÔ×ĎŇĹÎÉŃ ÉČ ÚÁ×ÉÓÉÍĎÓÔĹĘ:\n"
 "\n"
 
-#: ../rpmdrake_.c:383 ../rpmdrake_.c:391
-msgid "Some packages can't be removed"
-msgstr "îĹËĎÔĎŇŮĹ ĐÁËĹÔŮ ÎĹ ÍĎÇŐÔ ÂŮÔŘ ŐÄÁĚĹÎŮ"
-
-#: ../rpmdrake_.c:384
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Removing these packages would break your system, sorry:\n"
+"Sorry, the following package(s) can't be selected:\n"
 "\n"
 msgstr ""
-"ë ÓĎÖÁĚĹÎÉŔ ŐÄÁĚĹÎÉĹ ÜÔÉČ ĐÁËĹÔĎ× ÎÁŇŐŰÉÔ ŇÁÂĎÔŐ ÓÉÓÔĹÍŮ:\n"
+"éÚ×ÉÎÉÔĹ, ÎĎ ÓĚĹÄŐŔÝÉĹ ĐÁËĹÔŮ ÎĹ ÍĎÇŐÔ ÂŮÔŘ ×ŮÂŇÁÎŮ:\n"
 "\n"
 
-#: ../rpmdrake_.c:392 ../rpmdrake_.c:451
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "îĹËĎÔĎŇŮĹ ĐÁËĹÔŮ ÎĹ ÍĎÇŐÔ ÂŮÔŘ ŐÓÔÁÎĎ×ĚĹÎŮ"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
 "\n"
 msgstr ""
-"óĚĹÄŐŔÝÉĹ ĐÁËĹÔŮ ÎĹ ÍĎÇŐÔ ÂŮÔŘ ×ŮÂŇÁÎŮ\n"
-"ÄĚŃ ŐÄĎ×ĚĹÔ×ĎŇĹÎÉŃ ÉČ ÚÁ×ÉÓÉÍĎÓÔĹĘ:\n"
+"äĚŃ ŐÄĎ×ĚĹÔ×ĎŇĹÎÉŃ ÚÁ×ÉÓÉÍĎÓÔĹĘ ÓĚĹÄŐŔÝÉĹ ĐÁËĹÔŮ\n"
+"ÔÁËÖĹ ÄĎĚÖÎŮ ÂŮÔŘ ŐÓÔÁÎĎ×ĚĹÎŮ:\n"
 "\n"
 
-#: ../rpmdrake_.c:421
+#: ../rpmdrake:1
+#, c-format
 msgid "Additional packages needed"
 msgstr "ôŇĹÂŐŔÔÓŃ ÄĎĐĎĚÎÉÔĹĚŘÎŮĹ ĐÁËĹÔŮ"
 
-#: ../rpmdrake_.c:422
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be removed"
+msgstr "îĹËĎÔĎŇŮĹ ĐÁËĹÔŮ ÎĹ ÍĎÇŐÔ ÂŮÔŘ ŐÄÁĚĹÎŮ"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
+"Removing these packages would break your system, sorry:\n"
 "\n"
 msgstr ""
-"äĚŃ ŐÄĎ×ĚĹÔ×ĎŇĹÎÉŃ ÚÁ×ÉÓÉÍĎÓÔĹĘ ÓĚĹÄŐŔÝÉĹ ĐÁËĹÔŮ\n"
-"ÔÁËÖĹ ÄĎĚÖÎŮ ÂŮÔŘ ŐÓÔÁÎĎ×ĚĹÎŮ:\n"
+"ë ÓĎÖÁĚĹÎÉŔ ŐÄÁĚĹÎÉĹ ÜÔÉČ ĐÁËĹÔĎ× ÎÁŇŐŰÉÔ ŇÁÂĎÔŐ ÓÉÓÔĹÍŮ:\n"
 "\n"
 
-#: ../rpmdrake_.c:435
-msgid "Some packages can't be installed"
-msgstr "îĹËĎÔĎŇŮĹ ĐÁËĹÔŮ ÎĹ ÍĎÇŐÔ ÂŮÔŘ ŐÓÔÁÎĎ×ĚĹÎŮ"
-
-#: ../rpmdrake_.c:436
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
 "\n"
 msgstr ""
-"éÚ×ÉÎÉÔĹ, ÎĎ ÓĚĹÄŐŔÝÉĹ ĐÁËĹÔŮ ÎĹ ÍĎÇŐÔ ÂŮÔŘ ×ŮÂŇÁÎŮ:\n"
+"óĚĹÄŐŔÝÉĹ ĐÁËĹÔŮ ÔÁËÖĹ ÄĎĚÖÎŮ ÂŮÔŘ ŐÄÁĚĹÎŮ\n"
+"ÄĚŃ ŐÄĎ×ĚĹÔ×ĎŇĹÎÉŃ ÉČ ÚÁ×ÉÓÉÍĎÓÔĹĘ:\n"
 "\n"
 
-#: ../rpmdrake_.c:450 ../rpmdrake_.c:684
-msgid "Some packages need to be removed"
-msgstr "îĹËĎÔĎŇŮĹ ĐÁËĹÔŮ ÄĎĚÖÎŮ ÂŮÔŘ ŐÄÁĚĹÎŮ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr "îĹËĎÔĎŇŮĹ ÄĎĐĎĚÎÉÔĹĚŘÎŮĹ ĐÁËĹÔŮ ÄĎĚÖÎŮ ÂŮÔŘ ŐÄÁĚĹÎŮ"
 
-#: ../rpmdrake_.c:472
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "÷ŮÂŇÁÎĎ: %d íâ / ó×ĎÂĎÄÎĎ ÎÁ ÄÉÓËĹ: %d íâ"
+msgid "More information on package..."
+msgstr "äĎĐĎĚÎÉÔĹĚŘÎÁŃ ÉÎĆĎŇÍÁĂÉŃ Ď ĐÁËĹÔĹ..."
 
-#: ../rpmdrake_.c:474
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "÷ŮÂŇÁÎÎŮĘ ŇÁÚÍĹŇ: %d íâ"
+msgid "Information on packages"
+msgstr "éÎĆĎŇÍÁĂÉŃ Ď ĐÁËĹÔÁČ"
 
-#: ../rpmdrake_.c:482
-msgid "Files:\n"
-msgstr "ćÁĘĚŮ:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
+msgstr "äĎĐ. ÉÎĆĎŇÍÁĂÉŃ"
 
-#: ../rpmdrake_.c:483
-msgid "Changelog:\n"
-msgstr "Changelog:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "Addable"
+msgstr "íĎÖÎĎ ÄĎÂÁ×ÉÔŘ"
 
-#: ../rpmdrake_.c:486
-msgid "Source: "
-msgstr "îÁËĎĐÉÔĹĚŘ: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Upgradable"
+msgstr "íĎÖÎĎ ĎÂÎĎ×ÉÔŘ"
 
-#: ../rpmdrake_.c:487
-msgid "Currently installed version: "
-msgstr "őÓÔÁÎĎ×ĚĹÎÎÁŃ ×ĹŇÓÉŃ:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"The list of updates is void. This means that either there is\n"
+"no available update for the packages installed on your computer,\n"
+"or you already installed all of them."
+msgstr ""
+"óĐÉÓĎË ĐÁËĹÔĎ× ĐŐÓÔ. üÔĎ ĎÚÎÁŢÁĹÔ, ŢÔĎ ĚÉÂĎ ÎĹÔ ĎÂÎĎ×ĚĹÎÉĘ ÄĚŃ\n"
+"ĐÁËĹÔĎ×, ŐÓÔÁÎĎ×ĚĹÎÎŮČ ÎÁ ×ÁŰĹÍ ËĎÍĐŘŔÔĹŇĹ, ĚÉÂĎ ĎÎÉ ŐÖĹ ×ÓĹ\n"
+"ŐÓÔÁÎĎ×ĚĹÎŮ."
 
-#: ../rpmdrake_.c:491
-msgid "Reason for update: "
-msgstr "đŇÉŢÉÎÁ ĎÂÎĎ×ĚĹÎÉŃ:"
+#: ../rpmdrake:1
+#, c-format
+msgid "No update"
+msgstr "ďÂÎĎ×ĚĹÎÉĘ ÎĹÔ"
 
-#: ../rpmdrake_.c:493
-msgid "Name: "
-msgstr "îÁÚ×ÁÎÉĹ: "
+#: ../rpmdrake:1
+#, c-format
+msgid "(none)"
+msgstr "(ÎĹÔ)"
 
-#: ../rpmdrake_.c:494
-msgid "Version: "
-msgstr "÷ĹŇÓÉŃ:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, listing packages..."
+msgstr "đĎÖÁĚŐĘÓÔÁ, ĐĎÄĎÖÄÉÔĹ, ÓĎÓÔÁ×ĚŃĹÔÓŃ ÓĐÉÓĎË ĐÁËĹÔĎ×..."
 
-#: ../rpmdrake_.c:495
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s ëâ"
+msgid "unknown package "
+msgstr "ÎĹÉÚ×ĹÓÔÎŮĘ ĐÁËĹÔ"
 
-#: ../rpmdrake_.c:495
-msgid "Size: "
-msgstr "ňÁÚÍĹŇ: "
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "îŐÖĹÎ ĎÄÉÎ ÉÚ ÓĚĹÄŐŔÝÉČ ĐÁËĹÔĎ×"
 
-#: ../rpmdrake_.c:497
-msgid "Importance: "
-msgstr "÷ÁÖÎĎÓÔŘ: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please choose"
+msgstr "đĎÖÁĚŐĘÓÔÁ, ×ŮÂĹŇÉÔĹ"
 
-#: ../rpmdrake_.c:498
-msgid "Summary: "
-msgstr "éÔĎÇ: "
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:499
-msgid "Description: "
-msgstr "ďĐÉÓÁÎÉĹ:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Not selected"
+msgstr "îĹ ×ŮÂŇÁÎÎŮĹ"
 
-#: ../rpmdrake_.c:548
-msgid "Bugfixes updates"
-msgstr "ďÂÎĎ×ĚĹÎÉŃ ÂÁÇĆÉËÓĎ×"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected"
+msgstr "÷ŮÂŇÁÎÎŮĹ"
 
-#: ../rpmdrake_.c:548
-msgid "Normal updates"
-msgstr "îĎŇÍÁĚŘÎŮĹ ĎÂÎĎ×ĚĹÎÉŃ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results"
+msgstr "ňĹÚŐĚŘÔÁÔŮ ĐĎÉÓËÁ"
 
-#: ../rpmdrake_.c:567
-msgid "Mandrake choices"
-msgstr "÷ŮÂĎŇ Mandrake"
+#: ../rpmdrake:1
+#, c-format
+msgid "Stop"
+msgstr "ďÓÔÁÎĎ×ÉÔŘ"
 
-#: ../rpmdrake_.c:568
-msgid "All packages, alphabetical"
-msgstr "÷ÓĹ ĐÁËĹÔŮ, ĐĎ ÁĚĆÁ×ÉÔŐ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, searching..."
+msgstr "đĎÖÁĚŐĘÓÔÁ, ĐĎÄĎÖÄÉÔĹ, ×ŮĐĎĚÎŃĹÔÓŃ ĐĎÉÓË..."
 
-#: ../rpmdrake_.c:569
-msgid "All packages,"
-msgstr "÷ÓĹ ĐÁËĹÔŮ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
+msgstr "ňĹÚŐĚŘÔÁÔŮ ĐĎÉÓËÁ (ÎĹÔ)"
 
-#: ../rpmdrake_.c:592
-msgid "by group"
-msgstr "ĐĎ ÇŇŐĐĐÁÍ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "äŇŐÇĎĹ"
 
-#: ../rpmdrake_.c:592
-msgid "by size"
-msgstr "ĐĎ ŇÁÚÍĹŇŐ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"Welcome to the packages source editor!\n"
+"\n"
+"This tool will help you configure the packages sources you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"äĎÂŇĎ ĐĎÖÁĚĎ×ÁÔŘ × ŇĹÄÁËÔĎŇ ÎÁËĎĐÉÔĹĚĹĘ ĐÁËĹÔĎ×!\n"
+"üÔĎÔ ÉÎÓÔŇŐÍĹÎÔ ĐĎÍĎÖĹÔ ×ÁÍ ÎÁÓÔŇĎÉÔŘ ÎÁËĎĐÉÔĹĚÉ Ó ĐÁËĹÔÁÍÉ,\n"
+"ËĎÔĎŇŮĹ ×Ů ÖĹĚÁĹÔĹ ÉÓĐĎĚŘÚĎ×ÁÔŘ ÎÁ Ó×ĎĹÍ ËĎÍĐŘŔÔĹŇĹ. úÁÔĹÍ ĎÎÉ ÂŐÄŐÔ\n"
+"ÄĎÓÔŐĐÎŮ ÄĚŃ ŐÓÔÁÎĎ×ËÉ ÎĎ×ŮČ ĐÁËĹÔĎ× Ó ĐŇĎÇŇÁÍÍÎŮÍ ĎÂĹÓĐĹŢĹÎÉĹÍ ÉĚÉ ÄĚŃ\n"
+"×ŮĐĎĚÎĹÎÉŃ ĎÂÎĎ×ĚĹÎÉĘ."
 
-#: ../rpmdrake_.c:593
-msgid "by selection state"
-msgstr "ĐĎ ÓĎÓÔĎŃÎÉŔ ×ŮÂĎŇÁ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "óĎČŇÁÎÉÔŘ É ×ŮĘÔÉ"
 
-#: ../rpmdrake_.c:594
-msgid "by source repository"
-msgstr "ĐĎ ÉÓÔĎŢÎÉËŐ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy..."
+msgstr "đŇĎËÓÉ..."
 
-#: ../rpmdrake_.c:594
-msgid "by update availability"
-msgstr "ĐĎ ÄĎÓÔŐĐÎĎÓÔÉ ĎÂÎĎ×ĚĹÎÉĘ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
+msgstr "ďÂÎĎ×ÉÔŘ..."
 
-#: ../rpmdrake_.c:615
-msgid "in descriptions"
-msgstr "ĐĎ ĎĐÉÓÁÎÉŃÍ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "äĎÂÁ×ÉÔŘ..."
 
-#: ../rpmdrake_.c:615
-msgid "in files"
-msgstr "ĐĎ ĆÁĘĚÁÍ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "ňĹÄÁËÔÉŇĎ×ÁÔŘ"
 
-#: ../rpmdrake_.c:615
-msgid "in names"
-msgstr "ĐĎ ÉÍĹÎÁÍ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Source"
+msgstr "îÁËĎĐÉÔĹĚŘ"
 
-#: ../rpmdrake_.c:626
-msgid "Reload the packages list"
-msgstr "đĹŇĹÚÁÇŇŐÚÉÔŘ ÓĐÉÓĎË ĐÁËĹÔĎ×"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
+msgstr "÷ËĚŔŢĹÎ?"
 
-#: ../rpmdrake_.c:626
-msgid "Reset the selection"
-msgstr "óÂŇĎÓÉÔŘ ×ŮÂĎŇ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure sources"
+msgstr "îÁÓÔŇĎÉÔŘ ÎÁËĎĐÉÔĹĚÉ"
 
-#: ../rpmdrake_.c:652
-msgid "Maximum information"
-msgstr "íÁËÓÉÍŐÍ ÉÎĆĎŇÍÁĂÉÉ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "đÁŇĎĚŘ:"
 
-#: ../rpmdrake_.c:652
-msgid "Normal information"
-msgstr "óÔÁÎÄÁŇÔÎÁŃ ÉÎĆĎŇÍÁĂÉŃ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
+msgstr "đĎĚŘÚĎ×ÁÔĹĚŘ:"
 
-#: ../rpmdrake_.c:674
-msgid "Too many packages are selected"
-msgstr "÷ŮÂŇÁÎĎ ÓĚÉŰËĎÍ ÍÎĎÇĎ ĐÁËĹÔĎ×"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "÷Ů ÍĎÖĹÔĹ ŐËÁÚÁÔŘ ĐĎĚŘÚĎ×ÁÔĹĚŃ/ĐÁŇĎĚŘ ÄĚŃ ÁŐÔĹÎÔÉĆÉËÁĂÉÉ ÎÁ ĐŇĎËÓÉ:"
 
-#: ../rpmdrake_.c:720
-msgid "Find:"
-msgstr "îÁĘÔÉ:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "éÍŃ ČĎÓÔÁ ĐŇĎËÓÉ:"
 
-#: ../rpmdrake_.c:725
-msgid "Search"
-msgstr "đĎÉÓË"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"ĺÓĚÉ ×ÁÍ ÎŐÖĹÎ ĐŇĎËÓÉ, ××ĹÄÉÔĹ ÉÍŃ ČĎÓÔÁ É ĐŇÉ ÎĹĎÂČĎÄÉÍĎÓÔÉ ĐĎŇÔ "
+"(ÓÉÎÔÁËÓÉÓ: ČĎÓÔ_ĐŇĎËÓÉ[:ĐĎŇÔ])"
 
-#: ../rpmdrake_.c:731
-msgid "Install"
-msgstr "őÓÔÁÎĎ×ÉÔŘ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "îÁÓÔŇĎÉÔŘ ĐŇĎËÓÉ"
 
-#: ../rpmdrake_.c:738 data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrake Update"
-msgstr "ďÂÎĎ×ĚĹÎÉĹ Mandrake"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr "đĎÖÁĚŐĘÓÔÁ, ĐĎÄĎÖÄÉÔĹ, ĎÂÎĎ×ĚŃĹÔÓŃ ÎÁËĎĐÉÔĹĚŘ..."
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Installation"
-msgstr "őÓÔÁÎĎ×ËÁ ĐÁËĹÔĎ× ĐŇĎÇŇÁÍÍÎĎÇĎ ĎÂĹÓĐĹŢĹÎÉŃ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr ""
+"ţÔĎÂŮ ÓĎČŇÁÎÉÔŘ ÉÚÍĹÎĹÎÉŃ, ×ÁÍ ÎĹĎÂČĎÄÉÍĎ ×ÓÔÁ×ÉÔŘ × ĐŇÉ×ĎÄ ÎÁËĎĐÉÔĹĚŘ."
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Removal"
-msgstr "őÄÁĚĹÎÉĹ ĐÁËĹÔĎ× ĐŇĎÇŇÁÍÍÎĎÇĎ ĎÂĹÓĐĹŢĹÎÉŃ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
+msgstr "÷ÁÍ ÎĹĎÂČĎÄÉÍĎ ×ÓÔÁ×ÉÔŘ ÎÁËĎĐÉÔĹĚŘ ÄĚŃ ĐŇĎÄĎĚÖĹÎÉŃ"
 
-#: ../rpmdrake_.c:779
-msgid "Please wait, contacting mirror to update packages information."
-msgstr ""
-"đĎÖÁĚŐĘÓÔÁ, ĐĎÄĎÖÄÉÔĹ, ŐÓÔÁÎÁ×ĚÉ×ÁĹÔÓŃ ÓĎĹÄÉÎĹÎÉĹ Ó ÚĹŇËÁĚĎÍ, ŢÔĎÂŮ ĎÂÎĎ×ÉÔŘ "
-"ÉÎĆĎŇÍÁĂÉŔ Ď ĐÁËĹÔÁČ."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save changes"
+msgstr "óĎÚŇÁÎÉÔŘ ÉÚÍĹÎĹÎÉŃ"
 
-#: ../rpmdrake_.c:781
-msgid "Error updating medium"
-msgstr "ďŰÉÂËÁ ĐŇÉ ĎÂÎĎ×ĚĹÎÉÉ ÎÁËĎĐÉÔĹĚŃ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "ďÔÎĎÓÉÔĹĚŘÎŮĘ ĐŐÔŘ Ë synthesis/hdlist: "
 
-#: ../rpmdrake_.c:782
-msgid "There was an unrecoverable error while updating packages information."
-msgstr "đŇĎÉÚĎŰĚÁ ÎĹŐÓÔŇÁÎÉÍÁŃ ĎŰÉÂËÁ ĐŇÉ ĎÂÎĎ×ĚĹÎÉÉ ÉÎĆĎŇÍÁĂÉÉ Ď ĐÁËĹÔÁČ."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake_.c:787
-msgid "How to choose manually your mirror"
-msgstr "ëÁË ×ŇŐŢÎŐŔ ×ŮÂŇÁÔŘ Ó×ĎĹ ÚĹŇËÁĚĎ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Editing source \"%s\":"
+msgstr "ňĹÄÁËÔÉŇĎ×ÁÎÉĹ ÎÁËĎĐÉÔĹĚŃ \"%s\":"
 
-#: ../rpmdrake_.c:795
-msgid "Please wait, contacting mirror to initialize updates packages."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit a source"
+msgstr "ňĹÄÁËÔÉŇĎ×ÁÔŘ ÎÁËĎĐÉÔĹĚŘ"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr "đĎÖÁĚŐĘÓÔÁ, ĐĎÄĎÖÄÉÔĹ, ŐÄÁĚŃĹÔÓŃ ÎÁËĎĐÉÔĹĚŘ..."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, adding medium..."
+msgstr "đĎÖÁĚŐĘÓÔÁ, ĐĎÄĎÖÄÉÔĹ, ÄĎÂÁ×ĚŃĹÔÓŃ ÎÁËĎĐÉÔĹĚŘ..."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of source:"
+msgstr "ôÉĐ ÎÁËĎĐÉÔĹĚŃ:"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Adding a source:"
+msgstr "äĎÂÁ×ĚĹÎÉĹ ÎÁËĎĐÉÔĹĚŃ:"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 msgstr ""
-"đĎÖÁĚŐĘÓÔÁ, ĐĎÄĎÖÄÉÔĹ, ŐÓÔÁÎÁ×ĚÉ×ÁĹÔÓŃ ÓĎĹÄÉÎĹÎÉĹ Ó ÚĹŇËÁĚĎÍ, ŢÔĎÂŮ "
-"ÉÎÉĂÉÁĚÉÚÉŇĎ×ÁÔŘ ĐÁËĹÔŮ Ó ĎÂÎĎ×ĚĹÎÉŃÍÉ."
+"îÁËĎĐÉÔĹĚŘ Ó ÔÁËÉÍ ÎÁÚ×ÁÎÉĹÍ ŐÖĹ ÓŐÝĹÓÔ×ŐĹÔ,\n"
+"×Ů ÄĹĘÓÔ×ÉÔĹĚŘÎĎ ČĎÔÉÔĹ ĹÇĎ ÚÁÍĹÎÉÔŘ?"
 
-#: ../rpmdrake_.c:798
-msgid "Error adding update medium"
-msgstr "ďŰÉÂËÁ ĐŇÉ ÄĎÂÁ×ĚĹÎÉÉ ÎÁËĎĐÉÔĹĚŃ Ó ĎÂÎĎ×ĚĹÎÉŃÍÉ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to fill up at least the two first entries."
+msgstr "÷ÁÍ ÎĹĎÂČĎÄÉÍĎ ÚÁĐĎĚÎÉÔŘ ĐĎ ËŇÁĘÎĹĘ ÍĹŇĹ Ä×Á ĐĹŇ×ŮČ ĐŐÎËÔÁ."
 
-#: ../rpmdrake_.c:829
-msgid "Please wait, finding available packages..."
-msgstr "đĎÄĎÖÄÉÔĹ, ĐĎÖÁĚŐĘÓÔÁ, ×ŮĐĎĚÎŃĹÔÓŃ ĐĎÉÓË ÄĎÓÔŐĐÎŮČ ĐÁËĹÔĎ×..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "éÍŃ:"
 
-#: ../rpmdrake_.c:861
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "éÚŐŢÁĹÔÓŃ %s"
+msgid "Login:"
+msgstr "ěĎÇÉÎ:"
 
-#: ../rpmdrake_.c:880
-msgid "changes:"
-msgstr "ÉÚÍĹÎĹÎÉŃ:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "÷ŮÂĹŇÉÔĹ ÚĹŇËÁĚĎ..."
 
-#: ../rpmdrake_.c:884
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove .%s"
-msgstr "őÄÁĚÉÔŘ .%s"
+msgid "Browse..."
+msgstr "îÁĘÔÉ..."
 
-#: ../rpmdrake_.c:886
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "éÓĐĎĚŘÚĎ×ÁÔŘ .%s × ËÁŢĹÓÔ×Ĺ ÇĚÁ×ÎĎÇĎ ĆÁĘĚÁ"
+msgid "Path or mount point:"
+msgstr "đŐÔŘ ÉĚÉ ÔĎŢËÁ ÍĎÎÔÉŇĎ×ÁÎÉŃ:"
 
-#: ../rpmdrake_.c:888
-msgid "Do nothing"
-msgstr "îÉŢĹÇĹ ÎĹ ÄĹĚÁÔŘ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Removable device"
+msgstr "óßĹÍÎĎĹ ŐÓÔŇĎĘÓÔ×Ď"
 
-#: ../rpmdrake_.c:900
-msgid "Installation finished"
-msgstr "őÓÔÁÎĎ×ËÁ ÚÁ×ĹŇŰĹÎÁ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "HTTP server"
+msgstr "HTTP-ÓĹŇ×ĹŇ"
 
-#: ../rpmdrake_.c:910
-msgid "Inspect..."
-msgstr "éÚŐŢĹÎÉĹ..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "FTP-ÓĹŇ×ĹŇ"
 
-#: ../rpmdrake_.c:925
-msgid "Program missing"
-msgstr "đŇĎÇŇÁÍÍÁ ĎÔÓŐÔÓÔ×ŐĹÔ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path:"
+msgstr "đŐÔŘ:"
 
-#: ../rpmdrake_.c:926
-msgid "A required program is missing (grpmi). Check your installation."
-msgstr "ďÔÓŐÔÓÔ×ŐĹÔ ÔŇĹÂŐĹÍÁŃ ĐŇĎÇŇÁÍÍÁ (grpmi). đŇĎ×ĹŇŘÔĹ Ó×ĎŔ ŐÓÔÁÎĎ×ËŐ."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "ěĎËÁĚŘÎŮĹ ĆÁĘĚŮ"
 
-#: ../rpmdrake_.c:940
-msgid "Unable to get source packages."
-msgstr "îĹ×ĎÚÍĎÖÎĎ ĐĎĚŐŢÉÔŘ ÎÁËĎĐÉÔĹĚŘ Ó ĐÁËĹÔÁÍÉ."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add a source"
+msgstr "äĎÂÁ×ÉÔŘ ÎÁËĎĐÉÔĹĚŘ"
 
-#: ../rpmdrake_.c:941
-msgid "Unable to get source packages, sorry."
-msgstr "éÚ×ÉÎÉÔĹ, ÎĹ×ĎÚÍĎÖÎĎ ĐĎĚŐŢÉÔŘ ÎÁËĎĐÉÔĹĚŘ Ó ĐÁËĹÔÁÍÉ."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
+msgstr "îĹ×ĎÚÍĎÖÎĎ ĎÂÎĎ×ÉÔŘ ÎÁËĎĐÉÔĹĚŘ, ĎÎ ÂŐÄĹÔ Á×ÔĎÍÁÔÉŢĹÓËÉ ĎÔËĚŔŢĹÎ."
 
-#: ../rpmdrake_.c:948
-msgid "Change medium"
-msgstr "éÚÍĹÎÉÔŘ ÎÁËĎĐÉÔĹĚŘ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "îĹ×ĎÚÍĎÖÎĎ ÓĎÚÄÁÔŘ ÎÁËĎĐÉÔĹĚŘ."
 
-#: ../rpmdrake_.c:949
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "đĎÖÁĚŐĘÓÔÁ, ×ÓÔÁ×ŘÔĹ ÎÁËĎĐÉÔĹĚŘ Ó ÉÍĹÎĹÍ \"%s\" × ŐÓÔŇĎĘÓÔ×Ď [%s]"
+msgid "Please wait, updating media..."
+msgstr "đĎÖÁĚŐĘÓÔÁ, ĐĎÄĎÖÄÉÔĹ, ĎÂÎĎ×ĚŃĹÔÓŃ ÎÁËĎĐÉÔĹĚŘ..."
 
-#: ../rpmdrake_.c:957
-msgid "Installation failed"
-msgstr "őÓÔÁÎĎ×ËÁ ÂŮĚÁ ĐŇĹŇ×ÁÎÁ"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
+msgstr "ďÂÎĎ×ÉÔŘ"
 
-#: ../rpmdrake_.c:958
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Select the source(s) you wish to update:"
+msgstr "÷ŮÂĹŇÉÔĹ ÎÁËĎĐÉÔĹĚŘ(É), ËĎÔĎŇŮĘ ×Ů ČĎÔÉÔĹ ĎÂÎĎ×ÉÔŘ:"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please choose the desired mirror."
+msgstr "đĎÖÁĚŐĘÓÔÁ, ×ŮÂĹŇÉÔĹ ÖĹĚÁĹÍĎĹ ÚĹŇËÁĚĎ."
+
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
-"őÓÔÁÎĎ×ËÁ ÂŮĚÁ ĐŇĹŇ×ÁÎÁ, ĎÔÓŐÔÓÔ×ŐŔÔ ÎĹËĎÔĎŇŮĹ ĆÁĘĚŮ.\n"
-"÷ÁÍ ÍĎÖĹÔ ĐĎÎÁÄĎÂÉÔŘÓŃ ĎÂÎĎ×ÉÔŘ Ó×ĎŔ ÂÁÚŐ ÄÁÎÎŮČ ÎÁËĎĐÉÔĹĚĹĘ."
+"îĹ×ĎÚÍĎÖÎĎ ÎÁĘÔÉ ËÁËĎĹ-ĚÉÂĎ ĐĎÄČĎÄŃÝĹĹ ÚĹŇËÁĚĎ.\n"
+"\n"
+"đŇÉŢÉÎ, ×ŮÚ×Á×ŰÉČ ÜÔŐ ĐŇĎÂĚĹÍŐ, ÍĎÖĹÔ ÂŮÔŘ ÎĹÓËĎĚŘËĎ; ÎÁÉÂĎĚĹĹ\n"
+"ŢÁÓÔŮÍ Ń×ĚŃĹÔÓŃ ÓĚŐŢÁĘ, ËĎÇÄÁ ÁŇČÉÔĹËÔŐŇÁ ×ÁŰĹÇĎ ĐĎŇĂĹÓÓĎŇÁ ÎĹ\n"
+"ĐĎÄÄĹŇÖÉ×ÁĹÔÓŃ ďĆÉĂÉÁĚŘÎŮÍÉ ďÂÎĎ×ĚĹÎÉŃÍÉ Mandrake Linux."
 
-#: ../rpmdrake_.c:961
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr ""
-"đĎÄĎÖÄÉÔĹ, ĐĎÖÁĚŐĘÓÔÁ, ŐÄÁĚŃŔÔÓŃ ĐÁËĹÔŮ, ŢÔĎÂŮ ÄŇŐÇÉĹ ÍĎÇĚÉ ÂŮÔŘ ĎÂÎĎ×ĚĹÎŮ..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
+msgstr "îĹÔ ÚĹŇËÁĚÁ"
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"There was an error downloading the mirrors list:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
-"őÓÔÁÎĎ×ËÁ ÚÁ×ĹŇŰĹÎÁ; %s.\n"
+"đŇÉ ÓËÁŢÉ×ÁÎÉÉ ÓĐÉÓËÁ ÚĹŇËÁĚ ×ĎÚÎÉËĚÁ ĎŰÉÂËÁ:\n"
 "\n"
-"îĹËĎÔĎŇŮĹ ĆÁĘĚŮ ÎÁÓÔŇĎĘËÉ ÂŮĚÉ ÓĎÚÄÁÎŮ ËÁË `.rpmnew' ÉĚÉ `.rpmsave',\n"
-"ÔĹĐĹŇŘ ×Ů ÍĎÖĹÔĹ ĐĎÄŇĎÂÎĎ ÉÚŐŢÉÔŘ ÎĹËÔĎŇŮĹ ÄĹĘÓÔ×ÉŃ:"
+"%s\n"
+"÷ĎÚÍĎÖÎĎ ÓĹÔŘ ÉĚÉ ×ĹÂ-ÓÁĘÔ MandrakeSoft ÎĹÄĎÓÔŐĐÎŮ.\n"
+"đĎÖÁĚŐĘÓÔÁ, ĐĎĐŮÔÁĘÔĹÓŘ ÓÎĎ×Á ŢŐÔŘ ĐĎÚÖĹ."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "ďŰÉÂËÁ ×Ď ×ŇĹÍŃ ÓËÁŢÉ×ÁÎÉŃ"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
+"đĎÖÁĚŐĘÓÔÁ, ĐĎÄĎÖÄÉÔĹ, ÓËÁŢÉ×ÁŔÔÓŃ ÁÄŇĹÓÁ ÚĹŇËÁĚ Ó ×ĹÂ-ÓÁĘÔÁ\n"
+"MandrakeSoft"
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"some packages failed to install\n"
-"correctly"
+"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"
-"ÚÁ×ĹŇŰÉĚÁÓŘ ÎĹŐÄÁŢĹĘ"
+"íÎĹ ÎĹĎÂČĎÄÉÍĎ Ó×ŃÚÁÔŘÓŃ Ó ×ĹÂ-ÓÁĘÔĎÍ MandrakeSoft, ŢÔĎÂŮ ĐĎĚŐŢÉÔŘ\n"
+" ÓĐÉÓĎË ÚĹŇËÁĚ. đĎÖÁĚŐĘÓÔÁ, ŐÂĹÄÉÔĹÓŘ, ŢÔĎ ×ÁŰÁ ÓĹÔŘ × ÎÁÓÔĎŃÝÉĘ\n"
+"ÍĎÍĹÎÔ ŇÁÂĎÔÁĹÔ.\n"
+"÷ÓĹ × ĐĎŇŃÄËĹ? íĎÖÎĎ ĐŇĎÄĎĚÖÁÔŘ?"
 
-#: ../rpmdrake_.c:983
-msgid "everything was installed correctly"
-msgstr "×ÓĹ ÂŮĚĎ ŐÓĐĹŰÎĎ ŐÓÔÁÎĎ×ĚĹÎĎ"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United States"
+msgstr "óĎĹÄÉÎĹÎÎŮĹ űÔÁÔŮ"
 
-#: ../rpmdrake_.c:985
-msgid "Everything installed successfully"
-msgstr "÷ÓĹ ŐÓĐĹŰÎĎ ŐÓÔÁÎĎ×ĚĹÎĎ."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
+msgstr "ëÉÔÁĘ"
 
-#: ../rpmdrake_.c:986
-msgid "All requested packages were installed successfully."
-msgstr "÷ÓĹ ÚÁĐŇĎŰĹÎÎŮĹ ĐÁËĹÔŮ ÂŮĚÉ ŐÓĐĹŰÎĎ ŐÓÔÁÎĎ×ĚĹÎŮ."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr "ďÂßĹÄÉÎĹÎÎĎĹ ëĎŇĎĚĹ×ÓÔ×Ď"
 
-#: ../rpmdrake_.c:989
-msgid "Everything already installed."
-msgstr "÷ÓĹ ŐÖĹ ŐÓÔÁÎĎ×ĚĹÎĎ."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "ôÁĘ×ÁÎŘ"
 
-#: ../rpmdrake_.c:990
-msgid "Everything already installed (is this supposed to happen at all?)."
-msgstr "÷ÓĹ ŐÖĹ ŐÓÔÁÎĎ×ĚĹÎĎ (ÜÔĎ ×ĎĎÂÝĹ ÓĚŐŢÁĹÔÓŃ?)."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "ű×ĹĂÉŃ"
 
-#: ../rpmdrake_.c:997
-msgid "Problem during installation"
-msgstr "đŇĎÂĚĹÍÁ ×Ď ×ŇĹÍŃ ŐÓÔÁÎĎ×ËÉ"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
+msgstr "ňĎÓÓÉŃ"
 
-#: ../rpmdrake_.c:998
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"đŇÉ ŐÓÔÁÎĎ×ËĹ ×ĎÚÎÉËĚÁ ĐŇĎÂĚĹÍÁ:\n"
-"\n"
-"%s"
+msgid "Portugal"
+msgstr "đĎŇÔŐÇÁĚÉŃ"
 
-#: ../rpmdrake_.c:1012
-msgid "Please wait, reading packages database..."
-msgstr "đĎÄĎÖÄÉÔĹ, ĐĎÖÁĚŐĘÓÔÁ, ĐŇĎÉÚ×ĎÄÉÔÓŃ ŢÔĹÎÉĹ ÉÚ ÂÁÚŮ ÄÁÎÎŮČ..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
+msgstr "đĎĚŘŰÁ"
 
-#: ../rpmdrake_.c:1053
-msgid "Please wait, removing packages..."
-msgstr "đĎÄĎÖÄÉÔĹ, ĐĎÖÁĚŐĘÓÔÁ, ŐÄÁĚŃŔÔÓŃ ĐÁËĹÔŮ..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
+msgstr "îĎŇ×ĹÇÉŃ"
 
-#: ../rpmdrake_.c:1056
-msgid "Problem during removal"
-msgstr "đŇĎÂĚĹÍÁ ×Ď ×ŇĹÍŃ ŐÄÁĚĹÎÉŃ"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
+msgstr "îÉÄĹŇĚÁÎÄŮ"
 
-#: ../rpmdrake_.c:1057
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"đŇÉ ŐÄÁĚĹÎÉÉ ĐÁËĹÔĎ× ×ĎÚÎÉËĚÁ ĐŇĎÂĚĹÍÁ:\n"
-"\n"
-"%s"
+msgid "Korea"
+msgstr "ëĎŇĹŃ"
 
-#: ../rpmdrake_.c:1089
-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 "Japan"
+msgstr "ńĐĎÎÉŃ"
 
-#: ../rpmdrake_.c:1094
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"äĎÂŇĎ ĐĎÖÁĚĎ×ÁÔŘ × MandrakeUpdate!\n"
-"\n"
-"üÔĎÔ ÉÎÓÔŇŐÍĹÎÔ ĐĎÍĎÖĹÔ ×ÁÍ ×ŮÂŇÁÔŘ ĎÂÎĎ×ĚĹÎÉŃ ÄĚŃ ŐÓÔÁÎĎ×ËÉ ÎÁ ×Á\n"
-"ËĎÍĐŘŔÔĹŇ."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Italy"
+msgstr "éÔÁĚÉŃ"
 
-#: ../rpmdrake_.c:1099
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
-msgstr ""
-"äĎÂŇĎ ĐĎÖÁĚĎ×ÁÔŘ × ÉÎÓÔŇŐÍĹÎÔ ŐÓÔÁÎĎ×ËÉ ĐŇĎÇŇÁÍÍÎĎÇĎ ĎÂĹÓĐĹŢĹÎÉŃ!\n"
-"\n"
-"÷ÁŰÁ ÓÉÓÔĹÍÁ Mandrake Linux ĐĎÓÔÁ×ĚŃĹÔÓŃ Ó ÎĹÓËĎĚŘËÉÍÉ ÔŮÓŃŢÁÍÉ ĐÁËĹÔĎ×\n"
-"ĐŇĎÇŇÁÍÍÎĎÇĎ ĎÂĹÓĐĹŢĹÎÉŃ ÎÁ CDROM É DVD. üÔĎÔ ÉÎÓÔŇŐÍĹÎÔ ĐĎÍĎÖĹÔ ×ÁÍ\n"
-"×ŮÂŇÁÔŘ ĐŇĎÇŇÁÍÍÎĎĹ ĎÂĹÓĐĹŢĹÎÉŃ ÄĚŃ ŐÓÔÁÎĎ×ËÉ ÎÁ ×ÁŰ ËĎÍĐŘŔÔĹŇ."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Israel"
+msgstr "éÚŇÁÉĚŘ"
 
-#: data/rpmdrake-remove.desktop.in.h:1
-msgid "Remove Software"
-msgstr "őÄÁĚÉÔŘ ĐŇĎÇŇÁÍÍÎĎĹ ĎÂĹÓĐĹŢĹÎÉĹ"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "çŇĹĂÉŃ"
 
-#: data/rpmdrake-sources.desktop.in.h:1
-msgid "Software Sources Manager"
-msgstr "íĹÎĹÄÖĹŇ ÉÓÔĎŢÎÉËĎ× ĐŇĎÇŇÁÍÍÎĎÇĎ ĎÂĹÓĐĹŢĹÎÉŃ"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "France"
+msgstr "ćŇÁÎĂÉŃ"
 
-#: data/rpmdrake.desktop.in.h:1
-msgid "Install Software"
-msgstr "őÓÔÁÎĎ×ÉÔŘ ĐŇĎÇŇÁÍÍÎĎĹ ĎÂĹÓĐĹŢĹÎÉĹ"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "ćÉÎĚŃÎÄÉŃ"
 
-#~ msgid ""
-#~ "There is already a medium by that name, do you\n"
-#~ "really want to replace it?"
-#~ msgstr ""
-#~ "îÁËĎĐÉÔĹĚŘ Ó ÔÁËÉÍ ÎÁÚ×ÁÎÉĹÍ ŐÖĹ ÓŐÝĹÓÔ×ŐĹÔ,\n"
-#~ "×Ů ÄĹĘÓÔ×ÉÔĹĚŘÎĎ ČĎÔÉÔĹ ĹÇĎ ÚÁÍĹÎÉÔŘ?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "éÓĐÁÎÉŃ"
 
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-#~ "÷ÓĹ × ĐĎŇŃÄËĹ? íĎÖÎĎ ĐŇĎÄĎĚÖÁÔŘ?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
+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
+#, c-format
+msgid "Germany"
+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 "Czech Republic"
+msgstr "ţĹŰÓËÁŃ ňĹÓĐŐÂĚÉËÁ"
 
-#~ msgid ""
-#~ "There was an error downloading the mirrors list:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "The network, or MandrakeSoft website, are maybe unavailable.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "đŇÉ ÓËÁŢÉ×ÁÎÉÉ ÓĐÉÓËÁ ÚĹŇËÁĚ ×ĎÚÎÉËĚÁ ĎŰÉÂËÁ:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "÷ĎÚÍĎÖÎĎ ÓĹÔŘ ÉĚÉ ×ĹÂ-ÓÁĘÔ MandrakeSoft ÎĹÄĎÓÔŐĐÎŮ.\n"
-#~ "đĎÖÁĚŐĘÓÔÁ, ĐĎĐŮÔÁĘÔĹÓŘ ÓÎĎ×Á ŢŐÔŘ ĐĎÚÖĹ."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Costa Rica"
+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 "Canada"
+msgstr "ëÁÎÁÄÁ"
 
-#~ msgid ""
-#~ "The list of updates is void. This means that either there is\n"
-#~ "no available update for the packages installed on your computer,\n"
-#~ "or you already installed all of them."
-#~ msgstr ""
-#~ "óĐÉÓĎË ĐÁËĹÔĎ× ĐŐÓÔ. üÔĎ ĎÚÎÁŢÁĹÔ, ŢÔĎ ĚÉÂĎ ÎĹÔ ĎÂÎĎ×ĚĹÎÉĘ ÄĚŃ\n"
-#~ "ĐÁËĹÔĎ×, ŐÓÔÁÎĎ×ĚĹÎÎŮČ ÎÁ ×ÁŰĹÍ ËĎÍĐŘŔÔĹŇĹ, ĚÉÂĎ ĎÎÉ ŐÖĹ ×ÓĹ\n"
-#~ "ŐÓÔÁÎĎ×ĚĹÎŮ."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
+msgstr "âŇÁÚÉĚÉŃ"
 
-#~ msgid ""
-#~ "Warning: it seems that you are attempting to add so much\n"
-#~ "packages that your filesystem may run out of free diskspace,\n"
-#~ "during or after package installation ; this is particularly\n"
-#~ "dangerous and should be considered with care.\n"
-#~ "\n"
-#~ "Do you really want to install all the selected packages?"
-#~ msgstr ""
-#~ "đŇĹÄŐĐŇĹÖÄĹÎÉĹ: ĐĎČĎÖĹ, ŢÔĎ ×Ů ĐŮÔÁĹÔĹÓŘ ÄĎÂÁ×ÉÔŘ ÓĚÉŰËĎÍ\n"
-#~ "ÍÎĎÇĎ ĐÁËĹÔĎ×, ÉÚ-ÚÁ ŢĹÇĎ ×ÁŰĹĘ ĆÁĘĚĎ×ĎĘ ÓÉÓÔĹÍĹ ÎĹ Č×ÁÔÉÔ\n"
-#~ "Ó×ĎÂĎÄÎĎÇĎ ÍĹÓÔÁ ×Ď ×ŇĹÍŃ ÉĚÉ ĐĎÓĚĹ ŐÓÔÁÎĎ×ËÉ ĐÁËĹÔĎ×; ÜÔĎ\n"
-#~ "ŢŇĹÚ×ŮŢÁĘÎĎ ĎĐÁÓÎĎ É ÄĎĚÖÎĎ ÂŮÔŘ ŐŢÔĹÎĎ Ó ĎÓÔĎŇĎÖÎĎÓÔŘŔ.\n"
-#~ "\n"
-#~ "×Ů ÄĹĘÓÔ×ÉÔĹĚŘÎĎ ČĎÔÉÔĹ ŐÓÔÁÎĎ×ÉÔŘ ×ÓĹ ×ŮÂŇÁÎÎŮĹ ĐÁËĹÔŮ?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Belgium"
+msgstr "âĹĚŘÇÉŃ"
 
-#~ msgid ""
-#~ "The following packages have to be removed for others to be upgraded:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "óĚĹÄŐŔÝÉĹ ĐÁËĹÔŮ ÄĎĚÎŮ ÂŮÔŘ ŐÄÁĚĹÎŮ, ŢÔĎÂŮ ÍĎÇĚÉ ÂŮÔŘ ĎÂÎĎ×ĚĹÎŮ ÄŇŐÇÉĹ:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "÷ÓĹ × ĐĎŇŃÄËĹ? íĎÖÎĎ ĐŇĎÄĎĚÖÁÔŘ?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Australia"
+msgstr "á×ÓÔŇÁĚÉŃ"
 
-#~ msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#~ msgstr "-cronyx-helvetica-bold-normal--25-*-100-100-p-*-koi8-r,*-r-*"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
+msgstr "á×ÓÔŇÉŃ"
 
-#~ msgid ""
-#~ "I need to contact the mirror to get latest update packages.\n"
-#~ "Please check that your network is currently running.\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "íÎĹ ÎĹĎÂČĎÄÉÍĎ Ó×ŃÚÁÔŘÓŃ Ó ÚĹŇËÁĚĎÍ, ŢÔĎÂŮ ĐĎĚŐŢÉÔŘ ÓÁÍŮĹ\n"
-#~ "ĐĎÓĚĹÄÎÉĹ ĐÁËĹÔŮ Ó ĎÂÎĎ×ĚĹÎÉŃÍÉ. đĎÖÁĚŐĘÓÔÁ, ŐÂĹÄÉÔĹÓŘ,\n"
-#~ "ŢÔĎ ×ÁŰÁ ÓĹÔŘ × ÄÁÎÎŮĘ ÍĎÍĹÎÔ ŇÁÂĎÔÁĹÔ.\n"
-#~ "÷ÓĹ × ĐĎŇŃÄËĹ? íĎÖÎĎ ĐŇĎÄĎĚÖÁÔŘ?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "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.pm:1
+#, c-format
+msgid "No"
+msgstr "îĹÔ"
 
-#~ 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 ""
-#~ "đŇĎÉÚĎŰĚÁ ĎŰÉÂËÁ ĐŇÉ ÄĎÂÁ×ĚĹÎÉÉ ÎÁËĎĐÉÔĹĚŃ Ó ĎÂÎĎ×ĚĹÎÉŃÍÉ ŢĹŇĹÚ urpmi.\n"
-#~ "\n"
-#~ "üÔĎ ÍĎÖĹÔ ÂŮÔŘ ÉÚ-ÚÁ ÎĹ×ĹŇÎĎÇĎ ÉĚÉ ×ŇĹÍĹÎÎĎ ÎĹÄĎÓÔŐĐÎĎÇĎ ÚĹŇËÁĚÁ ÉĚÉ \n"
-#~ "× ÓĚŐŢÁĹ, ĹÓĚÉ ×ĹŇÓÉŃ ×ÁŰĹÇĎ Mandrake Linux (%s) ĹÝĹ/ŐÖĹ ÎĹ\n"
-#~ "ĐĎÄÄĹŇÖÉ×ÁĹÔÓŃ Mandrake Linux Official Updates.\n"
-#~ "\n"
-#~ "öĹĚÁĹÔĹ ĐĎĐŇĎÂĎ×ÁÔŘ ÄŇŐÇĎĹ ÚĹŇËÁĚĎ?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "äÁ"
+
+#: data/rpmdrake.desktop.in.h:1
+msgid "Install Software"
+msgstr "őÓÔÁÎĎ×ÉÔŘ ĐŇĎÇŇÁÍÍÎĎĹ ĎÂĹÓĐĹŢĹÎÉĹ"
+
+#: data/rpmdrake-remove.desktop.in.h:1
+msgid "Remove Software"
+msgstr "őÄÁĚÉÔŘ ĐŇĎÇŇÁÍÍÎĎĹ ĎÂĹÓĐĹŢĹÎÉĹ"
+
+#: data/rpmdrake-sources.desktop.in.h:1
+msgid "Software Sources Manager"
+msgstr "íĹÎĹÄÖĹŇ ÉÓÔĎŢÎÉËĎ× ĐŇĎÇŇÁÍÍÎĎÇĎ ĎÂĹÓĐĹŢĹÎÉŃ"
+
+#~ msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
+#~ msgstr "-cronyx-helvetica-bold-normal--25-*-100-100-p-*-koi8-r,*-r-*"
 
 #~ msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
 #~ msgstr "-cronyx-fixed-medium-r-normal--12-*-*-100--*-*-*-koi8-r,*"
diff --git a/po/ru.pom b/po/ru.pom
index e8c7126d..6370c8ec 100644
--- a/po/ru.pom
+++ b/po/ru.pom
@@ -4,169 +4,175 @@ msgstr "óĹŇ×ĹŇ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "óĹÔĹ×ĎĘ ËĎÍĐŘŔÔĹŇ (ËĚÉĹÎÔ)"
+msgid "Office Workstation"
+msgstr "ďĆÉÓÎÁŃ ŇÁÂĎŢÁŃ ÓÔÁÎĂÉŃ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS-ÓĹŇ×ĹŇ, SMB-ÓĹŇ×ĹŇ, Proxy-ÓĹŇ×ĹŇ, ssh-ÓĹŇ×ĹŇ"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"ďĆÉÓÎŮĹ ĐŇĎÇŇÁÍÍŮ: ÔĹÓÔĎ×ŮĹ ĐŇĎĂĹÓÓĎŇŮ (kword, abiword), ÜĚĹËÔŇĎÎÎŮĹ ÔÁÂĚÉĂŮ "
+"(kspread, gnumeric), ĐŇĎÓÍĎÔŇÝÉËÉ pdf É Ô.Ä."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "ďĆÉÓ"
+msgid "Workstation"
+msgstr "ňÁÂĎŢÁŃ ÓÔÁÎĂÉŃ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "ňÁÂĎŢÁŃ ÓÔÁÎĂÉŃ Gnome"
+msgid "Game station"
+msgstr "éÇŇĎ×ÁŃ ÓÔÁÎĂÉŃ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "óĹŇ×ÉÓÎŮĹ ĐŇĎÇŇÁÍÍŮ ÄĚŃ ×ÁŰĹÇĎ Palm Pilot ÉĚÉ Visor"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "ňÁÚ×ĚĹËÁÔĹĚŘÎŮĹ ĐŇĎÇŇÁÍÍŮ: ÁŇËÁÄŮ, ÎÁÓÔĎĚŘÎŮĹ ÉÇŇŮ, ÓÔŇÁÔĹÇÉÉ É Ô.Ä."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "ňÁÂĎŢÁŃ ÓÔÁÎĂÉŃ"
+msgid "Multimedia station"
+msgstr "íŐĚŘÔÉÍĹÄÉÁ ÓÔÁÎĂÉŃ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "ćÁĘĹŇ×ĎĚ/íÁŇŰŇŐÔÉÚÁÔĎŇ"
+msgid "Sound and video playing/editing programs"
+msgstr "đŇĎÇŇÁÍÍŮ ÄĚŃ ĐŇĎÉÇŇŮ×ÁÎÉŃ/ŇĹÄÁËÔÉŇĎ×ÁÎÉŃ Ú×ŐËÁ É ×ÉÄĹĎ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr "óĹŇ×ĹŇ ÄĎÍĹÎÎŮČ ÉÍĹÎ É NIS"
+msgid "Internet station"
+msgstr "óÔÁÎĂÉŃ éÎÔĹŇÎĹÔ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
 msgstr ""
-"ďĆÉÓÎŮĹ ĐŇĎÇŇÁÍÍŮ: ÔĹÓÔĎ×ŮĹ ĐŇĎĂĹÓÓĎŇŮ (kword, abiword), ÜĚĹËÔŇĎÎÎŮĹ ÔÁÂĚÉĂŮ "
-"(kspread, gnumeric), ĐŇĎÓÍĎÔŇÝÉËÉ pdf É Ô.Ä."
+"îÁÂĎŇ ÓĹŇ×ÉÓÎŮČ ĐŇĎÇŇÁÍÍ ÄĚŃ ŢÔĹÎÉŃ É ĎÔĐŇÁ×ËÉ ĐĎŢÔŮ É ÎĎ×ĎÓÔĹĘ (pine, mutt, "
+"tin...) É ĐŇĎÓÍĎÔŇÁ Web"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr ""
-"đŇĎÇŇÁÍÍŮ ÄĚŃ ŇÁÂĎÔŮ ÓĎ Ú×ŐËĎÍ: mp3- ÉĚÉ MIDI-ĐŇĎÉÇŇŮ×ÁÔĹĚÉ, ÍÉËŰĹŇŮ É Ô.Ä."
+msgid "Network Computer (client)"
+msgstr "óĹÔĹ×ĎĘ ËĎÍĐŘŔÔĹŇ (ËĚÉĹÎÔ)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "óÔÁÎÄÁŇÔÎÁŃ ÂÁÚÁ Linux. đĎÄÄĹŇÖËÁ ĐŇÉĚĎÖĹÎÉĘ ÔŇĹÔŘÉČ ĚÉĂ"
+msgid "Clients for different protocols including ssh"
+msgstr "ëĚÉĹÎÔŮ ÄĚŃ ŇÁÚĚÉŢÎŮČ ĐŇĎÔĎËĎĚĎ×, ×ËĚŔŢÁŃ ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "ëÎÉÇÉ É HowTo ĐĎ Linux É Ó×ĎÂĎÄÎĎÍ ĐŇĎÇŇÁÍÍÎĎÍ ĎÂĹÓĐĹŢĹÎÉÉ"
+msgid "Configuration"
+msgstr "îÁÓÔŇĎĘËÁ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "ňÁÂĎŢÁŃ ÓÔÁÎĂÉŃ KDE"
+msgid "Tools to ease the configuration of your computer"
+msgstr "óĹŇ×ÉÓÎŮĹ ĐŇĎÇŇÁÍÍŮ ÄĚŃ ĎÂĚĹÇŢĹÎÉŃ ÎÁÓÔŇĎĘËÉ ×ÁŰĹÇĎ ËĎÍĐŘŔÔĹŇÁ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm É Ô.Ä."
+msgid "Scientific Workstation"
+msgstr "îÁŐŢÎÁŃ ŇÁÂĎŢÁŃ ÓÔÁÎĂÉŃ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "íŐĚŘÔÉÍĹÄÉÁ - ÷ÉÄĹĎ"
+msgid "Scientific applications such as gnuplot"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr ""
-"îÁÂĎŇ ÓĹŇ×ÉÓÎŮČ ĐŇĎÇŇÁÍÍ ÄĚŃ ĐĎŢÔŮ, ÎĎ×ĎÓÔĹĘ, web, ĐĹŇĹÓŮĚËÉ ĆÁĘĚĎ× É ŢÁÔÁ"
+msgid "Console Tools"
+msgstr "óĹŇ×ÉÓÎŮĹ ĐŇĎÇŇÁÍÍŮ ÄĚŃ ËĎÎÓĎĚÉ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "âÁÚÁ ÄÁÎÎŮČ"
+msgid "Editors, shells, file tools, terminals"
+msgstr "ňĹÄÁËÔĎŇŮ, ËĎÍÁÎÄÎŮĹ ĐŇĎĂĹÓÓĎŇŮ, ĆÁĘĚĎ×ŮĹ ŐÔÉĚÉÔŮ, ÔĹŇÍÉÎÁĚŮ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "óĹŇ×ĹŇ ÂÁÚ ÄÁÎÎŮČ PostgreSQL ÉĚÉ MySQL"
+msgid "KDE Workstation"
+msgstr "ňÁÂĎŢÁŃ ÓÔÁÎĂÉŃ KDE"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "óĹŇ×ÉÓÎŮĹ ĐŇĎÇŇÁÍÍŮ ÄĚŃ ĎÂĚĹÇŢĹÎÉŃ ÎÁÓÔŇĎĘËÉ ×ÁŰĹÇĎ ËĎÍĐŘŔÔĹŇÁ"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"K Desktop Environment, ĎÓÎĎ×ÎÁŃ ÇŇÁĆÉŢĹÓËÁŃ ĎÂĎĚĎŢËÁ Ó ËĎĚĚĹËĂÉĹĘ "
+"ÓĎĐŇĎ×ĎÄÉÔĹĚŘÎŮČ ÓĹŇ×ÉÓÎŮČ ĐŇĎÇŇÁÍÍ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "íŐĚŘÔÉÍĹÄÉÁ - ú×ŐË"
+msgid "Graphical Environment"
+msgstr "çŇÁĆÉŢĹÓËÁŃ ĎÂĎĚĎŢËÁ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "äĎËŐÍĹÎÔÁĂÉŃ"
+msgid "Gnome Workstation"
+msgstr "ňÁÂĎŢÁŃ ÓÔÁÎĂÉŃ Gnome"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "óĹŇ×ÉÓÎŮĹ ĐŇĎÇŇÁÍÍŮ ÄĚŃ ËĎÎÓĎĚÉ"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+"çŇÁĆÉŢĹÓËÁŃ ĎÂĎĚĎŢËÁ Ó ŐÄĎÂÎŮÍ ÄĚŃ ĐĎĚŘÚĎ×ÁÔĹĚŃ ÎÁÂĎŇĎÍ ĐŇÉĚĎÖĹÎÉĘ É "
+"ÓĹŇ×ÉÓÎŮČ ĐŇĎÇŇÁÍÍ ŇÁÂĎŢĹÇĎ ÓÔĎĚÁ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr "đĎŢÔĎ×ŮĘ ÓĹŇ×ĹŇ Postfix, ÓĹŇ×ĹŇ ÎĎ×ĎÓÔĹĘ Inn"
+msgid "Other Graphical Desktops"
+msgstr "äŇŐÇÉĹ ÇŇÁĆÉŢĹÓËÉĹ ĎÂĎĚĎŢËÉ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "óÔÁÎĂÉŃ éÎÔĹŇÎĹÔ"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm É Ô.Ä."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "íŐĚŘÔÉÍĹÄÉÁ ÓÔÁÎĂÉŃ"
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+msgid "Development"
+msgstr "ňÁÚŇÁÂĎÔËÁ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "îÁÓÔŇĎĘËÁ"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "âÉÂĚÉĎÔĹËÉ ŇÁÚŇÁÂĎÔËÉ C É C++, ĐŇĎÇŇÁÍÍŮ É ĆÁĘĚŮ include"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "äĎĐĎĚÎÉÔĹĚŘÎŮĹ ÇŇÁĆÉŢĹÓËÉĹ ĎÂĎĚĎŢËÉ (Gnome, IceWM)"
+msgid "Documentation"
+msgstr "äĎËŐÍĹÎÔÁĂÉŃ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
-"K Desktop Environment, ĎÓÎĎ×ÎÁŃ ÇŇÁĆÉŢĹÓËÁŃ ĎÂĎĚĎŢËÁ Ó ËĎĚĚĹËĂÉĹĘ "
-"ÓĎĐŇĎ×ĎÄÉÔĹĚŘÎŮČ ÓĹŇ×ÉÓÎŮČ ĐŇĎÇŇÁÍÍ"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "ëÎÉÇÉ É HowTo ĐĎ Linux É Ó×ĎÂĎÄÎĎÍ ĐŇĎÇŇÁÍÍÎĎÍ ĎÂĹÓĐĹŢĹÎÉÉ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "çŇÁĆÉŢĹÓËÁŃ ĎÂĎĚĎŢËÁ"
+msgid "LSB"
+msgstr "LSB"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
+msgid "Linux Standard Base. Third party applications support"
+msgstr "óÔÁÎÄÁŇÔÎÁŃ ÂÁÚÁ Linux. đĎÄÄĹŇÖËÁ ĐŇÉĚĎÖĹÎÉĘ ÔŇĹÔŘÉČ ĚÉĂ"
+
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-msgid "Development"
-msgstr "ňÁÚŇÁÂĎÔËÁ"
+#: ../../share/compssUsers:999
+msgid "Web/FTP"
+msgstr "Web/FTP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -175,23 +181,33 @@ msgstr "Apache, Pro-ftpd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "đŇĎÇŇÁÍÍŮ ÄĚŃ ÓĎÚÄÁÎÉŃ É ÚÁĐÉÓÉ CD"
+msgid "Mail/Groupware/News"
+msgstr "đĎŢÔÁ/đď ËĎĚĚĹËÔÉ×ÎĎÇĎ ĐĎĚŘÚĎ×ÁÎÉŃ/îĎ×ĎÓÔÉ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "ďĆÉÓÎÁŃ ŇÁÂĎŢÁŃ ÓÔÁÎĂÉŃ"
+msgid "Postfix mail server, Inn news server"
+msgstr "đĎŢÔĎ×ŮĘ ÓĹŇ×ĹŇ Postfix, ÓĹŇ×ĹŇ ÎĎ×ĎÓÔĹĘ Inn"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm É Ô.Ä."
+msgid "Database"
+msgstr "âÁÚÁ ÄÁÎÎŮČ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "çŇÁĆÉŢĹÓËÉĹ ĐŇĎÇŇÁÍÍŮ, ÔÁËÉĹ ËÁË The Gimp"
+msgid "PostgreSQL or MySQL database server"
+msgstr "óĹŇ×ĹŇ ÂÁÚ ÄÁÎÎŮČ PostgreSQL ÉĚÉ MySQL"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Firewall/Router"
+msgstr "ćÁĘĹŇ×ĎĚ/íÁŇŰŇŐÔÉÚÁÔĎŇ"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Internet gateway"
+msgstr "éÎÔĹŇÎĹÔ-ŰĚŔÚ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -200,8 +216,8 @@ msgstr "DNS/NIS "
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "âÉÂĚÉĎÔĹËÉ ŇÁÚŇÁÂĎÔËÉ C É C++, ĐŇĎÇŇÁÍÍŮ É ĆÁĘĚŮ include"
+msgid "Domain Name and Network Information Server"
+msgstr "óĹŇ×ĹŇ ÄĎÍĹÎÎŮČ ÉÍĹÎ É NIS"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -210,18 +226,19 @@ msgstr "óĹŇ×ĹŇ ÓĹÔÉ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "đĎŢÔÁ/đď ËĎĚĚĹËÔÉ×ÎĎÇĎ ĐĎĚŘÚĎ×ÁÎÉŃ/îĎ×ĎÓÔÉ"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS-ÓĹŇ×ĹŇ, SMB-ÓĹŇ×ĹŇ, Proxy-ÓĹŇ×ĹŇ, ssh-ÓĹŇ×ĹŇ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "éÇŇĎ×ÁŃ ÓÔÁÎĂÉŃ"
+msgid "Office"
+msgstr "ďĆÉÓ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "÷ÉÄĹĎĐŇĎÉÇŇŮ×ÁÔĹĚÉ É ŇĹÄÁËÔĎŇŮ"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr ""
+"îÁÂĎŇ ÓĹŇ×ÉÓÎŮČ ĐŇĎÇŇÁÍÍ ÄĚŃ ĐĎŢÔŮ, ÎĎ×ĎÓÔĹĘ, web, ĐĹŇĹÓŮĚËÉ ĆÁĘĚĎ× É ŢÁÔÁ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -230,79 +247,67 @@ msgstr "íŐĚŘÔÉÍĹÄÉÁ - çŇÁĆÉËÁ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "ňÁÚ×ĚĹËÁÔĹĚŘÎŮĹ ĐŇĎÇŇÁÍÍŮ: ÁŇËÁÄŮ, ÎÁÓÔĎĚŘÎŮĹ ÉÇŇŮ, ÓÔŇÁÔĹÇÉÉ É Ô.Ä."
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
-"îÁÂĎŇ ÓĹŇ×ÉÓÎŮČ ĐŇĎÇŇÁÍÍ ÄĚŃ ŢÔĹÎÉŃ É ĎÔĐŇÁ×ËÉ ĐĎŢÔŮ É ÎĎ×ĎÓÔĹĘ (pine, mutt, "
-"tin...) É ĐŇĎÓÍĎÔŇÁ Web"
+msgid "Graphics programs such as The Gimp"
+msgstr "çŇÁĆÉŢĹÓËÉĹ ĐŇĎÇŇÁÍÍŮ, ÔÁËÉĹ ËÁË The Gimp"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "ěÉŢÎŮĹ ĆÉÎÁÎÓŮ"
+msgid "Multimedia - Sound"
+msgstr "íŐĚŘÔÉÍĹÄÉÁ - ú×ŐË"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
 msgstr ""
-"çŇÁĆÉŢĹÓËÁŃ ĎÂĎĚĎŢËÁ Ó ŐÄĎÂÎŮÍ ÄĚŃ ĐĎĚŘÚĎ×ÁÔĹĚŃ ÎÁÂĎŇĎÍ ĐŇÉĚĎÖĹÎÉĘ É "
-"ÓĹŇ×ÉÓÎŮČ ĐŇĎÇŇÁÍÍ ŇÁÂĎŢĹÇĎ ÓÔĎĚÁ"
+"đŇĎÇŇÁÍÍŮ ÄĚŃ ŇÁÂĎÔŮ ÓĎ Ú×ŐËĎÍ: mp3- ÉĚÉ MIDI-ĐŇĎÉÇŇŮ×ÁÔĹĚÉ, ÍÉËŰĹŇŮ É Ô.Ä."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "ëĚÉĹÎÔŮ ÄĚŃ ŇÁÚĚÉŢÎŮČ ĐŇĎÔĎËĎĚĎ×, ×ËĚŔŢÁŃ ssh"
+msgid "Multimedia - Video"
+msgstr "íŐĚŘÔÉÍĹÄÉÁ - ÷ÉÄĹĎ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
+msgid "Video players and editors"
+msgstr "÷ÉÄĹĎĐŇĎÉÇŇŮ×ÁÔĹĚÉ É ŇĹÄÁËÔĎŇŮ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "éÎÔĹŇÎĹÔ-ŰĚŔÚ"
+msgid "Multimedia - CD Burning"
+msgstr "íŐĚŘÔÉÍĹÄÉÁ - úÁĐÉÓŘ CD"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "đŇĎÇŇÁÍÍŮ ÄĚŃ ĐŇĎÉÇŇŮ×ÁÎÉŃ/ŇĹÄÁËÔÉŇĎ×ÁÎÉŃ Ú×ŐËÁ É ×ÉÄĹĎ"
+msgid "Tools to create and burn CD's"
+msgstr "đŇĎÇŇÁÍÍŮ ÄĚŃ ÓĎÚÄÁÎÉŃ É ÚÁĐÉÓÉ CD"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "äŇŐÇÉĹ ÇŇÁĆÉŢĹÓËÉĹ ĎÂĎĚĎŢËÉ"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "äĎĐĎĚÎÉÔĹĚŘÎŮĹ ÇŇÁĆÉŢĹÓËÉĹ ĎÂĎĚĎŢËÉ (Gnome, IceWM)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "ňĹÄÁËÔĎŇŮ, ËĎÍÁÎÄÎŮĹ ĐŇĎĂĹÓÓĎŇŮ, ĆÁĘĚĎ×ŮĹ ŐÔÉĚÉÔŮ, ÔĹŇÍÉÎÁĚŮ"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm É Ô.Ä."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "đŇĎÇŇÁÍÍŮ ÄĚŃ ŐĐŇÁ×ĚĹÎÉŃ ĆÉÎÁÎÓÁÍÉ, ÔÁËÉĹ ËÁË gnucash"
+msgid "Personal Information Management"
+msgstr "őĐŇÁ×ĚĹÎÉĹ ĚÉŢÎĎĘ ÉÎĆĎŇÍÁĂÉĹĘ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "őĐŇÁ×ĚĹÎÉĹ ĚÉŢÎĎĘ ÉÎĆĎŇÍÁĂÉĹĘ"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "óĹŇ×ÉÓÎŮĹ ĐŇĎÇŇÁÍÍŮ ÄĚŃ ×ÁŰĹÇĎ Palm Pilot ÉĚÉ Visor"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "íŐĚŘÔÉÍĹÄÉÁ - úÁĐÉÓŘ CD"
+msgid "Personal Finance"
+msgstr "ěÉŢÎŮĹ ĆÉÎÁÎÓŮ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "îÁŐŢÎÁŃ ŇÁÂĎŢÁŃ ÓÔÁÎĂÉŃ"
+msgid "Programs to manage your finances, such as gnucash"
+msgstr "đŇĎÇŇÁÍÍŮ ÄĚŃ ŐĐŇÁ×ĚĹÎÉŃ ĆÉÎÁÎÓÁÍÉ, ÔÁËÉĹ ËÁË gnucash"
 
diff --git a/po/sk.po b/po/sk.po
index 21c890e4..f06641c4 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2003-01-30 11:22+0100\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\n"
 "PO-Revision-Date: 2003-02-02 10:33+0100\n"
 "Last-Translator: Pavol Cvengros <orpheus@hq.alert.sk>\n"
 "Language-Team: Slovak <i18n@hq.alert.sk>\n"
@@ -16,870 +16,1160 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl_.c:43
-msgid "Unable to create medium."
-msgstr "Nemôžem vytvoriť médium."
-
-#: ../edit-urpm-sources.pl_.c:44
-msgid "Unable to update medium; it will be automatically disabled."
-msgstr "Nemôžem aktualizovať médium; bude automaticky zakázané."
-
-#: ../edit-urpm-sources.pl_.c:54
-msgid "Add a source"
-msgstr "Pridať zdroj"
-
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Local files"
-msgstr "Lokálne súbory"
-
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Path:"
-msgstr "Cesta:"
-
-#: ../edit-urpm-sources.pl_.c:56
-msgid "FTP server"
-msgstr "FTP server"
-
-#: ../edit-urpm-sources.pl_.c:56 ../edit-urpm-sources.pl_.c:57
-#: ../edit-urpm-sources.pl_.c:59 ../edit-urpm-sources.pl_.c:187
-msgid "URL:"
-msgstr "URL:"
-
-#: ../edit-urpm-sources.pl_.c:57
-msgid "HTTP server"
-msgstr "HTTP server"
-
-#: ../edit-urpm-sources.pl_.c:58
-msgid "Path or mount point:"
-msgstr "Cesta alebo bod pripojenia:"
-
-#: ../edit-urpm-sources.pl_.c:58
-msgid "Removable device"
-msgstr "Vymeniteľné zariadenie"
-
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:550
-msgid "Security updates"
-msgstr "Bezpečnostné aktualizácie"
-
-#: ../edit-urpm-sources.pl_.c:70
-msgid "Browse..."
-msgstr "Prechádzať..."
-
-#: ../edit-urpm-sources.pl_.c:72
-msgid "Choose a mirror..."
-msgstr "Zvoľte si miror..."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:92
-msgid "Login:"
-msgstr "Login:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to the software installation tool!\n"
+"\n"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
+msgstr ""
+"Vítajte v nástroji pre inštaláciu softvéru!\n"
+"\n"
+"Váš Mandrake Linux systém prichádza s niekoľko tisíc softvérovými\n"
+"balíčkami na CDROM alebo DVD. Tento nástroj Vám pomôže pri výbere a "
+"inštalácii\n"
+"softvéru na Váš počítač."
 
-#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:231
-msgid "Password:"
-msgstr "Heslo:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Vítajte v MandrakeUpdate!\n"
+"\n"
+"Tento nástroj Vám pomôže vybrať aktualizácie ktoré chcete nainštalovať do "
+"Vášho\n"
+"počítača."
 
-#: ../edit-urpm-sources.pl_.c:97
-msgid "Name:"
-msgstr "Meno:"
+#: ../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 ""
+"Vítajte v nástroji pre odstraňovanie softvéru!\n"
+"\n"
+"Tento nástroj Vám pomôže si zvoliť softvér ktorý chcete odstrániť\n"
+"z Vášho počítača."
 
-#: ../edit-urpm-sources.pl_.c:99 ../edit-urpm-sources.pl_.c:188
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Relatívna cesta k synthesis/hdlist: "
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"Vyskytol sa problém počas odstraňovania balíčkov:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:107
-msgid "You need to fill up at least the two first entries."
-msgstr "Je potrebné vyplniť najmenej prvé dve položky."
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during removal"
+msgstr "Problém počas odstraňovania"
 
-#: ../edit-urpm-sources.pl_.c:120
-msgid "Adding a source:"
-msgstr "Pridávam zdroj:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages..."
+msgstr "Prosím čakajte, odstraňujú balíčky..."
 
-#: ../edit-urpm-sources.pl_.c:121
-msgid "Type of source:"
-msgstr "Typ zdroja:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
+msgstr "Prosím čakajte, načítavam databázu balíčkov..."
 
-#: ../edit-urpm-sources.pl_.c:125 ../edit-urpm-sources.pl_.c:202
-#: ../edit-urpm-sources.pl_.c:235 ../rpmdrake.pm_.c:100 ../rpmdrake.pm_.c:139
-#: ../rpmdrake.pm_.c:322 ../rpmdrake_.c:355 ../rpmdrake_.c:367
-#: ../rpmdrake_.c:371 ../rpmdrake_.c:918 ../rpmdrake_.c:952
-msgid "Ok"
-msgstr "Ok"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Vyskytol sa problém počas inštalácie:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:140 ../edit-urpm-sources.pl_.c:196
-#: ../edit-urpm-sources.pl_.c:202 ../edit-urpm-sources.pl_.c:242
-#: ../rpmdrake.pm_.c:322 ../rpmdrake.pm_.c:355 ../rpmdrake_.c:355
-#: ../rpmdrake_.c:952
-msgid "Cancel"
-msgstr "Zrušiť"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during installation"
+msgstr "Problém počas inštalácie"
 
-#: ../edit-urpm-sources.pl_.c:147
-msgid "Please wait, adding medium..."
-msgstr "Prosím čakajte, pridávam médium..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
+msgstr "Všetko je už nainštalované (malo sa to vôbec stať?)."
 
-#: ../edit-urpm-sources.pl_.c:168
-msgid "Please wait, removing medium..."
-msgstr "Prosím čakajte, odstraňujem médium..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed."
+msgstr "Všetko je už nainštalované."
 
-#: ../edit-urpm-sources.pl_.c:181
-msgid "Edit a source"
-msgstr "Zmeniť zdroj"
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "Všetky požadované balíčky boli úspešne nainštalované."
 
-#: ../edit-urpm-sources.pl_.c:185
+#: ../rpmdrake:1
 #, c-format
-msgid "Editing source \"%s\":"
-msgstr "Zmena zdroja \"%s\":"
+msgid "Everything installed successfully"
+msgstr "Všetko bolo úspešne nainštalované"
 
-#: ../edit-urpm-sources.pl_.c:191
-msgid "Save changes"
-msgstr "Uložiť zmeny"
+#: ../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 ""
+"Inštalácia bola ukončená; %s.\n"
+"\n"
+"Niektoré konfiguračné súbory boli vytvorené ako `.rpmnew' alebo `.rpmsave',\n"
+"mali by ste ich prezrieš:"
 
-#: ../edit-urpm-sources.pl_.c:200
-msgid "You need to insert the medium to continue"
-msgstr "Vložte médium ak chcete pokračovať"
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "všetko bolo úspešne nainštalované"
 
-#: ../edit-urpm-sources.pl_.c:201
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "Pre uloženie zmien je potrebné aby ste vložili médium do mechaniky."
-
-#: ../edit-urpm-sources.pl_.c:206
-msgid "Please wait, updating medium..."
-msgstr "Prosím čakajte, aktualizujem médium..."
+"some packages failed to install\n"
+"correctly"
+msgstr ""
+"niektoré balíčky nie je možné nainštalovať\n"
+"korektne"
 
-#: ../edit-urpm-sources.pl_.c:217
-msgid "Configure proxies"
-msgstr "Nastaviť proxy"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages to allow others to be upgraded..."
+msgstr "Prosím čakajte, odstraňujem balíčky aby bolo možné iné aktualizovať..."
 
-#: ../edit-urpm-sources.pl_.c:223
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
 msgstr ""
-"Ak potrebujete proxy, zadajte meno hostiteľa a voliteľne aj port (syntax: "
-"<proxyhost[:port]>):"
+"Inštalácia neúspešná, niektoré súbory chýbajú.\n"
+"Možno bude potrebné aktualizovať databázu zdrojov."
 
-#: ../edit-urpm-sources.pl_.c:225
-msgid "Proxy hostname:"
-msgstr "Hostiteľ proxy:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation failed"
+msgstr "Inštalácia neúspešná"
 
-#: ../edit-urpm-sources.pl_.c:227
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "Môžete zadať užívateľské meno/heslo pre proxy autentifikáciu:"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
+msgstr "Zrušiť"
 
-#: ../edit-urpm-sources.pl_.c:229
-msgid "User:"
-msgstr "Užívateľ:"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "Ok"
 
-#: ../edit-urpm-sources.pl_.c:255
-msgid "Configure sources"
-msgstr "Nastaviť zdroje"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Prosím vložte médium s názvom \"%s\" do zariadenia [%s]"
 
-#: ../edit-urpm-sources.pl_.c:262
-msgid "Enabled?"
-msgstr "Povolené?"
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr "Vymeniť médium"
 
-#: ../edit-urpm-sources.pl_.c:263
-msgid "Source"
-msgstr "Zdroj"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
+msgstr "Nemôžem prevziať zdrojové balíčky, prepáčte."
 
-#: ../edit-urpm-sources.pl_.c:286 ../rpmdrake_.c:732
-msgid "Remove"
-msgstr "Odstrániť"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages."
+msgstr "Nie je možné prebrať zdrojové balíčky."
 
-#: ../edit-urpm-sources.pl_.c:288
-msgid "Edit"
-msgstr "Zmeň"
+#: ../rpmdrake:1
+#, c-format
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr "Požadovaný program chýba (grpmi). Prosím overte si inštaláciu."
 
-#: ../edit-urpm-sources.pl_.c:290
-msgid "Add..."
-msgstr "Pridať..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
+msgstr "Chýba program"
 
-#: ../edit-urpm-sources.pl_.c:292
-msgid "Update..."
-msgstr "Aktualizácia..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
+msgstr "Preveriť.."
 
-#: ../edit-urpm-sources.pl_.c:293
-msgid "Proxy..."
-msgstr "Proxy..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation finished"
+msgstr "Inštalácia ukončená"
 
-#: ../edit-urpm-sources.pl_.c:296
-msgid "Save and quit"
-msgstr "Uložiť a ukončiť"
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
+msgstr "Neurobiť nič"
 
-#: ../edit-urpm-sources.pl_.c:297 ../rpmdrake_.c:735
-msgid "Quit"
-msgstr "Ukončiť"
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
+msgstr "Použite .%s ako hlavný súbor"
 
-#: ../rpmdrake.pm_.c:96
-msgid "Yes"
-msgstr "Ano"
+#: ../rpmdrake:1
+#, c-format
+msgid "Remove .%s"
+msgstr "Odstrániť .%s"
 
-#: ../rpmdrake.pm_.c:98
-msgid "No"
-msgstr "Nie"
+#: ../rpmdrake:1
+#, c-format
+msgid "changes:"
+msgstr "zmeny:"
 
-#: ../rpmdrake.pm_.c:130
-msgid "Info..."
-msgstr "Info..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr "Preverujem %s"
 
-#: ../rpmdrake.pm_.c:183
-msgid "Austria"
-msgstr "Rakúsko"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, finding available packages..."
+msgstr "Prosím čakajte, hľadám dostupné balíčky..."
 
-#: ../rpmdrake.pm_.c:184
-msgid "Australia"
-msgstr "Austrália"
+#: ../rpmdrake:1
+#, c-format
+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 ""
 
-#: ../rpmdrake.pm_.c:185
-msgid "Belgium"
-msgstr "Belgicko"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
+msgstr "Chyba pri pridávaní média"
 
-#: ../rpmdrake.pm_.c:186
-msgid "Brazil"
-msgstr "Brazília"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
+msgstr ""
+"Prosím čakajte, kontaktujem miror pre inicializáciu aktualizácie balíčkov."
 
-#: ../rpmdrake.pm_.c:187
-msgid "Canada"
-msgstr "Kanada"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Sources Manager, and then add a `Security\n"
+"updates' source.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
 
-#: ../rpmdrake.pm_.c:188
-msgid "Costa Rica"
-msgstr "Costa Rica"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Ako si zvoliť miror manuálne"
 
-#: ../rpmdrake.pm_.c:189
-msgid "Czech Republic"
-msgstr "Česká Republika"
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
+msgstr "Nastala neopraviteľná chyba počas aktualizácie informácii o balíčkoch."
 
-#: ../rpmdrake.pm_.c:190
-msgid "Germany"
-msgstr "Nemecko"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
+msgstr "Chyba pri aktualizácii média"
 
-#: ../rpmdrake.pm_.c:191
-msgid "Danmark"
-msgstr "Dánsko"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
+msgstr ""
+"Prosím čakajte, kontaktujem miror pre aktualizáciu informácii o balíčkoch."
 
-#: ../rpmdrake.pm_.c:192 ../rpmdrake.pm_.c:196
-msgid "Greece"
-msgstr "Grécko"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
 
-#: ../rpmdrake.pm_.c:193
-msgid "Spain"
-msgstr "Španielsko"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Installation"
+msgstr "Inštalácia softvérových balíčkov"
 
-#: ../rpmdrake.pm_.c:194
-msgid "Finland"
-msgstr "Fínsko"
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, c-format
+msgid "Mandrake Update"
+msgstr "Mandrake Update"
 
-#: ../rpmdrake.pm_.c:195
-msgid "France"
-msgstr "Francúzsko"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
+msgstr "Odstránenie softvérových balíčkov"
 
-#: ../rpmdrake.pm_.c:197
-msgid "Israel"
-msgstr "Izrael"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Ukončiť"
 
-#: ../rpmdrake.pm_.c:198
-msgid "Italy"
-msgstr "Taliansko"
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "Inštaluj"
 
-#: ../rpmdrake.pm_.c:199
-msgid "Japan"
-msgstr "Japonsko"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "Odstrániť"
 
-#: ../rpmdrake.pm_.c:200
-msgid "Korea"
-msgstr "Korea"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search"
+msgstr "Hľadať"
 
-#: ../rpmdrake.pm_.c:201
-msgid "Netherlands"
-msgstr "Holandsko"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "Hľadaj:"
 
-#: ../rpmdrake.pm_.c:202
-msgid "Norway"
-msgstr "Nórsko"
+#: ../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 ""
 
-#: ../rpmdrake.pm_.c:203
-msgid "Poland"
-msgstr "Poľsko"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "Je potrebné odstrániť niektoré balíčky"
 
-#: ../rpmdrake.pm_.c:204
-msgid "Portugal"
-msgstr "Portugalsko"
+#: ../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 ""
 
-#: ../rpmdrake.pm_.c:205
-msgid "Russia"
-msgstr "Rusko"
+#: ../rpmdrake:1
+#, c-format
+msgid "Too many packages are selected"
+msgstr "Vybrali ste príliš veľa balíčkov"
 
-#: ../rpmdrake.pm_.c:206
-msgid "Sweden"
-msgstr "Švédsko"
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
+msgstr "Maximálne informácie"
 
-#: ../rpmdrake.pm_.c:207
-msgid "Taiwan"
-msgstr "Taiwan"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal information"
+msgstr "Normálne informácie"
 
-#: ../rpmdrake.pm_.c:208
-msgid "United Kingdom"
-msgstr "Veľká Británia"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update source(s)"
+msgstr "Aktualizácia zdrojov"
 
-#: ../rpmdrake.pm_.c:209
-msgid "China"
-msgstr "Čína"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reload the packages list"
+msgstr "Znovu načítač zoznam balíčkov"
 
-#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:211 ../rpmdrake.pm_.c:212
-#: ../rpmdrake.pm_.c:213 ../rpmdrake.pm_.c:264
-msgid "United States"
-msgstr "Spojené Štáty"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
+msgstr "Zrušiť výber"
 
-#: ../rpmdrake.pm_.c:277
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr "Prosím čakajte, sťahujem adresy mirorov z web stránky MandrakeSoft."
+#: ../rpmdrake:1
+#, c-format
+msgid "in files"
+msgstr "v súboroch"
 
-#: ../rpmdrake.pm_.c:283
-msgid "Error during download"
-msgstr "Chyba počas sťahovania"
+#: ../rpmdrake:1
+#, c-format
+msgid "in descriptions"
+msgstr "v popisoch"
 
-#: ../rpmdrake.pm_.c:292
-msgid "No mirror"
-msgstr "Žiaden miror"
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
+msgstr "v menách"
 
-#: ../rpmdrake.pm_.c:310
-msgid "Please choose the desired mirror."
-msgstr "Prosím zvoľte si jeden z mirorov."
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
+msgstr "podľa dostupnosti zdroja"
 
-#: ../rpmdrake.pm_.c:342 ../rpmdrake_.c:629
-msgid "Update source(s)"
-msgstr "Aktualizácia zdrojov"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
+msgstr "podľa zdroja"
 
-#: ../rpmdrake.pm_.c:346
-msgid "Select the source(s) you wish to update:"
-msgstr "Prosím zvoľte zdroj ktorý chcete aktualizovať:"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
+msgstr "podľa stavu výberu"
 
-#: ../rpmdrake.pm_.c:350
-msgid "Update"
-msgstr "Aktualizácia"
+#: ../rpmdrake:1
+#, c-format
+msgid "by size"
+msgstr "podľa veľkosti"
 
-#: ../rpmdrake.pm_.c:360
-msgid "Please wait, updating media..."
-msgstr "Prosím čakajte, aktualizujem média..."
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
+msgstr "podľa skupiny"
 
-#: ../rpmdrake_.c:101
-msgid "Other"
-msgstr "Iné"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages,"
+msgstr "Všetky balíčky,"
 
-#: ../rpmdrake_.c:123 ../rpmdrake_.c:137 ../rpmdrake_.c:229 ../rpmdrake_.c:300
-msgid "(none)"
-msgstr "(žiaden)"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
+msgstr "Všetky balíčky, abecedne"
 
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:484 ../rpmdrake_.c:485
-msgid "(Not available)"
-msgstr "(Nedostupné)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
+msgstr "Voľby Mandrake"
 
-#: ../rpmdrake_.c:153 ../rpmdrake_.c:210
-msgid "Search results"
-msgstr "Výsledky vyhľadávania"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal updates"
+msgstr "Normálne aktualizácie"
 
-#: ../rpmdrake_.c:153
-msgid "Search results (none)"
-msgstr "Výsledky vyhľadávania (žiadne)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Bugfixes updates"
+msgstr "Aktualizácie opravujúce chyby"
 
-#: ../rpmdrake_.c:163 ../rpmdrake_.c:174
-msgid "Please wait, searching..."
-msgstr "Prosím čakajte, vyhľadávam..."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
+msgstr "Bezpečnostné aktualizácie"
 
-#: ../rpmdrake_.c:177
-msgid "Stop"
-msgstr "Stop"
+#: ../rpmdrake:1
+#, c-format
+msgid "Description: "
+msgstr "Popis:"
 
-#: ../rpmdrake_.c:211 ../rpmdrake_.c:321
-msgid "Addable"
-msgstr "Pridateľné"
+#: ../rpmdrake:1
+#, c-format
+msgid "Summary: "
+msgstr "Stručný obsah: "
 
-#: ../rpmdrake_.c:211 ../rpmdrake_.c:321
-msgid "Upgradable"
-msgstr "Aktualizovateľné"
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "Dôležitosť: "
 
-#: ../rpmdrake_.c:213
-msgid "Not selected"
-msgstr "Nevybrané"
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake_.c:213
-msgid "Selected"
-msgstr "Vybrané"
+#: ../rpmdrake:1
+#, c-format
+msgid "Size: "
+msgstr "Veľkosť: "
 
-#: ../rpmdrake_.c:242
-msgid "rpmdrake"
-msgstr "rpmdrake"
+#: ../rpmdrake:1
+#, c-format
+msgid "Version: "
+msgstr "Verzia: "
 
-#: ../rpmdrake_.c:260 ../rpmdrake_.c:362 ../rpmdrake_.c:364
-msgid "More information on package..."
-msgstr "Viac informácii o balíčku..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "Názov: "
 
-#: ../rpmdrake_.c:261
-msgid "One of the following packages is needed:"
-msgstr "Jeden z nasledujúcich balíčkov je potrebný:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "Dôvod pre aktualizáciu:"
 
-#: ../rpmdrake_.c:261
-msgid "Please choose"
-msgstr "Prosím zvoľte"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
+msgstr "Aktuálne nainštalovaná verzia:"
 
-#: ../rpmdrake_.c:277
-msgid "unknown package "
-msgstr "neznámy balíček"
+#: ../rpmdrake:1
+#, c-format
+msgid "Source: "
+msgstr "Zdroj: "
 
-#: ../rpmdrake_.c:287
-msgid "Please wait, listing packages..."
-msgstr "Prosím čakajte, vypisujem balíčky..."
+#: ../rpmdrake:1
+#, c-format
+msgid "(Not available)"
+msgstr "(Nedostupné)"
 
-#: ../rpmdrake_.c:302
-msgid "No update"
-msgstr "Žiadna aktualizácia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
+msgstr "Záznam zmien:\n"
 
-#: ../rpmdrake_.c:355 ../rpmdrake_.c:356
-msgid "More infos"
-msgstr "Viac informácií"
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "Súbory:\n"
 
-#: ../rpmdrake_.c:357
-msgid "Information on packages"
-msgstr "Informácie o balíčkoch"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected size: %d MB"
+msgstr "Vybraná veľkosť: %d Mb"
 
-#: ../rpmdrake_.c:378
-msgid "Some additional packages need to be removed"
-msgstr "Je potrebné odstrániť niektoré balíčky"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Vybrané: %d MB / Dostupné: %d MB"
 
-#: ../rpmdrake_.c:379
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
 msgstr ""
-"Kvôli závislostiam budú tieto balíčky odstránené:\n"
+"Kvôli závislostiam musia byť nasledujúce balíčky teraz odznačené:\n"
 "\n"
 
-#: ../rpmdrake_.c:385 ../rpmdrake_.c:393
-msgid "Some packages can't be removed"
-msgstr "Niektoré balíčky nie je možné odstrániť"
-
-#: ../rpmdrake_.c:386
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Removing these packages would break your system, sorry:\n"
+"Sorry, the following package(s) can't be selected:\n"
 "\n"
 msgstr ""
-"Odstránenie týchto balíčkov naruší váš systém, prepáčte:\n"
+"Prepáčte, tieto balíčky nie je možné vybrať:\n"
 "\n"
 
-#: ../rpmdrake_.c:394 ../rpmdrake_.c:453
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "Niektoré balíčky nie je možné nainštalovať"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
 "\n"
 msgstr ""
-"Kvôli závislostiam musia byť nasledujúce balíčky teraz odznačené:\n"
+"Pre vyriešenie závislosti, sú potrebné nainštalovať tieto balíčky:\n"
 "\n"
 
-#: ../rpmdrake_.c:423
+#: ../rpmdrake:1
+#, c-format
 msgid "Additional packages needed"
 msgstr "Sú potrebné ďalšie balíčky"
 
-#: ../rpmdrake_.c:424
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be removed"
+msgstr "Niektoré balíčky nie je možné odstrániť"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
+"Removing these packages would break your system, sorry:\n"
 "\n"
 msgstr ""
-"Pre vyriešenie závislosti, sú potrebné nainštalovať tieto balíčky:\n"
+"Odstránenie týchto balíčkov naruší váš systém, prepáčte:\n"
 "\n"
 
-#: ../rpmdrake_.c:437
-msgid "Some packages can't be installed"
-msgstr "Niektoré balíčky nie je možné nainštalovať"
-
-#: ../rpmdrake_.c:438
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
 "\n"
 msgstr ""
-"Prepáčte, tieto balíčky nie je možné vybrať:\n"
+"Kvôli závislostiam budú tieto balíčky odstránené:\n"
 "\n"
 
-#: ../rpmdrake_.c:452 ../rpmdrake_.c:686
-msgid "Some packages need to be removed"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some additional packages need to be removed"
 msgstr "Je potrebné odstrániť niektoré balíčky"
 
-#: ../rpmdrake_.c:474
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Vybrané: %d MB / Dostupné: %d MB"
+msgid "More information on package..."
+msgstr "Viac informácii o balíčku..."
 
-#: ../rpmdrake_.c:476
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "Vybraná veľkosť: %d Mb"
+msgid "Information on packages"
+msgstr "Informácie o balíčkoch"
 
-#: ../rpmdrake_.c:484
-msgid "Files:\n"
-msgstr "Súbory:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
+msgstr "Viac informácií"
 
-#: ../rpmdrake_.c:485
-msgid "Changelog:\n"
-msgstr "Záznam zmien:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "Addable"
+msgstr "Pridateľné"
 
-#: ../rpmdrake_.c:488
-msgid "Source: "
-msgstr "Zdroj: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Upgradable"
+msgstr "Aktualizovateľné"
 
-#: ../rpmdrake_.c:489
-msgid "Currently installed version: "
-msgstr "Aktuálne nainštalovaná verzia:"
+#: ../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_.c:493
-msgid "Reason for update: "
-msgstr "Dôvod pre aktualizáciu:"
+#: ../rpmdrake:1
+#, c-format
+msgid "No update"
+msgstr "Žiadna aktualizácia"
 
-#: ../rpmdrake_.c:495
-msgid "Name: "
-msgstr "Názov: "
+#: ../rpmdrake:1
+#, c-format
+msgid "(none)"
+msgstr "(žiaden)"
 
-#: ../rpmdrake_.c:496
-msgid "Version: "
-msgstr "Verzia: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, listing packages..."
+msgstr "Prosím čakajte, vypisujem balíčky..."
 
-#: ../rpmdrake_.c:497
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "unknown package "
+msgstr "neznámy balíček"
 
-#: ../rpmdrake_.c:497
-msgid "Size: "
-msgstr "Veľkosť: "
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Jeden z nasledujúcich balíčkov je potrebný:"
 
-#: ../rpmdrake_.c:499
-msgid "Importance: "
-msgstr "Dôležitosť: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please choose"
+msgstr "Prosím zvoľte"
 
-#: ../rpmdrake_.c:500
-msgid "Summary: "
-msgstr "Stručný obsah: "
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:501
-msgid "Description: "
-msgstr "Popis:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Not selected"
+msgstr "Nevybrané"
 
-#: ../rpmdrake_.c:550
-msgid "Bugfixes updates"
-msgstr "Aktualizácie opravujúce chyby"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected"
+msgstr "Vybrané"
 
-#: ../rpmdrake_.c:550
-msgid "Normal updates"
-msgstr "Normálne aktualizácie"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results"
+msgstr "Výsledky vyhľadávania"
 
-#: ../rpmdrake_.c:569
-msgid "Mandrake choices"
-msgstr "Voľby Mandrake"
+#: ../rpmdrake:1
+#, c-format
+msgid "Stop"
+msgstr "Stop"
 
-#: ../rpmdrake_.c:570
-msgid "All packages, alphabetical"
-msgstr "Všetky balíčky, abecedne"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, searching..."
+msgstr "Prosím čakajte, vyhľadávam..."
 
-#: ../rpmdrake_.c:571
-msgid "All packages,"
-msgstr "Všetky balíčky,"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
+msgstr "Výsledky vyhľadávania (žiadne)"
 
-#: ../rpmdrake_.c:594
-msgid "by group"
-msgstr "podľa skupiny"
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Iné"
 
-#: ../rpmdrake_.c:594
-msgid "by size"
-msgstr "podľa veľkosti"
+#: ../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_.c:595
-msgid "by selection state"
-msgstr "podľa stavu výberu"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Uložiť a ukončiť"
 
-#: ../rpmdrake_.c:596
-msgid "by source repository"
-msgstr "podľa zdroja"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy..."
+msgstr "Proxy..."
 
-#: ../rpmdrake_.c:596
-msgid "by update availability"
-msgstr "podľa dostupnosti zdroja"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
+msgstr "Aktualizácia..."
 
-#: ../rpmdrake_.c:617
-msgid "in descriptions"
-msgstr "v popisoch"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "Pridať..."
 
-#: ../rpmdrake_.c:617
-msgid "in files"
-msgstr "v súboroch"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "Zmeň"
 
-#: ../rpmdrake_.c:617
-msgid "in names"
-msgstr "v menách"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Source"
+msgstr "Zdroj"
 
-#: ../rpmdrake_.c:628
-msgid "Reload the packages list"
-msgstr "Znovu načítač zoznam balíčkov"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
+msgstr "Povolené?"
 
-#: ../rpmdrake_.c:628
-msgid "Reset the selection"
-msgstr "Zrušiť výber"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure sources"
+msgstr "Nastaviť zdroje"
 
-#: ../rpmdrake_.c:654
-msgid "Maximum information"
-msgstr "Maximálne informácie"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "Heslo:"
 
-#: ../rpmdrake_.c:654
-msgid "Normal information"
-msgstr "Normálne informácie"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
+msgstr "Užívateľ:"
 
-#: ../rpmdrake_.c:676
-msgid "Too many packages are selected"
-msgstr "Vybrali ste príliš veľa balíčkov"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Môžete zadať užívateľské meno/heslo pre proxy autentifikáciu:"
 
-#: ../rpmdrake_.c:722
-msgid "Find:"
-msgstr "Hľadaj:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "Hostiteľ proxy:"
 
-#: ../rpmdrake_.c:727
-msgid "Search"
-msgstr "Hľadať"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"Ak potrebujete proxy, zadajte meno hostiteľa a voliteľne aj port (syntax: "
+"<proxyhost[:port]>):"
 
-#: ../rpmdrake_.c:733
-msgid "Install"
-msgstr "Inštaluj"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "Nastaviť proxy"
 
-#: ../rpmdrake_.c:740 data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrake Update"
-msgstr "Mandrake Update"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr "Prosím čakajte, aktualizujem médium..."
 
-#: ../rpmdrake_.c:740
-msgid "Software Packages Installation"
-msgstr "Inštalácia softvérových balíčkov"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "Pre uloženie zmien je potrebné aby ste vložili médium do mechaniky."
 
-#: ../rpmdrake_.c:740
-msgid "Software Packages Removal"
-msgstr "Odstránenie softvérových balíčkov"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
+msgstr "Vložte médium ak chcete pokračovať"
 
-#: ../rpmdrake_.c:781
-msgid "Please wait, contacting mirror to update packages information."
-msgstr ""
-"Prosím čakajte, kontaktujem miror pre aktualizáciu informácii o balíčkoch."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save changes"
+msgstr "Uložiť zmeny"
 
-#: ../rpmdrake_.c:783
-msgid "Error updating medium"
-msgstr "Chyba pri aktualizácii média"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Relatívna cesta k synthesis/hdlist: "
 
-#: ../rpmdrake_.c:784
-msgid "There was an unrecoverable error while updating packages information."
-msgstr "Nastala neopraviteľná chyba počas aktualizácie informácii o balíčkoch."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake_.c:789
-msgid "How to choose manually your mirror"
-msgstr "Ako si zvoliť miror manuálne"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Editing source \"%s\":"
+msgstr "Zmena zdroja \"%s\":"
 
-#: ../rpmdrake_.c:797
-msgid "Please wait, contacting mirror to initialize updates packages."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit a source"
+msgstr "Zmeniť zdroj"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr "Prosím čakajte, odstraňujem médium..."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, adding medium..."
+msgstr "Prosím čakajte, pridávam médium..."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of source:"
+msgstr "Typ zdroja:"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Adding a source:"
+msgstr "Pridávam zdroj:"
+
+#: ../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 ""
-"Prosím čakajte, kontaktujem miror pre inicializáciu aktualizácie balíčkov."
 
-#: ../rpmdrake_.c:800
-msgid "Error adding update medium"
-msgstr "Chyba pri pridávaní média"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to fill up at least the two first entries."
+msgstr "Je potrebné vyplniť najmenej prvé dve položky."
 
-#: ../rpmdrake_.c:831
-msgid "Please wait, finding available packages..."
-msgstr "Prosím čakajte, hľadám dostupné balíčky..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "Meno:"
 
-#: ../rpmdrake_.c:863
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Preverujem %s"
+msgid "Login:"
+msgstr "Login:"
 
-#: ../rpmdrake_.c:882
-msgid "changes:"
-msgstr "zmeny:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Zvoľte si miror..."
 
-#: ../rpmdrake_.c:886
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Odstrániť .%s"
+msgid "Browse..."
+msgstr "Prechádzať..."
 
-#: ../rpmdrake_.c:888
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Použite .%s ako hlavný súbor"
+msgid "Path or mount point:"
+msgstr "Cesta alebo bod pripojenia:"
 
-#: ../rpmdrake_.c:890
-msgid "Do nothing"
-msgstr "Neurobiť nič"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Removable device"
+msgstr "Vymeniteľné zariadenie"
 
-#: ../rpmdrake_.c:902
-msgid "Installation finished"
-msgstr "Inštalácia ukončená"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "HTTP server"
+msgstr "HTTP server"
 
-#: ../rpmdrake_.c:912
-msgid "Inspect..."
-msgstr "Preveriť.."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "FTP server"
 
-#: ../rpmdrake_.c:927
-msgid "Program missing"
-msgstr "Chýba program"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path:"
+msgstr "Cesta:"
 
-#: ../rpmdrake_.c:928
-msgid "A required program is missing (grpmi). Check your installation."
-msgstr "Požadovaný program chýba (grpmi). Prosím overte si inštaláciu."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "Lokálne súbory"
 
-#: ../rpmdrake_.c:942
-msgid "Unable to get source packages."
-msgstr "Nie je možné prebrať zdrojové balíčky."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add a source"
+msgstr "Pridať zdroj"
 
-#: ../rpmdrake_.c:943
-msgid "Unable to get source packages, sorry."
-msgstr "Nemôžem prevziať zdrojové balíčky, prepáčte."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
+msgstr "Nemôžem aktualizovať médium; bude automaticky zakázané."
 
-#: ../rpmdrake_.c:950
-msgid "Change medium"
-msgstr "Vymeniť médium"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "Nemôžem vytvoriť médium."
 
-#: ../rpmdrake_.c:951
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Prosím vložte médium s názvom \"%s\" do zariadenia [%s]"
+msgid "Please wait, updating media..."
+msgstr "Prosím čakajte, aktualizujem média..."
 
-#: ../rpmdrake_.c:959
-msgid "Installation failed"
-msgstr "Inštalácia neúspešná"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
+msgstr "Aktualizácia"
 
-#: ../rpmdrake_.c:960
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Select the source(s) you wish to update:"
+msgstr "Prosím zvoľte zdroj ktorý chcete aktualizovať:"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please choose the desired mirror."
+msgstr "Prosím zvoľte si jeden z mirorov."
+
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
-"Inštalácia neúspešná, niektoré súbory chýbajú.\n"
-"Možno bude potrebné aktualizovať databázu zdrojov."
 
-#: ../rpmdrake_.c:963
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr "Prosím čakajte, odstraňujem balíčky aby bolo možné iné aktualizovať..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
+msgstr "Žiaden miror"
 
-#: ../rpmdrake_.c:984
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"There was an error downloading the mirrors list:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
-"Inštalácia bola ukončená; %s.\n"
-"\n"
-"Niektoré konfiguračné súbory boli vytvorené ako `.rpmnew' alebo `.rpmsave',\n"
-"mali by ste ich prezrieš:"
 
-#: ../rpmdrake_.c:984
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "Chyba počas sťahovania"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "Prosím čakajte, sťahujem adresy mirorov z web stránky MandrakeSoft."
+
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"some packages failed to install\n"
-"correctly"
+"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 ""
-"niektoré balíčky nie je možné nainštalovať\n"
-"korektne"
 
-#: ../rpmdrake_.c:985
-msgid "everything was installed correctly"
-msgstr "všetko bolo úspešne nainštalované"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United States"
+msgstr "Spojené Štáty"
 
-#: ../rpmdrake_.c:987
-msgid "Everything installed successfully"
-msgstr "Všetko bolo úspešne nainštalované"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
+msgstr "Čína"
 
-#: ../rpmdrake_.c:988
-msgid "All requested packages were installed successfully."
-msgstr "Všetky požadované balíčky boli úspešne nainštalované."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr "Veľká Británia"
 
-#: ../rpmdrake_.c:991
-msgid "Everything already installed."
-msgstr "Všetko je už nainštalované."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "Taiwan"
 
-#: ../rpmdrake_.c:992
-msgid "Everything already installed (is this supposed to happen at all?)."
-msgstr "Všetko je už nainštalované (malo sa to vôbec stať?)."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "Švédsko"
 
-#: ../rpmdrake_.c:999
-msgid "Problem during installation"
-msgstr "Problém počas inštalácie"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
+msgstr "Rusko"
 
-#: ../rpmdrake_.c:1000
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Vyskytol sa problém počas inštalácie:\n"
-"\n"
-"%s"
+msgid "Portugal"
+msgstr "Portugalsko"
 
-#: ../rpmdrake_.c:1014
-msgid "Please wait, reading packages database..."
-msgstr "Prosím čakajte, načítavam databázu balíčkov..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
+msgstr "Poľsko"
 
-#: ../rpmdrake_.c:1055
-msgid "Please wait, removing packages..."
-msgstr "Prosím čakajte, odstraňujú balíčky..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
+msgstr "Nórsko"
 
-#: ../rpmdrake_.c:1058
-msgid "Problem during removal"
-msgstr "Problém počas odstraňovania"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
+msgstr "Holandsko"
 
-#: ../rpmdrake_.c:1059
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Vyskytol sa problém počas odstraňovania balíčkov:\n"
-"\n"
-"%s"
+msgid "Korea"
+msgstr "Korea"
 
-#: ../rpmdrake_.c:1091
-msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
-msgstr ""
-"Vítajte v nástroji pre odstraňovanie softvéru!\n"
-"\n"
-"Tento nástroj Vám pomôže si zvoliť softvér ktorý chcete odstrániť\n"
-"z Vášho počítača."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Japan"
+msgstr "Japonsko"
 
-#: ../rpmdrake_.c:1096
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"Vítajte v MandrakeUpdate!\n"
-"\n"
-"Tento nástroj Vám pomôže vybrať aktualizácie ktoré chcete nainštalovať do "
-"Vášho\n"
-"počítača."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Italy"
+msgstr "Taliansko"
 
-#: ../rpmdrake_.c:1101
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
-msgstr ""
-"Vítajte v nástroji pre inštaláciu softvéru!\n"
-"\n"
-"Váš Mandrake Linux systém prichádza s niekoľko tisíc softvérovými\n"
-"balíčkami na CDROM alebo DVD. Tento nástroj Vám pomôže pri výbere a "
-"inštalácii\n"
-"softvéru na Váš počítač."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Israel"
+msgstr "Izrael"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Grécko"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "France"
+msgstr "Francúzsko"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "Fínsko"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "Španielsko"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
+msgstr "Dánsko"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr "Nemecko"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
+msgstr "Česká Republika"
+
+#: ../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 "Brazília"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Belgium"
+msgstr "Belgicko"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Australia"
+msgstr "Austrália"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
+msgstr "Rakúsko"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Info..."
+msgstr "Info..."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
+msgstr "Nie"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Ano"
+
+#: data/rpmdrake.desktop.in.h:1
+msgid "Install Software"
+msgstr "Inštalácia softvéru"
 
 #: data/rpmdrake-remove.desktop.in.h:1
 msgid "Remove Software"
@@ -888,7 +1178,3 @@ msgstr "Odstrániť softvér"
 #: data/rpmdrake-sources.desktop.in.h:1
 msgid "Software Sources Manager"
 msgstr "Manažér zdrojov softvéru"
-
-#: data/rpmdrake.desktop.in.h:1
-msgid "Install Software"
-msgstr "Inštalácia softvéru"
diff --git a/po/sk.pom b/po/sk.pom
index ab635193..4e093438 100644
--- a/po/sk.pom
+++ b/po/sk.pom
@@ -4,166 +4,172 @@ msgstr "Server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Sieťovy počítač (klient)"
+msgid "Office Workstation"
+msgstr "Kancelárska stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS server, SMB server, Proxy server, SSH server"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Kancelárske programy: editory (kword, abiword), tabuľkové procesory "
+"(kspread, gnumeric), pdf prehliadače, atď"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Kancelária"
+msgid "Workstation"
+msgstr "Pracovná stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Gnome stanica"
+msgid "Game station"
+msgstr "Hracia stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Nástroje pre Váš Palm Pilot alebo Visor"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Zábavne programy: stolové, stratégie, atď"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Pracovná stanica"
+msgid "Multimedia station"
+msgstr "Multimediálna stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Firewall/Router"
+msgid "Sound and video playing/editing programs"
+msgstr "Programy na prehrávanie/editovanie zvuku a videa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr "Domain Name a Network Information Server"
+msgid "Internet station"
+msgstr "Internetová stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
 msgstr ""
-"Kancelárske programy: editory (kword, abiword), tabuľkové procesory "
-"(kspread, gnumeric), pdf prehliadače, atď"
+"Nástroje na čítanie a posielanie emailov a správ (pine, mutt, tin..) a "
+"prehliadanie www"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "Nástroje pre audio: mpš alebo midi prehrávače, etc"
+msgid "Network Computer (client)"
+msgstr "Sieťovy počítač (klient)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Linux Standard Base. Aplikačná podpora od tretej strany"
+msgid "Clients for different protocols including ssh"
+msgstr "Klientovia pre rôzne protokoly vrátane ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Knihy a návody pre Linux a iný voľný softvér"
+msgid "Configuration"
+msgstr "Konfigurácia"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "KDE stanica"
+msgid "Tools to ease the configuration of your computer"
+msgstr "Nástroje na jednoduchú konfiguráciu Vášho počítača"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, atď"
+msgid "Scientific Workstation"
+msgstr "Vedecká stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Multimédia - Video"
+msgid "Scientific applications such as gnuplot"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr "Nástroje pre elektronickú poštu, správy, web, prenos súborov, a chat"
+msgid "Console Tools"
+msgstr "Konzolové nástroje"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Databázy"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Editory, shelly, súborové nástroje, terminály"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL, alebo MySQL databázový server"
+msgid "KDE Workstation"
+msgstr "KDE stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Nástroje na jednoduchú konfiguráciu Vášho počítača"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"K Desktop Enviroment, grafické prostredie s množstvom pribalených programov"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "Multimédia - Zvuk"
+msgid "Graphical Environment"
+msgstr "Grafické prostredie"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dokumentácia"
+msgid "Gnome Workstation"
+msgstr "Gnome stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Konzolové nástroje"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr "Grafické rozhranie s aplikáciami a desktopovými nástrojmi"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr "Postfix email server, Inn news server"
+msgid "Other Graphical Desktops"
+msgstr "Iné grafické prostredia"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Internetová stanica"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, atď"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Multimediálna stanica"
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+msgid "Development"
+msgstr "Vývojárska"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Konfigurácia"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C a C++ vývojove knižnice, programy a include súbory"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Viac grafických prostredí (Gnome, IceWM)"
+msgid "Documentation"
+msgstr "Dokumentácia"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
-"K Desktop Enviroment, grafické prostredie s množstvom pribalených programov"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Knihy a návody pre Linux a iný voľný softvér"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Grafické prostredie"
+msgid "LSB"
+msgstr "LSB"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Linux Standard Base. Aplikačná podpora od tretej strany"
+
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-msgid "Development"
-msgstr "Vývojárska"
+#: ../../share/compssUsers:999
+msgid "Web/FTP"
+msgstr "Web/FTP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -172,23 +178,33 @@ msgstr "Apache a Pro-ftpd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "Nástroje na vytvorenie a napálenie CD"
+msgid "Mail/Groupware/News"
+msgstr "Mail/Groupware/News"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Kancelárska stanica"
+msgid "Postfix mail server, Inn news server"
+msgstr "Postfix email server, Inn news server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, atď"
+msgid "Database"
+msgstr "Databázy"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Grafické programy ako napr. The Gimp"
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL, alebo MySQL databázový server"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Firewall/Router"
+msgstr "Firewall/Router"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Internet gateway"
+msgstr "Brána k internetu"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -197,8 +213,8 @@ msgstr "DNS/NIS "
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C a C++ vývojove knižnice, programy a include súbory"
+msgid "Domain Name and Network Information Server"
+msgstr "Domain Name a Network Information Server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -207,18 +223,18 @@ msgstr "Sieťový server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "Mail/Groupware/Správy"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS server, SMB server, Proxy server, SSH server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Hracia stanica"
+msgid "Office"
+msgstr "Kancelária"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Prehrávače a editory videa"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr "Nástroje pre elektronickú poštu, správy, web, prenos súborov, a chat"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -227,76 +243,66 @@ msgstr "Multimédia - Grafika"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Zábavne programy: stolové, stratégie, atď"
+msgid "Graphics programs such as The Gimp"
+msgstr "Grafické programy ako napr. The Gimp"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
-"Nástroje na čítanie a posielanie emailov a správ (pine, mutt, tin..) a "
-"prehliadanie www"
+msgid "Multimedia - Sound"
+msgstr "Multimédia - Zvuk"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "Osobné financie"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "Nástroje pre audio: mpš alebo midi prehrávače, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr "Grafické rozhranie s aplikáciami a desktopovými nástrojmi"
+msgid "Multimedia - Video"
+msgstr "Multimédia - Video"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Klientovia pre rôzne protokoly vrátane ssh"
+msgid "Video players and editors"
+msgstr "Prehrávače a editory videa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
+msgid "Multimedia - CD Burning"
+msgstr "Multimédia - CD napaľovanie"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Brána k internetu"
+msgid "Tools to create and burn CD's"
+msgstr "Nástroje na vytvorenie a napálenie CD"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Programy na prehrávanie/editovanie zvuku a videa"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Viac grafických prostredí (Gnome, IceWM)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Iné grafické prostredia"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, atď"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Editory, shelly, súborové nástroje, terminály"
+msgid "Personal Information Management"
+msgstr "Osobný informačný manažment"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "Programy na správu vašich financií, napr. gnucash"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Nástroje pre Váš Palm Pilot alebo Visor"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "Osobný informačný manažment"
+msgid "Personal Finance"
+msgstr "Osobné financie"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multimédia - CD napaľovanie"
+msgid "Programs to manage your finances, such as gnucash"
+msgstr "Programy na správu vašich financií, napr. gnucash"
 
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Vedecká stanica"
diff --git a/po/sl.po b/po/sl.po
index 70712379..7f52120c 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.4\n"
-"POT-Creation-Date: 2003-01-19 16:57+0100\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\n"
 "PO-Revision-Date: 2002-03-04 00:55GMT\n"
 "Last-Translator: Gregor Pirnaver <gregor.pirnaver@email.si>\n"
 "Language-Team: Slovenščina <lugos-slo@lugos.si>\n"
@@ -17,908 +17,1131 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.5\n"
 
-#: ../edit-urpm-sources.pl_.c:39
-#, fuzzy
-msgid "Unable to create medium."
-msgstr "Ne morem narediti datoteke s poročilo, prekinjam.\n"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:40
-msgid "Unable to update medium; it will be automatically disabled."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to the software installation tool!\n"
+"\n"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:51
-#, fuzzy
-msgid "Add a source"
+#: ../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 ""
-"Prosim počakaj\n"
-"dodajm vir"
 
-#: ../edit-urpm-sources.pl_.c:52
-#, fuzzy
-msgid "Local files"
-msgstr "Lokalno"
+#: ../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_.c:52
-#, fuzzy
-msgid "Path:"
-msgstr "pot:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr "Problem se je pojavil med namestitvijo"
 
-#: ../edit-urpm-sources.pl_.c:53
-msgid "FTP server"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during removal"
+msgstr "Problem se je pojavil med namestitvijo"
 
-#: ../edit-urpm-sources.pl_.c:53 ../edit-urpm-sources.pl_.c:54
-#: ../edit-urpm-sources.pl_.c:56 ../edit-urpm-sources.pl_.c:175
-#, fuzzy
-msgid "URL:"
-msgstr "URL: "
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, removing packages..."
+msgstr "Prosim počakaj dokler rpm odranjuje sledeče pakete:"
 
-#: ../edit-urpm-sources.pl_.c:54
-msgid "HTTP server"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:55
-#, fuzzy
-msgid "Path or mount point:"
-msgstr "pota oz. točka priklopa"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr "Problem se je pojavil med namestitvijo"
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Removable device"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during installation"
+msgstr "Problem se je pojavil med namestitvijo"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:56 ../rpmdrake_.c:548
-msgid "Security updates"
-msgstr "Varnostna nadgradnje"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Everything already installed."
+msgstr "Paket je že nameščen"
 
-#: ../edit-urpm-sources.pl_.c:67
-msgid "Browse..."
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:69
-#, fuzzy
-msgid "Choose a mirror..."
-msgstr "Izberi strežnik:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:89
-#, fuzzy
-msgid "Login:"
-msgstr "uporabniško ime:"
+#: ../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 ""
 
-#: ../edit-urpm-sources.pl_.c:89 ../edit-urpm-sources.pl_.c:215
-#, fuzzy
-msgid "Password:"
-msgstr "geslo:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "everything was installed correctly"
+msgstr "Paket je že nameščen"
 
-#: ../edit-urpm-sources.pl_.c:94
-#, fuzzy
-msgid "Name:"
-msgstr "Ime"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"some packages failed to install\n"
+"correctly"
+msgstr "Že nameščeni paketi"
 
-#: ../edit-urpm-sources.pl_.c:96 ../edit-urpm-sources.pl_.c:176
-#, fuzzy
-msgid "Relative path to synthesis/hdlist:"
-msgstr "relativna pot do synthesis or hdlist: "
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, removing packages to allow others to be upgraded..."
+msgstr "Prosim izberi pakete, ki jih želiš nadgraditi"
 
-#: ../edit-urpm-sources.pl_.c:104
-msgid "You need to fill up at least the two first entries."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:116
-#, fuzzy
-msgid "Adding a source:"
-msgstr ""
-"Prosim počakaj\n"
-"dodajm vir"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Installation failed"
+msgstr "Na voljo"
 
-#: ../edit-urpm-sources.pl_.c:117
-msgid "Type of source:"
-msgstr "Vrsta vira:"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
+msgstr "Prekliči"
 
-#: ../edit-urpm-sources.pl_.c:121 ../edit-urpm-sources.pl_.c:187
-#: ../edit-urpm-sources.pl_.c:219 ../rpmdrake.pm_.c:97 ../rpmdrake.pm_.c:136
-#: ../rpmdrake.pm_.c:319 ../rpmdrake_.c:353 ../rpmdrake_.c:365
-#: ../rpmdrake_.c:369 ../rpmdrake_.c:916 ../rpmdrake_.c:950
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
 msgid "Ok"
 msgstr "V redu"
 
-#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:180
-#: ../edit-urpm-sources.pl_.c:187 ../edit-urpm-sources.pl_.c:220
-#: ../rpmdrake.pm_.c:319 ../rpmdrake.pm_.c:352 ../rpmdrake_.c:353
-#: ../rpmdrake_.c:950
-msgid "Cancel"
-msgstr "Prekliči"
-
-#: ../edit-urpm-sources.pl_.c:140
-#, fuzzy
-msgid "Please wait, adding medium..."
-msgstr "Preverjam odvisnosti..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:158
-#, fuzzy
-msgid "Please wait, removing medium..."
-msgstr "Preverjam odvisnosti..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:169
-#, fuzzy
-msgid "Edit a source"
-msgstr "Uredi vir"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:173
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "Uredi vir"
+msgid "Unable to get source packages."
+msgstr "Paket je slab, neberljiv ali pa ga ni mogoče najti"
 
-#: ../edit-urpm-sources.pl_.c:179
-#, fuzzy
-msgid "Save changes"
-msgstr "Paketi"
+#: ../rpmdrake:1
+#, c-format
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:185
-msgid "You need to insert the medium to continue"
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:186
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:191
-#, fuzzy
-msgid "Please wait, updating medium..."
-msgstr "Preverjam odvisnosti..."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Installation finished"
+msgstr "Na voljo"
 
-#: ../edit-urpm-sources.pl_.c:202
-#, fuzzy
-msgid "Configure proxies"
-msgstr "Nastavim vir?"
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:207
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:209
-msgid "Proxy hostname:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Remove .%s"
+msgstr "Zamenjljiv"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "changes:"
+msgstr "Paketi"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:211
-msgid "You may specify a user/password for the proxy authentication:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, finding available packages..."
+msgstr "osveči spisek paketov, ki so na voljo"
+
+#: ../rpmdrake:1
+#, c-format
+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 ""
 
-#: ../edit-urpm-sources.pl_.c:213
-msgid "User:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:235
-#, fuzzy
-msgid "Configure sources"
-msgstr "Nastavim vir?"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:242
-msgid "Enabled?"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Sources Manager, and then add a `Security\n"
+"updates' source.\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:243
-msgid "Source"
-msgstr "Vir"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:264 ../rpmdrake_.c:730
-#, fuzzy
-msgid "Remove"
-msgstr "Zamenjljiv"
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:266
-msgid "Edit"
-msgstr "Uredi"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:268
-msgid "Add..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:270
-msgid "Update..."
+#: ../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 ""
 
-#: ../edit-urpm-sources.pl_.c:271
-#, fuzzy
-msgid "Proxy..."
-msgstr "Napaka..."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Software Packages Installation"
+msgstr "Nameščeni paketi"
 
-#: ../edit-urpm-sources.pl_.c:274
-msgid "Save and quit"
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, fuzzy, c-format
+msgid "Mandrake Update"
 msgstr ""
+"Mandrake\n"
+"nadgradnja"
 
-#: ../edit-urpm-sources.pl_.c:275 ../rpmdrake_.c:733
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Software Packages Removal"
+msgstr "Upravitelj paketov"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
 msgid "Quit"
 msgstr "Končaj"
 
-#: ../rpmdrake.pm_.c:93
-msgid "Yes"
-msgstr ""
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "Namesti"
 
-#: ../rpmdrake.pm_.c:95
-msgid "No"
-msgstr ""
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Remove"
+msgstr "Zamenjljiv"
 
-#: ../rpmdrake.pm_.c:127
-msgid "Info..."
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Search"
+msgstr "išči"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "Najdi:"
+
+#: ../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 ""
 
-#: ../rpmdrake.pm_.c:180
-msgid "Austria"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:181
-msgid "Australia"
+#: ../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 ""
 
-#: ../rpmdrake.pm_.c:182
-msgid "Belgium"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Too many packages are selected"
+msgstr "Že nameščeni paketi"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:183
-msgid "Brazil"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Normal information"
+msgstr "normalne nadgradnje"
+
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update source(s)"
+msgstr "Uredi vir"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Reload the packages list"
+msgstr "Paket %s ni podpisan"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:184
-msgid "Canada"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "in files"
+msgstr "Lokalno"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "in descriptions"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:185
-msgid "Costa Rica"
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:186
-msgid "Czech Republic"
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:187
-msgid "Germany"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:188
-msgid "Danmark"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:189 ../rpmdrake.pm_.c:193
-msgid "Greece"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "by size"
+msgstr "Velikost vsebine (\"deep\")"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:190
-msgid "Spain"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "All packages,"
+msgstr "0 paketov, 0 bajtov"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:191
-#, fuzzy
-msgid "Finland"
-msgstr "Najdi:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mandrake choices"
+msgstr "Nadgradnja Mandraka"
 
-#: ../rpmdrake.pm_.c:192
-#, fuzzy
-msgid "France"
-msgstr "Prekliči"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Normal updates"
+msgstr "normalne nadgradnje"
 
-#: ../rpmdrake.pm_.c:194
-#, fuzzy
-msgid "Israel"
-msgstr "Nameščeni"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Bugfixes updates"
+msgstr "Varnostna nadgradnje"
 
-#: ../rpmdrake.pm_.c:195
-#, fuzzy
-msgid "Italy"
-msgstr "Nameščeni"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
+msgstr "Varnostna nadgradnje"
 
-#: ../rpmdrake.pm_.c:196
-msgid "Japan"
+#: ../rpmdrake:1
+#, c-format
+msgid "Description: "
 msgstr ""
 
-#: ../rpmdrake.pm_.c:197
-msgid "Korea"
+#: ../rpmdrake:1
+#, c-format
+msgid "Summary: "
 msgstr ""
 
-#: ../rpmdrake.pm_.c:198
-msgid "Netherlands"
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
 msgstr ""
 
-#: ../rpmdrake.pm_.c:199
-msgid "Norway"
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:200
-msgid "Poland"
+#: ../rpmdrake:1
+#, c-format
+msgid "Size: "
 msgstr ""
 
-#: ../rpmdrake.pm_.c:201
-#, fuzzy
-msgid "Portugal"
-msgstr "Port:"
-
-#: ../rpmdrake.pm_.c:202
-msgid "Russia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Version: "
 msgstr ""
 
-#: ../rpmdrake.pm_.c:203
-msgid "Sweden"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Name: "
+msgstr "Ime"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
 msgstr ""
 
-#: ../rpmdrake.pm_.c:204
-msgid "Taiwan"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
 msgstr ""
 
-#: ../rpmdrake.pm_.c:205
-msgid "United Kingdom"
+#: ../rpmdrake:1
+#, c-format
+msgid "Source: "
+msgstr "Vir: "
+
+#: ../rpmdrake:1
+#, c-format
+msgid "(Not available)"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:206
-msgid "China"
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:207 ../rpmdrake.pm_.c:208 ../rpmdrake.pm_.c:209
-#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:261
-msgid "United States"
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:274
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected size: %d MB"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:280
-msgid "Error during download"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:289
-#, fuzzy
-msgid "No mirror"
-msgstr "Brez napake"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
+msgstr ""
 
-#: ../rpmdrake.pm_.c:307
-#, fuzzy
-msgid "Please choose the desired mirror."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
 msgstr ""
-"Prosim počakaj\n"
-"pobiram spisek strežnikov"
 
-#: ../rpmdrake.pm_.c:339 ../rpmdrake_.c:627
-#, fuzzy
-msgid "Update source(s)"
-msgstr "Uredi vir"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be installed"
+msgstr "Že nameščeni paketi"
 
-#: ../rpmdrake.pm_.c:343
-#, fuzzy
-msgid "Select the source(s) you wish to update:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
 msgstr ""
-"Prosim izberi na vir,\n"
-"ki ga hočeš osvežiti:"
 
-#: ../rpmdrake.pm_.c:347
-#, fuzzy
-msgid "Update"
-msgstr "Samo nadgradnje"
-
-#: ../rpmdrake.pm_.c:358
-#, fuzzy
-msgid "Please wait, updating media..."
-msgstr "Preverjam odvisnosti..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Additional packages needed"
+msgstr ""
 
-#: ../rpmdrake_.c:99
-msgid "Other"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be removed"
 msgstr ""
 
-#: ../rpmdrake_.c:121 ../rpmdrake_.c:135 ../rpmdrake_.c:227 ../rpmdrake_.c:298
-msgid "(none)"
-msgstr "(noben)"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
 
-#: ../rpmdrake_.c:141 ../rpmdrake_.c:482 ../rpmdrake_.c:483
-msgid "(Not available)"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
 msgstr ""
+"Da bi zadovoljili vse odvisnosti,\n"
+"bodo odstranjeni sledeči paketi:"
 
-#: ../rpmdrake_.c:151 ../rpmdrake_.c:208
-#, fuzzy
-msgid "Search results"
-msgstr "Rezultati iskanja"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some additional packages need to be removed"
+msgstr "Ti dodatni paketi morajo biti nameščeni, da bo vse delalo dobro:"
 
-#: ../rpmdrake_.c:151
-#, fuzzy
-msgid "Search results (none)"
-msgstr "Rezultati iskanja"
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
+msgstr ""
 
-#: ../rpmdrake_.c:161 ../rpmdrake_.c:172
-#, fuzzy
-msgid "Please wait, searching..."
-msgstr "Prosim počakaj dokler rpm odranjuje sledeče pakete:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Information on packages"
+msgstr "Ne morem odpreti paketa"
 
-#: ../rpmdrake_.c:175
-msgid "Stop"
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
 msgstr ""
 
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
+#: ../rpmdrake:1
+#, c-format
 msgid "Addable"
 msgstr ""
 
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
+#: ../rpmdrake:1
+#, c-format
 msgid "Upgradable"
 msgstr ""
 
-#: ../rpmdrake_.c:211
-msgid "Not selected"
+#: ../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_.c:211
-msgid "Selected"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "No update"
+msgstr "normalne nadgradnje"
 
-#: ../rpmdrake_.c:240
-msgid "rpmdrake"
-msgstr "rpmdrake"
+#: ../rpmdrake:1
+#, c-format
+msgid "(none)"
+msgstr "(noben)"
 
-#: ../rpmdrake_.c:258 ../rpmdrake_.c:360 ../rpmdrake_.c:362
-msgid "More information on package..."
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, listing packages..."
+msgstr "Prosim počakaj dokler rpm odranjuje sledeče pakete:"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "Neznana stran"
 
-#: ../rpmdrake_.c:259
+#: ../rpmdrake:1
+#, c-format
 msgid "One of the following packages is needed:"
 msgstr ""
 
-#: ../rpmdrake_.c:259
+#: ../rpmdrake:1
+#, c-format
 msgid "Please choose"
 msgstr ""
 
-#: ../rpmdrake_.c:275
-#, fuzzy
-msgid "unknown package "
-msgstr "Neznana stran"
-
-#: ../rpmdrake_.c:285
-#, fuzzy
-msgid "Please wait, listing packages..."
-msgstr "Prosim počakaj dokler rpm odranjuje sledeče pakete:"
-
-#: ../rpmdrake_.c:300
-#, fuzzy
-msgid "No update"
-msgstr "normalne nadgradnje"
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:353 ../rpmdrake_.c:354
-msgid "More infos"
+#: ../rpmdrake:1
+#, c-format
+msgid "Not selected"
 msgstr ""
 
-#: ../rpmdrake_.c:355
-#, fuzzy
-msgid "Information on packages"
-msgstr "Ne morem odpreti paketa"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected"
+msgstr ""
 
-#: ../rpmdrake_.c:376
-#, fuzzy
-msgid "Some additional packages need to be removed"
-msgstr "Ti dodatni paketi morajo biti nameščeni, da bo vse delalo dobro:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Search results"
+msgstr "Rezultati iskanja"
 
-#: ../rpmdrake_.c:377
-#, fuzzy
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "Stop"
 msgstr ""
-"Da bi zadovoljili vse odvisnosti,\n"
-"bodo odstranjeni sledeči paketi:"
 
-#: ../rpmdrake_.c:383 ../rpmdrake_.c:391
-msgid "Some packages can't be removed"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, searching..."
+msgstr "Prosim počakaj dokler rpm odranjuje sledeče pakete:"
 
-#: ../rpmdrake_.c:384
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Search results (none)"
+msgstr "Rezultati iskanja"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
 msgstr ""
 
-#: ../rpmdrake_.c:392 ../rpmdrake_.c:451
+#: ../edit-urpm-sources.pl:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"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_.c:421
-msgid "Additional packages needed"
-msgstr ""
-
-#: ../rpmdrake_.c:422
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
 msgstr ""
 
-#: ../rpmdrake_.c:435
-#, fuzzy
-msgid "Some packages can't be installed"
-msgstr "Že nameščeni paketi"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Proxy..."
+msgstr "Napaka..."
 
-#: ../rpmdrake_.c:436
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
 msgstr ""
 
-#: ../rpmdrake_.c:450 ../rpmdrake_.c:684
-msgid "Some packages need to be removed"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
 msgstr ""
 
-#: ../rpmdrake_.c:472
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr ""
+msgid "Edit"
+msgstr "Uredi"
 
-#: ../rpmdrake_.c:474
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr ""
+msgid "Source"
+msgstr "Vir"
 
-#: ../rpmdrake_.c:482
-msgid "Files:\n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
 msgstr ""
 
-#: ../rpmdrake_.c:483
-msgid "Changelog:\n"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure sources"
+msgstr "Nastavim vir?"
 
-#: ../rpmdrake_.c:486
-msgid "Source: "
-msgstr "Vir: "
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Password:"
+msgstr "geslo:"
 
-#: ../rpmdrake_.c:487
-msgid "Currently installed version: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
 msgstr ""
 
-#: ../rpmdrake_.c:491
-msgid "Reason for update: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 
-#: ../rpmdrake_.c:493
-#, fuzzy
-msgid "Name: "
-msgstr "Ime"
-
-#: ../rpmdrake_.c:494
-msgid "Version: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
 msgstr ""
 
-#: ../rpmdrake_.c:495
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "%s KB"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
 msgstr ""
 
-#: ../rpmdrake_.c:495
-msgid "Size: "
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure proxies"
+msgstr "Nastavim vir?"
 
-#: ../rpmdrake_.c:497
-msgid "Importance: "
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, updating medium..."
+msgstr "Preverjam odvisnosti..."
 
-#: ../rpmdrake_.c:498
-msgid "Summary: "
+#: ../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_.c:499
-msgid "Description: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
 msgstr ""
 
-#: ../rpmdrake_.c:548
-#, fuzzy
-msgid "Bugfixes updates"
-msgstr "Varnostna nadgradnje"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Save changes"
+msgstr "Paketi"
 
-#: ../rpmdrake_.c:548
-#, fuzzy
-msgid "Normal updates"
-msgstr "normalne nadgradnje"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "relativna pot do synthesis or hdlist: "
 
-#: ../rpmdrake_.c:567
-#, fuzzy
-msgid "Mandrake choices"
-msgstr "Nadgradnja Mandraka"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "URL:"
+msgstr "URL: "
 
-#: ../rpmdrake_.c:568
-msgid "All packages, alphabetical"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing source \"%s\":"
+msgstr "Uredi vir"
 
-#: ../rpmdrake_.c:569
-#, fuzzy
-msgid "All packages,"
-msgstr "0 paketov, 0 bajtov"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Edit a source"
+msgstr "Uredi vir"
 
-#: ../rpmdrake_.c:592
-msgid "by group"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, removing medium..."
+msgstr "Preverjam odvisnosti..."
 
-#: ../rpmdrake_.c:592
-#, fuzzy
-msgid "by size"
-msgstr "Velikost vsebine (\"deep\")"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Please wait, adding medium..."
+msgstr "Preverjam odvisnosti..."
 
-#: ../rpmdrake_.c:593
-msgid "by selection state"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of source:"
+msgstr "Vrsta vira:"
 
-#: ../rpmdrake_.c:594
-msgid "by source repository"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Adding a source:"
 msgstr ""
+"Prosim počakaj\n"
+"dodajm vir"
 
-#: ../rpmdrake_.c:594
-msgid "by update availability"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 msgstr ""
 
-#: ../rpmdrake_.c:615
-msgid "in descriptions"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to fill up at least the two first entries."
 msgstr ""
 
-#: ../rpmdrake_.c:615
-#, fuzzy
-msgid "in files"
-msgstr "Lokalno"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Name:"
+msgstr "Ime"
 
-#: ../rpmdrake_.c:615
-msgid "in names"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Login:"
+msgstr "uporabniško ime:"
 
-#: ../rpmdrake_.c:626
-#, fuzzy
-msgid "Reload the packages list"
-msgstr "Paket %s ni podpisan"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Choose a mirror..."
+msgstr "Izberi strežnik:"
 
-#: ../rpmdrake_.c:626
-msgid "Reset the selection"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Browse..."
 msgstr ""
 
-#: ../rpmdrake_.c:652
-msgid "Maximum information"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Path or mount point:"
+msgstr "pota oz. točka priklopa"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Removable device"
 msgstr ""
 
-#: ../rpmdrake_.c:652
-#, fuzzy
-msgid "Normal information"
-msgstr "normalne nadgradnje"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "HTTP server"
+msgstr ""
 
-#: ../rpmdrake_.c:674
-#, fuzzy
-msgid "Too many packages are selected"
-msgstr "Že nameščeni paketi"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr ""
 
-#: ../rpmdrake_.c:720
-msgid "Find:"
-msgstr "Najdi:"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Path:"
+msgstr "pot:"
 
-#: ../rpmdrake_.c:725
-#, fuzzy
-msgid "Search"
-msgstr "išči"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Local files"
+msgstr "Lokalno"
 
-#: ../rpmdrake_.c:731
-msgid "Install"
-msgstr "Namesti"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a source"
+msgstr ""
+"Prosim počakaj\n"
+"dodajm vir"
 
-#: ../rpmdrake_.c:738 data/mandrakeupdate.desktop.in.h:1
-#, fuzzy
-msgid "Mandrake Update"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
 msgstr ""
-"Mandrake\n"
-"nadgradnja"
 
-#: ../rpmdrake_.c:738
-#, fuzzy
-msgid "Software Packages Installation"
-msgstr "Nameščeni paketi"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Unable to create medium."
+msgstr "Ne morem narediti datoteke s poročilo, prekinjam.\n"
 
-#: ../rpmdrake_.c:738
-#, fuzzy
-msgid "Software Packages Removal"
-msgstr "Upravitelj paketov"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Please wait, updating media..."
+msgstr "Preverjam odvisnosti..."
 
-#: ../rpmdrake_.c:779
-msgid "Please wait, contacting mirror to update packages information."
-msgstr ""
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update"
+msgstr "Samo nadgradnje"
 
-#: ../rpmdrake_.c:781
-msgid "Error updating medium"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Select the source(s) you wish to update:"
 msgstr ""
+"Prosim izberi na vir,\n"
+"ki ga hočeš osvežiti:"
 
-#: ../rpmdrake_.c:782
-msgid "There was an unrecoverable error while updating packages information."
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Please choose the desired mirror."
 msgstr ""
+"Prosim počakaj\n"
+"pobiram spisek strežnikov"
 
-#: ../rpmdrake_.c:787
-msgid "How to choose manually your mirror"
+#: ../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_.c:795
-msgid "Please wait, contacting mirror to initialize updates packages."
-msgstr ""
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "No mirror"
+msgstr "Brez napake"
 
-#: ../rpmdrake_.c:798
-msgid "Error adding update medium"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid ""
+"There was an error downloading the mirrors list:\n"
+"\n"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
 
-#: ../rpmdrake_.c:829
-#, fuzzy
-msgid "Please wait, finding available packages..."
-msgstr "osveči spisek paketov, ki so na voljo"
-
-#: ../rpmdrake_.c:861
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Inspecting %s"
+msgid "Error during download"
 msgstr ""
 
-#: ../rpmdrake_.c:880
-#, fuzzy
-msgid "changes:"
-msgstr "Paketi"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
 
-#: ../rpmdrake_.c:884
-#, fuzzy, c-format
-msgid "Remove .%s"
-msgstr "Zamenjljiv"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
 
-#: ../rpmdrake_.c:886
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Use .%s as main file"
+msgid "United States"
 msgstr ""
 
-#: ../rpmdrake_.c:888
-msgid "Do nothing"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
 msgstr ""
 
-#: ../rpmdrake_.c:900
-#, fuzzy
-msgid "Installation finished"
-msgstr "Na voljo"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr ""
 
-#: ../rpmdrake_.c:910
-msgid "Inspect..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
 msgstr ""
 
-#: ../rpmdrake_.c:925
-msgid "Program missing"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
 msgstr ""
 
-#: ../rpmdrake_.c:926
-msgid "A required program is missing (grpmi). Check your installation."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
 msgstr ""
 
-#: ../rpmdrake_.c:940
-#, fuzzy
-msgid "Unable to get source packages."
-msgstr "Paket je slab, neberljiv ali pa ga ni mogoče najti"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Portugal"
+msgstr "Port:"
 
-#: ../rpmdrake_.c:941
-msgid "Unable to get source packages, sorry."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
 msgstr ""
 
-#: ../rpmdrake_.c:948
-msgid "Change medium"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
 msgstr ""
 
-#: ../rpmdrake_.c:949
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+msgid "Netherlands"
 msgstr ""
 
-#: ../rpmdrake_.c:957
-#, fuzzy
-msgid "Installation failed"
-msgstr "Na voljo"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Korea"
+msgstr ""
 
-#: ../rpmdrake_.c:958
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Japan"
 msgstr ""
 
-#: ../rpmdrake_.c:961
-#, fuzzy
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr "Prosim izberi pakete, ki jih želiš nadgraditi"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Italy"
+msgstr "Nameščeni"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Israel"
+msgstr "Nameščeni"
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm: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 "Greece"
 msgstr ""
 
-#: ../rpmdrake_.c:982
-#, fuzzy
-msgid ""
-"some packages failed to install\n"
-"correctly"
-msgstr "Že nameščeni paketi"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "France"
+msgstr "Prekliči"
 
-#: ../rpmdrake_.c:983
-#, fuzzy
-msgid "everything was installed correctly"
-msgstr "Paket je že nameščen"
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Finland"
+msgstr "Najdi:"
 
-#: ../rpmdrake_.c:985
-msgid "Everything installed successfully"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
 msgstr ""
 
-#: ../rpmdrake_.c:986
-msgid "All requested packages were installed successfully."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
 msgstr ""
 
-#: ../rpmdrake_.c:989
-#, fuzzy
-msgid "Everything already installed."
-msgstr "Paket je že nameščen"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr ""
 
-#: ../rpmdrake_.c:990
-msgid "Everything already installed (is this supposed to happen at all?)."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
 msgstr ""
 
-#: ../rpmdrake_.c:997
-#, fuzzy
-msgid "Problem during installation"
-msgstr "Problem se je pojavil med namestitvijo"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Costa Rica"
+msgstr ""
 
-#: ../rpmdrake_.c:998
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr "Problem se je pojavil med namestitvijo"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Canada"
+msgstr ""
 
-#: ../rpmdrake_.c:1012
-msgid "Please wait, reading packages database..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
 msgstr ""
 
-#: ../rpmdrake_.c:1053
-#, fuzzy
-msgid "Please wait, removing packages..."
-msgstr "Prosim počakaj dokler rpm odranjuje sledeče pakete:"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Belgium"
+msgstr ""
 
-#: ../rpmdrake_.c:1056
-#, fuzzy
-msgid "Problem during removal"
-msgstr "Problem se je pojavil med namestitvijo"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Australia"
+msgstr ""
 
-#: ../rpmdrake_.c:1057
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr "Problem se je pojavil med namestitvijo"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
+msgstr ""
 
-#: ../rpmdrake_.c:1089
-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."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Info..."
 msgstr ""
 
-#: ../rpmdrake_.c:1094
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
 msgstr ""
 
-#: ../rpmdrake_.c:1099
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
 msgstr ""
 
+#: data/rpmdrake.desktop.in.h:1
+#, fuzzy
+msgid "Install Software"
+msgstr "namesti vse"
+
 #: data/rpmdrake-remove.desktop.in.h:1
 msgid "Remove Software"
 msgstr ""
@@ -927,11 +1150,6 @@ msgstr ""
 msgid "Software Sources Manager"
 msgstr ""
 
-#: data/rpmdrake.desktop.in.h:1
-#, fuzzy
-msgid "Install Software"
-msgstr "namesti vse"
-
 #, fuzzy
 #~ msgid "Update sources"
 #~ msgstr "Uredi vir"
diff --git a/po/sl.pom b/po/sl.pom
index 235def6d..26d78997 100644
--- a/po/sl.pom
+++ b/po/sl.pom
@@ -4,174 +4,178 @@ msgstr "strežnik"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
 #, fuzzy
-msgid "Network Computer (client)"
-msgstr "Izberite strežnik"
+msgid "Office Workstation"
+msgstr "Nastavitev zaslona"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 #, fuzzy
-msgid "Office"
-msgstr "Preklic"
+msgid "Workstation"
+msgstr "Nastavitev zaslona"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 #, fuzzy
-msgid "Gnome Workstation"
+msgid "Game station"
 msgstr "Nastavitev zaslona"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
+msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 #, fuzzy
-msgid "Workstation"
-msgstr "Nastavitev zaslona"
+msgid "Multimedia station"
+msgstr "Večpredstavnost"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
+msgid "Sound and video playing/editing programs"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr ""
+#, fuzzy
+msgid "Internet station"
+msgstr "Nastavitev zaslona"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr ""
+#, fuzzy
+msgid "Network Computer (client)"
+msgstr "Izberite strežnik"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
+msgid "Clients for different protocols including ssh"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr ""
+#, fuzzy
+msgid "Configuration"
+msgstr "Nastavitev zaslona"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 #, fuzzy
-msgid "KDE Workstation"
+msgid "Tools to ease the configuration of your computer"
+msgstr "Želite preizkusiti nastavitev?"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+#, fuzzy
+msgid "Scientific Workstation"
 msgstr "Nastavitev zaslona"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgid "Scientific applications such as gnuplot"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Multimedia - Video"
-msgstr "Večpredstavnost"
+msgid "Console Tools"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgid "Editors, shells, file tools, terminals"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr ""
+#, fuzzy
+msgid "KDE Workstation"
+msgstr "Nastavitev zaslona"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Tools to ease the configuration of your computer"
-msgstr "Želite preizkusiti nastavitev?"
+msgid "Graphical Environment"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 #, fuzzy
-msgid "Multimedia - Sound"
-msgstr "Večpredstavnost"
+msgid "Gnome Workstation"
+msgstr "Nastavitev zaslona"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Documentation"
-msgstr "Nastavitve modula:"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Console Tools"
+msgid "Other Graphical Desktops"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Internet station"
-msgstr "Nastavitev zaslona"
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+msgid "Development"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Multimedia station"
-msgstr "Večpredstavnost"
+msgid "C and C++ development libraries, programs and include files"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 #, fuzzy
-msgid "Configuration"
-msgstr "Nastavitev zaslona"
+msgid "Documentation"
+msgstr "Nastavitve modula:"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
+msgid "Books and Howto's on Linux and Free Software"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
+msgid "LSB"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
+msgid "Linux Standard Base. Third party applications support"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-msgid "Development"
+msgid "Web/FTP"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
@@ -181,33 +185,43 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
+msgid "Mail/Groupware/News"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Office Workstation"
-msgstr "Nastavitev zaslona"
+msgid "Postfix mail server, Inn news server"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgid "Database"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
+msgid "PostgreSQL or MySQL database server"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
+msgid "Firewall/Router"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+#, fuzzy
+msgid "Internet gateway"
+msgstr "Nastavitev zaslona"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "DNS/NIS "
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
+msgid "Domain Name and Network Information Server"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
@@ -218,18 +232,18 @@ msgstr "Izberite strežnik"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
+msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 #, fuzzy
-msgid "Game station"
-msgstr "Nastavitev zaslona"
+msgid "Office"
+msgstr "Preklic"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
@@ -240,77 +254,69 @@ msgstr "Večpredstavnost"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
+msgid "Graphics programs such as The Gimp"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr ""
+#, fuzzy
+msgid "Multimedia - Sound"
+msgstr "Večpredstavnost"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr ""
+#, fuzzy
+msgid "Multimedia - Video"
+msgstr "Večpredstavnost"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "LSB"
+msgid "Video players and editors"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 #, fuzzy
-msgid "Internet gateway"
-msgstr "Nastavitev zaslona"
+msgid "Multimedia - CD Burning"
+msgstr "Večpredstavnost"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
+msgid "Tools to create and burn CD's"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
+msgid "More Graphical Desktops (Gnome, IceWM)"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
+msgid "Personal Information Management"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
+msgid "Tools for your Palm Pilot or your Visor"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Multimedia - CD Burning"
-msgstr "Večpredstavnost"
+msgid "Personal Finance"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Scientific Workstation"
-msgstr "Nastavitev zaslona"
+msgid "Programs to manage your finances, such as gnucash"
+msgstr ""
+
diff --git a/po/sp.po b/po/sp.po
index dd779aa4..36e7db2f 100644
--- a/po/sp.po
+++ b/po/sp.po