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 "ij³ª´Ù"
+#: ../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 "ij³ª´Ù"
+
+#: ../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
@@ -6,7 +6,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 21:33+0100\n"
 "Last-Translator: Toma Jankovic <tomaja@net.yu>\n"
 "Language-Team: Serbian <i18n@mandrake.co.yu>\n"
@@ -15,453 +15,625 @@ 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 "½Õ ÜÞÓã ÔÐ ÝÐßàÐÒØÜ ÜÕÔØøãÜ."
+#: ../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:44
-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 ÞßÕàÐâØÒÝØ áØáâÕÜ øÕ ÔÞèÐÞ áÐ ÝÕÚÞÛØÚÞ åØùÐÔÐ ßÐÚÕâÐ\n"
+"áÐ ßàÞÓàÐÜØÜÐ, ÝÐ CD-ã ØÛØ DVD-ã. ¾ÒÐø ÐÛÐâ ûÕ ²ÐÜ ßÞÜÞûØ ÔÐ Ø×ÐÑÕàÕâÕ\n"
+"ßÐÚÕâÕ ÚÞøÕ ÖÕÛØâÕ ÔÐ ØÝáâÐÛØàÐâÕ ÝÐ ²Ðè àÐçãÝÐà."
 
-#: ../edit-urpm-sources.pl_.c:54
-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:55
-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:55
-msgid "Path:"
-msgstr "¿ãâaúÐ:"
+#: ../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:56
-msgid "FTP server"
-msgstr "FTP áÕàÒÕà"
+#: ../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:"
-msgstr "URL:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages..."
+msgstr "¼ÞÛØÜ ²Ðá áÐçÕÚÐøâÕ, ãÚÛÐúÐÜ ßÐÚÕâÕ..."
 
-#: ../edit-urpm-sources.pl_.c:57
-msgid "HTTP server"
-msgstr "HTTP áÕàÒÕà"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
+msgstr "¼ÞÛØÜ ÒÐá áÐçÕÚÐøâÕ, ãçØâÐÒÐÜ ÑÐ×ã ßÞÔÐâÐÚÐ Þ ßÐÚÕâØÜÐ..."
 
-#: ../edit-urpm-sources.pl_.c:58
-msgid "Path or mount point:"
-msgstr "¿ãâÐúÐ ØÛØ âaçÚÐ ÜÞÝâØàÐúÐ:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"½ÐØèÐÞ áÐÜ ÝÐ ßàÞÑÛÕÜ âÞÚÞÜ ØÝáâÐÛØàÐúÐ:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:58
-msgid "Removable device"
-msgstr "¿àÕÝÞáÝØ ãàÕòÐø"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during installation"
+msgstr "¿àÞÑÛÕÜ ×Ð ÒàÕÜÕ ØÝáâÐÛØàÐúÐ"
 
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:550
-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:70
-msgid "Browse..."
-msgstr "ÂàÐÖØ..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed."
+msgstr "ÁÒÕ øÕ ÒÕû ØÝáâÐÛØàÐÝÞ."
 
-#: ../edit-urpm-sources.pl_.c:72
-msgid "Choose a mirror..."
-msgstr "¸×ÐÑÕàØâÕ áÒÞj ÜØàÞà áÐjâ..."
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "ÁÒØ ßÐÚÕâØ, ÚÞøØ áâÕ ×ÐåâÕÒÐÛØ, áã ãáßÕèÝÞ ØÝáâÐÛØàÐÝØ."
 
-#: ../edit-urpm-sources.pl_.c:92
-msgid "Login:"
-msgstr "¿àØøÐÒÐ:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr "ÁÒÕ øÕ ÔÞÑàÞ ØÝáâÐÛØàÐÝÞ"
 
-#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:231
-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:97
-msgid "Name:"
-msgstr "¸Üe:"
+#: ../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:"
-msgstr "ÀÕÛÐâØÒÝÐ ßãâaúÐ ÚÐ synthesis/hdlist:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"some packages failed to install\n"
+"correctly"
+msgstr ""
+"ÝÕÚØ ßÐÚÕâØ áÕ ÝØáã ØáßàÐÒÝÞ\n"
+"ØÝáâÐÛØàÐâØ"
 
-#: ../edit-urpm-sources.pl_.c:107
-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:120
-msgid "Adding a source:"
-msgstr "´ÞÔÐjÕÜ Ø×ÒÞà:"
+#: ../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:121
-msgid "Type of source:"
-msgstr "ÂØß Ø×ÒÞàa:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation failed"
+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:952
+#: ../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: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 "¾ÔãáâÐÝØ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "ÃÑÐæØâÕ ÜÕÔØøãÜ áÐ ØÜÕÝÞÜ \"%s\" ã ãàÕòÐø [%s]"
 
-#: ../edit-urpm-sources.pl_.c:147
-msgid "Please wait, adding medium..."
-msgstr "¼ÞÛØÜÞ ²Ðá ÔÐ áÐçÕÚÐâÕ, ÔÞÔÐøÕÜ ÜÕÔØøãÜ..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr "¿àÞÜÕÝØ ÜÕÔØøãÜ"
 
-#: ../edit-urpm-sources.pl_.c:168
-msgid "Please wait, removing medium..."
-msgstr "¼ÞÛØÜÞ ²Ðá ÔÐ áÐçÕÚÐâÕ, ãÚÛÐúÐÜ ÜÕÔØøãÜ..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
+msgstr "½Õ ÜÞÓã ÔÐ ÔÞÑÐÒØÜ Ø×ÒÞàÝÕ ßÐÚÕâÕ, ÖÐÞ ÜØ øÕ."
 
-#: ../edit-urpm-sources.pl_.c:181
-msgid "Edit a source"
-msgstr "¸×ÜÕÝØ Ø×ÒÞà"
+#: ../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\":"
-msgstr "¼ÕúÐÜ Ø×ÒÞà \"%s\":"
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr "½ÕÔÞáâÐøÕ ßÞâàÕÑÝØ ßàÞÓàÐÜ (grpmi). ¿àÞÒÕàØâÕ áÒÞøã ØÝáâÐÛÐæØøã."
 
-#: ../edit-urpm-sources.pl_.c:191
-msgid "Save changes"
-msgstr "ÁÐçãÒÐø Ø×ÜÕÝÕ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
+msgstr "¿àÞÓàÐÜ ÝÕÔÞáâÐøÕ"
 
-#: ../edit-urpm-sources.pl_.c:200
-msgid "You need to insert the medium to continue"
-msgstr "¼ÞàÐâÕ ÔÐ ãÑÐæØâÕ ÜÕÔØøãÜ ÚÐÚÞ ÑØ áâÕ ÝÐáâÐÒØÛØ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
+msgstr "¿àÞÒÕàØ..."
 
-#: ../edit-urpm-sources.pl_.c:201
-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:206
-msgid "Please wait, updating medium..."
-msgstr "¼ÞÛØÜ ²Ðá áÐçÕÚÐøâÕ, ÐÖãàØàÐÜ ÜÕÔØøãÜ..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
+msgstr "½Õ àÐÔØ ÝØèâÐ"
 
-#: ../edit-urpm-sources.pl_.c:217
-msgid "Configure proxies"
-msgstr "¿ÞÔÕèÐÒÐúÕ ßàÞÚáØøÐ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
+msgstr "ºÞàØáâØ %s ÚÐÞ ÓÛÐÒÝØ äÐøÛ"
 
-#: ../edit-urpm-sources.pl_.c:223
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
-msgstr ""
-"°ÚÞ ²ÐÜ øÕ ßÞâàÕÑÝÐ ßàÞÚáØ, ãÝÕáØâÕ ØÜÕ ÔÞÜÐûØÝÐ Ø ÝÕÞÑÐÒÕ×ÝØ ßÞàâ "
-"(áØÝâÐÚáÐ: <proksi-domacin[:port]>):"
+#: ../rpmdrake:1
+#, c-format
+msgid "Remove .%s"
+msgstr "ÃÚÛÞÝØ: %s"
 
-#: ../edit-urpm-sources.pl_.c:225
-msgid "Proxy hostname:"
-msgstr "¸ÜÕ ßàÞÚáØ ÔÞÜÐûØÝÐ(hostname):"
+#: ../rpmdrake:1
+#, c-format
+msgid "changes:"
+msgstr "Ø×ÜÕÝÕ:"
 
-#: ../edit-urpm-sources.pl_.c:227
-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:229
-msgid "User:"
-msgstr "ºÞàØáÝØÚ:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, finding available packages..."
+msgstr "¼ÞÛØÜ ²Ðá áÐçÕÚÐøâÕ, ßàÞÝÐÛÐ×ØÜ ÔÞáâãßÝÕ ßÐÚÕâÕ..."
 
-#: ../edit-urpm-sources.pl_.c:255
-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) øÞè ÝØøÕ / ÝØøÕ ÒØèÕ ßÞÔàÖÐÐÝÐ ÞÔ áâàÐÝÕ "
+"Mandrake Linux\n"
+"Official Updates.\n"
+"\n"
+"´Ð ÛØ ÖÕÛØâÕ ÔÐ ßàÞÑÐâÕ áÐ ÔàãÓØÜ ÜØàÞàÞÜ?"
 
-#: ../edit-urpm-sources.pl_.c:262
-msgid "Enabled?"
-msgstr "ÃÚùãçØ?"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
+msgstr "³àÕèÚÐ ßàØÛØÚÞÜ ÔÞÔÐÒÐúÐ ÜÕÔØøãÜÐ áÐ ÝÐÔÞÓàÐÔúÞÜ"
 
-#: ../edit-urpm-sources.pl_.c:263
-msgid "Source"
-msgstr "¸×ÒÞà"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
+msgstr ""
+"¼ÞÛØÜ ²Ðá áÐçÕÚÐøâÕ, ÚÞÝâÐÚâØàÐÜ ÜØàÞà áÐøâ àÐÔØ ØÝØæØàÐúÐ ÐÖãàØàÐúÐ ßÐÚÕâÐ."
 
-#: ../edit-urpm-sources.pl_.c:286 ../rpmdrake_.c:732
-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"
+"ßÞÚàÕÝØâÕ ¼ÕÝÐÿÕà ÁÞäâÒÕàÐ, Ð ×ÐâØÜ ÔÞÔÐøâÕ `Security\n"
+"updates' Ø×ÒÞà.\n"
+"\n"
+"·ÐâØÜ, àÕáâÐàãøâÕ MandrakeUpdate."
 
-#: ../edit-urpm-sources.pl_.c:288
-msgid "Edit"
-msgstr "¸×ÜÕÝØ"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "ºÐÚÞ àãçÝÞ Ø×ÐÑàÐâØ áÒÞø ÜØàÞà áÐøâ"
 
-#: ../edit-urpm-sources.pl_.c:290
-msgid "Add..."
-msgstr "´ÞÔÐø..."
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
+msgstr ""
+"¿ÞøÐÒØÛÐ áÐ ÝÕßÞßàÐÒùØÒÐ ÓàÕèÚÐ âÞÚÞÜ ÐÖãàØàÐúÐ ØÝäÞàÜÐæØøÐ Þ ßÐÚÕâØÜÐ."
 
-#: ../edit-urpm-sources.pl_.c:292
-msgid "Update..."
-msgstr "°ÖãàØàÐø..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
+msgstr "³àÕèÚÐ ßàØ ÐÖãàØàÐúã ÜÕÔØøãÜÐ"
 
-#: ../edit-urpm-sources.pl_.c:293
-msgid "Proxy..."
-msgstr "¿àÞÚáØ..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
+msgstr ""
+"¼ÞÛØÜ ²Ðá áÐçÕÚÐøâÕ, ãáßÞáâÐÒùÐÜ ÒÕ×ã áÐ ÜØàÞà áÐøâÞÜ àÐÔØ ØÝäÞàÜÐæØøÕ Þ "
+"ÐÖãàØàÐÝØÜ ßÐÚÕâØÜÐ."
 
-#: ../edit-urpm-sources.pl_.c:296
-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:297 ../rpmdrake_.c:735
-msgid "Quit"
-msgstr "ºàÐj"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Installation"
+msgstr "¸ÝáâÐÛÐæØøÐ ßÐÚÕâÐ"
 
-#: ../rpmdrake.pm_.c:96
-msgid "Yes"
-msgstr "´Ð"
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, c-format
+msgid "Mandrake Update"
+msgstr "Mandrake Update"
 
-#: ../rpmdrake.pm_.c:98
-msgid "No"
-msgstr "½Õ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
+msgstr "ÃÚÛÐúÐúÕ ßÐÚÕâÐ"
 
-#: ../rpmdrake.pm_.c:130
-msgid "Info..."
-msgstr "¸ÝäÞàÜÐæØøÕ..."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "ºàÐj"
 
-#: ../rpmdrake.pm_.c:183
-msgid "Austria"
-msgstr "°ãáâàØøÐ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "¸ÝáâÐÛØàÐj"
 
-#: ../rpmdrake.pm_.c:184
-msgid "Australia"
-msgstr "°ãáâàÐÛØøÐ"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "ÃÚÛÞÝØ"
 
-#: ../rpmdrake.pm_.c:185
-msgid "Belgium"
-msgstr "±ÕÛÓØøÐ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search"
+msgstr "ÂàÐÖØ"
 
-#: ../rpmdrake.pm_.c:186
-msgid "Brazil"
-msgstr "±àÐ×ØÛ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "¿àÞÝaòØ: "
 
-#: ../rpmdrake.pm_.c:187
-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:188
-msgid "Costa Rica"
-msgstr "ºÞáâÐàØÚÐ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "½ÕÚØ ßÐÚÕâØ ÜÞàÐøã ÔÐ áÕ ãÚÛÞÝÕ"
 
-#: ../rpmdrake.pm_.c:189
-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:190
-msgid "Germany"
-msgstr "½ÕÜÐçÚÐ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Too many packages are selected"
+msgstr "¸×ÐÑàÐÛØ áâÕ ßàÕÒØèÕ ßÐÚÕâÐ"
 
-#: ../rpmdrake.pm_.c:191
-msgid "Danmark"
-msgstr "´ÐÝáÚÐ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
+msgstr "¿ÞâßãÝÐ ØÝäÞàÜÐæØøÐ"
 
-#: ../rpmdrake.pm_.c:192 ../rpmdrake.pm_.c:196
-msgid "Greece"
-msgstr "³àçÚÐ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal information"
+msgstr "½ÞàÜÐÛÐÝÐ ØÝäÞàÜÐæØøÐ"
 
-#: ../rpmdrake.pm_.c:193
-msgid "Spain"
-msgstr "ÈßÐÝØøÐ"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update source(s)"
+msgstr "°ÖãàØàÐúÕ Ø×ÒÞàÐ"
 
-#: ../rpmdrake.pm_.c:194
-msgid "Finland"
-msgstr "ÄØÝáÚÐ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reload the packages list"
+msgstr "¿ÞÝÞÒÞ ãçØâÐø ÛØáâã ßÐÚÕâÐ"
 
-#: ../rpmdrake.pm_.c:195
-msgid "France"
-msgstr "ÄàÐÝæãáÚÐ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
+msgstr "¿ÞÝÞÒÞ Ø×ÐÑÕàØ"
 
-#: ../rpmdrake.pm_.c:197
-msgid "Israel"
-msgstr "¸×àÐÕÛ"
+#: ../rpmdrake:1
+#, c-format
+msgid "in files"
+msgstr "ã äÐøÛÞÒØÜÐ"
 
-#: ../rpmdrake.pm_.c:198
-msgid "Italy"
-msgstr "¸âÐÛØøÐ"
+#: ../rpmdrake:1
+#, c-format
+msgid "in descriptions"
+msgstr "ã ÞßØáØÜÐ"
 
-#: ../rpmdrake.pm_.c:199
-msgid "Japan"
-msgstr "¨ÐßÐÝ"
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
+msgstr "ã ØÜÕÝØÜÐ"
 
-#: ../rpmdrake.pm_.c:200
-msgid "Korea"
-msgstr "ºÞàÕøÐ"
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
+msgstr "ßÞ ÔÞáâãßÝÞáâØ"
 
-#: ../rpmdrake.pm_.c:201
-msgid "Netherlands"
-msgstr "ÅÞÛÐÝÔØøÐ"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
+msgstr "ßÞ áâÐúã Ø×ÒÞàÝÞÓ ÚÞÔÐ"
 
-#: ../rpmdrake.pm_.c:202
-msgid "Norway"
-msgstr "½ÞàÒÕèÚÐ"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
+msgstr "ßÞ Ø×ÐÑàÐÝÞáâØ"
 
-#: ../rpmdrake.pm_.c:203
-msgid "Poland"
-msgstr "¿ÞùáÚÐ"
+#: ../rpmdrake:1
+#, c-format
+msgid "by size"
+msgstr "ßÞ ÒÕÛØçØÝØ"
 
-#: ../rpmdrake.pm_.c:204
-msgid "Portugal"
-msgstr "¿ÞàâãÓÐÛ"
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
+msgstr "ßÞ ÓàãßØ"
 
-#: ../rpmdrake.pm_.c:205
-msgid "Russia"
-msgstr "ÀãáØøÐ"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages,"
+msgstr "ÁÒØ ßÐÚÕâØ,"
 
-#: ../rpmdrake.pm_.c:206
-msgid "Sweden"
-msgstr "ÈÒÕÔáÚÐ"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
+msgstr "ÁÒØ ßÐÚÕâØ, ßÞ ÐÑÕæÕÔØ"
 
-#: ../rpmdrake.pm_.c:207
-msgid "Taiwan"
-msgstr "ÂÐøÒÐÝ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
+msgstr "Mandrake-ÞÒ Ø×ÑÞà"
 
-#: ../rpmdrake.pm_.c:208
-msgid "United Kingdom"
-msgstr "ÃøÕÔØúÕÝÞ ºàÐùÕÒáâÒÞ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal updates"
+msgstr "¾ÑØçÝÕ ÝÐÔÞÓàÐÔúÕ"
 
-#: ../rpmdrake.pm_.c:209
-msgid "China"
-msgstr "ºØÝÐ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Bugfixes updates"
+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 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
+msgstr "ÁØÓãàÝÞáÝÕ ÝÐÔÞÓàÐÔúÕ"
 
-#: ../rpmdrake.pm_.c:277
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
-"¼ÞÛØÜ ²Ðá áÐçÕÚÐøâÕ, áÚØÔÐÜ ÛØáâã ÔÞÔÐâÝØå ÐÔàÕáÐ áÐ MandrakeSoft-ÞÒÞÓ ÒÕÑ "
-"áÐøâÐ."
+#: ../rpmdrake:1
+#, c-format
+msgid "Description: "
+msgstr "¾ßØá:"
 
-#: ../rpmdrake.pm_.c:283
-msgid "Error during download"
-msgstr "³àÕèÚÐ âÞÚÞÜ ßàÕã×ØÜÐúÐ áÐ ØÝâÕàÝÕâÐ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Summary: "
+msgstr "ÁÐÖÕâÐÚ: "
 
-#: ../rpmdrake.pm_.c:292
-msgid "No mirror"
-msgstr "½ÕÜÐ ÜØàÞàÐ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "²ÐÖÝÞáâ: "
 
-#: ../rpmdrake.pm_.c:310
-msgid "Please choose the desired mirror."
-msgstr "¸×ÐÑÕàØâÕ áÐøâ ßÞ ÖÕùØ."
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake.pm_.c:342 ../rpmdrake_.c:629
-msgid "Update source(s)"
-msgstr "°ÖãàØàÐúÕ Ø×ÒÞàÐ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Size: "
+msgstr "²ÕÛØçØÝÐ: "
 
-#: ../rpmdrake.pm_.c:346
-msgid "Select the source(s) you wish to update:"
-msgstr "¸×ÐÑÕàØâÕ ÚÞøÕ ßÐÚÕâ(Õ) ÖÕÛØâÕ ÔÐ ÐÖãàØàÐâÕ:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Version: "
+msgstr "²Õà×ØøÐ: "
 
-#: ../rpmdrake.pm_.c:350
-msgid "Update"
-msgstr "AÖãàØàaúe"
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "¸ÜÕ: "
 
-#: ../rpmdrake.pm_.c:360
-msgid "Please wait, updating media..."
-msgstr "¼ÞÛØÜ ²Ðá áÐçÕÚÐøâÕ, ÐÖãàØàÐÜ ÜÕÔØøãÜ..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "ÀÐ×ÛÞÓ ÐÖãàØàÐúÐ:"
 
-#: ../rpmdrake_.c:101
-msgid "Other"
-msgstr "¾áâÐÛÞ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
+msgstr "ÂàÕÝãâÝÞ ØÝáâÐÛØàÐÝÐ ÒÕà×ØøÐ: "
 
-#: ../rpmdrake_.c:123 ../rpmdrake_.c:137 ../rpmdrake_.c:229 ../rpmdrake_.c:300
-msgid "(none)"
-msgstr "(ÝØjÕÔÐÝ)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Source: "
+msgstr "¸×ÒÞà: "
 
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:484 ../rpmdrake_.c:485
+#: ../rpmdrake:1
+#, c-format
 msgid "(Not available)"
 msgstr "(½ØøÕ ÔÞáâãßÝÞ)"
 
-#: ../rpmdrake_.c:153 ../rpmdrake_.c:210
-msgid "Search results"
-msgstr "ÀÕ×ãÛâÐâØ ßàÕâàÐÓe"
-
-#: ../rpmdrake_.c:153
-msgid "Search results (none)"
-msgstr "ÀÕ×ãÛâÐâ ßàÕâàÐÓe (ÝÕÜÐ)"
-
-#: ../rpmdrake_.c:163 ../rpmdrake_.c:174
-msgid "Please wait, searching..."
-msgstr "¼ÞÛØÜ ²Ðá áÐçÕÚÐøâÕ, âàÐÖØÜ..."
-
-#: ../rpmdrake_.c:177
-msgid "Stop"
-msgstr "ÁâÞß"
-
-#: ../rpmdrake_.c:211 ../rpmdrake_.c:321
-msgid "Addable"
-msgstr "¼ÞÓã áÕ ÔÞÔÐâØ"
-
-#: ../rpmdrake_.c:211 ../rpmdrake_.c:321
-msgid "Upgradable"
-msgstr "¼ÞÓã áÕ ÐÖãàØàÐâØ"
-
-#: ../rpmdrake_.c:213
-msgid "Not selected"
-msgstr "½Øáã Ø×ÐÑàÐÝØ"
-
-#: ../rpmdrake_.c:213
-msgid "Selected"
-msgstr "¸×ÐÑàÐÝØ"
-
-#: ../rpmdrake_.c:242
-msgid "rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake_.c:260 ../rpmdrake_.c:362 ../rpmdrake_.c:364
-msgid "More information on package..."
-msgstr "´ÞÔÐâÝÕ ØÝäÞàÜÐæØøÕ Þ ßÐÚÕâã..."
-
-#: ../rpmdrake_.c:261
-msgid "One of the following packages is needed:"
-msgstr "¨ÕÔÐÝ ÞÔ áÛÕÔÕûØå ßÐÚÕâÐ øÕ ßÞâàÕÑÐÝ:"
-
-#: ../rpmdrake_.c:261
-msgid "Please choose"
-msgstr "¸×ÐÑÕàØâÕ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
+msgstr "¸×ÜÕÝÕ:\n"
 
-#: ../rpmdrake_.c:277
-msgid "unknown package "
-msgstr "ÝÕßÞ×ÝÐâØ ßÐÚÕâ "
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "ÄÐøÛÞÒØ:\n"
 
-#: ../rpmdrake_.c:287
-msgid "Please wait, listing packages..."
-msgstr "¼ÞÛØÜ ²Ðá áaçÕÚÐjâÕ, ßàØÚÐ×ãøÕÜ ßÐÚÕâÕ..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected size: %d MB"
+msgstr "²ÕÛØçØÝÐ Ø×ÐÑàÐÝÞÓ: %d MB"
 
-#: ../rpmdrake_.c:302
-msgid "No update"
-msgstr "±Õ× ÐÖãàØàaúÐ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "¸×ÐÑàÐÝÞ: %d MB / ÁÛÞÑÞÔÐÝ ßàÞáâÞà ÝÐ ÔØáÚã: %d MB"
 
-#: ../rpmdrake_.c:355 ../rpmdrake_.c:356
-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:357
-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:378
-msgid "Some additional packages need to be removed"
-msgstr "¨Þè ÝÕÚØ ßÐÚÕâØ ÜÞàÐøã ÑØâØ ãÚÛÞúÕÝØ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "½ÕÚØ ßÐÚÕâØ ÝÕ ÜÞÓã ÔÐ áÕ ØÝáâÐÛØàÐøã"
 
-#: ../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 ""
-"´Ð ÑØ ×ÐÔÞÒÞùØÛØ áÒÕ ×ÐÒØáÝÞáâØ,áÛÕÔÕûØ ßÐÚÕâ(Ø) ÑØ âÐÚÞòÕ\n"
-"âàÕÑÐÛÞ ÔÐ áÕ ãÚÛÞÝÕ:\n"
+"´Ð ÑØ ×ÐÔÞÒÞùØÛØ ÜÕòã×ÐÒØáÝÞáâØ, áÛÕÔÕûØ ßÐÚÕâ(Ø) âÐÚÞòÕ âàÕÑÐ\n"
+"ÔÐ áÕ ØÝáâÐÛØàÐøã:\n"
 "\n"
 
-#: ../rpmdrake_.c:385 ../rpmdrake_.c:393
+#: ../rpmdrake:1
+#, c-format
+msgid "Additional packages needed"
+msgstr "¿ÞâàÕÑÝØ áã ÔÞÔÐâÝØ ßÐÚÕâØ"
+
+#: ../rpmdrake:1
+#, c-format
 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"
 "\n"
@@ -469,575 +641,603 @@ msgstr ""
 "¶ÐÛØÜ, ÐÛØ ãÚÛÐúÐúÕÜ ÞÒØå ßÐÚÕâÐ ÑØ áâÕ ÞèâÕâØâØ áØáâÕÜ:\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 ""
-"·ÑÞÓ ÜÕòã×ÐÒØáÝÞáâØ, áÛÕÔÕûØ ßÐÚÕâ(Ø) ÜÞàÐøã\n"
-"ÔÐ ÑãÔã ÝÕØ×ÐÑàÐÝØ:\n"
+"´Ð ÑØ ×ÐÔÞÒÞùØÛØ áÒÕ ×ÐÒØáÝÞáâØ,áÛÕÔÕûØ ßÐÚÕâ(Ø) ÑØ âÐÚÞòÕ\n"
+"âàÕÑÐÛÞ ÔÐ áÕ ãÚÛÞÝÕ:\n"
 "\n"
 
-#: ../rpmdrake_.c:423
-msgid "Additional packages needed"
-msgstr "¿ÞâàÕÑÝØ áã ÔÞÔÐâÝØ ßÐÚÕâØ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr "¨Þè ÝÕÚØ ßÐÚÕâØ ÜÞàÐøã ÑØâØ ãÚÛÞúÕÝØ"
 
-#: ../rpmdrake_.c:424
-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:437
-msgid "Some packages can't be installed"
-msgstr "½ÕÚØ ßÐÚÕâØ ÝÕ ÜÞÓã ÔÐ áÕ ØÝáâÐÛØàÐøã"
+#: ../rpmdrake:1
+#, c-format
+msgid "Information on packages"
+msgstr "¸ÝäÞàÜÐæØøÕ Þ ßÐÚÕâØÜÐ"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
+msgstr "²ØèÕ ØÝäÞàÜÐæØøÐ"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Addable"
+msgstr "¼ÞÓã áÕ ÔÞÔÐâØ"
 
-#: ../rpmdrake_.c:438
+#: ../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:452 ../rpmdrake_.c:686
-msgid "Some packages need to be removed"
-msgstr "½ÕÚØ ßÐÚÕâØ ÜÞàÐøã ÔÐ áÕ ãÚÛÞÝÕ"
+#: ../rpmdrake:1
+#, c-format
+msgid "No update"
+msgstr "±Õ× ÐÖãàØàaúÐ"
 
-#: ../rpmdrake_.c:474
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "¸×ÐÑàÐÝÞ: %d MB / ÁÛÞÑÞÔÐÝ ßàÞáâÞà ÝÐ ÔØáÚã: %d MB"
+msgid "(none)"
+msgstr "(ÝØjÕÔÐÝ)"
 
-#: ../rpmdrake_.c:476
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "²ÕÛØçØÝÐ Ø×ÐÑàÐÝÞÓ: %d MB"
+msgid "Please wait, listing packages..."
+msgstr "¼ÞÛØÜ ²Ðá áaçÕÚÐjâÕ, ßàØÚÐ×ãøÕÜ ßÐÚÕâÕ..."
 
-#: ../rpmdrake_.c:484
-msgid "Files:\n"
-msgstr "ÄÐøÛÞÒØ:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "unknown package "
+msgstr "ÝÕßÞ×ÝÐâØ ßÐÚÕâ "
 
-#: ../rpmdrake_.c:485
-msgid "Changelog:\n"
-msgstr "¸×ÜÕÝÕ:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "¨ÕÔÐÝ ÞÔ áÛÕÔÕûØå ßÐÚÕâÐ øÕ ßÞâàÕÑÐÝ:"
 
-#: ../rpmdrake_.c:488
-msgid "Source: "
-msgstr "¸×ÒÞà: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please choose"
+msgstr "¸×ÐÑÕàØâÕ"
 
-#: ../rpmdrake_.c:489
-msgid "Currently installed version: "
-msgstr "ÂàÕÝãâÝÞ ØÝáâÐÛØàÐÝÐ ÒÕà×ØøÐ: "
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:493
-msgid "Reason for update: "
-msgstr "ÀÐ×ÛÞÓ ÐÖãàØàÐúÐ:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Not selected"
+msgstr "½Øáã Ø×ÐÑàÐÝØ"
 
-#: ../rpmdrake_.c:495
-msgid "Name: "
-msgstr "¸ÜÕ: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected"
+msgstr "¸×ÐÑàÐÝØ"
 
-#: ../rpmdrake_.c:496
-msgid "Version: "
-msgstr "²Õà×ØøÐ: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results"
+msgstr "ÀÕ×ãÛâÐâØ ßàÕâàÐÓe"
 
-#: ../rpmdrake_.c:497
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Stop"
+msgstr "ÁâÞß"
 
-#: ../rpmdrake_.c:497
-msgid "Size: "
-msgstr "²ÕÛØçØÝÐ: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, searching..."
+msgstr "¼ÞÛØÜ ²Ðá áÐçÕÚÐøâÕ, âàÐÖØÜ..."
 
-#: ../rpmdrake_.c:499
-msgid "Importance: "
-msgstr "²ÐÖÝÞáâ: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
+msgstr "ÀÕ×ãÛâÐâ ßàÕâàÐÓe (ÝÕÜÐ)"
 
-#: ../rpmdrake_.c:500
-msgid "Summary: "
-msgstr "ÁÐÖÕâÐÚ: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "¾áâÐÛÞ"
 
-#: ../rpmdrake_.c:501
-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:550
-msgid "Bugfixes updates"
-msgstr "½ÐÔÞÓàÐÔúÕ áÐ ØáßàÐÒÚÐÜÐ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "ÁÐçãÒÐø Ø Ø×ÐòØ"
 
-#: ../rpmdrake_.c:550
-msgid "Normal updates"
-msgstr "¾ÑØçÝÕ ÝÐÔÞÓàÐÔúÕ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy..."
+msgstr "¿àÞÚáØ..."
 
-#: ../rpmdrake_.c:569
-msgid "Mandrake choices"
-msgstr "Mandrake-ÞÒ Ø×ÑÞà"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
+msgstr "°ÖãàØàÐø..."
 
-#: ../rpmdrake_.c:570
-msgid "All packages, alphabetical"
-msgstr "ÁÒØ ßÐÚÕâØ, ßÞ ÐÑÕæÕÔØ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "´ÞÔÐø..."
 
-#: ../rpmdrake_.c:571
-msgid "All packages,"
-msgstr "ÁÒØ ßÐÚÕâØ,"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "¸×ÜÕÝØ"
 
-#: ../rpmdrake_.c:594
-msgid "by group"
-msgstr "ßÞ ÓàãßØ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Source"
+msgstr "¸×ÒÞà"
 
-#: ../rpmdrake_.c:594
-msgid "by size"
-msgstr "ßÞ ÒÕÛØçØÝØ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
+msgstr "ÃÚùãçØ?"
 
-#: ../rpmdrake_.c:595
-msgid "by selection state"
-msgstr "ßÞ Ø×ÐÑàÐÝÞáâØ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure sources"
+msgstr "¿ÞÔÕèÐÒÐúÕ Ø×ÒÞàÐ"
 
-#: ../rpmdrake_.c:596
-msgid "by source repository"
-msgstr "ßÞ áâÐúã Ø×ÒÞàÝÞÓ ÚÞÔÐ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "»Þ×ØÝÚÐ:"
 
-#: ../rpmdrake_.c:596
-msgid "by update availability"
-msgstr "ßÞ ÔÞáâãßÝÞáâØ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
+msgstr "ºÞàØáÝØÚ:"
 
-#: ../rpmdrake_.c:617
-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:617
-msgid "in files"
-msgstr "ã äÐøÛÞÒØÜÐ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "¸ÜÕ ßàÞÚáØ ÔÞÜÐûØÝÐ(hostname):"
 
-#: ../rpmdrake_.c:617
-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 ""
+"°ÚÞ ²ÐÜ øÕ ßÞâàÕÑÝÐ ßàÞÚáØ, ãÝÕáØâÕ ØÜÕ ÔÞÜÐûØÝÐ Ø ÝÕÞÑÐÒÕ×ÝØ ßÞàâ "
+"(áØÝâÐÚáÐ: <proksi-domacin[:port]>):"
 
-#: ../rpmdrake_.c:628
-msgid "Reload the packages list"
-msgstr "¿ÞÝÞÒÞ ãçØâÐø ÛØáâã ßÐÚÕâÐ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "¿ÞÔÕèÐÒÐúÕ ßàÞÚáØøÐ"
 
-#: ../rpmdrake_.c:628
-msgid "Reset the selection"
-msgstr "¿ÞÝÞÒÞ Ø×ÐÑÕàØ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr "¼ÞÛØÜ ²Ðá áÐçÕÚÐøâÕ, ÐÖãàØàÐÜ ÜÕÔØøãÜ..."
 
-#: ../rpmdrake_.c:654
-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:654
-msgid "Normal information"
-msgstr "½ÞàÜÐÛÐÝÐ ØÝäÞàÜÐæØøÐ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
+msgstr "¼ÞàÐâÕ ÔÐ ãÑÐæØâÕ ÜÕÔØøãÜ ÚÐÚÞ ÑØ áâÕ ÝÐáâÐÒØÛØ"
 
-#: ../rpmdrake_.c:676
-msgid "Too many packages are selected"
-msgstr "¸×ÐÑàÐÛØ áâÕ ßàÕÒØèÕ ßÐÚÕâÐ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save changes"
+msgstr "ÁÐçãÒÐø Ø×ÜÕÝÕ"
 
-#: ../rpmdrake_.c:722
-msgid "Find:"
-msgstr "¿àÞÝaòØ: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "ÀÕÛÐâØÒÝÐ ßãâaúÐ ÚÐ synthesis/hdlist:"
 
-#: ../rpmdrake_.c:727
-msgid "Search"
-msgstr "ÂàÐÖØ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake_.c:733
-msgid "Install"
-msgstr "¸ÝáâÐÛØàÐj"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Editing source \"%s\":"
+msgstr "¼ÕúÐÜ Ø×ÒÞà \"%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 "¸×ÜÕÝØ Ø×ÒÞà"
 
-#: ../rpmdrake_.c:740
-msgid "Software Packages Installation"
-msgstr "¸ÝáâÐÛÐæØøÐ ßÐÚÕâÐ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr "¼ÞÛØÜÞ ²Ðá ÔÐ áÐçÕÚÐâÕ, ãÚÛÐúÐÜ ÜÕÔØøãÜ..."
 
-#: ../rpmdrake_.c:740
-msgid "Software Packages Removal"
-msgstr "ÃÚÛÐúÐúÕ ßÐÚÕâÐ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, adding medium..."
+msgstr "¼ÞÛØÜÞ ²Ðá ÔÐ áÐçÕÚÐâÕ, ÔÞÔÐøÕÜ ÜÕÔØøãÜ..."
 
-#: ../rpmdrake_.c:781
-msgid "Please wait, contacting mirror to update packages information."
-msgstr ""
-"¼ÞÛØÜ ²Ðá áÐçÕÚÐøâÕ, ãáßÞáâÐÒùÐÜ ÒÕ×ã áÐ ÜØàÞà áÐøâÞÜ àÐÔØ ØÝäÞàÜÐæØøÕ Þ "
-"ÐÖãàØàÐÝØÜ ßÐÚÕâØÜÐ."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of source:"
+msgstr "ÂØß Ø×ÒÞàa:"
 
-#: ../rpmdrake_.c:783
-msgid "Error updating medium"
-msgstr "³àÕèÚÐ ßàØ ÐÖãàØàÐúã ÜÕÔØøãÜÐ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Adding a source:"
+msgstr "´ÞÔÐjÕÜ Ø×ÒÞà:"
 
-#: ../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 ""
-"¿ÞøÐÒØÛÐ áÐ ÝÕßÞßàÐÒùØÒÐ ÓàÕèÚÐ âÞÚÞÜ ÐÖãàØàÐúÐ ØÝäÞàÜÐæØøÐ Þ ßÐÚÕâØÜÐ."
+"²Õü ßÞáâÞøØ ÜÕÔØø áÐ âØÜ ØÜÕÝÞÜ, ÔÐ ÛØ\n"
+"×ÐØáâÐ ÖÕÛØâÕ ÔÐ øÕ ×ÐÜÕÝØâÕ?"
 
-#: ../rpmdrake_.c:789
-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:797
-msgid "Please wait, contacting mirror to initialize updates packages."
-msgstr ""
-"¼ÞÛØÜ ²Ðá áÐçÕÚÐøâÕ, ÚÞÝâÐÚâØàÐÜ ÜØàÞà áÐøâ àÐÔØ ØÝØæØàÐúÐ ÐÖãàØàÐúÐ ßÐÚÕâÐ."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "¸Üe:"
 
-#: ../rpmdrake_.c:800
-msgid "Error adding update medium"
-msgstr "³àÕèÚÐ ßàØÛØÚÞÜ ÔÞÔÐÒÐúÐ ÜÕÔØøãÜÐ áÐ ÝÐÔÞÓàÐÔúÞÜ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
+msgstr "¿àØøÐÒÐ:"
 
-#: ../rpmdrake_.c:831
-msgid "Please wait, finding available packages..."
-msgstr "¼ÞÛØÜ ²Ðá áÐçÕÚÐøâÕ, ßàÞÝÐÛÐ×ØÜ ÔÞáâãßÝÕ ßÐÚÕâÕ..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "¸×ÐÑÕàØâÕ áÒÞj ÜØàÞà áÐjâ..."
 
-#: ../rpmdrake_.c:863
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "¿àÞÒÕàÐÒÐÜ %s"
+msgid "Browse..."
+msgstr "ÂàÐÖØ..."
 
-#: ../rpmdrake_.c:882
-msgid "changes:"
-msgstr "Ø×ÜÕÝÕ:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "¿ãâÐúÐ ØÛØ âaçÚÐ ÜÞÝâØàÐúÐ:"
 
-#: ../rpmdrake_.c:886
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove .%s"
-msgstr "ÃÚÛÞÝØ: %s"
+msgid "Removable device"
+msgstr "¿àÕÝÞáÝØ ãàÕòÐø"
 
-#: ../rpmdrake_.c:888
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "ºÞàØáâØ %s ÚÐÞ ÓÛÐÒÝØ äÐøÛ"
+msgid "HTTP server"
+msgstr "HTTP áÕàÒÕà"
 
-#: ../rpmdrake_.c:890
-msgid "Do nothing"
-msgstr "½Õ àÐÔØ ÝØèâÐ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "FTP áÕàÒÕà"
 
-#: ../rpmdrake_.c:902
-msgid "Installation finished"
-msgstr "¸ÝáâÐÛÐæØøÐ ÓÞâÞÒÐ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path:"
+msgstr "¿ãâaúÐ:"
 
-#: ../rpmdrake_.c:912
-msgid "Inspect..."
-msgstr "¿àÞÒÕàØ..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "»ÞÚÐÛÝØ äÐøÛÞÒØ"
 
-#: ../rpmdrake_.c:927
-msgid "Program missing"
-msgstr "¿àÞÓàÐÜ ÝÕÔÞáâÐøÕ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add a source"
+msgstr "´ÞÔÐø Ø×ÒÞà"
 
-#: ../rpmdrake_.c:928
-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:942
-msgid "Unable to get source packages."
-msgstr "½Õ ÜÞÓã ÔÐ ÔÞÑÐÒØÜ Ø×ÒÞàÝÕ ßÐÚÕâÕ."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "½Õ ÜÞÓã ÔÐ ÝÐßàÐÒØÜ ÜÕÔØøãÜ."
 
-#: ../rpmdrake_.c:943
-msgid "Unable to get source packages, sorry."
-msgstr "½Õ ÜÞÓã ÔÐ ÔÞÑÐÒØÜ Ø×ÒÞàÝÕ ßÐÚÕâÕ, ÖÐÞ ÜØ øÕ."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, updating media..."
+msgstr "¼ÞÛØÜ ²Ðá áÐçÕÚÐøâÕ, ÐÖãàØàÐÜ ÜÕÔØøãÜ..."
 
-#: ../rpmdrake_.c:950
-msgid "Change medium"
-msgstr "¿àÞÜÕÝØ ÜÕÔØøãÜ"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
+msgstr "AÖãàØàaúe"
 
-#: ../rpmdrake_.c:951
+#: ../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:959
-msgid "Installation failed"
-msgstr "¸ÝáâÐÛÐæØøÐ ÝÕãáßÕÛÐ"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please choose the desired mirror."
+msgstr "¸×ÐÑÕàØâÕ áÐøâ ßÞ ÖÕùØ."
 
-#: ../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 ""
-"¸ÝáâÐÛÐæØøÐ ÝØøÕ ãáßÕÛÐ, ÝÕÚØ äÐøÛÞÒØ ÝÕÔÞáâÐøã.\n"
-"¼ÞÖÔÐ ÑØ âàÕÑÐÛÞ ÔÐ ÐÖãàØàÐâÕ ÑÐ×ã ßÐÚÕâÐ."
+"½Õ ÜÞÓã ÔÐ ßàÞÝÐóÕÜ ÝØøÕÔÐÝ ÞÔÓÞÒÐàÐøãóØ ÜØàÞà.\n"
+"\n"
+"¼ÞÖÕ ßÞáâÞøÐâØ ÝÕÚÞÛØÚÞ àÐ×ÛÞÓÐ ×Ð ÞÒÐø ßàÞÑÛÕÜ; ÝÐøçÕèüØ øÕ\n"
+"áÛãçÐø ÔÐ ÐàåØâÕÚâãàÐ ÒÐèÕÓ ßàÞæÕáÞàÐ ÝØøÕ ßÞÔàÖÐÝÐ\n"
+"ÞÔ áâàÐÝÕ Mandrake Linux Official Updates."
 
-#: ../rpmdrake_.c:963
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr "¼ÞÛØÜ ²Ðá áÐçÕÚÐøâÕ, ãÚÛÐúÐÜ ßÐÚÕâÕ ÔÐ ÑØå ÞÜÞÓãûØÞ ÔàãÓØå ßÐÚÕâÐ..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
+msgstr "½ÕÜÐ ÜØàÞàÐ"
 
-#: ../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 ""
-"¸ÝáâÐÛÐæØøÐ øÕ ÓÞâÞÒÐ, %s.\n"
+"¿ÞøÐÒØÛÐ áÕ ÓàÕèÚÐ âÞÚÞÜ download-Ð ÛØáâÕ ÜØàÞà áÐøâÞÒÐ:\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: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"
-"ØÝáâÐÛØàÐâØ"
+"¶ÕÛØÜ ÔÐ ßÞáÕâØÜ MandrakeSoft ÒÕÑ áÐøâ ÔÐ ÑØ ÔÞÑÐÒØÞ ÛØáâã ÜØàÞàÐ.\n"
+"¿àÞÒÕàØâÕ ÔÐ ÛØ øÕ ÒÐèÐ ÚÞÝÕÚæØøÐ äãÚæØÞÝÐÛÝÐ.\n"
+"\n"
+"´Ð ÛØ øÕ Ã àÕÔã ÔÐ ÝÐáâÐÒØÜ?"
 
-#: ../rpmdrake_.c:985
-msgid "everything was installed correctly"
-msgstr "áÒØ ßÐÚÕâØ áã ÔÞÑàÞ ØÝáâÐÛØàÐÝØ"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United States"
+msgstr "ÁøÕÔØúÕÝÕ °ÜÕàØçÚÕ ´àÖÐÒÕ"
 
-#: ../rpmdrake_.c:987
-msgid "Everything installed successfully"
-msgstr "ÁÒÕ øÕ ÔÞÑàÞ ØÝáâÐÛØàÐÝÞ"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
+msgstr "ºØÝÐ"
 
-#: ../rpmdrake_.c:988
-msgid "All requested packages were installed successfully."
-msgstr "ÁÒØ ßÐÚÕâØ, ÚÞøØ áâÕ ×ÐåâÕÒÐÛØ, áã ãáßÕèÝÞ ØÝáâÐÛØàÐÝØ."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr "ÃøÕÔØúÕÝÞ ºàÐùÕÒáâÒÞ"
 
-#: ../rpmdrake_.c:991
-msgid "Everything already installed."
-msgstr "ÁÒÕ øÕ ÒÕû ØÝáâÐÛØàÐÝÞ."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "ÂÐøÒÐÝ"
 
-#: ../rpmdrake_.c:992
-msgid "Everything already installed (is this supposed to happen at all?)."
-msgstr "ÁÒÕ øÕ ÒÕû ØÝáâÐÛØàÐÝÞ (ÔÐ ÛØ øÕ ÞÒÞ ãÞßèâÕ âàÕÑÐÛÞ ÔÐ áÕ ÔÞÓÞÔØ?)."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "ÈÒÕÔáÚÐ"
 
-#: ../rpmdrake_.c:999
-msgid "Problem during installation"
-msgstr "¿àÞÑÛÕÜ ×Ð ÒàÕÜÕ ØÝáâÐÛØàÐúÐ"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
+msgstr "ÀãáØøÐ"
 
-#: ../rpmdrake_.c:1000
+#: ../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:1014
-msgid "Please wait, reading packages database..."
-msgstr "¼ÞÛØÜ ÒÐá áÐçÕÚÐøâÕ, ãçØâÐÒÐÜ ÑÐ×ã ßÞÔÐâÐÚÐ Þ ßÐÚÕâØÜÐ..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
+msgstr "¿ÞùáÚÐ"
 
-#: ../rpmdrake_.c:1055
-msgid "Please wait, removing packages..."
-msgstr "¼ÞÛØÜ ²Ðá áÐçÕÚÐøâÕ, ãÚÛÐúÐÜ ßÐÚÕâÕ..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
+msgstr "½ÞàÒÕèÚÐ"
 
-#: ../rpmdrake_.c:1058
-msgid "Problem during removal"
-msgstr "¿àÞÑÛÕÜ ßàØÛØÚÞÜ ãÚÛÐúÐúÐ"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
+msgstr "ÅÞÛÐÝÔØøÐ"
 
-#: ../rpmdrake_.c:1059
+#: ../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: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 ""
-"´ÞÑàÞÔÞèÛØ ã ßàÞÓàÐÜ ×Ð ãÚÛÐúÐúÕ áÞäâÒÕàÐ!\n"
-"\n"
-"¾ÒÐø ÐÛÐâ ÒÐÜ ÜÞÖÕ ßÞÜÞûØ ÔÐ Ø×ÐÑÕàÕâÕ áÞäâÒÕà ÖÕÛØâÕ ÔÐ ãÚÛÞÝØâÕ áÐ\n"
-"ÒÐèÕÓ àÐçãÝÐàÐ."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Japan"
+msgstr "¨ÐßÐÝ"
 
-#: ../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 ""
-"´ÞÑàÞÔÞèÛØ ã MandrakeUpdate!\n"
-"\n"
-"¾ÒÐø ÐÛÐâ ÒÐÜ ÜÞÖÕ ßÞÜÞûØ ÔÐ Ø×ÐÑÕâÕ ÝÞÒÕ ÒÕà×ØøÕ ßÐÚÕâÐ ÚÞøÕ ÖÕÛØâÕ ÔÐ "
-"ØÝáâÐÛØàÐâÕ ÝÐ\n"
-"ÒÐè àÐçãÝÐà."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Italy"
+msgstr "¸âÐÛØøÐ"
 
-#: ../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 ""
-"´ÞÑàÞÔÞèÛØ ã ÐÛÐâ ×Ð ØÝáâÐÛÐæØøã áÞäâÒÕàÐ!\n"
-"\n"
-"²Ðè Mandrake Linux ÞßÕàÐâØÒÝØ áØáâÕÜ øÕ ÔÞèÐÞ áÐ ÝÕÚÞÛØÚÞ åØùÐÔÐ ßÐÚÕâÐ\n"
-"áÐ ßàÞÓàÐÜØÜÐ, ÝÐ CD-ã ØÛØ 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 ""
-#~ "¿ÞøÐÒØÛÐ áÕ ÓàÕèÚÐ âÞÚÞÜ download-Ð ÛØáâÕ ÜØàÞà áÐøâÞÒÐ:\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 Official Updates."
+#: ../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"
-#~ "´Ð ÛØ øÕ Ã àÕÔã ÔÐ ÝÐáâÐÒØÜ?"
+#: ../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"
-#~ "ßÞÚàÕÝØâÕ ¼ÕÝÐÿÕà ÁÞäâÒÕàÐ, Ð ×ÐâØÜ ÔÞÔÐøâÕ `Security\n"
-#~ "updates' Ø×ÒÞà.\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) øÞè ÝØøÕ / ÝØøÕ ÒØèÕ ßÞÔàÖÐÐÝÐ ÞÔ áâàÐÝÕ "
-#~ "Mandrake Linux\n"
-#~ "Official Updates.\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-*"
 
 #, fuzzy
 #~ msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
diff --git a/po/sp.pom b/po/sp.pom
index 50e46d47..510fde79 100644
--- a/po/sp.pom
+++ b/po/sp.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"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "¼àeÖÝØ ÚÞÜßjãâÕà, (ÚÛØjÕÝâ)"
+msgid "Office Workstation"
+msgstr "ÀÐÔÝÐ(Office) áâÐÝØæa"
 
 # 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 ""
+"Office ßàÞÓàÐÜØ: âÕÚáâ ßàÞæÕáÞàØ (kword, abiword), âÐÑÕÛe (kspread, "
+"gnumeric), pdf ßàÕÓÛÕÔÝØæØ, ØâÔ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Office"
+msgid "Workstation"
+msgstr "ÀÐÔÝÐ áâÐÝØæa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Gnome àÐÔÝa áâÐÝØæa"
+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 "·ÐÑÐÒÝØ ßàÞÓàÐÜØ: ÐàÚÐÔÕ, ØÓÕ ÝÐ âÐÑÛØ, áâàÐâÕÓØjÕ, ØâÔ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "ÀÐÔÝÐ áâÐÝØæa"
+msgid "Multimedia station"
+msgstr "¼ãÛâØÜÕÔØjÐÛÝÐ áâÐÝØæa"
 
 # 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 "¿àÞÓàÐÜØ ×Ð ßãèâaúÕ ×ÒãÚa Ø ÒØÔÕa"
 
 # 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 "¸ÝâÕàÝÕâ áâÐÝØæ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"
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
 msgstr ""
-"Office ßàÞÓàÐÜØ: âÕÚáâ ßàÞæÕáÞàØ (kword, abiword), âÐÑÕÛe (kspread, "
-"gnumeric), pdf ßàÕÓÛÕÔÝØæØ, ØâÔ"
+"ÁÚãß ÐÛÐâÐ ×Ð çØâaúÕ Ø áÛaúÕ ÕÛ.ßÞèâÕ Ø ÒÕáâØ (pine, mutt, tin..) Ø ×Ð "
+"ßàÕâàaÖØÒaúe ¸ÝâÕàÝÕâa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "°ãÔØÞ aÛÐâØ: mp3 ØÛØ midi ßÛÕjÕàØ,ÜØÚáÕàØ, ØâÔ"
+msgid "Network Computer (client)"
+msgstr "¼àeÖÝØ ÚÞÜßjãâÕà, (ÚÛØjÕÝâ)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Linux Standard Base. Third party applications support"
-msgstr "¿ÐÚÕâØ ÚÞøã áã ÚÞÜßÐâØÑØÛÝØ áÐ Linux Standard Base-ÞÜ"
+msgid "Clients for different protocols including ssh"
+msgstr "ºÛØjÕÝâØ ×Ð àÐ×ÛØçØâÕ ßàÞâÞÚÞÛÕ ãÚùãçãjãûØ Ø 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úØÓÕ Ø ºÐÚÞ? (Howto's) ×Ð Linux Ø ±ÕáßÛÐâÝØ ÁÞäâÒÕà"
+msgid "Configuration"
+msgstr "ºÞÝäØÓãàÐæØøa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "KDE ßÐÔÝÐ áâÐÝØæa"
+msgid "Tools to ease the configuration of your computer"
+msgstr "°ÛÐâØ ×Ð ÛÐÚÞ ÚÞÝäØÓãàØáaúÕ ÚÞÜßjãâÕà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, ØâÔ"
+msgid "Scientific Workstation"
+msgstr "½ÐãçÝa àÐÔÝÐ áâÐÝØæa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "¼ãÛâØÜÕÔØja - ²ØÔÕÞ"
+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, âàÐÝáäÕà ÔÐâÞâÕÚa, ØÛØ chat"
+msgid "Console Tools"
+msgstr "ºÞÝ×ÞÛÝØ ÐÛÐâØ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "ÁÕàÒÕà,±Ð×Õ ßÞÔÐâÐÚa"
+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 ßÐÔÝÐ áâÐÝØæa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "°ÛÐâØ ×Ð ÛÐÚÞ ÚÞÝäØÓãàØáaúÕ ÚÞÜßjãâÕàa"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"K ´ÕáÚâÞß ÞÚàãÖeúÕ, ÞáÝÞÒÝÞ ÓàÐäØçÚÞ ÞÚàãÖeúÕ áa ÚÞÛÕÚæØjÞÜ ßàÐâeûØå ÐÛÐâa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "¼ãÛâØÜÕÔØja - ·ÒãÚ"
+msgid "Graphical Environment"
+msgstr "³àÐäØçÚÞ ¾ÚàãÖeúe"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "´ÞÚãÜÕÝâÐæØja"
+msgid "Gnome Workstation"
+msgstr "Gnome àÐÔÝa áâÐÝØæa"
 
 # 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 ""
+"³àÐäØçÚÐ ÞÚàãÖeúÐ ×Ð áÕâÞÜ ÚÞàØáÝØçÚNFS server, SMB server, Proxy serverNFS "
+"server, SMB server, Proxy serverØå ÐßÛØÚÐæØjÐ Ø ÔÕáÚâÞßÐÛÐâa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr "Postfix mail áÕàÒÕà, Inn news áÕàÒÕà"
+msgid "Other Graphical Desktops"
+msgstr "´àãÓØ ÓàÐäØçÚØ ÔÕáÚâÞßÞÒØ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "¸ÝâÕàÝÕâ áâÐÝØæa"
+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 "¼ãÛâØÜÕÔØjÐÛÝÐ áâÐÝØæa"
+# 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 "ºÞÝäØÓãàÐæØøa"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C Ø C++ àÐ×ÒÞjÝÕ ÑØÑÛØÞâÕÚe, ßàÞÓàÐÜØ  Ø ßàÞßàÐâÝÕ ÔÐâÞâÕÚe"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "JÞè ÓàÐäØçÚØå ÞÚàãÖeúa (Gnome, IceWM)"
+msgid "Documentation"
+msgstr "´ÞÚãÜÕÝâÐæØja"
 
 # 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 ´ÕáÚâÞß ÞÚàãÖeúÕ, ÞáÝÞÒÝÞ ÓàÐäØçÚÞ ÞÚàãÖeúÕ áa ÚÞÛÕÚæØjÞÜ ßàÐâeûØå ÐÛÐâa"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "KúØÓÕ Ø ºÐÚÞ? (Howto's) ×Ð Linux Ø ±ÕáßÛÐâÝØ ÁÞäâÒÕà"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "³àÐäØçÚÞ ¾ÚàãÖeúe"
+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 "»ØÝãÚáÞÒÐ ÁâÐÝÔÐàÔÝÐ ±Ð×Ð. ¿ÞÔàèÚÐ ×Ð Third party ÐßÛØÚÐØæøÕ"
+
 # 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
@@ -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 "°ÛÐâØ ×Ð ÚàÕØàaúÕ Ø ßàÖeúÕ CDa"
+msgid "Mail/Groupware/News"
+msgstr "ÁÕàÒÕà, µÛ.ßÞèâÐ/Groupware/²ÕáâØ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "ÀÐÔÝÐ(Office) áâÐÝØæa"
+msgid "Postfix mail server, Inn news server"
+msgstr "Postfix mail áÕàÒÕà, Inn 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, ØâÔ"
+msgid "Database"
+msgstr "ÁÕàÒÕà,±Ð×Õ ßÞÔÐâÐÚa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "³àÐäØçÚØ ßàÞÓàÐÜØ ÚÐÞ èâÞ jÕ 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/Router"
+
+# 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 "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++ àÐ×ÒÞjÝÕ ÑØÑÛØÞâÕÚe, ßàÞÓàÐÜØ  Ø ßàÞßàÐâÝÕ ÔÐâÞâÕÚe"
+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 "Office"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "²ØÔÕÞ ßÛÕjÕàØ Ø ÕÔØâÞàØ"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr "ÁÕâ ÐÛÐâÐ ×Ð ÕÛ.ßÞèâã, ÒÕáâØ, web, âàÐÝáäÕà ÔÐâÞâÕÚa, ØÛØ chat"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -228,79 +245,66 @@ msgstr "¼ãÛâØÜÕÔØja - ³àÐäØÚa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "·ÐÑÐÒÝØ ßàÞÓàÐÜØ: ÐàÚÐÔÕ, ØÓÕ ÝÐ âÐÑÛØ, áâàÐâÕÓØjÕ, ØâÔ"
-
-# 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 ""
-"ÁÚãß ÐÛÐâÐ ×Ð çØâaúÕ Ø áÛaúÕ ÕÛ.ßÞèâÕ Ø ÒÕáâØ (pine, mutt, tin..) Ø ×Ð "
-"ßàÕâàaÖØÒaúe ¸ÝâÕàÝÕâa"
+msgid "Graphics programs such as The Gimp"
+msgstr "³àÐäØçÚØ ßàÞÓàÐÜØ ÚÐÞ èâÞ jÕ Gimp"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "»ØçÝÕ äØÝÐÝáØje"
+msgid "Multimedia - Sound"
+msgstr "¼ãÛâØÜÕÔØja - ·ÒãÚ"
 
 # 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 ""
-"³àÐäØçÚÐ ÞÚàãÖeúÐ ×Ð áÕâÞÜ ÚÞàØáÝØçÚNFS server, SMB server, Proxy serverNFS "
-"server, SMB server, Proxy serverØå ÐßÛØÚÐæØjÐ Ø ÔÕáÚâÞßÐÛÐâa"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "°ãÔØÞ aÛÐâØ: mp3 ØÛØ midi ßÛÕjÕàØ,ÜØÚáÕàØ, ØâÔ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "ºÛØjÕÝâØ ×Ð àÐ×ÛØçØâÕ ßàÞâÞÚÞÛÕ ãÚùãçãjãûØ Ø ssh"
+msgid "Multimedia - Video"
+msgstr "¼ãÛâØÜÕÔØja - ²ØÔÕÞ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
+msgid "Video players and editors"
+msgstr "²ØÔÕÞ ßÛÕjÕàØ Ø ÕÔØâÞàØ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "¸ÝâÕàÝÕâ gateway"
+msgid "Multimedia - CD Burning"
+msgstr "¼ãÛâØÜÕÔØja - CD ßàÖeúÕ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "¿àÞÓàÐÜØ ×Ð ßãèâaúÕ ×ÒãÚa Ø ÒØÔÕa"
+msgid "Tools to create and burn CD's"
+msgstr "°ÛÐâØ ×Ð ÚàÕØàaúÕ Ø ßàÖeúÕ CDa"
 
 # 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 "JÞè ÓàÐäØçÚØå ÞÚàãÖeúa (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 "¿àÞÓàÐÜØ ×Ð ãßàÐÒùaúÕ ÒaèØÜ äØÝÐÝáØjÐÜa, ÚÐÞ èâÞ jÕ gnucash"
+msgid "Personal Information Management"
+msgstr "ÃßàÐÒùaúÕ ßàØÒÐâÝØÜ ØÝäÞàÜÐæØjÐÜa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "ÃßàÐÒùaúÕ ßàØÒÐâÝØÜ ØÝäÞàÜÐæØjÐÜa"
+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 "¼ãÛâØÜÕÔØja - CD ßàÖeúÕ"
+msgid "Personal Finance"
+msgstr "»ØçÝÕ äØÝÐÝáØje"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "½ÐãçÝa àÐÔÝÐ áâÐÝØæa"
+msgid "Programs to manage your finances, such as gnucash"
+msgstr "¿àÞÓàÐÜØ ×Ð ãßàÐÒùaúÕ ÒaèØÜ äØÝÐÝáØjÐÜa, ÚÐÞ èâÞ jÕ gnucash"
 
diff --git a/po/sq.po b/po/sq.po
index 4422ae9d..0f0262a3 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2003-01-24 16:31+0100\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\n"
 "PO-Revision-Date: 2002-11-27 21:45:+0100\n"
 "Last-Translator: Naim Daka <naim70@freesurf>\n"
 "Language-Team: Albanian <LL@li.org>\n"
@@ -14,883 +14,1233 @@ 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."
-msgstr "I pa mundur krijimi i burimit."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"A jeni në pajtim për të vazhduar?"
 
-#: ../edit-urpm-sources.pl_.c:40
-msgid "Unable to update medium; it will be automatically disabled."
-msgstr "I pa mundur azhurnimi i burimit; do të çkyqet automatikisht."
+#: ../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 ""
+"Mirë se vini në instalimit software me vegël!\n"
+"\n"
+"Sistemi i juaj Mandrake Linux është i furnizuar me mijëra pako\n"
+"sofware, në CDROM ose DVD. Kjo vegël do të ju ndihmojë për të zgjedhur, "
+"cilin\n"
+"sofware dëshironi ta instaloni në kompjuterin tuaj."
 
-#: ../edit-urpm-sources.pl_.c:50
-msgid "Add a source"
-msgstr "Shtim i një burimi:"
+#: ../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 ""
+"Mirë se vini në MandrakeUpdate!\n"
+"\n"
+"Kjo vegël do të ju ndihmojë për intalimin e zgjedhjeve për azhurnimin e\n"
+"kompjuterit tuaj."
 
-#: ../edit-urpm-sources.pl_.c:51
-msgid "Local files"
-msgstr "Skedaret lokale"
+#: ../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 ""
+"Mirë se vini në veglën e software për zhdukje!\n"
+"\n"
+"Kjo vegël do të ju ndihmojë se cilin software dëshironi ta zhdukni nga "
+"kompjuteri\n"
+"juaj."
 
-#: ../edit-urpm-sources.pl_.c:51
-msgid "Path:"
-msgstr "Shtegu:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"Një problem është paraqitur gjatë zhdukjes së pakove:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:52
-msgid "FTP server"
-msgstr "Serveri FTP"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during removal"
+msgstr "Një problem është paraqitur gjatë zhdukjes"
 
-#: ../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 "Një moment ju lutemi, zhdukja pakove..."
 
-#: ../edit-urpm-sources.pl_.c:53
-msgid "HTTP server"
-msgstr "Serveri HTTP"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
+msgstr "Një moment ju lutemi, lexim i pakove në bazën e të dhënave..."
 
-#: ../edit-urpm-sources.pl_.c:54
-msgid "Path or mount point:"
-msgstr "Shtegu apo pika montuese:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Një problem është paraqitur gjatë instalimit:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:54
-msgid "Removable device"
-msgstr "Mjet i lëvizshëm"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during installation"
+msgstr "Një problem është paraqitur gjatë instalimit"
 
-#: ../edit-urpm-sources.pl_.c:55 ../rpmdrake_.c:548
-msgid "Security updates"
-msgstr "Azhurnim i sigurisë"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
+msgstr "Janë instaluar më heret (a duhej të arritej me të vërtet?)."
 
-#: ../edit-urpm-sources.pl_.c:66
-msgid "Browse..."
-msgstr "Shfletues..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed."
+msgstr "Janë instaluar më heret"
 
-#: ../edit-urpm-sources.pl_.c:68
-msgid "Choose a mirror..."
-msgstr "Zgjedheni pasqyren tuaj..."
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "Të gjitha pakot e zgjedhura janë instaluar si duhet."
 
-#: ../edit-urpm-sources.pl_.c:88
-msgid "Login:"
-msgstr "Login:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr "Gjdo gjë është instaluar si duhet"
 
-#: ../edit-urpm-sources.pl_.c:88 ../edit-urpm-sources.pl_.c:227
-msgid "Password:"
-msgstr "Parulla:"
+#: ../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 ""
+"Mbarim i instalimit; %s.\n"
+"\n"
+"Disa konfigurime të skedareve janë krijuar si `.rpmnew' ose `.rpmsave',\n"
+"ju mund ti verifikoni ato, që në fund të vendosni çfarë dëshironi të bëni: "
 
-#: ../edit-urpm-sources.pl_.c:93
-msgid "Name:"
-msgstr "Emri:"
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "gjdo gjë është instaluar si duhet"
 
-#: ../edit-urpm-sources.pl_.c:95 ../edit-urpm-sources.pl_.c:184
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Shtegu që ka të bëjë me synthesis/hdlist:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"some packages failed to install\n"
+"correctly"
+msgstr ""
+"disa pako nuk janë instaluar\n"
+"si duhet"
 
-#: ../edit-urpm-sources.pl_.c:103
-msgid "You need to fill up at least the two first entries."
-msgstr "Ju duhet ti mbushni më së paku dy hyrjet e para."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages to allow others to be upgraded..."
+msgstr ""
+"Një moment ju lutemi, të mbaroj zhdukjen e pakove, që të tjerat të mund të "
+"instalohen..."
 
-#: ../edit-urpm-sources.pl_.c:116
-msgid "Adding a source:"
-msgstr "Shtim i burimit:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
+msgstr ""
+"Dështim gjatë instalimit, disa skedare mungojnë.\n"
+"A dëshironi ti azhurnoni burimet tuaja."
 
-#: ../edit-urpm-sources.pl_.c:117
-msgid "Type of source:"
-msgstr "Tip i burimit:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation failed"
+msgstr "Dështim i instalimit"
 
-#: ../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 "Anulo"
+
+#: ../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 "Anulo"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Ju lutemi futni emrimin e burimit \"%s\" në mjetë [%s]"
 
-#: ../edit-urpm-sources.pl_.c:143
-msgid "Please wait, adding medium..."
-msgstr "Ju letemi keni durim, shtim i burimit..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr "Ndërrim i burimit"
 
-#: ../edit-urpm-sources.pl_.c:164
-msgid "Please wait, removing medium..."
-msgstr "Ju lutemi një moment, zhdukje e burimit..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
+msgstr "E pa mundur marrja e burimeve mbi pakot, kemi ndjesë"
 
-#: ../edit-urpm-sources.pl_.c:177
-msgid "Edit a source"
-msgstr "Boto një burim"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages."
+msgstr "E pa mundur marrja e burimeve mbi pakot."
 
-#: ../edit-urpm-sources.pl_.c:181
+#: ../rpmdrake:1
 #, c-format
-msgid "Editing source \"%s\":"
-msgstr "Botim i burimit \"%s\":"
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr "Një program i nevojshëm mungon (grmpi). Verifikoni instalimin tuaj."
 
-#: ../edit-urpm-sources.pl_.c:187
-msgid "Save changes"
-msgstr "Regjistro ndryshimet"
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
+msgstr "Munges i programit"
 
-#: ../edit-urpm-sources.pl_.c:196
-msgid "You need to insert the medium to continue"
-msgstr "Ju duhet ta futni burimin për të vazhduar"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
+msgstr "Inspektim..."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation finished"
+msgstr "Instalimi mbaroj"
 
-#: ../edit-urpm-sources.pl_.c:197
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
+msgstr "Asnjë ndryshim"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
+msgstr "Përdore .%s si skedare kryesore"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Remove .%s"
+msgstr "Zhduke .%s"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "changes:"
+msgstr "ndryshimet"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr "Inspektim i %s"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, finding available packages..."
+msgstr "Një moment ju lutemi, gjetja e pakove të lira..."
+
+#: ../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 ""
-"Më në fund për ti regjistruar ndryshimet, ju duhet ta futni burimin në "
-"lexues."
+"Një gabim është paraqitur gjatë shtimit të azhurnimit, via urpmi.\n"
+"\n"
+"Kjo mundë të ndodhë ngase pasqyrja nuk është e lirë momentalishtë ose,\n"
+"nëse versioni i Mandrake Linux (%s) nuk është në përkrahje / apo nuk "
+"përkrahet fare nga Mandrake Linux\n"
+"Azhurnim zyrtarë.\n"
+"\n"
+"A dëshironi të provoni një pasqyre tjetër?"
 
-#: ../edit-urpm-sources.pl_.c:202
-msgid "Please wait, updating medium..."
-msgstr "Ju lutemi një moment, azhurnim i burimit..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
+msgstr "Gabim gjatë shtimit të burimit azhurnues"
 
-#: ../edit-urpm-sources.pl_.c:213
-msgid "Configure proxies"
-msgstr "Konfigurim i proxies"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
+msgstr ""
+"Një moment ju lutemi, kyqje në pasqyre që më në fund ti gjeni pakot për ti "
+"azhurnuar."
 
-#: ../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]>):"
+"You may also 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ëse keni nevojë për proxy, hyni emrin e makinës dhe të portës zgjedhëse"
-"(sintaksa është:<emriimakinës[:porta]>):"
+"Ju mund ta zgjedhni cilën do pasqyrë nga ana juaj: për t'ia arritur,\n"
+"startoni Software Sources Manager, dhe shtoni një 'Azhurnim\n"
+"të sigurisë'.\n"
+"\n"
+"Dhe, ristartoni MandrakeUpdate."
 
-#: ../edit-urpm-sources.pl_.c:221
-msgid "Proxy hostname:"
-msgstr "Emri i serverit proxy:"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Si ta zgjedhni pasqyrën nga ana juaj"
 
-#: ../edit-urpm-sources.pl_.c:223
-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 ""
-"Ju keni mundësi të përdorni një emër të përdoruesit/parullën për tu kyqur\n"
-"në serverin proxy"
+"Një gabim fatal është paraqitur gjatë azhrunimit, të pakove me infomacione."
 
-#: ../edit-urpm-sources.pl_.c:225
-msgid "User:"
-msgstr "Emri i përdoruesit:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
+msgstr "Gabim mbi azhurnimin e burimit"
 
-#: ../edit-urpm-sources.pl_.c:251
-msgid "Configure sources"
-msgstr "Konfigurim i burimeve"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
+msgstr ""
+"Një moment ju lutemi, kyqja në pasqyre, që më në fund të bëhet azhurnimi i "
+"informacoineve mbi pakot"
 
-#: ../edit-urpm-sources.pl_.c:258
-msgid "Enabled?"
-msgstr "Activ?"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Kamë nevojë që ta kontaktoj pasqyrën, dhe të pranojë infomacione të reja mbi "
+"azhurnimin.\n"
+"Verifikoni rrjetin dhe funksionimin e tij.\n"
+"\n"
+"A dëshironi të vazhdoni?"
 
-#: ../edit-urpm-sources.pl_.c:259
-msgid "Source"
-msgstr "Burim"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Installation"
+msgstr "Instalim i Pakove Software"
+
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, c-format
+msgid "Mandrake Update"
+msgstr "Mandrake Update"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
+msgstr "Zhdukja e Pakove Software"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Braktise"
 
-#: ../edit-urpm-sources.pl_.c:282 ../rpmdrake_.c:730
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "Instalo"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
 msgid "Remove"
 msgstr "Zhduke"
 
-#: ../edit-urpm-sources.pl_.c:284
-msgid "Edit"
-msgstr "Botues"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search"
+msgstr "Hetim"
 
-#: ../edit-urpm-sources.pl_.c:286
-msgid "Add..."
-msgstr "Shto..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "Gjetje:"
 
-#: ../edit-urpm-sources.pl_.c:288
-msgid "Update..."
-msgstr "Azhurnim..."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Pakot e zgjedhura me radhë, duhet të zhduken që të tjerat të kenë mundësi\n"
+"për azhurnim:\n"
+"\n"
+"%s\n"
+"\n"
+"A dëshironi të vazhdoni?"
 
-#: ../edit-urpm-sources.pl_.c:289
-msgid "Proxy..."
-msgstr "Proxy..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "Kemi ndjesë pakot duhet të zhduken"
 
-#: ../edit-urpm-sources.pl_.c:292
-msgid "Save and quit"
-msgstr "Regjistro dhe braktise"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr ""
+"Kujdes: me sa duket ju jeni duke u munduar të instaloni një numër të\n"
+"madhë të pakove, është e mundur që disku i juaj të mos ketë vendë të\n"
+"mjaftueshëm mbasandej apo gjatë instalimit; kjo metodë është tejet e "
+"rrezikshme\n"
+"e cila duhet të shqyrtohet me kujdes të madhë.\n"
+"\n"
+"A me të vërtetë dëshironi ti instaloni të gjitha pakot e zgjedhura?"
 
-#: ../edit-urpm-sources.pl_.c:293 ../rpmdrake_.c:733
-msgid "Quit"
-msgstr "Braktise"
+#: ../rpmdrake:1
+#, c-format
+msgid "Too many packages are selected"
+msgstr "Numër shumë i madhë i pakove të zgjedhura"
 
-#: ../rpmdrake.pm_.c:96
-msgid "Yes"
-msgstr "Po"
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
+msgstr "Infomacione maksimale"
 
-#: ../rpmdrake.pm_.c:98
-msgid "No"
-msgstr "Jo"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal information"
+msgstr "Infomacione normale"
 
-#: ../rpmdrake.pm_.c:130
-msgid "Info..."
-msgstr "Infomacion..."
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update source(s)"
+msgstr "Azhurnim i burimeve"
 
-#: ../rpmdrake.pm_.c:183
-msgid "Austria"
-msgstr "Austria"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reload the packages list"
+msgstr "Ringarko listën e pakove"
 
-#: ../rpmdrake.pm_.c:184
-msgid "Australia"
-msgstr "Australia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
+msgstr "Vërja në fillim e zgjedhjeve"
 
-#: ../rpmdrake.pm_.c:185
-msgid "Belgium"
-msgstr "Belgjika"
+#: ../rpmdrake:1
+#, c-format
+msgid "in files"
+msgstr "mes skedareve"
 
-#: ../rpmdrake.pm_.c:186
-msgid "Brazil"
-msgstr "Brazili"
+#: ../rpmdrake:1
+#, c-format
+msgid "in descriptions"
+msgstr "mes përshkrimeve"
 
-#: ../rpmdrake.pm_.c:187
-msgid "Canada"
-msgstr "Kanada"
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
+msgstr "mes emrave"
 
-#: ../rpmdrake.pm_.c:188
-msgid "Costa Rica"
-msgstr "Kosta Rika"
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
+msgstr "simbas azhurnimit apo të reja"
 
-#: ../rpmdrake.pm_.c:189
-msgid "Czech Republic"
-msgstr "Republika Çeke"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
+msgstr "simbas burimit"
 
-#: ../rpmdrake.pm_.c:190
-msgid "Germany"
-msgstr "Gjermania"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
+msgstr "të zgjedhura apo të pa zgjedhur"
 
-#: ../rpmdrake.pm_.c:191
-msgid "Danmark"
-msgstr "Danimarka"
+#: ../rpmdrake:1
+#, c-format
+msgid "by size"
+msgstr "simbas madhësisë"
 
-#: ../rpmdrake.pm_.c:192 ../rpmdrake.pm_.c:196
-msgid "Greece"
-msgstr "Greqia"
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
+msgstr "simbas grupit"
 
-#: ../rpmdrake.pm_.c:193
-msgid "Spain"
-msgstr "Spanja"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages,"
+msgstr "Të gjitha pakot, "
 
-#: ../rpmdrake.pm_.c:194
-msgid "Finland"
-msgstr "Finlanda"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
+msgstr "Të gjitha pakot, janë të radhitura simbas alfabetit"
 
-#: ../rpmdrake.pm_.c:195
-msgid "France"
-msgstr "Franca"
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
+msgstr "Mandrake zgjedhjet"
 
-#: ../rpmdrake.pm_.c:197
-msgid "Israel"
-msgstr "Izraeli"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal updates"
+msgstr "Azhurnim normale"
 
-#: ../rpmdrake.pm_.c:198
-msgid "Italy"
-msgstr "Italia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Bugfixes updates"
+msgstr "Korigjim i bug(it) azhurnues"
 
-#: ../rpmdrake.pm_.c:199
-msgid "Japan"
-msgstr "Japonia"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
+msgstr "Azhurnim i sigurisë"
 
-#: ../rpmdrake.pm_.c:200
-msgid "Korea"
-msgstr "Korea"
+#: ../rpmdrake:1
+#, c-format
+msgid "Description: "
+msgstr "Përshkrim: "
 
-#: ../rpmdrake.pm_.c:201
-msgid "Netherlands"
-msgstr "Holanda"
+#: ../rpmdrake:1
+#, c-format
+msgid "Summary: "
+msgstr "Titull: "
 
-#: ../rpmdrake.pm_.c:202
-msgid "Norway"
-msgstr "Norvegjia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "Rëndësia: "
 
-#: ../rpmdrake.pm_.c:203
-msgid "Poland"
-msgstr "Polonia"
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake.pm_.c:204
-msgid "Portugal"
-msgstr "Portugalia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Size: "
+msgstr "Madhësia: "
 
-#: ../rpmdrake.pm_.c:205
-msgid "Russia"
-msgstr "Rusia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Version: "
+msgstr "Versioni: "
 
-#: ../rpmdrake.pm_.c:206
-msgid "Sweden"
-msgstr "Suedia"
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "Emri: "
 
-#: ../rpmdrake.pm_.c:207
-msgid "Taiwan"
-msgstr "Taivani"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "Arësyja për azhurnim: "
 
-#: ../rpmdrake.pm_.c:208
-msgid "United Kingdom"
-msgstr "Britania e Madhe"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
+msgstr "Versioni i tanishëm i instaluar: "
 
-#: ../rpmdrake.pm_.c:209
-msgid "China"
-msgstr "Kina"
+#: ../rpmdrake:1
+#, c-format
+msgid "Source: "
+msgstr "Burim:"
 
-#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:211 ../rpmdrake.pm_.c:212
-#: ../rpmdrake.pm_.c:213 ../rpmdrake.pm_.c:264
-msgid "United States"
-msgstr "Shtetet e Bashkuara"
+#: ../rpmdrake:1
+#, c-format
+msgid "(Not available)"
+msgstr "(I nxënë)"
 
-#: ../rpmdrake.pm_.c:277
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
-"Një moment ju lutemi, transferimi i adresave të pasqyreve nga web "
-"MandrakeSoft."
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
+msgstr "Changelog:\n"
 
-#: ../rpmdrake.pm_.c:283
-msgid "Error during download"
-msgstr "Gabim gjatë transferimit"
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "Skedaret:\n"
 
-#: ../rpmdrake.pm_.c:292
-msgid "No mirror"
-msgstr "Asnjë pasqyre"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected size: %d MB"
+msgstr "Madhësia e zgjedhur: %d MB"
 
-#: ../rpmdrake.pm_.c:310
-msgid "Please choose the desired mirror."
-msgstr "Zgjedheni pasqyrën tuaj."
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Zgjedheni: %d MB / Vendë të lirë në disk: %d MB"
 
-#: ../rpmdrake.pm_.c:342 ../rpmdrake_.c:627
-msgid "Update source(s)"
-msgstr "Azhurnim i burimeve"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
+msgstr ""
+"Me rastin e mbushjes së mvarësisë, pakot e radhitura nuk duhet të jenë të "
+"zgjedhura:\n"
+"\n"
 
-#: ../rpmdrake.pm_.c:346
-msgid "Select the source(s) you wish to update:"
-msgstr "Zgjedheni burimin të cilin dëshironi ta azhurnoni:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+msgstr ""
+"Kemi ndjesë, pako(t) e radhitur(a) nuk mundë të zgjedhe(n):\n"
+"\n"
 
-#: ../rpmdrake.pm_.c:350
-msgid "Update"
-msgstr "Azhurnim"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "Disa nga pakot nuk mund të instalohen"
 
-#: ../rpmdrake.pm_.c:360
-msgid "Please wait, updating media..."
-msgstr "Një moment ju lutemi, azhurnim i burimeve..."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
+msgstr ""
+"Me rastin e mbushjes së mvarësisë, pakot e radhitura duhet të instalohen\n"
+":\n"
+"\n"
 
-#: ../rpmdrake_.c:99
-msgid "Other"
-msgstr "Tjetri"
+#: ../rpmdrake:1
+#, c-format
+msgid "Additional packages needed"
+msgstr "Keni nevojë për pakot shtuesë"
 
-#: ../rpmdrake_.c:121 ../rpmdrake_.c:135 ../rpmdrake_.c:227 ../rpmdrake_.c:298
-msgid "(none)"
-msgstr "(asnjë)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be removed"
+msgstr "Disa nga pakot nuk mund të zhduken"
 
-#: ../rpmdrake_.c:141 ../rpmdrake_.c:482 ../rpmdrake_.c:483
-msgid "(Not available)"
-msgstr "(I nxënë)"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
+"Zhdukja e këtyre pakove do të dëmtojë sistemin tuaj, kemi ndjesë:\n"
+"\n"
 
-#: ../rpmdrake_.c:151 ../rpmdrake_.c:208
-msgid "Search results"
-msgstr "Kërkues i rezultateve"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
+"Me rastin e mbushjes së mvarësisë, pakot e radhitura duhet të zhduken:\n"
+"\n"
 
-#: ../rpmdrake_.c:151
-msgid "Search results (none)"
-msgstr "Rezultatet e hetimeve (asnjë)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr "Disa nga pakot e shumta duhet të zhduken"
 
-#: ../rpmdrake_.c:161 ../rpmdrake_.c:172
-msgid "Please wait, searching..."
-msgstr "Një moment, hetimet në vazhdim e sipër..."
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
+msgstr "Më shumë informacione në pako..."
 
-#: ../rpmdrake_.c:175
-msgid "Stop"
-msgstr "Ndalë"
+#: ../rpmdrake:1
+#, c-format
+msgid "Information on packages"
+msgstr "Informacione në pako"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
+msgstr "Më shumë informacione"
 
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
+#: ../rpmdrake:1
+#, c-format
 msgid "Addable"
 msgstr "Të reja"
 
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
+#: ../rpmdrake:1
+#, c-format
 msgid "Upgradable"
 msgstr "Azhurnues"
 
-#: ../rpmdrake_.c:211
-msgid "Not selected"
-msgstr "I pa zgjedhur"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"The list of updates is void. This means that either there is\n"
+"no available update for the packages installed on your computer,\n"
+"or you already installed all of them."
+msgstr ""
+"Lista e azhurnimeve, është e zbrazët. Që d.m.th. se\n"
+"asnjë nga pakot e instaluara, nuk janë azhurnuar në kompjuterin tuaj\n"
+"ose ju i keni instaluar më heret ato."
 
-#: ../rpmdrake_.c:211
-msgid "Selected"
-msgstr "Zgjedhur"
+#: ../rpmdrake:1
+#, c-format
+msgid "No update"
+msgstr "Asnjë azhurnim"
 
-#: ../rpmdrake_.c:240
-msgid "rpmdrake"
-msgstr "rpmdrake"
+#: ../rpmdrake:1
+#, c-format
+msgid "(none)"
+msgstr "(asnjë)"
 
-#: ../rpmdrake_.c:258 ../rpmdrake_.c:360 ../rpmdrake_.c:362
-msgid "More information on package..."
-msgstr "Më shumë informacione në pako..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, listing packages..."
+msgstr "Një moment ju lutemi, numërim i pakove..."
 
-#: ../rpmdrake_.c:259
+#: ../rpmdrake:1
+#, c-format
+msgid "unknown package "
+msgstr "pako a pa njoftur"
+
+#: ../rpmdrake:1
+#, c-format
 msgid "One of the following packages is needed:"
 msgstr "Një nga pakot vijuese është e nevojshme:"
 
-#: ../rpmdrake_.c:259
+#: ../rpmdrake:1
+#, c-format
 msgid "Please choose"
 msgstr "Ju lutemi zgjedheni"
 
-#: ../rpmdrake_.c:275
-msgid "unknown package "
-msgstr "pako a pa njoftur"
-
-#: ../rpmdrake_.c:285
-msgid "Please wait, listing packages..."
-msgstr "Një moment ju lutemi, numërim i pakove..."
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:300
-msgid "No update"
-msgstr "Asnjë azhurnim"
+#: ../rpmdrake:1
+#, c-format
+msgid "Not selected"
+msgstr "I pa zgjedhur"
 
-#: ../rpmdrake_.c:353 ../rpmdrake_.c:354
-msgid "More infos"
-msgstr "Më shumë informacione"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected"
+msgstr "Zgjedhur"
 
-#: ../rpmdrake_.c:355
-msgid "Information on packages"
-msgstr "Informacione në pako"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results"
+msgstr "Kërkues i rezultateve"
 
-#: ../rpmdrake_.c:376
-msgid "Some additional packages need to be removed"
-msgstr "Disa nga pakot e shumta duhet të zhduken"
+#: ../rpmdrake:1
+#, c-format
+msgid "Stop"
+msgstr "Ndalë"
 
-#: ../rpmdrake_.c:377
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"Me rastin e mbushjes së mvarësisë, pakot e radhitura duhet të zhduken:\n"
-"\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, searching..."
+msgstr "Një moment, hetimet në vazhdim e sipër..."
 
-#: ../rpmdrake_.c:383 ../rpmdrake_.c:391
-msgid "Some packages can't be removed"
-msgstr "Disa nga pakot nuk mund të zhduken"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
+msgstr "Rezultatet e hetimeve (asnjë)"
 
-#: ../rpmdrake_.c:384
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
-"Zhdukja e këtyre pakove do të dëmtojë sistemin tuaj, kemi ndjesë:\n"
-"\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Tjetri"
 
-#: ../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 ""
-"Me rastin e mbushjes së mvarësisë, pakot e radhitura nuk duhet të jenë të "
-"zgjedhura:\n"
+"Mirë se vini në botuesin e burimet të pakove!\n"
 "\n"
+"Kjo vegël do të ju ndihmojë për konfigurimin e pakove në burime, të cilat\n"
+"ju dëshironi ti përdorni në kompjuterin tuaj. Ato do të ju mundësojnë të "
+"instaloni\n"
+"pako të reja software ose azhurnimin e tyre."
 
-#: ../rpmdrake_.c:421
-msgid "Additional packages needed"
-msgstr "Keni nevojë për pakot shtuesë"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Regjistro dhe braktise"
 
-#: ../rpmdrake_.c:422
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
-msgstr ""
-"Me rastin e mbushjes së mvarësisë, pakot e radhitura duhet të instalohen\n"
-":\n"
-"\n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy..."
+msgstr "Proxy..."
 
-#: ../rpmdrake_.c:435
-msgid "Some packages can't be installed"
-msgstr "Disa nga pakot nuk mund të instalohen"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
+msgstr "Azhurnim..."
 
-#: ../rpmdrake_.c:436
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-msgstr ""
-"Kemi ndjesë, pako(t) e radhitur(a) nuk mundë të zgjedhe(n):\n"
-"\n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "Shto..."
 
-#: ../rpmdrake_.c:450 ../rpmdrake_.c:684
-msgid "Some packages need to be removed"
-msgstr "Kemi ndjesë pakot duhet të zhduken"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "Botues"
 
-#: ../rpmdrake_.c:472
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Zgjedheni: %d MB / Vendë të lirë në disk: %d MB"
+msgid "Source"
+msgstr "Burim"
 
-#: ../rpmdrake_.c:474
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "Madhësia e zgjedhur: %d MB"
+msgid "Enabled?"
+msgstr "Activ?"
 
-#: ../rpmdrake_.c:482
-msgid "Files:\n"
-msgstr "Skedaret:\n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure sources"
+msgstr "Konfigurim i burimeve"
 
-#: ../rpmdrake_.c:483
-msgid "Changelog:\n"
-msgstr "Changelog:\n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "Parulla:"
 
-#: ../rpmdrake_.c:486
-msgid "Source: "
-msgstr "Burim:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
+msgstr "Emri i përdoruesit:"
 
-#: ../rpmdrake_.c:487
-msgid "Currently installed version: "
-msgstr "Versioni i tanishëm i instaluar: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+"Ju keni mundësi të përdorni një emër të përdoruesit/parullën për tu kyqur\n"
+"në serverin proxy"
 
-#: ../rpmdrake_.c:491
-msgid "Reason for update: "
-msgstr "Arësyja për azhurnim: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "Emri i serverit proxy:"
 
-#: ../rpmdrake_.c:493
-msgid "Name: "
-msgstr "Emri: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"Nëse keni nevojë për proxy, hyni emrin e makinës dhe të portës zgjedhëse"
+"(sintaksa është:<emriimakinës[:porta]>):"
 
-#: ../rpmdrake_.c:494
-msgid "Version: "
-msgstr "Versioni: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "Konfigurim i proxies"
 
-#: ../rpmdrake_.c:495
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Please wait, updating medium..."
+msgstr "Ju lutemi një moment, azhurnim i burimit..."
 
-#: ../rpmdrake_.c:495
-msgid "Size: "
-msgstr "Madhësia: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr ""
+"Më në fund për ti regjistruar ndryshimet, ju duhet ta futni burimin në "
+"lexues."
 
-#: ../rpmdrake_.c:497
-msgid "Importance: "
-msgstr "Rëndësia: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
+msgstr "Ju duhet ta futni burimin për të vazhduar"
 
-#: ../rpmdrake_.c:498
-msgid "Summary: "
-msgstr "Titull: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save changes"
+msgstr "Regjistro ndryshimet"
 
-#: ../rpmdrake_.c:499
-msgid "Description: "
-msgstr "Përshkrim: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Shtegu që ka të bëjë me synthesis/hdlist:"
 
-#: ../rpmdrake_.c:548
-msgid "Bugfixes updates"
-msgstr "Korigjim i bug(it) azhurnues"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake_.c:548
-msgid "Normal updates"
-msgstr "Azhurnim normale"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Editing source \"%s\":"
+msgstr "Botim i burimit \"%s\":"
 
-#: ../rpmdrake_.c:567
-msgid "Mandrake choices"
-msgstr "Mandrake zgjedhjet"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit a source"
+msgstr "Boto një burim"
 
-#: ../rpmdrake_.c:568
-msgid "All packages, alphabetical"
-msgstr "Të gjitha pakot, janë të radhitura simbas alfabetit"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr "Ju lutemi një moment, zhdukje e burimit..."
 
-#: ../rpmdrake_.c:569
-msgid "All packages,"
-msgstr "Të gjitha pakot, "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, adding medium..."
+msgstr "Ju letemi keni durim, shtim i burimit..."
 
-#: ../rpmdrake_.c:592
-msgid "by group"
-msgstr "simbas grupit"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of source:"
+msgstr "Tip i burimit:"
 
-#: ../rpmdrake_.c:592
-msgid "by size"
-msgstr "simbas madhësisë"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Adding a source:"
+msgstr "Shtim i burimit:"
 
-#: ../rpmdrake_.c:593
-msgid "by selection state"
-msgstr "të zgjedhura apo të pa zgjedhur"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"Një burim tjetër ekziston me të njëjtin emër, a dëshironi\n"
+"me të vërtetë ta zëvendësoni atë?"
 
-#: ../rpmdrake_.c:594
-msgid "by source repository"
-msgstr "simbas burimit"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to fill up at least the two first entries."
+msgstr "Ju duhet ti mbushni më së paku dy hyrjet e para."
 
-#: ../rpmdrake_.c:594
-msgid "by update availability"
-msgstr "simbas azhurnimit apo të reja"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "Emri:"
 
-#: ../rpmdrake_.c:615
-msgid "in descriptions"
-msgstr "mes përshkrimeve"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
+msgstr "Login:"
 
-#: ../rpmdrake_.c:615
-msgid "in files"
-msgstr "mes skedareve"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Zgjedheni pasqyren tuaj..."
 
-#: ../rpmdrake_.c:615
-msgid "in names"
-msgstr "mes emrave"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Browse..."
+msgstr "Shfletues..."
 
-#: ../rpmdrake_.c:626
-msgid "Reload the packages list"
-msgstr "Ringarko listën e pakove"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Shtegu apo pika montuese:"
 
-#: ../rpmdrake_.c:626
-msgid "Reset the selection"
-msgstr "Vërja në fillim e zgjedhjeve"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Removable device"
+msgstr "Mjet i lëvizshëm"
 
-#: ../rpmdrake_.c:652
-msgid "Maximum information"
-msgstr "Infomacione maksimale"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "HTTP server"
+msgstr "Serveri HTTP"
 
-#: ../rpmdrake_.c:652
-msgid "Normal information"
-msgstr "Infomacione normale"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "Serveri FTP"
 
-#: ../rpmdrake_.c:674
-msgid "Too many packages are selected"
-msgstr "Numër shumë i madhë i pakove të zgjedhura"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path:"
+msgstr "Shtegu:"
 
-#: ../rpmdrake_.c:720
-msgid "Find:"
-msgstr "Gjetje:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "Skedaret lokale"
 
-#: ../rpmdrake_.c:725
-msgid "Search"
-msgstr "Hetim"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add a source"
+msgstr "Shtim i një burimi:"
 
-#: ../rpmdrake_.c:731
-msgid "Install"
-msgstr "Instalo"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
+msgstr "I pa mundur azhurnimi i burimit; do të çkyqet automatikisht."
 
-#: ../rpmdrake_.c:738 data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrake Update"
-msgstr "Mandrake Update"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "I pa mundur krijimi i burimit."
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Installation"
-msgstr "Instalim i Pakove Software"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, updating media..."
+msgstr "Një moment ju lutemi, azhurnim i burimeve..."
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Removal"
-msgstr "Zhdukja e Pakove Software"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
+msgstr "Azhurnim"
 
-#: ../rpmdrake_.c:779
-msgid "Please wait, contacting mirror to update packages information."
-msgstr ""
-"Një moment ju lutemi, kyqja në pasqyre, që më në fund të bëhet azhurnimi i "
-"informacoineve mbi pakot"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Select the source(s) you wish to update:"
+msgstr "Zgjedheni burimin të cilin dëshironi ta azhurnoni:"
 
-#: ../rpmdrake_.c:781
-msgid "Error updating medium"
-msgstr "Gabim mbi azhurnimin e burimit"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please choose the desired mirror."
+msgstr "Zgjedheni pasqyrën tuaj."
 
-#: ../rpmdrake_.c:782
-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 ""
-"Një gabim fatal është paraqitur gjatë azhrunimit, të pakove me infomacione."
+"E pa mundur gjetja e një pasqyre.\n"
+"\n"
+"Është e mudur të jenë shumë arësye; më e shpeshta është\n"
+"mbi të gjitha, arkitektura e procesorit tuaj nuk mundë të\n"
+"përkrahet nga Azhurnimi i Mandrake Linux Zyrtar"
 
-#: ../rpmdrake_.c:787
-msgid "How to choose manually your mirror"
-msgstr "Si ta zgjedhni pasqyrën nga ana juaj"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
+msgstr "Asnjë pasqyre"
 
-#: ../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 ""
-"Një moment ju lutemi, kyqje në pasqyre që më në fund ti gjeni pakot për ti "
-"azhurnuar."
+"Një gabim është paraqitur gjatë transferimit të listës së pasqyreve:\n"
+"\n"
+"%s\n"
+"Rrjeti apo adresa web e MandrakeSoft, e mundur që janë të nxënë\n"
+"Ju lutemi provoni më vonë."
 
-#: ../rpmdrake_.c:798
-msgid "Error adding update medium"
-msgstr "Gabim gjatë shtimit të burimit azhurnues"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "Gabim gjatë transferimit"
 
-#: ../rpmdrake_.c:829
-msgid "Please wait, finding available packages..."
-msgstr "Një moment ju lutemi, gjetja e pakove të lira..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
+"Një moment ju lutemi, transferimi i adresave të pasqyreve nga web "
+"MandrakeSoft."
 
-#: ../rpmdrake_.c:861
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Inspektim i %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 ""
+"Më duhet të kontaktoj adresën web të MandrakeSoft, për të pranuar listën e "
+"pasqyreve.\n"
+"Verifikoni rrjetin (network) ju lutemi, nëse ai punon si duhet.\n"
+"\n"
+"A jeni në pajtim për të vazhduar?"
 
-#: ../rpmdrake_.c:880
-msgid "changes:"
-msgstr "ndryshimet"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United States"
+msgstr "Shtetet e Bashkuara"
 
-#: ../rpmdrake_.c:884
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Zhduke .%s"
+msgid "China"
+msgstr "Kina"
 
-#: ../rpmdrake_.c:886
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Përdore .%s si skedare kryesore"
+msgid "United Kingdom"
+msgstr "Britania e Madhe"
 
-#: ../rpmdrake_.c:888
-msgid "Do nothing"
-msgstr "Asnjë ndryshim"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "Taivani"
 
-#: ../rpmdrake_.c:900
-msgid "Installation finished"
-msgstr "Instalimi mbaroj"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "Suedia"
 
-#: ../rpmdrake_.c:910
-msgid "Inspect..."
-msgstr "Inspektim..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
+msgstr "Rusia"
 
-#: ../rpmdrake_.c:925
-msgid "Program missing"
-msgstr "Munges i programit"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Portugal"
+msgstr "Portugalia"
 
-#: ../rpmdrake_.c:926
-msgid "A required program is missing (grpmi). Check your installation."
-msgstr "Një program i nevojshëm mungon (grmpi). Verifikoni instalimin tuaj."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
+msgstr "Polonia"
 
-#: ../rpmdrake_.c:940
-msgid "Unable to get source packages."
-msgstr "E pa mundur marrja e burimeve mbi pakot."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
+msgstr "Norvegjia"
 
-#: ../rpmdrake_.c:941
-msgid "Unable to get source packages, sorry."
-msgstr "E pa mundur marrja e burimeve mbi pakot, kemi ndjesë"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
+msgstr "Holanda"
 
-#: ../rpmdrake_.c:948
-msgid "Change medium"
-msgstr "Ndërrim i burimit"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Korea"
+msgstr "Korea"
 
-#: ../rpmdrake_.c:949
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Ju lutemi futni emrimin e burimit \"%s\" në mjetë [%s]"
+msgid "Japan"
+msgstr "Japonia"
 
-#: ../rpmdrake_.c:957
-msgid "Installation failed"
-msgstr "Dështim i instalimit"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Italy"
+msgstr "Italia"
 
-#: ../rpmdrake_.c:958
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"Dështim gjatë instalimit, disa skedare mungojnë.\n"
-"A dëshironi ti azhurnoni burimet tuaja."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Israel"
+msgstr "Izraeli"
 
-#: ../rpmdrake_.c:961
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr ""
-"Një moment ju lutemi, të mbaroj zhdukjen e pakove, që të tjerat të mund të "
-"instalohen..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Greqia"
 
-#: ../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 ""
-"Mbarim i instalimit; %s.\n"
-"\n"
-"Disa konfigurime të skedareve janë krijuar si `.rpmnew' ose `.rpmsave',\n"
-"ju mund ti verifikoni ato, që në fund të vendosni çfarë dëshironi të bëni: "
+msgid "France"
+msgstr "Franca"
 
-#: ../rpmdrake_.c:982
-msgid ""
-"some packages failed to install\n"
-"correctly"
-msgstr ""
-"disa pako nuk janë instaluar\n"
-"si duhet"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "Finlanda"
 
-#: ../rpmdrake_.c:983
-msgid "everything was installed correctly"
-msgstr "gjdo gjë është instaluar si duhet"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "Spanja"
 
-#: ../rpmdrake_.c:985
-msgid "Everything installed successfully"
-msgstr "Gjdo gjë është instaluar si duhet"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
+msgstr "Danimarka"
 
-#: ../rpmdrake_.c:986
-msgid "All requested packages were installed successfully."
-msgstr "Të gjitha pakot e zgjedhura janë instaluar si duhet."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr "Gjermania"
 
-#: ../rpmdrake_.c:989
-msgid "Everything already installed."
-msgstr "Janë instaluar më heret"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
+msgstr "Republika Çeke"
 
-#: ../rpmdrake_.c:990
-msgid "Everything already installed (is this supposed to happen at all?)."
-msgstr "Janë instaluar më heret (a duhej të arritej me të vërtet?)."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Costa Rica"
+msgstr "Kosta Rika"
 
-#: ../rpmdrake_.c:997
-msgid "Problem during installation"
-msgstr "Një problem është paraqitur gjatë instalimit"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Canada"
+msgstr "Kanada"
 
-#: ../rpmdrake_.c:998
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Një problem është paraqitur gjatë instalimit:\n"
-"\n"
-"%s"
+msgid "Brazil"
+msgstr "Brazili"
 
-#: ../rpmdrake_.c:1012
-msgid "Please wait, reading packages database..."
-msgstr "Një moment ju lutemi, lexim i pakove në bazën e të dhënave..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Belgium"
+msgstr "Belgjika"
 
-#: ../rpmdrake_.c:1053
-msgid "Please wait, removing packages..."
-msgstr "Një moment ju lutemi, zhdukja pakove..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Australia"
+msgstr "Australia"
 
-#: ../rpmdrake_.c:1056
-msgid "Problem during removal"
-msgstr "Një problem është paraqitur gjatë zhdukjes"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
+msgstr "Austria"
 
-#: ../rpmdrake_.c:1057
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Një problem është paraqitur gjatë zhdukjes së pakove:\n"
-"\n"
-"%s"
+msgid "Info..."
+msgstr "Infomacion..."
 
-#: ../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 ""
-"Mirë se vini në veglën e software për zhdukje!\n"
-"\n"
-"Kjo vegël do të ju ndihmojë se cilin software dëshironi ta zhdukni nga "
-"kompjuteri\n"
-"juaj."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
+msgstr "Jo"
 
-#: ../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 ""
-"Mirë se vini në MandrakeUpdate!\n"
-"\n"
-"Kjo vegël do të ju ndihmojë për intalimin e zgjedhjeve për azhurnimin e\n"
-"kompjuterit tuaj."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Po"
 
-#: ../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 ""
-"Mirë se vini në instalimit software me vegël!\n"
-"\n"
-"Sistemi i juaj Mandrake Linux është i furnizuar me mijëra pako\n"
-"sofware, në CDROM ose DVD. Kjo vegël do të ju ndihmojë për të zgjedhur, "
-"cilin\n"
-"sofware dëshironi ta instaloni në kompjuterin tuaj."
+#: data/rpmdrake.desktop.in.h:1
+msgid "Install Software"
+msgstr "Instalo Softwarin"
 
 #: data/rpmdrake-remove.desktop.in.h:1
 msgid "Remove Software"
@@ -900,168 +1250,8 @@ msgstr "Zhdukje e Software"
 msgid "Software Sources Manager"
 msgstr "Administrim i Burimeve Software"
 
-#: data/rpmdrake.desktop.in.h:1
-msgid "Install Software"
-msgstr "Instalo Softwarin"
-
-#~ msgid ""
-#~ "There is already a medium by that name, do you\n"
-#~ "really want to replace it?"
-#~ msgstr ""
-#~ "Një burim tjetër ekziston me të njëjtin emër, a dëshironi\n"
-#~ "me të vërtetë ta zëvendësoni atë?"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-#~ "A jeni në pajtim për të vazhduar?"
-
-#~ 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 ""
-#~ "Mirë se vini në botuesin e burimet të pakove!\n"
-#~ "\n"
-#~ "Kjo vegël do të ju ndihmojë për konfigurimin e pakove në burime, të "
-#~ "cilat\n"
-#~ "ju dëshironi ti përdorni në kompjuterin tuaj. Ato do të ju mundësojnë të "
-#~ "instaloni\n"
-#~ "pako të reja software ose azhurnimin e tyre."
-
-#~ msgid ""
-#~ "I need to contact MandrakeSoft website to get the mirrors list.\n"
-#~ "Please check that your network is currently running.\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "Më duhet të kontaktoj adresën web të MandrakeSoft, për të pranuar listën "
-#~ "e pasqyreve.\n"
-#~ "Verifikoni rrjetin (network) ju lutemi, nëse ai punon si duhet.\n"
-#~ "\n"
-#~ "A jeni në pajtim për të vazhduar?"
-
-#~ msgid ""
-#~ "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 ""
-#~ "Një gabim është paraqitur gjatë transferimit të listës së pasqyreve:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "Rrjeti apo adresa web e MandrakeSoft, e mundur që janë të nxënë\n"
-#~ "Ju lutemi provoni më vonë."
-
-#~ msgid ""
-#~ "I can't find any suitable mirror.\n"
-#~ "\n"
-#~ "There can be many reasons for this problem; the most frequent is\n"
-#~ "the case when the architecture of your processor is not supported\n"
-#~ "by Mandrake Linux Official Updates."
-#~ msgstr ""
-#~ "E pa mundur gjetja e një pasqyre.\n"
-#~ "\n"
-#~ "Është e mudur të jenë shumë arësye; më e shpeshta është\n"
-#~ "mbi të gjitha, arkitektura e procesorit tuaj nuk mundë të\n"
-#~ "përkrahet nga Azhurnimi i Mandrake Linux Zyrtar"
-
-#~ msgid ""
-#~ "The list of updates is void. This means that either there is\n"
-#~ "no available update for the packages installed on your computer,\n"
-#~ "or you already installed all of them."
-#~ msgstr ""
-#~ "Lista e azhurnimeve, është e zbrazët. Që d.m.th. se\n"
-#~ "asnjë nga pakot e instaluara, nuk janë azhurnuar në kompjuterin tuaj\n"
-#~ "ose ju i keni instaluar më heret ato."
-
-#~ msgid ""
-#~ "Warning: it seems that you are attempting to add so much\n"
-#~ "packages that your filesystem may run out of free diskspace,\n"
-#~ "during or after package installation ; this is particularly\n"
-#~ "dangerous and should be considered with care.\n"
-#~ "\n"
-#~ "Do you really want to install all the selected packages?"
-#~ msgstr ""
-#~ "Kujdes: me sa duket ju jeni duke u munduar të instaloni një numër të\n"
-#~ "madhë të pakove, është e mundur që disku i juaj të mos ketë vendë të\n"
-#~ "mjaftueshëm mbasandej apo gjatë instalimit; kjo metodë është tejet e "
-#~ "rrezikshme\n"
-#~ "e cila duhet të shqyrtohet me kujdes të madhë.\n"
-#~ "\n"
-#~ "A me të vërtetë dëshironi ti instaloni të gjitha pakot e zgjedhura?"
-
-#~ msgid ""
-#~ "The following packages have to be removed for others to be upgraded:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "Pakot e zgjedhura me radhë, duhet të zhduken që të tjerat të kenë "
-#~ "mundësi\n"
-#~ "për azhurnim:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "A dëshironi të vazhdoni?"
-
 #~ msgid "-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 ""
-#~ "Kamë nevojë që ta kontaktoj pasqyrën, dhe të pranojë infomacione të reja "
-#~ "mbi azhurnimin.\n"
-#~ "Verifikoni rrjetin dhe funksionimin e tij.\n"
-#~ "\n"
-#~ "A dëshironi të vazhdoni?"
-
-#~ msgid ""
-#~ "You may also choose your desired mirror manually: to do so,\n"
-#~ "launch the Software Sources Manager, and then add a `Security\n"
-#~ "updates' source.\n"
-#~ "\n"
-#~ "Then, restart MandrakeUpdate."
-#~ msgstr ""
-#~ "Ju mund ta zgjedhni cilën do pasqyrë nga ana juaj: për t'ia arritur,\n"
-#~ "startoni Software Sources Manager, dhe shtoni një 'Azhurnim\n"
-#~ "të sigurisë'.\n"
-#~ "\n"
-#~ "Dhe, ristartoni MandrakeUpdate."
-
-#~ msgid ""
-#~ "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 ""
-#~ "Një gabim është paraqitur gjatë shtimit të azhurnimit, via urpmi.\n"
-#~ "\n"
-#~ "Kjo mundë të ndodhë ngase pasqyrja nuk është e lirë momentalishtë ose,\n"
-#~ "nëse versioni i Mandrake Linux (%s) nuk është në përkrahje / apo nuk "
-#~ "përkrahet fare nga Mandrake Linux\n"
-#~ "Azhurnim zyrtarë.\n"
-#~ "\n"
-#~ "A dëshironi të provoni një pasqyre tjetër?"
-
 #~ msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
 #~ msgstr "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
diff --git a/po/sq.pom b/po/sq.pom
index 7183dbdc..7dfef87e 100644
--- a/po/sq.pom
+++ b/po/sq.pom
@@ -4,164 +4,174 @@ msgstr "Server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr ""
+msgid "Office Workstation"
+msgstr "Stacion Punues në Tryezë"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Network Computer (client)"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
 msgstr ""
+"Programe për tryezë: trajtues të teksteve (kword, abiword), tablues "
+"(kspread, gnumeric), çfaqës pdf, etj."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr ""
+msgid "Workstation"
+msgstr "Stacion punues"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr ""
+msgid "Game station"
+msgstr "Stacion Lojërash"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr ""
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Programe ahengi: lojë arkade, lojë me stenda, strategjike, etj"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr ""
+msgid "Multimedia station"
+msgstr "Stacion Multimedia"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr ""
+msgid "Sound and video playing/editing programs"
+msgstr "Programe për lojëra/botime të zërit dhe videos"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr ""
+msgid "Internet station"
+msgstr "Stacion Interneti"
 
 # 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 ""
+"Përgjithësia a veglave për leximin, dërgimin e letrave elektronike të "
+"lajmeve (pine, mutt, tin...) dhe për të lundruar 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"
-msgstr ""
+msgid "Network Computer (client)"
+msgstr "Kompjuter Rrjeti (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 ""
+msgid "Clients for different protocols including ssh"
+msgstr "Klient për protokole të ndryshme me përfshirje të 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 "Konfigurim"
 
 # 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 "Tools to ease the configuration of your computer"
+msgstr "Vegla për të konfiguruar kompjuterin tuaj"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr ""
+msgid "Scientific Workstation"
+msgstr "Stacion Punues Shkencor"
 
 # 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
-msgid "Multimedia - Video"
-msgstr ""
+msgid "Console Tools"
+msgstr "Vegla në konsolë"
 
 # 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 "Botues, interpretues, vegla skedaresh, terminale"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr ""
+msgid "KDE Workstation"
+msgstr "Stacion punues KDE"
 
 # 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 ""
+"Mjedisi i Tryezës K, dhe grafiku basic, i mjedisit me koleksionimin e veglave"
 
 # 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 "Mjedis Grafikë"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr ""
+msgid "Gnome Workstation"
+msgstr "Stacion punues Gnome"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dokumentacion"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+"Një mjedis grafikë me përdorues-miqësie, një përgjithësi e palikacioneve dhe "
+"vegla në tryezë"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Vegla në konsolë"
+msgid "Other Graphical Desktops"
+msgstr "Mjedise të Tjera Grafike në Tryezë"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr "Server i letrave Postfix, server i lajmeve Inn"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etj."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Stacion Interneti"
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+msgid "Development"
+msgstr "Zhvillim"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Stacion Multimedia"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "Biblotekë zhvilluese e C dhe C++, programe dhe skedare me përfshirje"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Konfigurim"
+msgid "Documentation"
+msgstr "Dokumentacion"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Më shumë Grafikë në Tryezë (Gnome, IceWM)"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Libra dhe Howto's për Linux dhe Software gratis"
 
 # 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 ""
-"Mjedisi i Tryezës K, dhe grafiku basic, i mjedisit me koleksionimin e veglave"
+msgid "LSB"
+msgstr "LSB"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Mjedis Grafikë"
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Bazë Standarde e Linux. Përkrahë aplikacione të pjesës së tretë"
 
 # 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 "Zhvillim"
+msgid "Web/FTP"
+msgstr "Web/FTP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -170,121 +180,114 @@ 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 "Vegla për të krijuar dhe gdhendur CD'të"
+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 "Stacion Punues në Tryezë"
+msgid "Postfix mail server, Inn news server"
+msgstr "Server i letrave Postfix, server i lajmeve 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, etj"
+msgid "Database"
+msgstr "Bazë e të dhënave"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Programe grafike sikur Gimpi"
+msgid "PostgreSQL or MySQL database server"
+msgstr "Server PostgreSQL apo MySQL i bazës së të dhënave"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "DNS/NIS "
-msgstr "DNS/NIS "
+msgid "Firewall/Router"
+msgstr "Murë-i-Zjarrtë/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 "Biblotekë zhvilluese e C dhe C++, programe dhe skedare me përfshirje"
+msgid "Internet gateway"
+msgstr "Portë kaluese Interneti"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Srever Rrjeti"
+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 "Server i Emrit (DNS) dhe Server i Informacionit (NIS)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Stacion Lojërash"
+msgid "Network Computer server"
+msgstr "Server Kompjuter Rrjeti"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Lexues dhe botues video"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "Server NFS, server SMB, server Proxy, server ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Graphics"
-msgstr "Multimedia - Grafikët"
+msgid "Office"
+msgstr "Tryezë"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Programe ahengi: lojë arkade, lojë me stenda, strategjike, etj"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr ""
+"Përdorues të veglave për letra, lajme, web, trasferim të skedareve dhe 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 ""
-"Përgjithësia a veglave për leximin, dërgimin e letrave elektronike të "
-"lajmeve (pine, mutt, tin...) dhe për të lundruar në internet."
+msgid "Multimedia - Graphics"
+msgstr "Multimedia - Grafikët"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "Qeverisje e Financave"
+msgid "Graphics programs such as The Gimp"
+msgstr "Programe grafike sikur 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 ""
-"Një mjedis grafikë me përdorues-miqësie, një përgjithësi e palikacioneve dhe "
-"vegla në tryezë"
+msgid "Multimedia - Sound"
+msgstr "Multimedia - Zëri"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Klient për protokole të ndryshme me përfshirje të ssh"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "Vegla audio: lexues mp3 apo midi, mikserë, etj."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
+msgid "Multimedia - Video"
+msgstr "Multimedia - Video"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Portë Kaluese Internet"
+msgid "Video players and editors"
+msgstr "Lexues dhe botues për video"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Programe për lojëra/botime të zërit dhe videos"
+msgid "Multimedia - CD Burning"
+msgstr "Multimedia - Gdhendës CD"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Mjedise të Tjera Grafike"
+msgid "Tools to create and burn CD's"
+msgstr "Vegla për të krijuar dhe gdhendur CD'të"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Botues, interpretues, vegla skedaresh, terminale"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Më shumë Grafikë në Tryezë (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 "Programe për të qeverisur financat tuaja, sikur gnucash"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etj."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -293,11 +296,16 @@ msgstr "Qeverisje e Infomacioneve Personale"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multimedia - Gdhendës CD"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Vegla për Palm Pilotin tuaj apo Visor"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Aplikacion Shkencor"
+msgid "Personal Finance"
+msgstr "Financat Personale"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Programs to manage your finances, such as gnucash"
+msgstr "Programe për të qeverisur financat tuaja, sikur gnucash"
 
diff --git a/po/sr.po b/po/sr.po
index 833d3025..a9b5f588 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2003-01-30 11:22+0100\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\n"
 "PO-Revision-Date: 2003-02-02 21:33+0100\n"
 "Last-Translator: Toma Jankovic_<tomaja@net.yu>\n"
 "Language-Team: Serbian <i18n@mandrake.co.yu>\n"
@@ -15,453 +15,627 @@ 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 "Ne mogu da napravim medijum."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Da li je U redu da nastavim?"
 
-#: ../edit-urpm-sources.pl_.c:44
-msgid "Unable to update medium; it will be automatically disabled."
-msgstr "Ne mogu da a¾uriram medijum; 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 operativni sistem je do¹ao sa nekoliko hiljada paketa\n"
+"sa programima, na CD-u ili DVD-u. Ovaj alat æe Vam pomoæi da izaberete\n"
+"pakete koje ¾elite da instalirate na Va¹ raèunar."
 
-#: ../edit-urpm-sources.pl_.c:54
-msgid "Add a source"
-msgstr "Dodaj 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 vam mo¾e pomoæi da izabete nove verzije paketa koje ¾elite da "
+"instalirate na\n"
+"va¹ raèunar."
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Local files"
-msgstr "Lokalni fajlovi"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to the software removal tool!\n"
+"\n"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
+msgstr ""
+"Dobrodo¹li u program za uklanjanje softvera!\n"
+"\n"
+"Ovaj alat vam mo¾e pomoæi da izaberete softver ¾elite da uklonite sa\n"
+"va¹eg raèunara."
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Path:"
-msgstr "Putanja:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"Nai¹ao sam na problem prilikom uklanjanja paketa:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:56
-msgid "FTP server"
-msgstr "FTP server"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during removal"
+msgstr "Problem prilikom uklanjanja"
 
-#: ../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 "Molim Vas saèekajte, uklanjam pakete..."
 
-#: ../edit-urpm-sources.pl_.c:57
-msgid "HTTP server"
-msgstr "HTTP server"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
+msgstr "Molim vas saèekajte, uèitavam bazu podataka o paketima..."
 
-#: ../edit-urpm-sources.pl_.c:58
-msgid "Path or mount point:"
-msgstr "Putanja ili taèka montiranja:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Nai¹ao sam na problem tokom instaliranja:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:58
-msgid "Removable device"
-msgstr "Prenosni ureðaj"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during installation"
+msgstr "Problem za vreme instaliranja"
 
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:550
-msgid "Security updates"
-msgstr "Sigurnosne nadogradnje"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
+msgstr "Sve je veæ instalirano (da li je ovo uop¹te trebalo da se dogodi?)."
 
-#: ../edit-urpm-sources.pl_.c:70
-msgid "Browse..."
-msgstr "Tra¾i..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed."
+msgstr "Sve je veæ instalirano."
 
-#: ../edit-urpm-sources.pl_.c:72
-msgid "Choose a mirror..."
-msgstr "Izaberite svoj miror sajt..."
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "Svi paketi, koji ste zahtevali, su uspe¹no instalirani."
 
-#: ../edit-urpm-sources.pl_.c:92
-msgid "Login:"
-msgstr "Prijava:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr "Sve je dobro instalirano"
 
-#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:231
-msgid "Password:"
-msgstr "Lozinka:"
+#: ../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 gotova, %s.\n"
+"\n"
+"Napravio sam neke fajlove sa pode¹avanjima, primer `.rpmnew' ili `."
+"rpmsave',\n"
+"mo¾ete da ih proverite kako bi ste ne¹to preduzeli:"
 
-#: ../edit-urpm-sources.pl_.c:97
-msgid "Name:"
-msgstr "Ime:"
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "svi paketi su dobro instalirani"
 
-#: ../edit-urpm-sources.pl_.c:99 ../edit-urpm-sources.pl_.c:188
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Relativna putanja ka synthesis/hdlist:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"some packages failed to install\n"
+"correctly"
+msgstr ""
+"neki paketi se nisu ispravno\n"
+"instalirati"
 
-#: ../edit-urpm-sources.pl_.c:107
-msgid "You need to fill up at least the two first entries."
-msgstr "Morate da popunite najmanje prva dva polja."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages to allow others to be upgraded..."
+msgstr "Molim Vas saèekajte, uklanjam pakete da bih omoguæio drugih paketa..."
 
-#: ../edit-urpm-sources.pl_.c:120
-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 uspela, neki fajlovi nedostaju.\n"
+"Mo¾da bi trebalo da a¾urirate bazu paketa."
 
-#: ../edit-urpm-sources.pl_.c:121
-msgid "Type of source:"
-msgstr "Tip izvora:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation failed"
+msgstr "Instalacija neuspela"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
+msgstr "Odustani"
 
-#: ../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 "U redu"
 
-#: ../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 "Odustani"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Ubacite medijum sa imenom \"%s\" u ureðaj [%s]"
 
-#: ../edit-urpm-sources.pl_.c:147
-msgid "Please wait, adding medium..."
-msgstr "Molimo Vas da saèekate, dodajem medijum..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr "Promeni medijum"
 
-#: ../edit-urpm-sources.pl_.c:168
-msgid "Please wait, removing medium..."
-msgstr "Molimo Vas da saèekate, uklanjam medijum..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
+msgstr "Ne mogu da dobavim izvorne pakete, ¾ao mi je."
 
-#: ../edit-urpm-sources.pl_.c:181
-msgid "Edit a source"
-msgstr "Izmeni izvor"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages."
+msgstr "Ne mogu da dobavim izvorne pakete."
 
-#: ../edit-urpm-sources.pl_.c:185
+#: ../rpmdrake:1
 #, c-format
-msgid "Editing source \"%s\":"
-msgstr "Menjam izvor \"%s\":"
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr "Nedostaje potrebni program (grpmi). Proverite svoju instalaciju."
 
-#: ../edit-urpm-sources.pl_.c:191
-msgid "Save changes"
-msgstr "Saèuvaj izmene"
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
+msgstr "Program nedostaje"
 
-#: ../edit-urpm-sources.pl_.c:200
-msgid "You need to insert the medium to continue"
-msgstr "Morate da ubacite medijum kako bi ste nastavili"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
+msgstr "Proveri..."
 
-#: ../edit-urpm-sources.pl_.c:201
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "Da bi ste saèuvali izmene, morate da ubacite medijum u ureðaj."
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation finished"
+msgstr "Instalacija gotova"
 
-#: ../edit-urpm-sources.pl_.c:206
-msgid "Please wait, updating medium..."
-msgstr "Molim Vas saèekajte, a¾uriram medijum..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
+msgstr "Ne radi ni¹ta"
 
-#: ../edit-urpm-sources.pl_.c:217
-msgid "Configure proxies"
-msgstr "Pode¹avanje proksija"
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
+msgstr "Koristi %s kao glavni fajl"
 
-#: ../edit-urpm-sources.pl_.c:223
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
-msgstr ""
-"Ako Vam je potrebna proksi, unesite ime domaæina i neobavezni port "
-"(sintaksa: <proksi-domacin[:port]>):"
+#: ../rpmdrake:1
+#, c-format
+msgid "Remove .%s"
+msgstr "Ukloni: %s"
 
-#: ../edit-urpm-sources.pl_.c:225
-msgid "Proxy hostname:"
-msgstr "Ime proksi domaæina(hostname):"
+#: ../rpmdrake:1
+#, c-format
+msgid "changes:"
+msgstr "izmene:"
 
-#: ../edit-urpm-sources.pl_.c:227
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "Mo¾ete da podesite korisnika/lozinku za identifikaciju proksija:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr "Proveravam %s"
 
-#: ../edit-urpm-sources.pl_.c:229
-msgid "User:"
-msgstr "Korisnik:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, finding available packages..."
+msgstr "Molim Vas saèekajte, pronalazim dostupne pakete..."
 
-#: ../edit-urpm-sources.pl_.c:255
-msgid "Configure sources"
-msgstr "Pode¹avanje izvora"
+#: ../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 ""
+"Pojavila se gre¹ka tokom poku¹aja da se a¾urira medij preko urpmi.\n"
+"\n"
+"Ovo je usledilo mo¾da usled prekida ili trenutne nedostupnosti mirora, ili "
+"va¹a\n"
+"Mandrake Linux verzija (%s) jo¹ nije / nije vi¹e podr¾aana od strane "
+"Mandrake Linux\n"
+"Official Updates.\n"
+"\n"
+"Da li ¾elite da probate sa drugim mirorom?"
 
-#: ../edit-urpm-sources.pl_.c:262
-msgid "Enabled?"
-msgstr "Ukljuèi?"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
+msgstr "Gre¹ka prilikom dodavanja medijuma sa nadogradnjom"
 
-#: ../edit-urpm-sources.pl_.c:263
-msgid "Source"
-msgstr "Izvor"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
+msgstr ""
+"Molim Vas saèekajte, kontaktiram miror sajt radi iniciranja a¾uriranja "
+"paketa."
 
-#: ../edit-urpm-sources.pl_.c:286 ../rpmdrake_.c:732
-msgid "Remove"
-msgstr "Ukloni"
+#: ../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 izabrati ¾eljeni miror sajt i ruèno: da bi to uradili,\n"
+"pokrenite Menad¾er Softvera, a zatim dodajte `Security\n"
+"updates' izvor.\n"
+"\n"
+"Zatim, restarujte MandrakeUpdate."
 
-#: ../edit-urpm-sources.pl_.c:288
-msgid "Edit"
-msgstr "Izmeni"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Kako ruèno izabrati svoj miror sajt"
 
-#: ../edit-urpm-sources.pl_.c:290
-msgid "Add..."
-msgstr "Dodaj..."
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
+msgstr ""
+"Pojavila sa nepopravljiva gre¹ka tokom a¾uriranja informacija o paketima."
 
-#: ../edit-urpm-sources.pl_.c:292
-msgid "Update..."
-msgstr "A¾uriraj..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
+msgstr "Gre¹ka pri a¾uriranju medijuma"
 
-#: ../edit-urpm-sources.pl_.c:293
-msgid "Proxy..."
-msgstr "Proksi..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
+msgstr ""
+"Molim Vas saèekajte, uspostavljam vezu sa miror sajtom radi informacije o "
+"a¾uriranim paketima."
 
-#: ../edit-urpm-sources.pl_.c:296
-msgid "Save and quit"
-msgstr "Saèuvaj 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 ""
+"Ja ¾elim da posetim miror radi dobavljanja najnovijih verzija paketa.\n"
+"Proverite da li je va¹a konekcija funkcionalna i uspostavljena.\n"
+"\n"
+"Da li je U redu da nastavim?"
 
-#: ../edit-urpm-sources.pl_.c:297 ../rpmdrake_.c:735
-msgid "Quit"
-msgstr "Kraj"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Installation"
+msgstr "Instalacija paketa"
 
-#: ../rpmdrake.pm_.c:96
-msgid "Yes"
-msgstr "Da"
+#: ../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 "Uklanjanje paketa"
 
-#: ../rpmdrake.pm_.c:130
-msgid "Info..."
-msgstr "Informacije..."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Kraj"
 
-#: ../rpmdrake.pm_.c:183
-msgid "Austria"
-msgstr "Austrija"
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "Instaliraj"
 
-#: ../rpmdrake.pm_.c:184
-msgid "Australia"
-msgstr "Australija"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "Ukloni"
 
-#: ../rpmdrake.pm_.c:185
-msgid "Belgium"
-msgstr "Belgija"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search"
+msgstr "Tra¾i"
 
-#: ../rpmdrake.pm_.c:186
-msgid "Brazil"
-msgstr "Brazil"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "Pronaði: "
 
-#: ../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 ""
+"SledeKji paketi treba da budu uklonjeni da bi se drugi instalirali:\n"
+"\n"
+"%s\n"
+"\n"
+"da li je U redu da nastavim?"
 
-#: ../rpmdrake.pm_.c:188
-msgid "Costa Rica"
-msgstr "Kostarika"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "Neki paketi moraju da se uklone"
 
-#: ../rpmdrake.pm_.c:189
-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 ""
 
-#: ../rpmdrake.pm_.c:190
-msgid "Germany"
-msgstr "Nemaèka"
+#: ../rpmdrake:1
+#, c-format
+msgid "Too many packages are selected"
+msgstr "Izabrali ste previ¹e paketa"
 
-#: ../rpmdrake.pm_.c:191
-msgid "Danmark"
-msgstr "Danska"
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
+msgstr "Potpuna informacija"
 
-#: ../rpmdrake.pm_.c:192 ../rpmdrake.pm_.c:196
-msgid "Greece"
-msgstr "Grèka"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal information"
+msgstr "Normalana informacija"
 
-#: ../rpmdrake.pm_.c:193
-msgid "Spain"
-msgstr "©panija"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update source(s)"
+msgstr "A¾uriranje izvora"
 
-#: ../rpmdrake.pm_.c:194
-msgid "Finland"
-msgstr "Finska"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reload the packages list"
+msgstr "Ponovo uèitaj listu paketa"
 
-#: ../rpmdrake.pm_.c:195
-msgid "France"
-msgstr "Francuska"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
+msgstr "Ponovo izaberi"
 
-#: ../rpmdrake.pm_.c:197
-msgid "Israel"
-msgstr "Izrael"
+#: ../rpmdrake:1
+#, c-format
+msgid "in files"
+msgstr "u fajlovima"
 
-#: ../rpmdrake.pm_.c:198
-msgid "Italy"
-msgstr "Italija"
+#: ../rpmdrake:1
+#, c-format
+msgid "in descriptions"
+msgstr "u opisima"
 
-#: ../rpmdrake.pm_.c:199
-msgid "Japan"
-msgstr "Japan"
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
+msgstr "u imenima"
 
-#: ../rpmdrake.pm_.c:200
-msgid "Korea"
-msgstr "Koreja"
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
+msgstr "po dostupnosti"
 
-#: ../rpmdrake.pm_.c:201
-msgid "Netherlands"
-msgstr "Holandija"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
+msgstr "po stanju izvornog koda"
 
-#: ../rpmdrake.pm_.c:202
-msgid "Norway"
-msgstr "Norve¹ka"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
+msgstr "po izabranosti"
 
-#: ../rpmdrake.pm_.c:203
-msgid "Poland"
-msgstr "Poljska"
+#: ../rpmdrake:1
+#, c-format
+msgid "by size"
+msgstr "po velièini"
 
-#: ../rpmdrake.pm_.c:204
-msgid "Portugal"
-msgstr "Portugal"
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
+msgstr "po grupi"
 
-#: ../rpmdrake.pm_.c:205
-msgid "Russia"
-msgstr "Rusija"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages,"
+msgstr "Svi paketi,"
 
-#: ../rpmdrake.pm_.c:206
-msgid "Sweden"
-msgstr "©vedska"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
+msgstr "Svi paketi, po abecedi"
 
-#: ../rpmdrake.pm_.c:207
-msgid "Taiwan"
-msgstr "Tajvan"
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
+msgstr "Mandrake-ov izbor"
 
-#: ../rpmdrake.pm_.c:208
-msgid "United Kingdom"
-msgstr "Ujedinjeno Kraljevstvo"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal updates"
+msgstr "Obiène nadogradnje"
 
-#: ../rpmdrake.pm_.c:209
-msgid "China"
-msgstr "Kina"
+#: ../rpmdrake:1
+#, c-format
+msgid "Bugfixes updates"
+msgstr "Nadogradnje sa ispravkama"
 
-#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:211 ../rpmdrake.pm_.c:212
-#: ../rpmdrake.pm_.c:213 ../rpmdrake.pm_.c:264
-msgid "United States"
-msgstr "Sjedinjene Amerièke Dr¾ave"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
+msgstr "Sigurnosne nadogradnje"
 
-#: ../rpmdrake.pm_.c:277
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
-"Molim Vas saèekajte, skidam listu dodatnih adresa sa MandrakeSoft-ovog veb "
-"sajta."
+#: ../rpmdrake:1
+#, c-format
+msgid "Description: "
+msgstr "Opis:"
 
-#: ../rpmdrake.pm_.c:283
-msgid "Error during download"
-msgstr "Gre¹ka tokom preuzimanja sa interneta"
+#: ../rpmdrake:1
+#, c-format
+msgid "Summary: "
+msgstr "Sa¾etak: "
 
-#: ../rpmdrake.pm_.c:292
-msgid "No mirror"
-msgstr "Nema mirora"
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "Va¾nost: "
 
-#: ../rpmdrake.pm_.c:310
-msgid "Please choose the desired mirror."
-msgstr "Izaberite sajt po ¾elji."
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake.pm_.c:342 ../rpmdrake_.c:629
-msgid "Update source(s)"
-msgstr "A¾uriranje izvora"
+#: ../rpmdrake:1
+#, c-format
+msgid "Size: "
+msgstr "Velièina: "
 
-#: ../rpmdrake.pm_.c:346
-msgid "Select the source(s) you wish to update:"
-msgstr "Izaberite koje paket(e) ¾elite da a¾urirate:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Version: "
+msgstr "Verzija: "
 
-#: ../rpmdrake.pm_.c:350
-msgid "Update"
-msgstr "A¾uriranje"
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "Ime: "
 
-#: ../rpmdrake.pm_.c:360
-msgid "Please wait, updating media..."
-msgstr "Molim Vas saèekajte, a¾uriram medijum..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "Razlog a¾uriranja:"
 
-#: ../rpmdrake_.c:101
-msgid "Other"
-msgstr "Ostalo"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
+msgstr "Trenutno instalirana verzija: "
 
-#: ../rpmdrake_.c:123 ../rpmdrake_.c:137 ../rpmdrake_.c:229 ../rpmdrake_.c:300
-msgid "(none)"
-msgstr "(nijedan)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Source: "
+msgstr "Izvor: "
 
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:484 ../rpmdrake_.c:485
+#: ../rpmdrake:1
+#, c-format
 msgid "(Not available)"
 msgstr "(Nije dostupno)"
 
-#: ../rpmdrake_.c:153 ../rpmdrake_.c:210
-msgid "Search results"
-msgstr "Rezultati pretrage"
-
-#: ../rpmdrake_.c:153
-msgid "Search results (none)"
-msgstr "Rezultat pretrage (nema)"
-
-#: ../rpmdrake_.c:163 ../rpmdrake_.c:174
-msgid "Please wait, searching..."
-msgstr "Molim Vas saèekajte, tra¾im..."
-
-#: ../rpmdrake_.c:177
-msgid "Stop"
-msgstr "Stop"
-
-#: ../rpmdrake_.c:211 ../rpmdrake_.c:321
-msgid "Addable"
-msgstr "Mogu se dodati"
-
-#: ../rpmdrake_.c:211 ../rpmdrake_.c:321
-msgid "Upgradable"
-msgstr "Mogu se a¾urirati"
-
-#: ../rpmdrake_.c:213
-msgid "Not selected"
-msgstr "Nisu izabrani"
-
-#: ../rpmdrake_.c:213
-msgid "Selected"
-msgstr "Izabrani"
-
-#: ../rpmdrake_.c:242
-msgid "rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake_.c:260 ../rpmdrake_.c:362 ../rpmdrake_.c:364
-msgid "More information on package..."
-msgstr "Dodatne informacije o paketu..."
-
-#: ../rpmdrake_.c:261
-msgid "One of the following packages is needed:"
-msgstr "Jedan od sledeæih paketa je potreban:"
-
-#: ../rpmdrake_.c:261
-msgid "Please choose"
-msgstr "Izaberite"
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
+msgstr "Izmene:\n"
 
-#: ../rpmdrake_.c:277
-msgid "unknown package "
-msgstr "nepoznati paket "
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "Fajlovi:\n"
 
-#: ../rpmdrake_.c:287
-msgid "Please wait, listing packages..."
-msgstr "Molim Vas saèekajte, prikazujem pakete..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected size: %d MB"
+msgstr "Velièina izabranog: %d MB"
 
-#: ../rpmdrake_.c:302
-msgid "No update"
-msgstr "Bez a¾uriranja"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Izabrano: %d MB / Slobodan prostor na disku: %d MB"
 
-#: ../rpmdrake_.c:355 ../rpmdrake_.c:356
-msgid "More infos"
-msgstr "Vi¹e informacija"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
+msgstr ""
+"Zbog meðuzavisnosti, sledeæi paket(i) moraju\n"
+"da budu neizabrani:\n"
+"\n"
 
-#: ../rpmdrake_.c:357
-msgid "Information on packages"
-msgstr "Informacije o paketima"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+msgstr ""
+"®alim, ali sledeæi paket(i) ne mogu da budu izabrani:\n"
+"\n"
 
-#: ../rpmdrake_.c:378
-msgid "Some additional packages need to be removed"
-msgstr "Jo¹ neki paketi moraju biti uklonjeni"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "Neki paketi ne mogu da se instaliraju"
 
-#: ../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 ""
-"Da bi zadovoljili sve zavisnosti,sledeæi paket(i) bi takoðe\n"
-"trebalo da se uklone:\n"
+"Da bi zadovoljili meðuzavisnosti, sledeæi paket(i) takoðe treba\n"
+"da se instaliraju:\n"
 "\n"
 
-#: ../rpmdrake_.c:385 ../rpmdrake_.c:393
+#: ../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 "Neki paketi se ne mogu ukloniti"
 
-#: ../rpmdrake_.c:386
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -469,575 +643,604 @@ msgstr ""
 "®alim, ali uklanjanjem ovih paketa bi ste o¹tetiti sistem:\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 ""
-"Zbog meðuzavisnosti, sledeæi paket(i) moraju\n"
-"da budu neizabrani:\n"
+"Da bi zadovoljili sve zavisnosti,sledeæi paket(i) bi takoðe\n"
+"trebalo da se uklone:\n"
 "\n"
 
-#: ../rpmdrake_.c:423
-msgid "Additional packages needed"
-msgstr "Potrebni su dodatni paketi"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr "Jo¹ neki paketi moraju biti uklonjeni"
 
-#: ../rpmdrake_.c:424
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
-msgstr ""
-"Da bi zadovoljili meðuzavisnosti, sledeæi paket(i) takoðe treba\n"
-"da se instaliraju:\n"
-"\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
+msgstr "Dodatne informacije o paketu..."
 
-#: ../rpmdrake_.c:437
-msgid "Some packages can't be installed"
-msgstr "Neki paketi ne mogu da se instaliraju"
+#: ../rpmdrake:1
+#, c-format
+msgid "Information on packages"
+msgstr "Informacije o paketima"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
+msgstr "Vi¹e informacija"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Addable"
+msgstr "Mogu se dodati"
 
-#: ../rpmdrake_.c:438
+#: ../rpmdrake:1
+#, c-format
+msgid "Upgradable"
+msgstr "Mogu se a¾urirati"
+
+#: ../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, ali sledeæi paket(i) ne mogu da budu izabrani:\n"
-"\n"
+"Lista paketa za a¾uriranje nije kreirana. Ovo ili znaèi ili da nema "
+"dostupnih\n"
+"paketa za a¾uriranje za va¹ raèunar,\n"
+"ili su oni veKj instalirani."
 
-#: ../rpmdrake_.c:452 ../rpmdrake_.c:686
-msgid "Some packages need to be removed"
-msgstr "Neki paketi moraju da se uklone"
+#: ../rpmdrake:1
+#, c-format
+msgid "No update"
+msgstr "Bez a¾uriranja"
 
-#: ../rpmdrake_.c:474
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Izabrano: %d MB / Slobodan prostor na disku: %d MB"
+msgid "(none)"
+msgstr "(nijedan)"
 
-#: ../rpmdrake_.c:476
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "Velièina izabranog: %d MB"
+msgid "Please wait, listing packages..."
+msgstr "Molim Vas saèekajte, prikazujem pakete..."
 
-#: ../rpmdrake_.c:484
-msgid "Files:\n"
-msgstr "Fajlovi:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "unknown package "
+msgstr "nepoznati paket "
 
-#: ../rpmdrake_.c:485
-msgid "Changelog:\n"
-msgstr "Izmene:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Jedan od sledeæih paketa je potreban:"
 
-#: ../rpmdrake_.c:488
-msgid "Source: "
-msgstr "Izvor: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please choose"
+msgstr "Izaberite"
 
-#: ../rpmdrake_.c:489
-msgid "Currently installed version: "
-msgstr "Trenutno instalirana verzija: "
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:493
-msgid "Reason for update: "
-msgstr "Razlog a¾uriranja:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Not selected"
+msgstr "Nisu izabrani"
 
-#: ../rpmdrake_.c:495
-msgid "Name: "
-msgstr "Ime: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected"
+msgstr "Izabrani"
 
-#: ../rpmdrake_.c:496
-msgid "Version: "
-msgstr "Verzija: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results"
+msgstr "Rezultati pretrage"
 
-#: ../rpmdrake_.c:497
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Stop"
+msgstr "Stop"
 
-#: ../rpmdrake_.c:497
-msgid "Size: "
-msgstr "Velièina: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, searching..."
+msgstr "Molim Vas saèekajte, tra¾im..."
 
-#: ../rpmdrake_.c:499
-msgid "Importance: "
-msgstr "Va¾nost: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
+msgstr "Rezultat pretrage (nema)"
 
-#: ../rpmdrake_.c:500
-msgid "Summary: "
-msgstr "Sa¾etak: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Ostalo"
 
-#: ../rpmdrake_.c:501
-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 izvornog koda u Paketima!\n"
+"\n"
+"Ovaj alat vam mo¾e pomoKji da podesite kod u paketima koje ¾elite da "
+"koristite\n"
+"na va¹em raèunaru. Nakon toga Kje biti spremi za instalaciju kao novi "
+"paketi\n"
+"ili za a¾uriranje starih."
 
-#: ../rpmdrake_.c:550
-msgid "Bugfixes updates"
-msgstr "Nadogradnje sa ispravkama"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Saèuvaj i izaði"
 
-#: ../rpmdrake_.c:550
-msgid "Normal updates"
-msgstr "Obiène nadogradnje"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy..."
+msgstr "Proksi..."
 
-#: ../rpmdrake_.c:569
-msgid "Mandrake choices"
-msgstr "Mandrake-ov izbor"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
+msgstr "A¾uriraj..."
 
-#: ../rpmdrake_.c:570
-msgid "All packages, alphabetical"
-msgstr "Svi paketi, po abecedi"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "Dodaj..."
 
-#: ../rpmdrake_.c:571
-msgid "All packages,"
-msgstr "Svi paketi,"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "Izmeni"
 
-#: ../rpmdrake_.c:594
-msgid "by group"
-msgstr "po grupi"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Source"
+msgstr "Izvor"
 
-#: ../rpmdrake_.c:594
-msgid "by size"
-msgstr "po velièini"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
+msgstr "Ukljuèi?"
 
-#: ../rpmdrake_.c:595
-msgid "by selection state"
-msgstr "po izabranosti"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure sources"
+msgstr "Pode¹avanje izvora"
 
-#: ../rpmdrake_.c:596
-msgid "by source repository"
-msgstr "po stanju izvornog koda"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "Lozinka:"
 
-#: ../rpmdrake_.c:596
-msgid "by update availability"
-msgstr "po dostupnosti"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
+msgstr "Korisnik:"
 
-#: ../rpmdrake_.c:617
-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 da podesite korisnika/lozinku za identifikaciju proksija:"
 
-#: ../rpmdrake_.c:617
-msgid "in files"
-msgstr "u fajlovima"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "Ime proksi domaæina(hostname):"
 
-#: ../rpmdrake_.c:617
-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 potrebna proksi, unesite ime domaæina i neobavezni port "
+"(sintaksa: <proksi-domacin[:port]>):"
 
-#: ../rpmdrake_.c:628
-msgid "Reload the packages list"
-msgstr "Ponovo uèitaj listu paketa"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "Pode¹avanje proksija"
 
-#: ../rpmdrake_.c:628
-msgid "Reset the selection"
-msgstr "Ponovo izaberi"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr "Molim Vas saèekajte, a¾uriram medijum..."
 
-#: ../rpmdrake_.c:654
-msgid "Maximum information"
-msgstr "Potpuna informacija"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "Da bi ste saèuvali izmene, morate da ubacite medijum u ureðaj."
 
-#: ../rpmdrake_.c:654
-msgid "Normal information"
-msgstr "Normalana informacija"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
+msgstr "Morate da ubacite medijum kako bi ste nastavili"
 
-#: ../rpmdrake_.c:676
-msgid "Too many packages are selected"
-msgstr "Izabrali ste previ¹e paketa"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save changes"
+msgstr "Saèuvaj izmene"
 
-#: ../rpmdrake_.c:722
-msgid "Find:"
-msgstr "Pronaði: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Relativna putanja ka synthesis/hdlist:"
 
-#: ../rpmdrake_.c:727
-msgid "Search"
-msgstr "Tra¾i"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake_.c:733
-msgid "Install"
-msgstr "Instaliraj"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Editing source \"%s\":"
+msgstr "Menjam izvor \"%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 "Izmeni izvor"
 
-#: ../rpmdrake_.c:740
-msgid "Software Packages Installation"
-msgstr "Instalacija paketa"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr "Molimo Vas da saèekate, uklanjam medijum..."
 
-#: ../rpmdrake_.c:740
-msgid "Software Packages Removal"
-msgstr "Uklanjanje paketa"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, adding medium..."
+msgstr "Molimo Vas da saèekate, dodajem medijum..."
 
-#: ../rpmdrake_.c:781
-msgid "Please wait, contacting mirror to update packages information."
-msgstr ""
-"Molim Vas saèekajte, uspostavljam vezu sa miror sajtom radi informacije o "
-"a¾uriranim paketima."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of source:"
+msgstr "Tip izvora:"
 
-#: ../rpmdrake_.c:783
-msgid "Error updating medium"
-msgstr "Gre¹ka pri a¾uriranju medijuma"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Adding a source:"
+msgstr "Dodajem izvor:"
 
-#: ../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 ""
-"Pojavila sa nepopravljiva gre¹ka tokom a¾uriranja informacija o paketima."
+"VeKj postoji medij sa tim imenom, da li\n"
+"zaista ¾elite da je zamenite?"
 
-#: ../rpmdrake_.c:789
-msgid "How to choose manually your mirror"
-msgstr "Kako ruèno izabrati svoj miror sajt"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to fill up at least the two first entries."
+msgstr "Morate da popunite najmanje prva dva polja."
 
-#: ../rpmdrake_.c:797
-msgid "Please wait, contacting mirror to initialize updates packages."
-msgstr ""
-"Molim Vas saèekajte, kontaktiram miror sajt radi iniciranja a¾uriranja paketa."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "Ime:"
 
-#: ../rpmdrake_.c:800
-msgid "Error adding update medium"
-msgstr "Gre¹ka prilikom dodavanja medijuma sa nadogradnjom"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
+msgstr "Prijava:"
 
-#: ../rpmdrake_.c:831
-msgid "Please wait, finding available packages..."
-msgstr "Molim Vas saèekajte, pronalazim dostupne pakete..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Izaberite svoj miror sajt..."
 
-#: ../rpmdrake_.c:863
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Proveravam %s"
+msgid "Browse..."
+msgstr "Tra¾i..."
 
-#: ../rpmdrake_.c:882
-msgid "changes:"
-msgstr "izmene:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Putanja ili taèka montiranja:"
 
-#: ../rpmdrake_.c:886
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Ukloni: %s"
+msgid "Removable device"
+msgstr "Prenosni ureðaj"
 
-#: ../rpmdrake_.c:888
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Koristi %s kao glavni fajl"
+msgid "HTTP server"
+msgstr "HTTP server"
 
-#: ../rpmdrake_.c:890
-msgid "Do nothing"
-msgstr "Ne radi ni¹ta"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "FTP server"
 
-#: ../rpmdrake_.c:902
-msgid "Installation finished"
-msgstr "Instalacija gotova"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path:"
+msgstr "Putanja:"
 
-#: ../rpmdrake_.c:912
-msgid "Inspect..."
-msgstr "Proveri..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "Lokalni fajlovi"
 
-#: ../rpmdrake_.c:927
-msgid "Program missing"
-msgstr "Program nedostaje"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add a source"
+msgstr "Dodaj izvor"
 
-#: ../rpmdrake_.c:928
-msgid "A required program is missing (grpmi). Check your installation."
-msgstr "Nedostaje potrebni program (grpmi). Proverite svoju instalaciju."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
+msgstr "Ne mogu da a¾uriram medijum; on æe biti automatski iskljuèen."
 
-#: ../rpmdrake_.c:942
-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 da napravim medijum."
 
-#: ../rpmdrake_.c:943
-msgid "Unable to get source packages, sorry."
-msgstr "Ne mogu da dobavim izvorne pakete, ¾ao mi je."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, updating media..."
+msgstr "Molim Vas saèekajte, a¾uriram medijum..."
 
-#: ../rpmdrake_.c:950
-msgid "Change medium"
-msgstr "Promeni medijum"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
+msgstr "A¾uriranje"
 
-#: ../rpmdrake_.c:951
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Ubacite medijum sa imenom \"%s\" u ureðaj [%s]"
+msgid "Select the source(s) you wish to update:"
+msgstr "Izaberite koje paket(e) ¾elite da a¾urirate:"
 
-#: ../rpmdrake_.c:959
-msgid "Installation failed"
-msgstr "Instalacija neuspela"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please choose the desired mirror."
+msgstr "Izaberite sajt po ¾elji."
 
-#: ../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 ""
-"Instalacija nije uspela, neki fajlovi nedostaju.\n"
-"Mo¾da bi trebalo da a¾urirate bazu paketa."
+"Ne mogu da pronagjem nijedan odgovarajugji miror.\n"
+"\n"
+"Mo¾e postojati nekoliko razloga za ovaj problem; najèe¹Kji je\n"
+"sluèaj da arhitektura va¹eg procesora nije podr¾ana\n"
+"od strane Mandrake Linux Official Updates."
 
-#: ../rpmdrake_.c:963
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr "Molim Vas saèekajte, uklanjam pakete da bih omoguæio drugih paketa..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
+msgstr "Nema mirora"
 
-#: ../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 ""
-"Instalacija je gotova, %s.\n"
+"Pojavila se gre¹ka tokom download-a liste miror sajtova:\n"
 "\n"
-"Napravio sam neke fajlove sa pode¹avanjima, primer `.rpmnew' ili `.rpmsave',\n"
-"mo¾ete da ih proverite kako bi ste ne¹to preduzeli:"
+"%s\n"
+"Internet, ili MandrakeSoft-ov veb sajt mo¾da nisu trenutno dostupni.\n"
+"Poku¹ajte kasnije ponovo."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "Gre¹ka tokom preuzimanja sa interneta"
 
-#: ../rpmdrake_.c:984
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
+"Molim Vas saèekajte, skidam listu dodatnih adresa sa MandrakeSoft-ovog veb "
+"sajta."
+
+#: ../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 se nisu ispravno\n"
-"instalirati"
+"®elim da posetim MandrakeSoft veb sajt da bi dobavio listu mirora.\n"
+"Proverite da li je va¹a konekcija fukcionalna.\n"
+"\n"
+"Da li je U redu da nastavim?"
 
-#: ../rpmdrake_.c:985
-msgid "everything was installed correctly"
-msgstr "svi paketi su dobro instalirani"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United States"
+msgstr "Sjedinjene Amerièke Dr¾ave"
 
-#: ../rpmdrake_.c:987
-msgid "Everything installed successfully"
-msgstr "Sve je dobro instalirano"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
+msgstr "Kina"
 
-#: ../rpmdrake_.c:988
-msgid "All requested packages were installed successfully."
-msgstr "Svi paketi, koji ste zahtevali, su uspe¹no instalirani."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr "Ujedinjeno Kraljevstvo"
 
-#: ../rpmdrake_.c:991
-msgid "Everything already installed."
-msgstr "Sve je veæ instalirano."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "Tajvan"
 
-#: ../rpmdrake_.c:992
-msgid "Everything already installed (is this supposed to happen at all?)."
-msgstr "Sve je veæ instalirano (da li je ovo uop¹te trebalo da se dogodi?)."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "©vedska"
 
-#: ../rpmdrake_.c:999
-msgid "Problem during installation"
-msgstr "Problem za vreme instaliranja"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
+msgstr "Rusija"
 
-#: ../rpmdrake_.c:1000
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Nai¹ao sam na problem tokom instaliranja:\n"
-"\n"
-"%s"
+msgid "Portugal"
+msgstr "Portugal"
 
-#: ../rpmdrake_.c:1014
-msgid "Please wait, reading packages database..."
-msgstr "Molim vas saèekajte, uèitavam bazu podataka o paketima..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
+msgstr "Poljska"
 
-#: ../rpmdrake_.c:1055
-msgid "Please wait, removing packages..."
-msgstr "Molim Vas saèekajte, uklanjam pakete..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
+msgstr "Norve¹ka"
 
-#: ../rpmdrake_.c:1058
-msgid "Problem during removal"
-msgstr "Problem prilikom uklanjanja"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
+msgstr "Holandija"
 
-#: ../rpmdrake_.c:1059
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Nai¹ao sam na problem prilikom uklanjanja paketa:\n"
-"\n"
-"%s"
+msgid "Korea"
+msgstr "Koreja"
 
-#: ../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 ""
-"Dobrodo¹li u program za uklanjanje softvera!\n"
-"\n"
-"Ovaj alat vam mo¾e pomoæi da izaberete softver ¾elite da uklonite sa\n"
-"va¹eg raèunara."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "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 ""
-"Dobrodo¹li u MandrakeUpdate!\n"
-"\n"
-"Ovaj alat vam mo¾e pomoæi da izabete nove verzije paketa koje ¾elite da "
-"instalirate na\n"
-"va¹ raèunar."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Italy"
+msgstr "Italija"
 
-#: ../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 ""
-"Dobrodo¹li u alat za instalaciju softvera!\n"
-"\n"
-"Va¹ Mandrake Linux operativni sistem je do¹ao sa nekoliko hiljada paketa\n"
-"sa programima, na CD-u ili DVD-u. Ovaj alat æe Vam pomoæi da izaberete\n"
-"pakete koje ¾elite da instalirate 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 "Menad¾er Softverskog Koda"
+#: ../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 ""
-#~ "VeKj postoji medij sa tim imenom, da li\n"
-#~ "zaista ¾elite da je zamenite?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "©panija"
 
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-#~ "Da li je U redu 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 izvornog koda u Paketima!\n"
-#~ "\n"
-#~ "Ovaj alat vam mo¾e pomoKji da podesite kod u paketima koje ¾elite da "
-#~ "koristite\n"
-#~ "na va¹em raèunaru. Nakon toga Kje biti spremi za instalaciju kao novi "
-#~ "paketi\n"
-#~ "ili za a¾uriranje starih."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr "Nemaè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 ""
-#~ "®elim da posetim MandrakeSoft veb sajt da bi dobavio listu mirora.\n"
-#~ "Proverite da li je va¹a konekcija fukcionalna.\n"
-#~ "\n"
-#~ "Da li je U redu da nastavim?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "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 ""
-#~ "Pojavila se gre¹ka tokom download-a liste miror sajtova:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "Internet, ili MandrakeSoft-ov veb sajt mo¾da nisu trenutno dostupni.\n"
-#~ "Poku¹ajte kasnije ponovo."
+#: ../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 da pronagjem nijedan odgovarajugji miror.\n"
-#~ "\n"
-#~ "Mo¾e postojati nekoliko razloga za ovaj problem; najèe¹Kji je\n"
-#~ "sluèaj da arhitektura va¹eg procesora nije podr¾ana\n"
-#~ "od strane Mandrake Linux Official Updates."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "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 paketa za a¾uriranje nije kreirana. Ovo ili znaèi ili da nema "
-#~ "dostupnih\n"
-#~ "paketa za a¾uriranje za va¹ raèunar,\n"
-#~ "ili su oni veKj instalirani."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
+msgstr "Brazil"
 
-#~ msgid ""
-#~ "The following packages have to be removed for others to be upgraded:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "SledeKji paketi treba da budu uklonjeni da bi se drugi instalirali:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "da li je U redu da nastavim?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Belgium"
+msgstr "Belgija"
 
-#~ 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 "Australija"
 
-#~ msgid ""
-#~ "I need to contact the mirror to get latest update packages.\n"
-#~ "Please check that your network is currently running.\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "Ja ¾elim da posetim miror radi dobavljanja najnovijih verzija paketa.\n"
-#~ "Proverite da li je va¹a konekcija funkcionalna i uspostavljena.\n"
-#~ "\n"
-#~ "Da li je U redu da nastavim?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
+msgstr "Austrija"
 
-#~ msgid ""
-#~ "You may also choose your desired mirror manually: to do so,\n"
-#~ "launch the Software Sources Manager, and then add a `Security\n"
-#~ "updates' source.\n"
-#~ "\n"
-#~ "Then, restart MandrakeUpdate."
-#~ msgstr ""
-#~ "Mo¾ete izabrati ¾eljeni miror sajt i ruèno: da bi to uradili,\n"
-#~ "pokrenite Menad¾er Softvera, a zatim dodajte `Security\n"
-#~ "updates' izvor.\n"
-#~ "\n"
-#~ "Zatim, restarujte MandrakeUpdate."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Info..."
+msgstr "Informacije..."
 
-#~ 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 ""
-#~ "Pojavila se gre¹ka tokom poku¹aja da se a¾urira medij preko urpmi.\n"
-#~ "\n"
-#~ "Ovo je usledilo mo¾da usled prekida ili trenutne nedostupnosti mirora, "
-#~ "ili va¹a\n"
-#~ "Mandrake Linux verzija (%s) jo¹ nije / nije vi¹e podr¾aana od strane "
-#~ "Mandrake Linux\n"
-#~ "Official Updates.\n"
-#~ "\n"
-#~ "Da li ¾elite da probate sa drugim mirorom?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
+msgstr "Ne"
+
+#: ../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 "Menad¾er Softverskog Koda"
+
+#~ msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
+#~ msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
 
 #, fuzzy
 #~ msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
diff --git a/po/sr.pom b/po/sr.pom
index 58b85cd7..db001304 100644
--- a/po/sr.pom
+++ b/po/sr.pom
@@ -4,167 +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 "Mre¾ni kompjuter, (klijent)"
+msgid "Office Workstation"
+msgstr "Radna(Office) 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 ""
+"Office programi: tekst procesori (kword, abiword), tabele (kspread, "
+"gnumeric), pdf preglednici, itd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Office"
+msgid "Workstation"
+msgstr "Radna stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Gnome radna stanica"
+msgid "Game station"
+msgstr "Stanica za igru"
 
 # 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 Palm Pilot ili Visor"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Zabavni programi: arkade, ige na tabli, strategije, itd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Radna stanica"
+msgid "Multimedia station"
+msgstr "Multimedijalna stanica"
 
 # 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 "Programi za pu¹tanje zvuka i videa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr "Ime Domena i Mre¾ni Informacioni Server"
+msgid "Internet station"
+msgstr "Internet 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 ""
-"Office programi: tekst procesori (kword, abiword), tabele (kspread, "
-"gnumeric), pdf preglednici, itd"
+"Skup alata za èitanje i slanje el.po¹te i vesti (pine, mutt, tin..) i za "
+"pretra¾ivanje Interneta"
 
 # 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 alati: mp3 ili midi plejeri,mikseri, itd"
+msgid "Network Computer (client)"
+msgstr "Mre¾ni kompjuter, (klijent)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Paketi koju su kompatibilni sa Linux Standard Base-om"
+msgid "Clients for different protocols including ssh"
+msgstr "Klijenti za razlièite protokole ukljuèujuæi i 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 "Knjige i Kako? (Howto's) za Linux i Besplatni Softver"
+msgid "Configuration"
+msgstr "Konfiguracija"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "KDE padna stanica"
+msgid "Tools to ease the configuration of your computer"
+msgstr "Alati za lako konfigurisanje kompjutera"
 
 # 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 Workstation"
+msgstr "Nauèna radna stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Multimedija - 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 "Set alata za el.po¹tu, vesti, web, transfer datoteka, ili chat"
+msgid "Console Tools"
+msgstr "Konzolni alati"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Server,Baze podataka"
+msgid "Editors, shells, file tools, terminals"
+msgstr "editori,¹elovi, alati za datoteke, terminali"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL ili MySQL server za bazu podataka"
+msgid "KDE Workstation"
+msgstr "KDE padna stanica"
 
 # 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 konfigurisanje kompjutera"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"K Desktop okru¾enje, osnovno grafièko okru¾enje sa kolekcijom prateæih alata"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "Multimedija - Zvuk"
+msgid "Graphical Environment"
+msgstr "Grafièko Okru¾enje"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dokumentacija"
+msgid "Gnome Workstation"
+msgstr "Gnome radna stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Konzolni alati"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+"Grafièka okru¾enja za setom korisnièkNFS server, SMB server, Proxy serverNFS "
+"server, SMB server, Proxy serverih aplikacija i desktopalata"
 
 # 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 "Other Graphical Desktops"
+msgstr "Drugi grafièki desktopovi"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Internet stanica"
+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 "Multimedia station"
-msgstr "Multimedijalna stanica"
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+msgid "Development"
+msgstr "Razvojna"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Konfiguracija"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C i C++ razvojne biblioteke, programi  i propratne datoteke"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Jo¹ grafièkih okru¾enja (Gnome, IceWM)"
+msgid "Documentation"
+msgstr "Dokumentacija"
 
 # 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 okru¾enje, osnovno grafièko okru¾enje sa kolekcijom prateæih alata"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Knjige i Kako? (Howto's) za Linux i Besplatni Softver"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Grafièko Okru¾enje"
+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-ova Standardna Baza. Podr¹ka za Third party aplikaicje"
+
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-msgid "Development"
-msgstr "Razvojna"
+#: ../../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 +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 kreiranje i pr¾enje CDa"
+msgid "Mail/Groupware/News"
+msgstr "Server, El.po¹ta/Groupware/Vesti"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Radna(Office) 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 "Server,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 server za bazu podataka"
+
+# 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
@@ -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 i C++ razvojne biblioteke, programi  i propratne datoteke"
+msgid "Domain Name and Network Information Server"
+msgstr "Ime Domena i Mre¾ni Informacioni Server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -208,18 +225,18 @@ msgstr "Mre¾ni Server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "Server, El.po¹ta/Groupware/Vesti"
+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 "Office"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Video plejeri i editori"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr "Set alata za el.po¹tu, vesti, web, transfer datoteka, ili chat"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -228,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, ige na tabli, 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 el.po¹te i vesti (pine, mutt, tin..) i za "
-"pretra¾ivanje Interneta"
+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èka okru¾enja za setom korisnièkNFS server, SMB server, Proxy serverNFS "
-"server, SMB server, Proxy serverih aplikacija i desktopalata"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "Audio alati: mp3 ili midi plejeri,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 razlièite protokole ukljuèujuæi i ssh"
+msgid "Multimedia - Video"
+msgstr "Multimedija - 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 plejeri 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 - CD pr¾enje"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Programi za pu¹tanje zvuka i videa"
+msgid "Tools to create and burn CD's"
+msgstr "Alati za kreiranje i pr¾enje CDa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Drugi grafièki desktopovi"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Jo¹ grafièkih okru¾enja (Gnome, IceWM)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "editori,¹elovi, alati za datoteke, 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 privatnim informacijama"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "Upravljanje privatnim informacijama"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Alati za Palm Pilot ili 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 "Liène finansije"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Nauèna 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/sv.po b/po/sv.po
index 52c51a0f..94f3a2b6 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-sv\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-01 14:54+0100\n"
 "Last-Translator: Mattias Newzella <newzella@linux.nu>\n"
 "Language-Team: svenska <sv@li.org>\n"
@@ -18,450 +18,594 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 
-#: ../edit-urpm-sources.pl_.c:43
-msgid "Unable to create medium."
-msgstr "Kan inte skapa media."
+#: ../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 "Kan inte uppdatera media; det kommer att inaktiveras automatiskt."
+#: ../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älkommen till verktyget för programinstallation!\n"
+"\n"
+"Mandrake Linux-systemet distribueras med flera tusen programpaket\n"
+"på cd-rom eller dvd. Det här verktyget hjälper dig att välja vilka program\n"
+"du vill installera på datorn."
 
-#: ../edit-urpm-sources.pl_.c:54
-msgid "Add a source"
-msgstr "Lägg till en källa"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Välkommen till MandrakeUpdate!\n"
+"\n"
+"Det här verktyget hjälper dig att välja uppdateringarna du vill\n"
+"installera på datorn."
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Local files"
-msgstr "Lokala 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 ""
+"Välkommen till verktyget för borttag av paket!\n"
+"\n"
+"Det här verktyget hjälper dig att välja vilka program du vill ta bort från\n"
+"datorn."
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Path:"
-msgstr "Sökväg:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"Det uppstod ett problem vid borttag av paket:\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 vid borttag"
 
-#: ../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 "Vänta, tar bort paket..."
 
-#: ../edit-urpm-sources.pl_.c:57
-msgid "HTTP server"
-msgstr "HTTP-server"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
+msgstr "Vänta, läser paketdatabas..."
 
-#: ../edit-urpm-sources.pl_.c:58
-msgid "Path or mount point:"
-msgstr "Sökväg eller monteringspunkt:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Det uppstod ett problem under installationen:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:58
-msgid "Removable device"
-msgstr "Flyttbar enhet"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during installation"
+msgstr "Problem under installation"
 
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:550
-msgid "Security updates"
-msgstr "Säkerhetsuppdateringar"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
+msgstr "Allt är redan installerat (ska detta hända över huvud taget?)."
 
-#: ../edit-urpm-sources.pl_.c:70
-msgid "Browse..."
-msgstr "Bläddra..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed."
+msgstr "Allt är redan installerat."
 
-#: ../edit-urpm-sources.pl_.c:72
-msgid "Choose a mirror..."
-msgstr "Välj en spegel..."
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "Alla begärda paket installerades utan problem."
 
-#: ../edit-urpm-sources.pl_.c:92
-msgid "Login:"
-msgstr "Användarnamn:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr "Allt installerades utan problem"
 
-#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:231
-msgid "Password:"
-msgstr "Lösenord:"
+#: ../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 är slutförd; %s.\n"
+"\n"
+"Några konfigurationsfiler skapades som \".rpmnew\" eller \".rpmsave\",\n"
+"du kan nu undersöka några för att vidta åtgärder:"
 
-#: ../edit-urpm-sources.pl_.c:97
-msgid "Name:"
-msgstr "Namn:"
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "allt installerades utan problem"
 
-#: ../edit-urpm-sources.pl_.c:99 ../edit-urpm-sources.pl_.c:188
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Relativ sökväg till synthesis eller hdlist:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"some packages failed to install\n"
+"correctly"
+msgstr ""
+"vissa paket kan inte installeras\n"
+"korrekt"
 
-#: ../edit-urpm-sources.pl_.c:107
-msgid "You need to fill up at least the two first entries."
-msgstr "Du måste fylla i åtminstone de två första posterna."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages to allow others to be upgraded..."
+msgstr "Vänta , tar bort paket för att andra ska kunna uppdateras..."
 
-#: ../edit-urpm-sources.pl_.c:120
-msgid "Adding a source:"
-msgstr "Lägger till en källa:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
+msgstr ""
+"Installationen misslyckades, vissa filer saknas.\n"
+"Du kanske ska uppdatera din källdatabas."
 
-#: ../edit-urpm-sources.pl_.c:121
-msgid "Type of source:"
-msgstr "Typ av källa:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation failed"
+msgstr "Installationen misslyckades"
 
-#: ../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 "Avbryt"
+
+#: ../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 "Avbryt"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Lägg i media med namn \"%s\" i enhet [%s]"
 
-#: ../edit-urpm-sources.pl_.c:147
-msgid "Please wait, adding medium..."
-msgstr "Vänta, lägger till media..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr "Byt media"
 
-#: ../edit-urpm-sources.pl_.c:168
-msgid "Please wait, removing medium..."
-msgstr "Vänta, tar bort media..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
+msgstr "Kunde inte hämta källpaket."
 
-#: ../edit-urpm-sources.pl_.c:181
-msgid "Edit a source"
-msgstr "Redigera en källa"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages."
+msgstr "Kunde inte hämta källpaket."
 
-#: ../edit-urpm-sources.pl_.c:185
+#: ../rpmdrake:1
 #, c-format
-msgid "Editing source \"%s\":"
-msgstr "Redigerar källa \"%s\":"
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr "Ett program (grpmi) som krävs saknas. Kontrollera installationen."
 
-#: ../edit-urpm-sources.pl_.c:191
-msgid "Save changes"
-msgstr "Spara ändringar"
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
+msgstr "Program saknas"
 
-#: ../edit-urpm-sources.pl_.c:200
-msgid "You need to insert the medium to continue"
-msgstr "Du måste lägga i mediet för att fortsätta"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
+msgstr "Undersök..."
 
-#: ../edit-urpm-sources.pl_.c:201
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "För att kunna spara ändringarna måste du lägga i mediet i enheten."
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation finished"
+msgstr "Installation slutförd"
 
-#: ../edit-urpm-sources.pl_.c:206
-msgid "Please wait, updating medium..."
-msgstr "Vänta, uppdaterar media..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
+msgstr "Gör ingenting"
 
-#: ../edit-urpm-sources.pl_.c:217
-msgid "Configure proxies"
-msgstr "Anpassa proxy"
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
+msgstr "Använd .%s som huvudfil"
 
-#: ../edit-urpm-sources.pl_.c:223
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
-msgstr ""
-"Om du behöver en proxy, ange värddatornamnet och en valfi port (syntax: "
-"<proxyhost[:port]>):"
+#: ../rpmdrake:1
+#, c-format
+msgid "Remove .%s"
+msgstr "Ta bort .%s"
 
-#: ../edit-urpm-sources.pl_.c:225
-msgid "Proxy hostname:"
-msgstr "Proxyvärddatornamn:"
+#: ../rpmdrake:1
+#, c-format
+msgid "changes:"
+msgstr "ändringar:"
 
-#: ../edit-urpm-sources.pl_.c:227
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "Du kan specificera ett användarnamn/lösenord för proxyautentiseringen:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr "Undersöker %s"
 
-#: ../edit-urpm-sources.pl_.c:229
-msgid "User:"
-msgstr "Användare:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, finding available packages..."
+msgstr "Vänta, hittar tillgängliga paket..."
 
-#: ../edit-urpm-sources.pl_.c:255
-msgid "Configure sources"
-msgstr "Anpassa källor"
+#: ../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 "Aktiverad?"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
+msgstr "Fel vid tillägg av uppdateringsmedia"
 
-#: ../edit-urpm-sources.pl_.c:263
-msgid "Source"
-msgstr "Källa"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
+msgstr "Vänta, kontaktar spegel för att initiera uppdateringspaket."
 
-#: ../edit-urpm-sources.pl_.c:286 ../rpmdrake_.c:732
-msgid "Remove"
-msgstr "Ta bort"
+#: ../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 "Redigera"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Hur du manuellt väljer en spegel"
 
-#: ../edit-urpm-sources.pl_.c:290
-msgid "Add..."
-msgstr "Lägg till..."
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
+msgstr ""
+"Ett fel som ej kan återställas uppstod under uppdatering av paketinformation."
 
-#: ../edit-urpm-sources.pl_.c:292
-msgid "Update..."
-msgstr "Uppdatera..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
+msgstr "Fel vid uppdatering av media"
 
-#: ../edit-urpm-sources.pl_.c:293
-msgid "Proxy..."
-msgstr "Proxy..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
+msgstr "Vänta, kontaktar spegel för att uppdatera paketinformation."
 
-#: ../edit-urpm-sources.pl_.c:296
-msgid "Save and quit"
-msgstr "Spara och avsluta"
+#: ../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 "Avsluta"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Installation"
+msgstr "Paketinstallation"
 
-#: ../rpmdrake.pm_.c:96
-msgid "Yes"
-msgstr "Ja"
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, c-format
+msgid "Mandrake Update"
+msgstr "Uppdatera Mandrake"
 
-#: ../rpmdrake.pm_.c:98
-msgid "No"
-msgstr "Nej"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
+msgstr "Paketborttag"
 
-#: ../rpmdrake.pm_.c:130
-msgid "Info..."
-msgstr "Information..."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Avsluta"
 
-#: ../rpmdrake.pm_.c:183
-msgid "Austria"
-msgstr "Österrike"
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "Installera"
 
-#: ../rpmdrake.pm_.c:184
-msgid "Australia"
-msgstr "Australien"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "Ta bort"
 
-#: ../rpmdrake.pm_.c:185
-msgid "Belgium"
-msgstr "Belgien"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search"
+msgstr "Sök"
 
-#: ../rpmdrake.pm_.c:186
-msgid "Brazil"
-msgstr "Brasilien"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "Hitta:"
 
-#: ../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 ""
 
-#: ../rpmdrake.pm_.c:188
-msgid "Costa Rica"
-msgstr "Costa Rica"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "Vissa paket måste tas bort"
 
-#: ../rpmdrake.pm_.c:189
-msgid "Czech Republic"
-msgstr "Tjeckien"
+#: ../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 "Tyskland"
+#: ../rpmdrake:1
+#, c-format
+msgid "Too many packages are selected"
+msgstr "För många paket är valda"
 
-#: ../rpmdrake.pm_.c:191
-msgid "Danmark"
-msgstr "Danmark"
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
+msgstr "Maximal information"
 
-#: ../rpmdrake.pm_.c:192 ../rpmdrake.pm_.c:196
-msgid "Greece"
-msgstr "Grekland"
+#: ../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 "Uppdatera källor"
 
-#: ../rpmdrake.pm_.c:194
-msgid "Finland"
-msgstr "Finland"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reload the packages list"
+msgstr "Ladda om paketlistan"
 
-#: ../rpmdrake.pm_.c:195
-msgid "France"
-msgstr "Frankrike"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
+msgstr "Återställ valet"
 
-#: ../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 beskrivningar"
 
-#: ../rpmdrake.pm_.c:199
-msgid "Japan"
-msgstr "Japan"
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
+msgstr "i namn"
 
-#: ../rpmdrake.pm_.c:200
-msgid "Korea"
-msgstr "Korea"
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
+msgstr "efter uppdateringstillgänglighet"
 
-#: ../rpmdrake.pm_.c:201
-msgid "Netherlands"
-msgstr "Nederländerna"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
+msgstr "efter källagringsplats"
 
-#: ../rpmdrake.pm_.c:202
-msgid "Norway"
-msgstr "Norge"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
+msgstr "efter valstatus"
 
-#: ../rpmdrake.pm_.c:203
-msgid "Poland"
-msgstr "Polen"
+#: ../rpmdrake:1
+#, c-format
+msgid "by size"
+msgstr "efter storlek"
 
-#: ../rpmdrake.pm_.c:204
-msgid "Portugal"
-msgstr "Portugal"
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
+msgstr "efter grupp"
 
-#: ../rpmdrake.pm_.c:205
-msgid "Russia"
-msgstr "Ryssland"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages,"
+msgstr "Alla paket,"
 
-#: ../rpmdrake.pm_.c:206
-msgid "Sweden"
-msgstr "Sverige"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
+msgstr "Alla paket, alfabetiskt"
 
-#: ../rpmdrake.pm_.c:207
-msgid "Taiwan"
-msgstr "Taiwan"
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
+msgstr "Mandrake-val"
 
-#: ../rpmdrake.pm_.c:208
-msgid "United Kingdom"
-msgstr "Storbritannien"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal updates"
+msgstr "Normala uppdateringar"
 
-#: ../rpmdrake.pm_.c:209
-msgid "China"
-msgstr "Kina"
+#: ../rpmdrake:1
+#, c-format
+msgid "Bugfixes updates"
+msgstr "Felrättningsuppdateringar"
 
-#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:211 ../rpmdrake.pm_.c:212
-#: ../rpmdrake.pm_.c:213 ../rpmdrake.pm_.c:264
-msgid "United States"
-msgstr "Amerikas förenta stater"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
+msgstr "Säkerhetsuppdateringar"
 
-#: ../rpmdrake.pm_.c:277
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr "Vänta, laddar ner spegeladresser från MandrakeSofts webbplats."
+#: ../rpmdrake:1
+#, c-format
+msgid "Description: "
+msgstr "Beskrivning: "
 
-#: ../rpmdrake.pm_.c:283
-msgid "Error during download"
-msgstr "Fel under nerladdning"
+#: ../rpmdrake:1
+#, c-format
+msgid "Summary: "
+msgstr "Sammanfattning: "
 
-#: ../rpmdrake.pm_.c:292
-msgid "No mirror"
-msgstr "Ingen spegel"
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "Viktighet: "
 
-#: ../rpmdrake.pm_.c:310
-msgid "Please choose the desired mirror."
-msgstr "Välj önskad spegel."
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake.pm_.c:342 ../rpmdrake_.c:629
-msgid "Update source(s)"
-msgstr "Uppdatera källor"
+#: ../rpmdrake:1
+#, c-format
+msgid "Size: "
+msgstr "Storlek: "
 
-#: ../rpmdrake.pm_.c:346
-msgid "Select the source(s) you wish to update:"
-msgstr "Välj källan/källorna du vill uppdatera:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Version: "
+msgstr "Version: "
 
-#: ../rpmdrake.pm_.c:350
-msgid "Update"
-msgstr "Uppdatera"
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "Namn: "
 
-#: ../rpmdrake.pm_.c:360
-msgid "Please wait, updating media..."
-msgstr "Vänta, uppdaterar media..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "Orsak för uppdatering: "
 
-#: ../rpmdrake_.c:101
-msgid "Other"
-msgstr "Annan"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
+msgstr "Installerad version: "
 
-#: ../rpmdrake_.c:123 ../rpmdrake_.c:137 ../rpmdrake_.c:229 ../rpmdrake_.c:300
-msgid "(none)"
-msgstr "(inget)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Source: "
+msgstr "Källa: "
 
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:484 ../rpmdrake_.c:485
+#: ../rpmdrake:1
+#, c-format
 msgid "(Not available)"
 msgstr "(Ingen tillgänglig)"
 
-#: ../rpmdrake_.c:153 ../rpmdrake_.c:210
-msgid "Search results"
-msgstr "Sökresultat"
-
-#: ../rpmdrake_.c:153
-msgid "Search results (none)"
-msgstr "Sökresultat (inget)"
-
-#: ../rpmdrake_.c:163 ../rpmdrake_.c:174
-msgid "Please wait, searching..."
-msgstr "Vänta, söker..."
-
-#: ../rpmdrake_.c:177
-msgid "Stop"
-msgstr "Stoppa"
-
-#: ../rpmdrake_.c:211 ../rpmdrake_.c:321
-msgid "Addable"
-msgstr "Kan läggas till"
-
-#: ../rpmdrake_.c:211 ../rpmdrake_.c:321
-msgid "Upgradable"
-msgstr "Kan uppdateras"
-
-#: ../rpmdrake_.c:213
-msgid "Not selected"
-msgstr "Inte vald"
-
-#: ../rpmdrake_.c:213
-msgid "Selected"
-msgstr "Vald"
-
-#: ../rpmdrake_.c:242
-msgid "rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake_.c:260 ../rpmdrake_.c:362 ../rpmdrake_.c:364
-msgid "More information on package..."
-msgstr "Mer information om paket..."
-
-#: ../rpmdrake_.c:261
-msgid "One of the following packages is needed:"
-msgstr "Ett av följande paket krävs:"
-
-#: ../rpmdrake_.c:261
-msgid "Please choose"
-msgstr "Välj"
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
+msgstr "Ändringslogg:\n"
 
-#: ../rpmdrake_.c:277
-msgid "unknown package "
-msgstr "okänt paket "
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "Filer:\n"
 
-#: ../rpmdrake_.c:287
-msgid "Please wait, listing packages..."
-msgstr "Vänta, listar paket..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected size: %d MB"
+msgstr "Vald storlek: %d MB"
 
-#: ../rpmdrake_.c:302
-msgid "No update"
-msgstr "Ingen uppdatering"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Valda: %d MB / ledigt diskutrymme: %d MB"
 
-#: ../rpmdrake_.c:355 ../rpmdrake_.c:356
-msgid "More infos"
-msgstr "Mer information"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
+msgstr ""
+"På grund av deras beroenden måste följande paket\n"
+"avmarkeras:\n"
+"\n"
 
-#: ../rpmdrake_.c:357
-msgid "Information on packages"
-msgstr "Information om paket"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+msgstr ""
+"Följande paket kan inte väljas:\n"
+"\n"
 
-#: ../rpmdrake_.c:378
-msgid "Some additional packages need to be removed"
-msgstr "Några ytterligare paket måste tas bort"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "Vissa paket kan inte installeras"
 
-#: ../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 av deras beroenden måste följande paket också tas bort:\n"
+"För att uppfylla beroenden måste följande paket också installeras:\n"
 "\n"
 
-#: ../rpmdrake_.c:385 ../rpmdrake_.c:393
+#: ../rpmdrake:1
+#, c-format
+msgid "Additional packages needed"
+msgstr "Ytterligare paket krävs"
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "Vissa paket kan inte tas bort"
 
-#: ../rpmdrake_.c:386
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -469,417 +613,563 @@ msgstr ""
 "Om du tar bort dessa paket kommer systemet att sluta fungera:\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 av deras beroenden måste följande paket\n"
-"avmarkeras:\n"
+"På grund av deras beroenden måste följande paket också tas bort:\n"
 "\n"
 
-#: ../rpmdrake_.c:423
-msgid "Additional packages needed"
-msgstr "Ytterligare paket krävs"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr "Några ytterligare paket måste tas bort"
 
-#: ../rpmdrake_.c:424
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
-msgstr ""
-"För att uppfylla beroenden måste följande paket också installeras:\n"
-"\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
+msgstr "Mer information om paket..."
 
-#: ../rpmdrake_.c:437
-msgid "Some packages can't be installed"
-msgstr "Vissa paket kan inte installeras"
+#: ../rpmdrake:1
+#, c-format
+msgid "Information on packages"
+msgstr "Information om paket"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
+msgstr "Mer information"
 
-#: ../rpmdrake_.c:438
+#: ../rpmdrake:1
+#, c-format
+msgid "Addable"
+msgstr "Kan läggas till"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Upgradable"
+msgstr "Kan uppdateras"
+
+#: ../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 ""
-"Följande paket kan inte väljas:\n"
-"\n"
 
-#: ../rpmdrake_.c:452 ../rpmdrake_.c:686
-msgid "Some packages need to be removed"
-msgstr "Vissa paket måste tas bort"
+#: ../rpmdrake:1
+#, c-format
+msgid "No update"
+msgstr "Ingen uppdatering"
 
-#: ../rpmdrake_.c:474
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Valda: %d MB / ledigt diskutrymme: %d MB"
+msgid "(none)"
+msgstr "(inget)"
 
-#: ../rpmdrake_.c:476
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "Vald storlek: %d MB"
+msgid "Please wait, listing packages..."
+msgstr "Vänta, listar paket..."
 
-#: ../rpmdrake_.c:484
-msgid "Files:\n"
-msgstr "Filer:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "unknown package "
+msgstr "okänt paket "
 
-#: ../rpmdrake_.c:485
-msgid "Changelog:\n"
-msgstr "Ändringslogg:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Ett av följande paket krävs:"
 
-#: ../rpmdrake_.c:488
-msgid "Source: "
-msgstr "Källa: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please choose"
+msgstr "Välj"
 
-#: ../rpmdrake_.c:489
-msgid "Currently installed version: "
-msgstr "Installerad version: "
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:493
-msgid "Reason for update: "
-msgstr "Orsak för uppdatering: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Not selected"
+msgstr "Inte vald"
 
-#: ../rpmdrake_.c:495
-msgid "Name: "
-msgstr "Namn: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected"
+msgstr "Vald"
 
-#: ../rpmdrake_.c:496
-msgid "Version: "
-msgstr "Version: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results"
+msgstr "Sökresultat"
 
-#: ../rpmdrake_.c:497
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Stop"
+msgstr "Stoppa"
 
-#: ../rpmdrake_.c:497
-msgid "Size: "
-msgstr "Storlek: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, searching..."
+msgstr "Vänta, söker..."
 
-#: ../rpmdrake_.c:499
-msgid "Importance: "
-msgstr "Viktighet: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
+msgstr "Sökresultat (inget)"
 
-#: ../rpmdrake_.c:500
-msgid "Summary: "
-msgstr "Sammanfattning: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Annan"
 
-#: ../rpmdrake_.c:501
-msgid "Description: "
-msgstr "Beskrivning: "
+#: ../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 "Felrättningsuppdateringar"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Spara och avsluta"
 
-#: ../rpmdrake_.c:550
-msgid "Normal updates"
-msgstr "Normala uppdateringar"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy..."
+msgstr "Proxy..."
 
-#: ../rpmdrake_.c:569
-msgid "Mandrake choices"
-msgstr "Mandrake-val"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
+msgstr "Uppdatera..."
 
-#: ../rpmdrake_.c:570
-msgid "All packages, alphabetical"
-msgstr "Alla paket, alfabetiskt"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "Lägg till..."
 
-#: ../rpmdrake_.c:571
-msgid "All packages,"
-msgstr "Alla paket,"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "Redigera"
 
-#: ../rpmdrake_.c:594
-msgid "by group"
-msgstr "efter grupp"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Source"
+msgstr "Källa"
 
-#: ../rpmdrake_.c:594
-msgid "by size"
-msgstr "efter storlek"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
+msgstr "Aktiverad?"
 
-#: ../rpmdrake_.c:595
-msgid "by selection state"
-msgstr "efter valstatus"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure sources"
+msgstr "Anpassa källor"
 
-#: ../rpmdrake_.c:596
-msgid "by source repository"
-msgstr "efter källagringsplats"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "Lösenord:"
 
-#: ../rpmdrake_.c:596
-msgid "by update availability"
-msgstr "efter uppdateringstillgänglighet"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
+msgstr "Användare:"
 
-#: ../rpmdrake_.c:617
-msgid "in descriptions"
-msgstr "i beskrivningar"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Du kan specificera ett användarnamn/lösenord för proxyautentiseringen:"
 
-#: ../rpmdrake_.c:617
-msgid "in files"
-msgstr "i filer"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "Proxyvärddatornamn:"
 
-#: ../rpmdrake_.c:617
-msgid "in names"
-msgstr "i namn"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"Om du behöver en proxy, ange värddatornamnet och en valfi port (syntax: "
+"<proxyhost[:port]>):"
 
-#: ../rpmdrake_.c:628
-msgid "Reload the packages list"
-msgstr "Ladda om paketlistan"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "Anpassa proxy"
 
-#: ../rpmdrake_.c:628
-msgid "Reset the selection"
-msgstr "Återställ valet"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr "Vänta, uppdaterar media..."
 
-#: ../rpmdrake_.c:654
-msgid "Maximum information"
-msgstr "Maximal 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 "För att kunna spara ändringarna måste du lägga i mediet i enheten."
 
-#: ../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 måste lägga i mediet för att fortsätta"
 
-#: ../rpmdrake_.c:676
-msgid "Too many packages are selected"
-msgstr "För många paket är valda"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save changes"
+msgstr "Spara ändringar"
 
-#: ../rpmdrake_.c:722
-msgid "Find:"
-msgstr "Hitta:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Relativ sökväg till synthesis eller hdlist:"
 
-#: ../rpmdrake_.c:727
-msgid "Search"
-msgstr "Sök"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake_.c:733
-msgid "Install"
-msgstr "Installera"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Editing source \"%s\":"
+msgstr "Redigerar källa \"%s\":"
 
-#: ../rpmdrake_.c:740 data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrake Update"
-msgstr "Uppdatera Mandrake"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit a source"
+msgstr "Redigera en källa"
 
-#: ../rpmdrake_.c:740
-msgid "Software Packages Installation"
-msgstr "Paketinstallation"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr "Vänta, tar bort media..."
 
-#: ../rpmdrake_.c:740
-msgid "Software Packages Removal"
-msgstr "Paketborttag"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, adding medium..."
+msgstr "Vänta, lägger till media..."
 
-#: ../rpmdrake_.c:781
-msgid "Please wait, contacting mirror to update packages information."
-msgstr "Vänta, kontaktar spegel för att uppdatera paketinformation."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of source:"
+msgstr "Typ av källa:"
 
-#: ../rpmdrake_.c:783
-msgid "Error updating medium"
-msgstr "Fel vid uppdatering av media"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Adding a source:"
+msgstr "Lägger till en källa:"
 
-#: ../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 ""
-"Ett fel som ej kan återställas uppstod under uppdatering av paketinformation."
 
-#: ../rpmdrake_.c:789
-msgid "How to choose manually your mirror"
-msgstr "Hur du manuellt väljer en spegel"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to fill up at least the two first entries."
+msgstr "Du måste fylla i åtminstone de två första posterna."
 
-#: ../rpmdrake_.c:797
-msgid "Please wait, contacting mirror to initialize updates packages."
-msgstr "Vänta, kontaktar spegel för att initiera uppdateringspaket."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "Namn:"
 
-#: ../rpmdrake_.c:800
-msgid "Error adding update medium"
-msgstr "Fel vid tillägg av uppdateringsmedia"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
+msgstr "Användarnamn:"
 
-#: ../rpmdrake_.c:831
-msgid "Please wait, finding available packages..."
-msgstr "Vänta, hittar tillgängliga paket..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Välj en spegel..."
 
-#: ../rpmdrake_.c:863
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Undersöker %s"
+msgid "Browse..."
+msgstr "Bläddra..."
 
-#: ../rpmdrake_.c:882
-msgid "changes:"
-msgstr "ändringar:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Sökväg eller monteringspunkt:"
 
-#: ../rpmdrake_.c:886
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Ta bort .%s"
+msgid "Removable device"
+msgstr "Flyttbar enhet"
 
-#: ../rpmdrake_.c:888
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Använd .%s som huvudfil"
+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 "Installation slutförd"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path:"
+msgstr "Sökväg:"
 
-#: ../rpmdrake_.c:912
-msgid "Inspect..."
-msgstr "Undersök..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "Lokala filer"
 
-#: ../rpmdrake_.c:927
-msgid "Program missing"
-msgstr "Program saknas"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add a source"
+msgstr "Lägg till en källa"
 
-#: ../rpmdrake_.c:928
-msgid "A required program is missing (grpmi). Check your installation."
-msgstr "Ett program (grpmi) som krävs saknas. Kontrollera installationen."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
+msgstr "Kan inte uppdatera media; det kommer att inaktiveras automatiskt."
 
-#: ../rpmdrake_.c:942
-msgid "Unable to get source packages."
-msgstr "Kunde inte hämta källpaket."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "Kan inte skapa media."
 
-#: ../rpmdrake_.c:943
-msgid "Unable to get source packages, sorry."
-msgstr "Kunde inte hämta källpaket."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, updating media..."
+msgstr "Vänta, uppdaterar media..."
 
-#: ../rpmdrake_.c:950
-msgid "Change medium"
-msgstr "Byt media"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
+msgstr "Uppdatera"
 
-#: ../rpmdrake_.c:951
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Lägg i media med namn \"%s\" i enhet [%s]"
+msgid "Select the source(s) you wish to update:"
+msgstr "Välj källan/källorna du vill uppdatera:"
 
-#: ../rpmdrake_.c:959
-msgid "Installation failed"
-msgstr "Installationen misslyckades"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please choose the desired mirror."
+msgstr "Välj önskad spegel."
 
-#: ../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 misslyckades, vissa filer saknas.\n"
-"Du kanske ska uppdatera din källdatabas."
 
-#: ../rpmdrake_.c:963
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr "Vänta , tar bort paket för att andra ska kunna uppdateras..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
+msgstr "Ingen spegel"
 
-#: ../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 är slutförd; %s.\n"
-"\n"
-"Några konfigurationsfiler skapades som \".rpmnew\" eller \".rpmsave\",\n"
-"du kan nu undersöka några för att vidta åtgärder:"
 
-#: ../rpmdrake_.c:984
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "Fel under nerladdning"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "Vänta, laddar ner spegeladresser från MandrakeSofts webbplats."
+
+#: ../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 ""
-"vissa paket kan inte installeras\n"
-"korrekt"
 
-#: ../rpmdrake_.c:985
-msgid "everything was installed correctly"
-msgstr "allt installerades utan problem"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United States"
+msgstr "Amerikas förenta stater"
 
-#: ../rpmdrake_.c:987
-msgid "Everything installed successfully"
-msgstr "Allt installerades utan problem"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
+msgstr "Kina"
 
-#: ../rpmdrake_.c:988
-msgid "All requested packages were installed successfully."
-msgstr "Alla begärda paket installerades utan problem."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr "Storbritannien"
 
-#: ../rpmdrake_.c:991
-msgid "Everything already installed."
-msgstr "Allt är redan installerat."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "Taiwan"
 
-#: ../rpmdrake_.c:992
-msgid "Everything already installed (is this supposed to happen at all?)."
-msgstr "Allt är redan installerat (ska detta hända över huvud taget?)."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "Sverige"
 
-#: ../rpmdrake_.c:999
-msgid "Problem during installation"
-msgstr "Problem under installation"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
+msgstr "Ryssland"
 
-#: ../rpmdrake_.c:1000
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Det uppstod ett problem under installationen:\n"
-"\n"
-"%s"
+msgid "Portugal"
+msgstr "Portugal"
 
-#: ../rpmdrake_.c:1014
-msgid "Please wait, reading packages database..."
-msgstr "Vänta, läser paketdatabas..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
+msgstr "Polen"
 
-#: ../rpmdrake_.c:1055
-msgid "Please wait, removing packages..."
-msgstr "Vänta, tar bort paket..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
+msgstr "Norge"
 
-#: ../rpmdrake_.c:1058
-msgid "Problem during removal"
-msgstr "Problem vid borttag"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
+msgstr "Nederländerna"
 
-#: ../rpmdrake_.c:1059
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Det uppstod ett problem vid borttag av paket:\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älkommen till verktyget för borttag av paket!\n"
-"\n"
-"Det här verktyget hjälper dig att välja vilka program du vill ta bort från\n"
-"datorn."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "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 ""
-"Välkommen till MandrakeUpdate!\n"
-"\n"
-"Det här verktyget hjälper dig att välja uppdateringarna du vill\n"
-"installera på datorn."
+#: ../rpmdrake.pm:1
+#, 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 ""
-"Välkommen till verktyget för programinstallation!\n"
-"\n"
-"Mandrake Linux-systemet distribueras med flera tusen programpaket\n"
-"på cd-rom eller dvd. Det här verktyget hjälper dig att välja vilka program\n"
-"du vill installera på datorn."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Israel"
+msgstr "Israel"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Grekland"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "France"
+msgstr "Frankrike"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "Finland"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "Spanien"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
+msgstr "Danmark"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr "Tyskland"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
+msgstr "Tjeckien"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Costa Rica"
+msgstr "Costa Rica"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Canada"
+msgstr "Kanada"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
+msgstr "Brasilien"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Belgium"
+msgstr "Belgien"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Australia"
+msgstr "Australien"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
+msgstr "Österrike"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Info..."
+msgstr "Information..."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
+msgstr "Nej"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Ja"
+
+#: data/rpmdrake.desktop.in.h:1
+msgid "Install Software"
+msgstr "Installera program"
 
 #: data/rpmdrake-remove.desktop.in.h:1
 msgid "Remove Software"
@@ -888,7 +1178,3 @@ msgstr "Ta bort program"
 #: data/rpmdrake-sources.desktop.in.h:1
 msgid "Software Sources Manager"
 msgstr "Programhanterare för källor"
-
-#: data/rpmdrake.desktop.in.h:1
-msgid "Install Software"
-msgstr "Installera program"
diff --git a/po/sv.pom b/po/sv.pom
index b590d1f5..fdff210d 100644
--- a/po/sv.pom
+++ b/po/sv.pom
@@ -4,168 +4,174 @@ msgstr "Server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Webb/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Nätverksdator (klient)"
+msgid "Office Workstation"
+msgstr "Kontorsarbetsstation"
 
 # 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, Proxyserver, SSH-server"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Kontorsprogram: ordbehandlare (Kword, Abiword), kalkylprogram (Kspread, "
+"Gnumeric), PDF-visare, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Kontor"
+msgid "Workstation"
+msgstr "Arbetsstation"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Gnome-arbetsstation"
+msgid "Game station"
+msgstr "Spelstation"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Verktyg för Palm Pilot eller Visor"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Underhållande program: arkad, brädspel, strategi, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Arbetsstation"
+msgid "Multimedia station"
+msgstr "Multimediastation"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Brandvägg/Router"
+msgid "Sound and video playing/editing programs"
+msgstr "Redigerings- och uppspelningsprogram för video och ljud"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr "Domännamns- och Network Information-Server"
+msgid "Internet station"
+msgstr "Internetstation"
 
 # 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 ""
-"Kontorsprogram: ordbehandlare (Kword, Abiword), kalkylprogram (Kspread, "
-"Gnumeric), PDF-visare, etc"
+"En samling verktyg för att läsa och skicka e-post och nyheter (Pine, Mutt, "
+"Tin...) och för att utforska 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 "Ljudrelaterade verktyg: MP3- eller Midi-spelare, mixrar, etc"
+msgid "Network Computer (client)"
+msgstr "Nätverksdator (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. Stöd för tredjepartsprogram"
+msgid "Clients for different protocols including ssh"
+msgstr "Klienter för olika protokoll inkluderande 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öcker och \"Howto's\" om Linux och fri mjukvara"
+msgid "Configuration"
+msgstr "Konfiguration"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "KDE-arbetsstation"
+msgid "Tools to ease the configuration of your computer"
+msgstr "Verktyg för att underlätta konfigurationen av datorn"
 
 # 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 "Vetenskaplig arbetsstation"
 
 # 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 ""
-"En samling verktyg för e-post, diskussioner, webb, filöverföring och chatt"
+msgid "Console Tools"
+msgstr "Konsollverktyg"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Databas"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Editorer, skal, filverktyg, terminaler"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL- eller MySQL-databasserver"
+msgid "KDE Workstation"
+msgstr "KDE-arbetsstation"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Verktyg för att underlätta konfigurationen av datorn"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"K Desktop Environment, den grundläggande grafiska miljön med en samling "
+"tillhörande verktyg"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "Multimedia - Ljud"
+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-arbetsstation"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Konsollverktyg"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+"Grafisk miljö med en samling användarvänliga program och skrivbordsverktyg"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr "E-postservern Postfix, Diskussionsgruppsservern Inn"
+msgid "Other Graphical Desktops"
+msgstr "Andra grafiska skrivbordsmiljöer"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Internetstation"
+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 "Multimediastation"
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+msgid "Development"
+msgstr "Utveckling"
 
 # 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 "Utvecklingsbibliotek, program och include-filer för C och C++"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Fler grafiska skrivbordsmiljö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 Environment, den grundläggande grafiska miljön med en samling "
-"tillhörande verktyg"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Böcker och \"Howto's\" om Linux och fri mjukvara"
 
 # 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. Stöd för tredjepartsprogram"
+
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-msgid "Development"
-msgstr "Utveckling"
+#: ../../share/compssUsers:999
+msgid "Web/FTP"
+msgstr "Webb/FTP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -174,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 "Verktyg för att skapa och bränna cd-skivor"
+msgid "Mail/Groupware/News"
+msgstr "E-post/Grupprogram/Diskussioner"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Kontorsarbetsstation"
+msgid "Postfix mail server, Inn news server"
+msgstr "E-postservern Postfix, Diskussionsgruppsservern 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 "Databas"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Grafiska program som till exempel Gimp"
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL- eller MySQL-databasserver"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Firewall/Router"
+msgstr "Brandvägg/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 +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 "Utvecklingsbibliotek, program och include-filer för C och C++"
+msgid "Domain Name and Network Information Server"
+msgstr "Domännamns- och Network Information-Server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -209,18 +225,19 @@ msgstr "Nätverksserver"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "E-post/Grupprogram/Diskussioner"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS-server, SMB-server, Proxyserver, SSH-server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Spelstation"
+msgid "Office"
+msgstr "Kontor"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Videospelare och editorer"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr ""
+"En samling verktyg för e-post, diskussioner, webb, filöverföring och chatt"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -229,78 +246,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 "Underhållande program: arkad, brädspel, 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 ""
-"En samling verktyg för att läsa och skicka e-post och nyheter (Pine, Mutt, "
-"Tin...) och för att utforska Internet"
+msgid "Graphics programs such as The Gimp"
+msgstr "Grafiska program som till exempel Gimp"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "Personlig ekonomi"
+msgid "Multimedia - Sound"
+msgstr "Multimedia - Ljud"
 
 # 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 miljö med en samling användarvänliga program och skrivbordsverktyg"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "Ljudrelaterade verktyg: MP3- eller Midi-spelare, mixrar, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Klienter för olika protokoll inkluderande 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 "Videospelare och editorer"
 
 # 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-bränning"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Redigerings- och uppspelningsprogram för video och ljud"
+msgid "Tools to create and burn CD's"
+msgstr "Verktyg för att skapa och bränna cd-skivor"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Andra grafiska skrivbordsmiljöer"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Fler grafiska skrivbordsmiljöer (Gnome, IceWM)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Editorer, skal, filverktyg, 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 "Program för att hantera din ekonomi, som till exempel Gnucash"
+msgid "Personal Information Management"
+msgstr "Personlig informationshantering (PIM)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "Personlig informationshantering (PIM)"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Verktyg för Palm Pilot eller Visor"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multimedia - cd-bränning"
+msgid "Personal Finance"
+msgstr "Personlig ekonomi"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Vetenskaplig arbetsstation"
+msgid "Programs to manage your finances, such as gnucash"
+msgstr "Program för att hantera din ekonomi, som till exempel Gnucash"
 
diff --git a/po/ta.po b/po/ta.po
index e983e367..d59fe7c4 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.0\n"
-"POT-Creation-Date: 2003-02-12 14:24+0100\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\n"
 "PO-Revision-Date: 2002-09-06 00:31+0800\n"
 "Last-Translator: prabu anand <prabu_anand2000@yahoo.com>\n"
 "Language-Team: ta <ta@li.org>\n"
@@ -14,451 +14,621 @@ 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 "ஊடகத�ைத உர�வாக�க ம�டியவில�ைல"
+#: ../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:44
-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"
+"இக�கர�வி மூலம� தேவையான  ெமன�ெபார�ளை உங�கள� கணினியில�\n"
+"நிற�வ ம�டிய�ம�"
 
-#: ../edit-urpm-sources.pl_.c:54
-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:55
-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:55
-msgid "Path:"
-msgstr "பாதை:"
+# c-format
+#: ../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:56
-msgid "FTP server"
-msgstr "FTP பாிமாறி"
+#: ../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:"
-msgstr "URL:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages..."
+msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�...பொதிகள� நீக�கப�பட�கின�றன..."
 
-#: ../edit-urpm-sources.pl_.c:57
-msgid "HTTP server"
-msgstr "HTTP பாிமாறி"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
+msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�...பொதித� தரவ� வாசிக�கப�பட�கிறத�..."
 
-#: ../edit-urpm-sources.pl_.c:58
-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:58
-msgid "Removable device"
-msgstr "கழற�ற� சாதனங�கள�"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during installation"
+msgstr "நிற�வ�தலில� பிழை நேர�ந�த�ள�ளத�"
 
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:550
-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:70
-msgid "Browse..."
-msgstr "ேமலோட�..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed."
+msgstr "அனைத�த�ம� �ற�கனவே நிற�வப�பட�ட�விட�டத�"
 
-#: ../edit-urpm-sources.pl_.c:72
-msgid "Choose a mirror..."
-msgstr "அர�கில� உள�ள இணைப�பதிப�ைப தேர�வ�ச� செய�..."
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "நீங�கள� கேட�ட அனைத�த� பொதிகள�ம� வெற�றிகரமாக நிற�வப�பட�டத�"
 
-#: ../edit-urpm-sources.pl_.c:92
-msgid "Login:"
-msgstr "பயனர�கணக�க�"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr "அனைத�த�ம� வெற�றிகரமாக நிற�வப�பட�ட�ள�ளத�"
 
-#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:231
-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:97
-msgid "Name:"
-msgstr "பெயர�:"
+#: ../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:"
-msgstr "synthesis/hdlist ேகாப�ப�களின� சார�ப� பாதை"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"some packages failed to install\n"
+"correctly"
+msgstr ""
+"சில பொதிகளை சரியாக நிற�வ \n"
+"ம�டியவில�ைல"
 
-#: ../edit-urpm-sources.pl_.c:107
-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:120
-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:121
-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: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
+#: ../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:953
-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:147
-msgid "Please wait, adding medium..."
-msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�.... ப�திய ஊடகம� சேர�க�கப�பட�கிறத�"
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr "ஊடகத�ைத மாற�றவ�ம�"
 
-#: ../edit-urpm-sources.pl_.c:168
-msgid "Please wait, removing medium..."
-msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�.... ஊடகம� நீக�கப�பட�கிறத�"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
+msgstr "மூலப� பொதிகள� கிடைக�கவில�ைல மன�னிக�கவ�ம�"
 
-#: ../edit-urpm-sources.pl_.c:181
-msgid "Edit a source"
-msgstr "மூலத�ைத திர�த�தி அமை"
+#: ../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\":"
-msgstr "\"%s\": என�ற மூலத�ைத திர�த�தியமை"
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr "தேவையான நிரல� இல�ைல.உங�கள� நிற�வல� சரியாக உள�ளதா என பார�க�கவ�ம�"
 
-#: ../edit-urpm-sources.pl_.c:191
-msgid "Save changes"
-msgstr "மாற�றங�களை சேமி"
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
+msgstr "நிரல� இல�ைல"
 
-#: ../edit-urpm-sources.pl_.c:200
-msgid "You need to insert the medium to continue"
-msgstr "தொடர�ந�த� செல�ல நீங�கள� ஊடகத�ைத உள�ளீட� செய�ய வேண�ட�ம�"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
+msgstr "சோதிக�கப�பட�கிறத�..."
 
-#: ../edit-urpm-sources.pl_.c:201
-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:206
-msgid "Please wait, updating medium..."
-msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�.... ஊடகம� ப�த�ப�பிக�கப�பட�கிறத�"
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
+msgstr "ஒன�ற�ம� செய�யாதே"
 
-#: ../edit-urpm-sources.pl_.c:217
-msgid "Configure proxies"
-msgstr "பினாமிகளை வடிவமை"
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
+msgstr ".%s என�பதை ம�க�கிய கோப�பாக பயன�பட�த�த�"
 
-#: ../edit-urpm-sources.pl_.c:223
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
-msgstr ""
-"உங�கள�க�க� பினாமி தேவைப�பட�டால�, பினாமியின�  பயனர� பெயரைய�ம� த�றையைய�ம� கொட�க�கவ�ம�"
-"(மாதிரி: <proxyhost[:port]>):"
+#: ../rpmdrake:1
+#, c-format
+msgid "Remove .%s"
+msgstr "நீக�க�  .%s"
 
-#: ../edit-urpm-sources.pl_.c:225
-msgid "Proxy hostname:"
-msgstr "பினாமியின� பெயர�"
+#: ../rpmdrake:1
+#, c-format
+msgid "changes:"
+msgstr "மாற�றங�கள�:"
 
-#: ../edit-urpm-sources.pl_.c:227
-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:229
-msgid "User:"
-msgstr "பயனர�:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, finding available packages..."
+msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�..இர�க�க�ம� பொதிகளை கண�ட�பிடிக�கப� பட�கிறத�"
 
-#: ../edit-urpm-sources.pl_.c:255
-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"
+"ஒர�வேளை மாண�ட�ேரக� லினக�ஸ� வெளியீட� (%s)இத�வரை/இனிமேல� ஆதரிக�கப�ட மாட�டாத�\n"
+"இணையத�தில� www.google.com சென�ற� தேடி\n"
+"பார�ங�கள�\n"
+"\n"
+"மற�ற இணைப� பதிப�பில� ம�யற�சி செய�த� பார�ங�கள�"
 
-#: ../edit-urpm-sources.pl_.c:262
-msgid "Enabled?"
-msgstr "ெசயல�பட�த�தப�பட�ட�ள�ளதா?"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
+msgstr "ப�த�ப�பித�தல�ல� ஊடகத�தில� பிழை நேர�ந�த�ள�ளத�"
 
-#: ../edit-urpm-sources.pl_.c:263
-msgid "Source"
-msgstr "மூலம�"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
+msgstr ""
+"தயவ�செய�த� காத�திர�க�கவ�ம�...இைணப�பதிப�ேபாட� தொடர�ப� கொன�ட� "
+"ப�த�ப�பித�தல� ெதாடங�கப�பட�கிறத�"
 
-#: ../edit-urpm-sources.pl_.c:286 ../rpmdrake_.c:732
-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 "உங�கள� இணை பதிப�ைப எப�படித� தேர�வ�ச� செய�வத�"
 
-#: ../edit-urpm-sources.pl_.c:288
-msgid "Edit"
-msgstr "தொக�"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "உங�கள� இணைபதிப�ைப ைகம�ைறயாக எப�படித� தேர�வ�ச� செய�வத�"
 
-#: ../edit-urpm-sources.pl_.c:290
-msgid "Add..."
-msgstr "சேர�..."
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
+msgstr "ஊடக விவர ப�த�ப�பித�தலின�ேபாத� சரிசெய�ய ம�டியாத பிழை நேர�ந�த�ள�ளத�"
 
-#: ../edit-urpm-sources.pl_.c:292
-msgid "Update..."
-msgstr "ப�த�ப�பிக�கவ�ம�..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
+msgstr "ஊடக ப�த�ப�பித�தலில� பிழை நேர�ந�த�ள�ளத�"
 
-#: ../edit-urpm-sources.pl_.c:293
-msgid "Proxy..."
-msgstr "பினாமி..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
+msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�...இணைப�பதிப�ேபாட� தொடர�ப� கொன�ட�ள�ளத�"
 
-#: ../edit-urpm-sources.pl_.c:296
-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:297 ../rpmdrake_.c:735
-msgid "Quit"
-msgstr "ெவளிச�ெசல�"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Installation"
+msgstr "ெமன�ெபார�ள� நிற�வல�"
 
-#: ../rpmdrake.pm_.c:96
-msgid "Yes"
-msgstr "ஆம�"
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, c-format
+msgid "Mandrake Update"
+msgstr "மாண�ட�ேரக� ப�த�ப�பித�தல�"
 
-#: ../rpmdrake.pm_.c:98
-msgid "No"
-msgstr "இல�ைல"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
+msgstr "ெமன�ெபார�ள� நீக�கம�"
 
-#: ../rpmdrake.pm_.c:130
-msgid "Info..."
-msgstr "தகவல�..."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "ெவளிச�ெசல�"
 
-#: ../rpmdrake.pm_.c:183
-msgid "Austria"
-msgstr "ஆஸ�திரியா"
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "நிற�வ�"
 
-#: ../rpmdrake.pm_.c:184
-msgid "Australia"
-msgstr "ஆஸ�திரேலியா"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "நீக�க�"
 
-#: ../rpmdrake.pm_.c:185
-msgid "Belgium"
-msgstr "பெல�ஜியம�"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search"
+msgstr "தேட�"
 
-#: ../rpmdrake.pm_.c:186
-msgid "Brazil"
-msgstr "பிரேசில�"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "கண�ட�பிடி:"
 
-#: ../rpmdrake.pm_.c:187
-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:188
-msgid "Costa Rica"
-msgstr "கோஸ�டா ரிகா"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "சில பொதிகள� நீக�கப�படவேண�ட�ம�"
 
-#: ../rpmdrake.pm_.c:189
-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"
+"நீங�கள� இந�த எச�சரிக�கையை மீறி இவை அனைத�ைதய�ம� நிற�வ விர�ம�ப�கிறீர�களா?"
 
-#: ../rpmdrake.pm_.c:190
-msgid "Germany"
-msgstr "ெஜர�மனி"
+#: ../rpmdrake:1
+#, c-format
+msgid "Too many packages are selected"
+msgstr "அளவ�க�கதிகமான பொதிகள� தேர�வ� செய�யப�பட�ட�ள�ளத�"
 
-#: ../rpmdrake.pm_.c:191
-msgid "Danmark"
-msgstr "டென�மார�க�"
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
+msgstr "அதிகபட�ச விவரம�"
 
-#: ../rpmdrake.pm_.c:192 ../rpmdrake.pm_.c:196
-msgid "Greece"
-msgstr "கிரேக�கம�"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal information"
+msgstr "சாதரன விவரம�"
 
-#: ../rpmdrake.pm_.c:193
-msgid "Spain"
-msgstr "ஸ�ெபயின�"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update source(s)"
+msgstr "ப�த�ப�பிக�கப�பட வேண�டிய மூல(ங�கள�)"
 
-#: ../rpmdrake.pm_.c:194
-msgid "Finland"
-msgstr "பின�லாந�த�"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reload the packages list"
+msgstr "பொதிகளின� பட�டியலை மீலேற�றவ�ம�"
 
-#: ../rpmdrake.pm_.c:195
-msgid "France"
-msgstr "பிரான�ஸ�"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
+msgstr "தேர�வ�களை மறந�த� விட�"
 
-#: ../rpmdrake.pm_.c:197
-msgid "Israel"
-msgstr "இஸ�ேரல�"
+#: ../rpmdrake:1
+#, c-format
+msgid "in files"
+msgstr "கோப�ப�களில�"
 
-#: ../rpmdrake.pm_.c:198
-msgid "Italy"
-msgstr "இத�தாலி"
+#: ../rpmdrake:1
+#, c-format
+msgid "in descriptions"
+msgstr "விளக�கங�களில� "
 
-#: ../rpmdrake.pm_.c:199
-msgid "Japan"
-msgstr "ஜப�பான�"
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
+msgstr "பெயர�களில�"
 
-#: ../rpmdrake.pm_.c:200
-msgid "Korea"
-msgstr "கொரியா"
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
+msgstr "ப�த�ப�பிக�கப�பட வேண�டியவையின�படி"
 
-#: ../rpmdrake.pm_.c:201
-msgid "Netherlands"
-msgstr "நெதர�லாந�த�"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
+msgstr "மூலங�களின� இர�ப�ப�ப�படி"
 
-#: ../rpmdrake.pm_.c:202
-msgid "Norway"
-msgstr "நார�ேவ"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
+msgstr "தேர�வாகிய�ள�ளபடி"
 
-#: ../rpmdrake.pm_.c:203
-msgid "Poland"
-msgstr "போலாந�த�"
+#: ../rpmdrake:1
+#, c-format
+msgid "by size"
+msgstr "அளவ�ப�படி"
 
-#: ../rpmdrake.pm_.c:204
-msgid "Portugal"
-msgstr "போர�ச�கல�"
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
+msgstr "க�ழ�ப�படி"
 
-#: ../rpmdrake.pm_.c:205
-msgid "Russia"
-msgstr "ரஷ�யா"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages,"
+msgstr "அனைத�த� பொதிகள�ம�"
 
-#: ../rpmdrake.pm_.c:206
-msgid "Sweden"
-msgstr "ச�விடன�"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
+msgstr "அனைத�த� பொதிகள�ம�,அகர வரிசைப�படி"
 
-#: ../rpmdrake.pm_.c:207
-msgid "Taiwan"
-msgstr "தைவான�"
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
+msgstr "மாண�ட�ேரக� தேர�வ�கள�"
 
-#: ../rpmdrake.pm_.c:208
-msgid "United Kingdom"
-msgstr "பிரிட�டன�"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal updates"
+msgstr "சாதரன ப�த�ப�பித�தல�"
 
-#: ../rpmdrake.pm_.c:209
-msgid "China"
-msgstr "சீனா"
+#: ../rpmdrake:1
+#, c-format
+msgid "Bugfixes updates"
+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 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
+msgstr "பாத�காப�ப� ப�த�ப�பித�தல�"
 
-#: ../rpmdrake.pm_.c:277
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�... இணைப�பதிப�ப� விவரங�கள� இறக�கப�பட�கிறத�"
+#: ../rpmdrake:1
+#, c-format
+msgid "Description: "
+msgstr "விளக�கம�: "
 
-#: ../rpmdrake.pm_.c:283
-msgid "Error during download"
-msgstr "இறக�க�வதில� பிழை நேர�ந�த�ள�ளத�"
+#: ../rpmdrake:1
+#, c-format
+msgid "Summary: "
+msgstr "விவரம�: "
 
-#: ../rpmdrake.pm_.c:292
-msgid "No mirror"
-msgstr "இணைப�பதிப�ப� �த�மில�ைல"
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "ம�க�கியத�த�வம�: "
 
-#: ../rpmdrake.pm_.c:310
-msgid "Please choose the desired mirror."
-msgstr "தயவ�செய�த� உங�கள�க�க� அர�கில�ள�ள இணைப�பதிப�ைப ேதர�ந�ெதட�ங�கள�"
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake.pm_.c:342 ../rpmdrake_.c:629
-msgid "Update source(s)"
-msgstr "ப�த�ப�பிக�கப�பட வேண�டிய மூல(ங�கள�)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Size: "
+msgstr "அளவ�: "
 
-#: ../rpmdrake.pm_.c:346
-msgid "Select the source(s) you wish to update:"
-msgstr "நீங�கள� ப�த�ப�பிக�க விர�ம�ப�கிற  மூலங�களை தேர�வ� செய�யவ�ம�"
+#: ../rpmdrake:1
+#, c-format
+msgid "Version: "
+msgstr "வெளியீட�: "
 
-#: ../rpmdrake.pm_.c:350
-msgid "Update"
-msgstr "ப�த�ப�பிக�கவ�ம�"
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "பெயர�: "
 
-#: ../rpmdrake.pm_.c:360
-msgid "Please wait, updating media..."
-msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�.... ஊடகம� ப�த�ப�பிக�கப�பட�கிறத�"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "ப�த�ப�பிக�க வேண�டிய காரனம�"
 
-#: ../rpmdrake_.c:101
-msgid "Other"
-msgstr "மற�ற"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
+msgstr "தற�ேபாத� நிற�வப�பட�ட�ள�ள பொதியின� வெளியீட�: "
 
-#: ../rpmdrake_.c:123 ../rpmdrake_.c:137 ../rpmdrake_.c:229 ../rpmdrake_.c:300
-msgid "(none)"
-msgstr "(ஒன�ற�மில�ைல)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Source: "
+msgstr "மூலம�: "
 
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:484 ../rpmdrake_.c:485
+#: ../rpmdrake:1
+#, c-format
 msgid "(Not available)"
 msgstr "(கிைடக�கவில�ைல)"
 
-#: ../rpmdrake_.c:153 ../rpmdrake_.c:210
-msgid "Search results"
-msgstr "தேடலின� ம�டிவ�கள�"
-
-#: ../rpmdrake_.c:153
-msgid "Search results (none)"
-msgstr "தேடலின� ம�டிவ�கள�(ஒன�ற�மில�ைல)"
-
-#: ../rpmdrake_.c:163 ../rpmdrake_.c:174
-msgid "Please wait, searching..."
-msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�..தேடப�பட�கிறத�"
-
-#: ../rpmdrake_.c:177
-msgid "Stop"
-msgstr "நிற�த�த�"
-
-#: ../rpmdrake_.c:211 ../rpmdrake_.c:321
-msgid "Addable"
-msgstr "சேர�க�கப�படக�கூடிய"
-
-#: ../rpmdrake_.c:211 ../rpmdrake_.c:321
-msgid "Upgradable"
-msgstr "ப�த�ப�பிக�கக�கூடிய"
-
-#: ../rpmdrake_.c:213
-msgid "Not selected"
-msgstr "தேர�வ� ெசய�யப�படவில�ைல"
-
-#: ../rpmdrake_.c:213
-msgid "Selected"
-msgstr "தேர�வ� ெசய�யப�பட�ட�ள�ளத�"
-
-#: ../rpmdrake_.c:242
-msgid "rpmdrake"
-msgstr "டிேரக�ெமன�ெபார�ள�"
-
-#: ../rpmdrake_.c:260 ../rpmdrake_.c:362 ../rpmdrake_.c:364
-msgid "More information on package..."
-msgstr "பொதிகளைப� பற�றிய மேல�ம� விவரங�கள�"
-
-#: ../rpmdrake_.c:261
-msgid "One of the following packages is needed:"
-msgstr "கீழ�ள�ள பொதிகளில� ஒன�ற� தேவை"
-
-#: ../rpmdrake_.c:261
-msgid "Please choose"
-msgstr "தயவ�செய�த� ேதர�ந�ெதட�க�கவ�ம�"
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
+msgstr "மாற�றப�பதிவ�:\n"
 
-#: ../rpmdrake_.c:277
-msgid "unknown package "
-msgstr "தெரியாத பொதி"
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "கோப�ப�கள�:\n"
 
-#: ../rpmdrake_.c:287
-msgid "Please wait, listing packages..."
-msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�, பொதிகள� பட�டியலிடப�பட�கிறத�"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected size: %d MB"
+msgstr "ேதர�ந�ெதட�த�த�ள�ள அளவ�: %d MB"
 
-#: ../rpmdrake_.c:302
-msgid "No update"
-msgstr "ப�த�ப�பிக�க ஒன�ற�மில�ைல"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "ேதர�ந�ெதட�த�த�ள�ளவற�றின� அளவ�: %d MB / தற�ேபாத�ள�ள இடம�: %d MB"
 
-#: ../rpmdrake_.c:355 ../rpmdrake_.c:356
-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:357
-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:378
-msgid "Some additional packages need to be removed"
-msgstr "மேல�ம� சில பொதிகள� நீக�கப�பட வேண�ட�ம�"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "சில பொதிகளை நிற�வ ம�டியவில�ைல"
 
-#: ../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 ""
-"சில கட�ட�ப�பாட�களினால� கீேழ ெகாட�க�கப�பட�ட�ள�ள பொதிகள� நீக�கப�பட \n"
+"சில கட�ட�ப�பாட�களினால� கீேழ ெகாட�க�கப�பட�ட�ள�ள பொதிகள� நிற�வப�பட \n"
 "வேண�ட�ம�:\n"
 "\n"
 
-#: ../rpmdrake_.c:385 ../rpmdrake_.c:393
+#: ../rpmdrake:1
+#, c-format
+msgid "Additional packages needed"
+msgstr "மேல�ம� சில பொதிகள� தேவை"
+
+#: ../rpmdrake:1
+#, c-format
 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"
 "\n"
@@ -466,577 +636,599 @@ msgstr ""
 "மன�னிக�கவ�ம�, இந�த ெபாதிகளை நீக�கினால� அத� உங�கள� கணினியை பழ�தாக�கி விட�ம�\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 ""
-"சில கட�ட�ப�பாட�களினால� கீேழ ெகாட�க�கப�பட�ட�ள�ள பொதிகள� \n"
-"நிற�வப�படக�கூடாத�, அவற�ைற ேதர�விலிர�ந�த� விலக�க�ங�கள�:\n"
+"சில கட�ட�ப�பாட�களினால� கீேழ ெகாட�க�கப�பட�ட�ள�ள பொதிகள� நீக�கப�பட \n"
+"வேண�ட�ம�:\n"
 "\n"
 
-#: ../rpmdrake_.c:423
-msgid "Additional packages needed"
-msgstr "மேல�ம� சில பொதிகள� தேவை"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr "மேல�ம� சில பொதிகள� நீக�கப�பட வேண�ட�ம�"
 
-#: ../rpmdrake_.c:424
-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:437
-msgid "Some packages can't be installed"
-msgstr "சில பொதிகளை நிற�வ ம�டியவில�ைல"
+#: ../rpmdrake:1
+#, c-format
+msgid "Information on packages"
+msgstr "பொதிகளைப� பற�றிய மேலதிக விவரங�கள�"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
+msgstr "ேமலதிக விவரம�"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Addable"
+msgstr "சேர�க�கப�படக�கூடிய"
 
-#: ../rpmdrake_.c:438
+#: ../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:452 ../rpmdrake_.c:686
-msgid "Some packages need to be removed"
-msgstr "சில பொதிகள� நீக�கப�படவேண�ட�ம�"
+#: ../rpmdrake:1
+#, c-format
+msgid "No update"
+msgstr "ப�த�ப�பிக�க ஒன�ற�மில�ைல"
 
-#: ../rpmdrake_.c:474
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "ேதர�ந�ெதட�த�த�ள�ளவற�றின� அளவ�: %d MB / தற�ேபாத�ள�ள இடம�: %d MB"
+msgid "(none)"
+msgstr "(ஒன�ற�மில�ைல)"
 
-#: ../rpmdrake_.c:476
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "ேதர�ந�ெதட�த�த�ள�ள அளவ�: %d MB"
+msgid "Please wait, listing packages..."
+msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�, பொதிகள� பட�டியலிடப�பட�கிறத�"
 
-#: ../rpmdrake_.c:484
-msgid "Files:\n"
-msgstr "கோப�ப�கள�:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "unknown package "
+msgstr "தெரியாத பொதி"
 
-#: ../rpmdrake_.c:485
-msgid "Changelog:\n"
-msgstr "மாற�றப�பதிவ�:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "கீழ�ள�ள பொதிகளில� ஒன�ற� தேவை"
 
-#: ../rpmdrake_.c:488
-msgid "Source: "
-msgstr "மூலம�: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please choose"
+msgstr "தயவ�செய�த� ேதர�ந�ெதட�க�கவ�ம�"
 
-#: ../rpmdrake_.c:489
-msgid "Currently installed version: "
-msgstr "தற�ேபாத� நிற�வப�பட�ட�ள�ள பொதியின� வெளியீட�: "
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "டிேரக�ெமன�ெபார�ள�"
 
-#: ../rpmdrake_.c:493
-msgid "Reason for update: "
-msgstr "ப�த�ப�பிக�க வேண�டிய காரனம�"
+#: ../rpmdrake:1
+#, c-format
+msgid "Not selected"
+msgstr "தேர�வ� ெசய�யப�படவில�ைல"
 
-#: ../rpmdrake_.c:495
-msgid "Name: "
-msgstr "பெயர�: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected"
+msgstr "தேர�வ� ெசய�யப�பட�ட�ள�ளத�"
 
-#: ../rpmdrake_.c:496
-msgid "Version: "
-msgstr "வெளியீட�: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results"
+msgstr "தேடலின� ம�டிவ�கள�"
 
-#: ../rpmdrake_.c:497
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Stop"
+msgstr "நிற�த�த�"
 
-#: ../rpmdrake_.c:497
-msgid "Size: "
-msgstr "அளவ�: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, searching..."
+msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�..தேடப�பட�கிறத�"
 
-#: ../rpmdrake_.c:499
-msgid "Importance: "
-msgstr "ம�க�கியத�த�வம�: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
+msgstr "தேடலின� ம�டிவ�கள�(ஒன�ற�மில�ைல)"
 
-#: ../rpmdrake_.c:500
-msgid "Summary: "
-msgstr "விவரம�: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "மற�ற"
 
-#: ../rpmdrake_.c:501
-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:550
-msgid "Bugfixes updates"
-msgstr "பிழைநீக�க ப�த�ப�பித�தல�"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "சேமித�த�விட�ட� ெவளிச�ெசல�"
 
-#: ../rpmdrake_.c:550
-msgid "Normal updates"
-msgstr "சாதரன ப�த�ப�பித�தல�"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy..."
+msgstr "பினாமி..."
 
-#: ../rpmdrake_.c:569
-msgid "Mandrake choices"
-msgstr "மாண�ட�ேரக� தேர�வ�கள�"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
+msgstr "ப�த�ப�பிக�கவ�ம�..."
 
-#: ../rpmdrake_.c:570
-msgid "All packages, alphabetical"
-msgstr "அனைத�த� பொதிகள�ம�,அகர வரிசைப�படி"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "சேர�..."
 
-#: ../rpmdrake_.c:571
-msgid "All packages,"
-msgstr "அனைத�த� பொதிகள�ம�"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "தொக�"
 
-#: ../rpmdrake_.c:594
-msgid "by group"
-msgstr "க�ழ�ப�படி"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Source"
+msgstr "மூலம�"
 
-#: ../rpmdrake_.c:594
-msgid "by size"
-msgstr "அளவ�ப�படி"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
+msgstr "ெசயல�பட�த�தப�பட�ட�ள�ளதா?"
 
-#: ../rpmdrake_.c:595
-msgid "by selection state"
-msgstr "தேர�வாகிய�ள�ளபடி"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure sources"
+msgstr "மூலங�களை வடிவமை"
 
-#: ../rpmdrake_.c:596
-msgid "by source repository"
-msgstr "மூலங�களின� இர�ப�ப�ப�படி"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "கடவ�ச�செல�:"
 
-#: ../rpmdrake_.c:596
-msgid "by update availability"
-msgstr "ப�த�ப�பிக�கப�பட வேண�டியவையின�படி"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
+msgstr "பயனர�:"
 
-#: ../rpmdrake_.c:617
-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:617
-msgid "in files"
-msgstr "கோப�ப�களில�"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "பினாமியின� பெயர�"
 
-#: ../rpmdrake_.c:617
-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 ""
+"உங�கள�க�க� பினாமி தேவைப�பட�டால�, பினாமியின�  பயனர� பெயரைய�ம� த�றையைய�ம� கொட�க�கவ�ம�"
+"(மாதிரி: <proxyhost[:port]>):"
 
-#: ../rpmdrake_.c:628
-msgid "Reload the packages list"
-msgstr "பொதிகளின� பட�டியலை மீலேற�றவ�ம�"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "பினாமிகளை வடிவமை"
 
-#: ../rpmdrake_.c:628
-msgid "Reset the selection"
-msgstr "தேர�வ�களை மறந�த� விட�"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�.... ஊடகம� ப�த�ப�பிக�கப�பட�கிறத�"
 
-#: ../rpmdrake_.c:654
-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:654
-msgid "Normal information"
-msgstr "சாதரன விவரம�"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
+msgstr "தொடர�ந�த� செல�ல நீங�கள� ஊடகத�ைத உள�ளீட� செய�ய வேண�ட�ம�"
 
-#: ../rpmdrake_.c:676
-msgid "Too many packages are selected"
-msgstr "அளவ�க�கதிகமான பொதிகள� தேர�வ� செய�யப�பட�ட�ள�ளத�"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save changes"
+msgstr "மாற�றங�களை சேமி"
 
-#: ../rpmdrake_.c:722
-msgid "Find:"
-msgstr "கண�ட�பிடி:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "synthesis/hdlist ேகாப�ப�களின� சார�ப� பாதை"
 
-#: ../rpmdrake_.c:727
-msgid "Search"
-msgstr "தேட�"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake_.c:733
-msgid "Install"
-msgstr "நிற�வ�"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Editing source \"%s\":"
+msgstr "\"%s\": என�ற மூலத�ைத திர�த�தியமை"
 
-#: ../rpmdrake_.c:740 data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrake Update"
-msgstr "மாண�ட�ேரக� ப�த�ப�பித�தல�"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit a source"
+msgstr "மூலத�ைத திர�த�தி அமை"
 
-#: ../rpmdrake_.c:740
-msgid "Software Packages Installation"
-msgstr "ெமன�ெபார�ள� நிற�வல�"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�.... ஊடகம� நீக�கப�பட�கிறத�"
 
-#: ../rpmdrake_.c:740
-msgid "Software Packages Removal"
-msgstr "ெமன�ெபார�ள� நீக�கம�"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, adding medium..."
+msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�.... ப�திய ஊடகம� சேர�க�கப�பட�கிறத�"
 
-#: ../rpmdrake_.c:781
-msgid "Please wait, contacting mirror to update packages information."
-msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�...இணைப�பதிப�ேபாட� தொடர�ப� கொன�ட�ள�ளத�"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of source:"
+msgstr "மூலத�தின� வகை"
 
-#: ../rpmdrake_.c:783
-msgid "Error updating medium"
-msgstr "ஊடக ப�த�ப�பித�தலில� பிழை நேர�ந�த�ள�ளத�"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Adding a source:"
+msgstr "ப�திய மூலம� சேர�க�கப�பட�கிறத�"
 
-#: ../rpmdrake_.c:784
-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:789
-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:797
-msgid "Please wait, contacting mirror to initialize updates packages."
-msgstr ""
-"தயவ�செய�த� காத�திர�க�கவ�ம�...இைணப�பதிப�ேபாட� தொடர�ப� கொன�ட� "
-"ப�த�ப�பித�தல� ெதாடங�கப�பட�கிறத�"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "பெயர�:"
 
-#: ../rpmdrake_.c:800
-msgid "Error adding update medium"
-msgstr "ப�த�ப�பித�தல�ல� ஊடகத�தில� பிழை நேர�ந�த�ள�ளத�"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
+msgstr "பயனர�கணக�க�"
 
-#: ../rpmdrake_.c:831
-msgid "Please wait, finding available packages..."
-msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�..இர�க�க�ம� பொதிகளை கண�ட�பிடிக�கப� பட�கிறத�"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "அர�கில� உள�ள இணைப�பதிப�ைப தேர�வ�ச� செய�..."
 
-#: ../rpmdrake_.c:863
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "சோதிக�கப�பட�கிறத�  %s"
+msgid "Browse..."
+msgstr "ேமலோட�..."
 
-#: ../rpmdrake_.c:882
-msgid "changes:"
-msgstr "மாற�றங�கள�:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "பாதை அல�லத� �ற�றப�ப�ள�ளி"
 
-#: ../rpmdrake_.c:886
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove .%s"
-msgstr "நீக�க�  .%s"
+msgid "Removable device"
+msgstr "கழற�ற� சாதனங�கள�"
 
-#: ../rpmdrake_.c:888
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr ".%s என�பதை ம�க�கிய கோப�பாக பயன�பட�த�த�"
+msgid "HTTP server"
+msgstr "HTTP பாிமாறி"
 
-#: ../rpmdrake_.c:890
-msgid "Do nothing"
-msgstr "ஒன�ற�ம� செய�யாதே"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "FTP பாிமாறி"
 
-#: ../rpmdrake_.c:902
-msgid "Installation finished"
-msgstr "நிற�வ�தல� ம�டிந�தத�"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path:"
+msgstr "பாதை:"
 
-#: ../rpmdrake_.c:912
-msgid "Inspect..."
-msgstr "சோதிக�கப�பட�கிறத�..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "உள�ளமைக� கோப�ப�கள�"
 
-#: ../rpmdrake_.c:927
-msgid "Program missing"
-msgstr "நிரல� இல�ைல"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add a source"
+msgstr "ப�திய மூலம� சேர�க�கப�பட�கிறத�"
 
-#: ../rpmdrake_.c:928
-msgid "A required program is missing (grpmi). Check your installation."
-msgstr "தேவையான நிரல� இல�ைல.உங�கள� நிற�வல� சரியாக உள�ளதா என பார�க�கவ�ம�"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
+msgstr "ஊடகத�ைத ப�த�ப�பிக�க ம�டியவில�ைல,அத� தானாகவே ம�டக�கப�பட�ம�"
 
-#: ../rpmdrake_.c:942
-msgid "Unable to get source packages."
-msgstr "மூலப� பொதிகள� கிடைக�கவில�ைல"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "ஊடகத�ைத உர�வாக�க ம�டியவில�ைல"
 
-#: ../rpmdrake_.c:943
-msgid "Unable to get source packages, sorry."
-msgstr "மூலப� பொதிகள� கிடைக�கவில�ைல மன�னிக�கவ�ம�"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, updating media..."
+msgstr "தயவ�செய�த� காத�திர�க�கவ�ம�.... ஊடகம� ப�த�ப�பிக�கப�பட�கிறத�"
 
-#: ../rpmdrake_.c:951
-msgid "Change medium"
-msgstr "ஊடகத�ைத மாற�றவ�ம�"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
+msgstr "ப�த�ப�பிக�கவ�ம�"
 
-#: ../rpmdrake_.c:952
+#: ../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:960
-msgid "Installation failed"
-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 ""
-"நிற�வ�தலில� பிழை நேர�ந�த�ள�ளத� சில கோப�ப�கள� கானப�படவில�ைல.\n"
-"உங�கள� மூலத�தரவ�களை ப�த�ப�பித�த� பார�ங�கள�"
+"மாற�ற� இணைப� பதிப�ப� �த�மில�ைல\n"
+"\n"
+"நீங�கள� வேற� வழியில� ம�யற�சி செய�த� பார�ங�கள�.\n"
+"இணையத�தில� www.google.com சென�ற� தேடி\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"
 "\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: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 ""
-"சில பொதிகளை சரியாக நிற�வ \n"
-"ம�டியவில�ைல"
+"நான� மாண�ட�ேரக�இணையதளத�திற�க�ச� சென�ற� இணைப� பதிப�ப� விவரங�களை \n"
+"இறக�க வேண�ட�ம�.இதற�க� நீங�கள� இணையத�தில� இனைந�திர�க�கவேண�ட�ம�.\n"
+"\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 "நெதர�லாந�த�"
 
-# c-format
-#: ../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 ""
-"மாண�ட�ேரக�ப�த�ப�பித�தல�க�க� வர�க!\n"
-"\n"
-"இக�கர�வி மூலம� உங�கள� கணினியில� உள�ள  ெமன�ெபார�ளை நீங�கள� ப�த�ப�பிக�க\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"
-"நிற�வ ம�டிய�ம�"
+#: ../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 ""
-#~ "நான� மாண�ட�ேரக�இணையதளத�திற�க�ச� சென�ற� இணைப� பதிப�ப� விவரங�களை \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"
-#~ "நீங�கள� இணையத�தில� இல�லாதிர�க�கலாம�;இல�ைல மாண�ட�ேரக� இணையதளத�தில�.\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"
-#~ "இணையத�தில� www.google.com சென�ற� தேடி\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"
-#~ "அப�படியென�றால� நிகழ�நிலைப�பட�த�த ப�திய பொதிகள� �த�மில�ைல,\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"
-#~ "நீங�கள� இந�த எச�சரிக�கையை மீறி இவை அனைத�ைதய�ம� நிற�வ விர�ம�ப�கிறீர�களா?"
+#: ../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 "-*-TSC_Avarangal-bold-r-normal--25-*-100-100-p-*-tscii-0,*-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 "உங�கள� இணை பதிப�ைப எப�படித� தேர�வ�ச� செய�வத�"
+#: ../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"
-#~ "ஒர�வேளை மாண�ட�ேரக� லினக�ஸ� வெளியீட� (%s)இத�வரை/இனிமேல� ஆதரிக�கப�ட மாட�டாத�\n"
-#~ "இணையத�தில� www.google.com சென�ற� தேடி\n"
-#~ "பார�ங�கள�\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 "-*-TSC_Avarangal-bold-r-normal--25-*-100-100-p-*-tscii-0,*-r-*"
 
 #~ msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
 #~ msgstr "-*-TSC_Avarangal-bold-r-normal--25-*-100-100-p-*-tscii-0,*"
diff --git a/po/ta.pom b/po/ta.pom
index 80080334..6feac19c 100644
--- a/po/ta.pom
+++ b/po/ta.pom
@@ -4,163 +4,167 @@ msgstr "சேவையகம�"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "இணையதள/கோப�ப�ப� பாிமாற�றம�"
+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 "அல�வல� கர�விகள�(விாிதாள�, நிகழ�த�தி,வரைபடக� கர�விகள�)"
 
 # 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 "gசாளர மேலாளர�"
+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 "உங�கள� பாம�/வைசார� ஆகிய கையாட�களை பயன�பட�த�த உதவ�ங�கர�விகள�"
+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 "DNS/NIS"
+msgid ""
+"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 ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
-msgstr "அல�வல� கர�விகள�(விாிதாள�, நிகழ�த�தி,வரைபடக� கர�விகள�)"
+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, மிடி இயக�கிகள�"
+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 "LSB- லினக�ஸ� தரக�கட�ட�ப�பாட�ட�க�க� தேவையான நிரல�கள�."
+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 "ப�த�தகங�கள� மற�ற�ம� எப�படிச� செய�வத� போன�ற உதவி நூல�"
+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 "K வரைவியல�வழி சாளர மேலாளர�கள�"
+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 "g,i,e ஆகிய பயன�பட�த�த�வதற�க� எளிதான வரைவியல�வழி  மேலாளர�கள�"
+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 "Kசாளரமைப�ப� பணிக�கணினி"
 
 # 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சாளரமைப�ப�-  ஓர� பயன�பட�த�த�வதற�க� எளிதான வரைவியல�வழி  மேலாளர�"
 
 # 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 "க�ேனாம� பணிக�கணினி"
 
 # 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 "மின�னஞ�சல� பரிமாறி"
+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 "இணையக� கணிணி"
+# 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 "மேல�ம� பல வரைவியல�வழி சூழல�கள�[i, g போன�றவை]"
+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"
-msgstr "Kசாளரமேலாளர�-  ஓர� பயன�பட�த�த�வதற�க� எளிதான வரைவியல�வழி  மேலாளர�"
+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 "LSB- லினக�ஸ� தரக�கட�ட�ப�பாட�ட�க�க� தேவையான நிரல�கள�."
 
 # 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 "இணையதள/கோப�ப�ப� பாிமாற�றம�"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -169,23 +173,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 "சிடி உர�வாக�க/எரிக�க உதவ�ங�கர�விகள�"
+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 "மின�னஞ�சல� பரிமாறி"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "g, e, i போன�ற சாளர மேலாளர�கள�"
+msgid "Database"
+msgstr "தரவ�தளங�கள�"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "gவரைவியல� போன�ற நிரல�கள�"
+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
@@ -194,8 +208,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 "DNS/NIS"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -204,18 +218,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
@@ -224,75 +238,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 "நீங�கள� மின�னஞ�சல�, மற�ற�ம� இணையத�தை மேலோட உதவ�ங�கர�விகள�"
+msgid "Graphics programs such as The Gimp"
+msgstr "gவரைவியல� போன�ற நிரல�கள�"
 
 # 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, மிடி இயக�கிகள�"
 
 # 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 "பல�லூடக-சிடி எரித�தல�"
 
 # 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 "சிடி உர�வாக�க/எரிக�க உதவ�ங�கர�விகள�"
 
 # 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 "க�ேனாம�, �ஸ�விம� போன�ற சாளர மேலாளர�கள�"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "உங�கள� வரவ�செலவ� விவரங�களை இந�த நிரல�கள� மூலம� பேனலாம�"
+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 "உங�கள� பாம�/வைசார� ஆகிய ைகயடக�க கணினிகளை பயன�பட�த�த உதவ�ங�கர�விகள�"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "பல�லூடக-சிடி எரித�தல�"
+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 "உங�கள� வரவ�செலவ� விவரங�களை இந�த நிரல�கள� மூலம� பேனலாம�"
 
diff --git a/po/tg.po b/po/tg.po
index b76973a9..41003f08 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.1\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 17:11+0500\n"
 "Last-Translator: Dilshod Marupov <dma165@hotmail.com>\n"
 "Language-Team: Tajik\n"
@@ -15,872 +15,1162 @@ 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 "Сохтани миёна номумкин."
-
-#: ../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 "Да�тгоҳи хориҷ шаванда"
-
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:550
-msgid "Security updates"
-msgstr "�авигариҳои бехатарӣ"
-
-#: ../edit-urpm-sources.pl_.c:70
-msgid "Browse..."
-msgstr "Барра�ии..."
-
-#: ../edit-urpm-sources.pl_.c:72
-msgid "Choose a mirror..."
-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: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 ""
+"Марҳамат ба а�боби коргузориши нармафзор!\n"
+"\n"
+"Си�теми Шумо, Mandrake Linux бо �кчанд ҳазор қуттиҳои нармафзор дар CDROM\n"
+"ё DVD пешниҳод карда мешавад. Ин а�боб ба шумо барои интихоби нармафзор\n"
+"барои коргузоштан ба компютери Шумо ёрӣ медиҳад."
 
-#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:231
-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:97
-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:99 ../edit-urpm-sources.pl_.c:188
-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:107
-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:120
-msgid "Adding a source:"
-msgstr "Иловаи �арчашма:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages..."
+msgstr "Интизор шавед, хориҷи қуттиҳо..."
 
-#: ../edit-urpm-sources.pl_.c:121
-msgid "Type of source:"
-msgstr "�авъи �арчашма:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages 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:952
-msgid "Ok"
-msgstr "Ok"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Дар вақти коргузориш муаммо рӯй дод:\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 "Бекор кардан"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during installation"
+msgstr "Муаммо ҳангоми коргузориш"
 
-#: ../edit-urpm-sources.pl_.c:147
-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:168
-msgid "Please wait, removing medium..."
-msgstr "Интизор шавед, хориҷи миёна..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed."
+msgstr "Ҳамачиз аллакай коргузошта шудаа�т."
 
-#: ../edit-urpm-sources.pl_.c:181
-msgid "Edit a source"
-msgstr "Таҳрири �арчашма"
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "Ҳамаи қуттиҳои талабшуда бомуваффақи�т коргузошташуданд."
 
-#: ../edit-urpm-sources.pl_.c:185
+#: ../rpmdrake:1
 #, c-format
-msgid "Editing source \"%s\":"
-msgstr "Таҳрири �арчашмаи \"%s\":"
+msgid "Everything installed successfully"
+msgstr "Ҳамачиз бомуваффақи�т кор гузошта шуд"
 
-#: ../edit-urpm-sources.pl_.c:191
-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:200
-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: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 ""
-"Барои нигоҳ доштани тағирот, Шумо бо�д ба ҳаракатовар миёна дохил кунед."
-
-#: ../edit-urpm-sources.pl_.c:206
-msgid "Please wait, updating medium..."
-msgstr "Интизор шавед, навкунии миёна..."
+"баъзе қуттиҳо барои коргузориши дуру�т\n"
+"нагузашт"
 
-#: ../edit-urpm-sources.pl_.c:217
-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: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 ""
-"Ба Шумо ноиб лозим бошад, номихидматгор ва даргоҳи ихтиёрӣ гузоред (наҳв: "
-"<хидматгорноиб[:даргоҳ]>):"
+"Коргузориш нагузашт, баъзе файлҳо не�танд.\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 "Ok"
 
-#: ../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 "�авигарии Mandrake"
 
-#: ../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 ""
-"Лутфан интизор шавед, фаровири адре�ҳои оинаҳо аз пойгоҳи 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 "�авигариҳои Ғалати�лоҳ (Bugfixes)"
 
-#: ../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 KБ"
 
-#: ../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 МБ"
 
-#: ../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"
-msgstr "Changelog:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "Addable"
+msgstr "Иловашаванда"
 
-#: ../rpmdrake_.c:488
-msgid "Source: "
-msgstr "Сарчашма: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Upgradable"
+msgstr "�фзоишшаванда"
 
-#: ../rpmdrake_.c:489
-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 ""
 
-#: ../rpmdrake_.c:493
-msgid "Reason for update: "
-msgstr "��о� барои навигарӣ: "
+#: ../rpmdrake:1
+#, c-format
+msgid "No update"
+msgstr "�авигарӣ не�т"
 
-#: ../rpmdrake_.c:495
-msgid "Name: "
-msgstr "�ом: "
+#: ../rpmdrake:1
+#, c-format
+msgid "(none)"
+msgstr "(ҳеҷ)"
 
-#: ../rpmdrake_.c:496
-msgid "Version: "
-msgstr "�у�ха: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, listing packages..."
+msgstr "Интизор шавед, рӯйхат�озии қуттиҳо..."
 
-#: ../rpmdrake_.c:497
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KБ"
+msgid "unknown package "
+msgstr "қуттии номаълум"
 
-#: ../rpmdrake_.c:497
-msgid "Size: "
-msgstr "Ҳаҷм: "
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Яке аз қуттиҳои зерин лозим а�т:"
 
-#: ../rpmdrake_.c:499
-msgid "Importance: "
-msgstr "Зарури�т: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please choose"
+msgstr "Илтимо� интихоб кунед"
 
-#: ../rpmdrake_.c:500
-msgid "Summary: "
-msgstr "Маълумот: "
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:501
-msgid "Description: "
-msgstr "Тав�иф: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Not selected"
+msgstr "Интихобнашуда"
 
-#: ../rpmdrake_.c:550
-msgid "Bugfixes updates"
-msgstr "�авигариҳои Ғалати�лоҳ (Bugfixes)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected"
+msgstr "Интихобшуда"
 
-#: ../rpmdrake_.c:550
-msgid "Normal updates"
-msgstr "�авигариҳои оддӣ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results"
+msgstr "�атиҷаҳои ҷу�туҷӯ"
 
-#: ../rpmdrake_.c:569
-msgid "Mandrake choices"
-msgstr "Интихоботи Mandrake"
+#: ../rpmdrake:1
+#, c-format
+msgid "Stop"
+msgstr "И�т"
 
-#: ../rpmdrake_.c:570
-msgid "All packages, alphabetical"
-msgstr "Ҳамаи қуттиҳо, аз рӯи алифбо"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, searching..."
+msgstr "Интизор шавед, ҷу�туҷӯ..."
 
-#: ../rpmdrake_.c:571
-msgid "All packages,"
-msgstr "Ҳаммаи қуттиҳо,"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
+msgstr "�атиҷаҳои ҷу�туҷӯ (ҳеҷ)"
 
-#: ../rpmdrake_.c:594
-msgid "by group"
-msgstr "аз рӯи қуттӣ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Дигар"
 
-#: ../rpmdrake_.c:594
-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 ""
 
-#: ../rpmdrake_.c:595
-msgid "by selection state"
-msgstr "аз рӯи вазъи�ти интихоб"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "�игоҳ дошта бароед"
 
-#: ../rpmdrake_.c:596
-msgid "by source repository"
-msgstr "аз рӯи анбори �арчашма"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy..."
+msgstr "�оиб..."
 
-#: ../rpmdrake_.c:596
-msgid "by update availability"
-msgstr "аз рӯи да�тра�ии навигарӣ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
+msgstr "�авкунӣ..."
 
-#: ../rpmdrake_.c:617
-msgid "in descriptions"
-msgstr "дар тав�ифҳо"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "Илова..."
 
-#: ../rpmdrake_.c:617
-msgid "in files"
-msgstr "дар файлҳо"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "Таҳрир кардан"
 
-#: ../rpmdrake_.c:617
-msgid "in names"
-msgstr "дар номҳо"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Source"
+msgstr "Сарчашма"
 
-#: ../rpmdrake_.c:628
-msgid "Reload the packages list"
-msgstr "Бозборкунии рӯйхати қуттиҳо"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
+msgstr "Даргирифта?"
 
-#: ../rpmdrake_.c:628
-msgid "Reset the selection"
-msgstr "Бознишондодани интихоб"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure sources"
+msgstr "Танзимдарории �арчашмаҳо"
 
-#: ../rpmdrake_.c:654
-msgid "Maximum information"
-msgstr "Маълумоти калонтарин"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "Гузарвожа:"
 
-#: ../rpmdrake_.c:654
-msgid "Normal information"
-msgstr "Маълумоти оддӣ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
+msgstr "Корванд:"
 
-#: ../rpmdrake_.c:676
-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:722
-msgid "Find:"
-msgstr "�фтан:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "�оиби номихидматгор:"
 
-#: ../rpmdrake_.c:727
-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:733
-msgid "Install"
-msgstr "Коргузоштан"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "Танзимдарории ноибҳо"
 
-#: ../rpmdrake_.c:740 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:740
-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:740
-msgid "Software Packages Removal"
-msgstr "Хориҷкунии Қуттиҳои �армафзор"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
+msgstr "Барои давом Шумо бо�д миёна дохил кунед"
 
-#: ../rpmdrake_.c:781
-msgid "Please wait, contacting mirror to update packages information."
-msgstr "Интизор шавед, пайва�тшавӣ бо оина барои навкунии маълумоти қуттиҳо."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save changes"
+msgstr "�игоҳдории тағиротҳо"
 
-#: ../rpmdrake_.c:783
-msgid "Error updating medium"
-msgstr "Хатогии навкунии миёна"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Роҳи ни�би ба synthesis/hdlist:"
 
-#: ../rpmdrake_.c:784
-msgid "There was an unrecoverable error while updating packages information."
-msgstr "Хатогии бартарафнашаванда ҳангоми навкунии маълумоти қуттиҳо руй дод."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake_.c:789
-msgid "How to choose manually your mirror"
-msgstr "Чӣ тавр оинаатонро да�тӣ интихоб мекунед"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Editing source \"%s\":"
+msgstr "Таҳрири �арчашмаи \"%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 "Таҳрири �арчашма"
+
+#: ../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 ""
-"Интизор шавед, пайва�тшавӣ бо оина барои шинохтани навигариҳои қуттиҳо."
 
-#: ../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 "Шумо бо�д ақалан ду оинаи авваларо пур кунед."
 
-#: ../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 "�оми дохилӣ (login):"
 
-#: ../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:950
-msgid "Change medium"
-msgstr "Ивази миёна"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "Сохтани миёна номумкин."
 
-#: ../rpmdrake_.c:951
+#: ../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:959
-msgid "Installation failed"
-msgstr "Коргузориш нагузашт"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
+msgstr "�ав кардан"
 
-#: ../rpmdrake_.c:960
+#: ../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:963
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr "Интизор шавед, хориҷи қуттиҳо барои афзоиш шудани дигарон..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
+msgstr "Оина не�т"
 
-#: ../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 ""
-"Коргузориш ба итмом ра�ид; %s.\n"
-"\n"
-"Баъзе файлҳои танзимдарорӣ ҳамчун `.rpmnew' ё `.rpmsave' офаридашуда\n"
-"буданд, акнун метавонед баъзеашонро барои амалиётҳо бозра�ӣ кунед:"
 
-#: ../rpmdrake_.c:984
+#: ../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"
-"нагузашт"
 
-#: ../rpmdrake_.c:985
-msgid "everything was installed correctly"
-msgstr "ҳамачиз дуру�т коргузошта шуд"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United States"
+msgstr "Иолоти Муттаҳида"
 
-#: ../rpmdrake_.c:987
-msgid "Everything installed successfully"
-msgstr "Ҳамачиз бомуваффақи�т кор гузошта шуд"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
+msgstr "Хитой"
 
-#: ../rpmdrake_.c:988
-msgid "All requested packages were installed successfully."
-msgstr "Ҳамаи қуттиҳои талабшуда бомуваффақи�т коргузошташуданд."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr "Подшоҳии Муттаҳида"
 
-#: ../rpmdrake_.c:991
-msgid "Everything already installed."
-msgstr "Ҳамачиз аллакай коргузошта шудаа�т."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "Тойвон"
 
-#: ../rpmdrake_.c:992
-msgid "Everything already installed (is this supposed to happen at all?)."
-msgstr "Ҳамачиз аллакай коргузошта шудаа�т (ин умуман шуданаш шарт а�т?)"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "Суид"
 
-#: ../rpmdrake_.c:999
-msgid "Problem during installation"
-msgstr "Муаммо ҳангоми коргузориш"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
+msgstr "Ру�и�"
 
-#: ../rpmdrake_.c:1000
+#: ../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:1014
-msgid "Please wait, reading packages database..."
-msgstr "Интизор шавед, хониши манбаи маълумоти қуттиҳо..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
+msgstr "Лаҳи�тон"
 
-#: ../rpmdrake_.c:1055
-msgid "Please wait, removing packages..."
-msgstr "Интизор шавед, хориҷи қуттиҳо..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
+msgstr "�орвеж"
 
-#: ../rpmdrake_.c:1058
-msgid "Problem during removal"
-msgstr "Муаммо ҳангоми хориҷкунӣ"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
+msgstr "Ҳуланд"
 
-#: ../rpmdrake_.c:1059
+#: ../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: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 ""
-"Марҳамат ба а�боби хориҷи нармафзор!\n"
-"\n"
-"Ин а�боб ба шумо барои интихоби нармафзор барои хориҷ аз компютери Шумо\n"
-"ёрӣ медиҳад."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Japan"
+msgstr "Ҷопон"
 
-#: ../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 ""
-"Марҳамат ба MandrakeUpdate!\n"
-"\n"
-"Ин а�боб ба шумо барои интихоби навигарӣ барои коргузоштан ба компютери\n"
-"Шумо ёрӣ медиҳад."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Italy"
+msgstr "Итолиё"
 
-#: ../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 ""
-"Марҳамат ба а�боби коргузориши нармафзор!\n"
-"\n"
-"Си�теми Шумо, Mandrake Linux бо �кчанд ҳазор қуттиҳои нармафзор дар CDROM\n"
-"ё 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"
@@ -890,10 +1180,6 @@ msgstr "Хориҷи �армафзор"
 msgid "Software Sources Manager"
 msgstr "Менеҷери Сарчашмаҳои �армафзор"
 
-#: data/rpmdrake.desktop.in.h:1
-msgid "Install Software"
-msgstr "Коргузориши �армафзор"
-
 #~ msgid "%d packages, %Ld bytes"
 #~ msgstr "%d қуттиҳо, %Ld байтҳо"
 
diff --git a/po/tg.pom b/po/tg.pom
index e69de29b..d121a420 100644
--- a/po/tg.pom
+++ b/po/tg.pom
@@ -0,0 +1,303 @@
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+msgid "Server"
+msgstr "Хидматра�он"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Office Workstation"
+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"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Workstation"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Game station"
+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 "Multimedia station"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Sound and video playing/editing programs"
+msgstr ""
+
+# 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
+#: ../../share/compssUsers:999
+msgid ""
+"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 "Network Computer (client)"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Clients for different protocols including ssh"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Configuration"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Tools to ease the configuration of your computer"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Scientific Workstation"
+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 ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Editors, shells, file tools, terminals"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "KDE Workstation"
+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 ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Graphical Environment"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Gnome Workstation"
+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 ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Other Graphical Desktops"
+msgstr ""
+
+# 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
+# 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 "C and C++ development libraries, programs and include files"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Documentation"
+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 ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+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
+#: ../../share/compssUsers:999
+msgid "Web/FTP"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Apache, Pro-ftpd"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+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
+msgid "Database"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+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
+msgid "Internet gateway"
+msgstr ""
+
+# 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 "Domain Name and Network Information Server"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Network Computer server"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Office"
+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 ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Multimedia - Graphics"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Graphics programs such as The Gimp"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Multimedia - Sound"
+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 ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Multimedia - Video"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Video players and editors"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Multimedia - CD Burning"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Tools to create and burn CD's"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Personal Information Management"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+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 Finance"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Programs to manage your finances, such as gnucash"
+msgstr ""
+
diff --git a/po/th.po b/po/th.po
index eced1deb..6e258578 100644
--- a/po/th.po
+++ b/po/th.po
@@ -5,7 +5,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-11-27 21:43+0700\n"
 "Last-Translator: Varokas Panusuwan <varokasp@hotmail.com>\n"
 "Language-Team: Thai <th@li.org>\n"
@@ -14,865 +14,1199 @@ 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 ""
+"ยินดีต้อนรับสู่ software installation tool!\n"
+"\n"
+"Mandrake Linux ของคุณมาพร้อม�ับเพ�เ�จโปร��รทเป็นพลายพันตัว\n"
+"บน CDROM หรือ DVD  โปร��รมนี้จะช่วยคุณเลือ�ว่าโปร��รทไหนที่คุณต้อง�าร\n"
+"จะลงบนเครื่อง"
 
-#: ../edit-urpm-sources.pl_.c:51
-#, fuzzy
-msgid "Add a source"
-msgstr "เพิ่ม 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 ""
+"ยินดีต้อนรับสู่ Mandrake Update!\n"
+"\n"
+"โปร��รมนี้จะช่วยคุณใน�ารเลือ�ตัวอัพเดทที่คุณต้อง�าร install ลงในเครื่อง"
 
-#: ../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 ""
+"ยินดีต้อนรับสู่ software removal tool!\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 ""
+"เ�ิดปั�หาขณะ install:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:53
-msgid "FTP server"
-msgstr "เซอร์เวอร์ FTP"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during removal"
+msgstr "เ�ิดปั�หาขณะ install"
 
-#: ../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 ""
+"เ�ิดปั�หาขณะ install:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Removable device"
-msgstr "ไดร์ฟเคลื่อนย้ายได้"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during installation"
+msgstr "เ�ิดปั�หาขณะ install"
 
-#: ../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 "ทุ�อย่างถู� install ไว้หมด�ล้ว"
 
-#: ../edit-urpm-sources.pl_.c:67
-msgid "Browse..."
-msgstr "เลือ�..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed."
+msgstr "ทุ�อย่างถู� install ไว้หมด�ล้ว"
 
-#: ../edit-urpm-sources.pl_.c:69
-msgid "Choose a mirror..."
-msgstr "เลือ� mirror..."
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "เพ�เ�จทุ�ตัวที่เลือ�ไว้ถู� install เรียบร้อย"
 
-#: ../edit-urpm-sources.pl_.c:89
-msgid "Login:"
-msgstr "ล็อ�อิน:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr "ทุ�อย่างถู� install เรียบร้อย"
 
-#: ../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 ""
+"install เสร็จสมบูรณ์; %s\n"
+"\n"
+"ไฟล์ configuration บางตัวถู�สร้างในชื่อ '.rpmnew' หรือ '.rpmsave', \n"
+"คุณอาจจะต้องตรวจสอบไฟล์เหล่านี้หา�ต้อง�ารทำอย่างอื่นต่อไป"
 
-#: ../edit-urpm-sources.pl_.c:94
-msgid "Name:"
-msgstr "ชื่อ:"
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "ทุ�อย่างถู� install เรียบร้อย"
 
-#: ../edit-urpm-sources.pl_.c:96 ../edit-urpm-sources.pl_.c:176
-msgid "Relative path to synthesis/hdlist:"
-msgstr "พาธ�บบ relative ไปยัง synthesis/hdlist:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"some packages failed to install\n"
+"correctly"
+msgstr ""
+"ไม่สามารถ install เพ�เ�จบางตัวได้\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 "เพิ่ม source: "
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
+msgstr ""
+"install ไม่สำเร็จ, ไฟล์บางไฟล์อยู่ไท่ครบ\n"
+"คุณอาจจะต้องอัพเดท�านข้อมูล source ของคุณ"
 
-#: ../edit-urpm-sources.pl_.c:117
-msgid "Type of source:"
-msgstr "ชนิดของ source:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation failed"
+msgstr "install ไม่สำเร็จ"
 
-#: ../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 "ไม่สามารถหา source เพ�เ�จได้"
 
-#: ../edit-urpm-sources.pl_.c:169
-msgid "Edit a source"
-msgstr "��้ไข source"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages."
+msgstr "ไม่สามารถหา source เพ�เ�จได้"
 
-#: ../edit-urpm-sources.pl_.c:173
+#: ../rpmdrake:1
 #, c-format
-msgid "Editing source \"%s\":"
-msgstr "�ำลัง��้ไข source \"%s\":"
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr "โปร��รมที่ต้อง�าร (grpmi) หายไป �รุณาตรวจสอบตัวเลือ� install ของคุณ"
 
-#: ../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 "install เสร็จเรียบร้อย"
 
-#: ../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 "ปรับ�ต่ง proxies"
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
+msgstr "ใช้ %s เป็นไฟล์หลั�Manager"
 
-#: ../edit-urpm-sources.pl_.c:207
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
-msgstr "ถ้าคุณต้อง�ารใช้ proxy �รุณาใส่ชื่อ host �ละ port (รูป�บบ: <proxyhost[:port]>):"
+#: ../rpmdrake:1
+#, c-format
+msgid "Remove .%s"
+msgstr "ลบ %s"
 
-#: ../edit-urpm-sources.pl_.c:209
-msgid "Proxy hostname:"
-msgstr "ชื่อโฮส proxy: "
+#: ../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 "คุณต้องใส่ล็อ�อิน�ละพาสเวิร์ดเพื่อใช้ proxy:"
+#: ../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 "ปรับ�ต่ง 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 ""
+"มีข้อผิดพลาดเ�ิดขึ้นขณะ�ำลังเพื่มสื่อข้อมูลอัพเดทผ่าน urpmi\n"
+"\n"
+"สาเหตุอาจจะมาจา�ลิง�์ mirror เสีย หรือ ปิดบริ�ารชั่วคราว หรือ เวอร์ชันของ\n"
+"Mandrake Linux ของคุณ (%s) ไม่ได้รับหรือย�เลิ� �ารสนับสนุนจา� Mandrake Linux\n"
+"Offical Updates\n"
+"\n"
+"คุณต้อง�ารจะลอง mirror อื่นหรือไม่?"
 
-#: ../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 "Source"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
+msgstr "�ำลังติดต่อ�ับ mirror เพื่อขออัพเดทเพ�เ�จ �รุณารอสั�ครู่"
 
-#: ../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 ""
+"คุณสามารถเลือ� mirror ได้เอง\n"
+"โดยเปิด Software Sources Manager �ล้ว�็เพิ่ม Security updates' source\n"
+"\n"
+"จา�นั้น �็ปิด�ล้วเปิด Mandrake Update อี�ครั้ง"
 
-#: ../edit-urpm-sources.pl_.c:266
-msgid "Edit"
-msgstr "��้ไข"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "วิธีเลือ� mirror ของคุณเอง"
 
-#: ../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 "Proxy..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
+msgstr "�ำลังติดต่อ�ับ mirror เพื่ออัพเดทข้อมูลเพ�เ�จ, �รุณารอสั�ครู่"
 
-#: ../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 ""
+"โปร��รทต้อง�ารติดต่อ�ับ mirror เพื่อหาตัวอัพเดทล่าสุด\n"
+"�รุณาตรวจสอบว่าระบบเนตเวอร์��ำลังใช้งานอยู่\n"
+"\n"
+"คุณต้อง�ารจะทำต่อไปหรือไม่?"
 
-#: ../edit-urpm-sources.pl_.c:275 ../rpmdrake_.c:733
-msgid "Quit"
-msgstr "ออ�"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Installation"
+msgstr "�าร install package"
 
-#: ../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 "Install"
 
-#: ../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 "อัพเดท source(s)"
 
-#: ../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 "reset รายชื่อที่ถู�เลือ�"
 
-#: ../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 "ตาม source 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 "ทุ�เพ�เ�จ, เรียงตามตัวอั�ษร"
 
-#: ../rpmdrake.pm_.c:204
-msgid "Taiwan"
-msgstr "ไต้หวัน"
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
+msgstr "Mandrake choices"
 
-#: ../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 "�รุณารอสั�ครุ่, �ำลังดาว์นโหลดรายชื่อ mirrors จา�เวป 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 "ไม่พบ mirror"
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "ความสำคั�:"
 
-#: ../rpmdrake.pm_.c:307
-msgid "Please choose the desired mirror."
-msgstr "�รุณาเลือ� mirror ที่ต้อง�าร"
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake.pm_.c:339 ../rpmdrake_.c:627
-msgid "Update source(s)"
-msgstr "อัพเดท source(s)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Size: "
+msgstr "ขนาด:"
 
-#: ../rpmdrake.pm_.c:343
-msgid "Select the source(s) you wish to update:"
-msgstr "เลือ� source(s) ที่คุณต้อง�ารจะอัพเดท"
+#: ../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 "Source:"
 
-#: ../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 "Changelog:\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 ""
+"เนื่องจา� dependencies จา�เพจเ�จเหล่านี้ ทำให้ต้องเลือ�ออ�ตอนนี้:\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 "ไม่สามารถ install บางเพ�เ�จได้"
 
-#: ../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 ""
-"เนื่องจา� dependencies จา�เพจเ�จเหล่านี้ ทำให้เพ�เ�จที่มีชื่อดังนี้\n"
-"ต้องถู�ลบออ�:\n"
+"เนื่องจา� dependencies, เพจเ�จเหล่านี้จะต้อง install ไปด้วย:\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 ""
-"เนื่องจา� dependencies จา�เพจเ�จเหล่านี้ ทำให้ต้องเลือ�ออ�ตอนนี้:\n"
+"เนื่องจา� dependencies จา�เพจเ�จเหล่านี้ ทำให้เพ�เ�จที่มีชื่อดังนี้\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 ""
-"เนื่องจา� dependencies, เพจเ�จเหล่านี้จะต้อง install ไปด้วย:\n"
-"\n"
 
-#: ../rpmdrake_.c:435
-msgid "Some packages can't be installed"
-msgstr "ไม่สามารถ install บางเพ�เ�จได้"
+#: ../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"
+"เพ�เ�จที่อยู่ในเครื่องของคุณหรือไม่�็ถู� install หมด�ล้ว"
 
-#: ../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 "Changelog:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "ต้อง�าร�พ�เ�จหนึ่งในรายชื่อนี้:"
 
-#: ../rpmdrake_.c:486
-msgid "Source: "
-msgstr "Source:"
+#: ../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 ""
+"ยินดีต้อนรับสู่ package source editor!\n"
+"\n"
+"เครื่องมือนี้จะช่วยคุณใน�ารปรับ�ต่ง package sources ที่คุณจะใช้ในเครื่องคอมพิวเตอร์\n"
+"ของคุณ เพื่อที่เพ�เ�จเหล่านี้จะได้พร้อมสำหรับ�าร install หรืออัพเดทต่อไป"
 
-#: ../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 "Proxy..."
 
-#: ../rpmdrake_.c:567
-msgid "Mandrake choices"
-msgstr "Mandrake choices"
+#: ../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 "Source"
 
-#: ../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 "ปรับ�ต่ง source"
 
-#: ../rpmdrake_.c:594
-msgid "by source repository"
-msgstr "ตาม source 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 "คุณต้องใส่ล็อ�อิน�ละพาสเวิร์ดเพื่อใช้ proxy:"
 
-#: ../rpmdrake_.c:615
-msgid "in files"
-msgstr "ในไฟล์"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "ชื่อโฮส proxy: "
 
-#: ../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 "ถ้าคุณต้อง�ารใช้ proxy �รุณาใส่ชื่อ host �ละ port (รูป�บบ: <proxyhost[:port]>):"
 
-#: ../rpmdrake_.c:626
-msgid "Reload the packages list"
-msgstr "โหลดรายชื่อเพจเ�จใหม่"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "ปรับ�ต่ง proxies"
 
-#: ../rpmdrake_.c:626
-msgid "Reset the selection"
-msgstr "reset รายชื่อที่ถู�เลือ�"
+#: ../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 "พาธ�บบ relative ไปยัง 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 "Install"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Editing source \"%s\":"
+msgstr "�ำลัง��้ไข source \"%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 "��้ไข source"
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Installation"
-msgstr "�าร install package"
+#: ../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 "�ำลังติดต่อ�ับ mirror เพื่ออัพเดทข้อมูลเพ�เ�จ, �รุณารอสั�ครู่"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of source:"
+msgstr "ชนิดของ source:"
 
-#: ../rpmdrake_.c:781
-msgid "Error updating medium"
-msgstr "้้เ�ิดข้อผิดผลาดขณะพยายามอัพเดทสื่อข้อมูล"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Adding a source:"
+msgstr "เพิ่ม source: "
 
-#: ../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 "วิธีเลือ� mirror ของคุณเอง"
+#: ../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 "�ำลังติดต่อ�ับ mirror เพื่อขออัพเดทเพ�เ�จ �รุณารอสั�ครู่"
+#: ../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 "เลือ� mirror..."
 
-#: ../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 เป็นไฟล์หลั�Manager"
+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 "install เสร็จเรียบร้อย"
+#: ../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 "เพิ่ม source: "
 
-#: ../rpmdrake_.c:926
-msgid "A required program is missing (grpmi). Check your installation."
-msgstr "โปร��รมที่ต้อง�าร (grpmi) หายไป �รุณาตรวจสอบตัวเลือ� install ของคุณ"
+#: ../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 "ไม่สามารถหา source เพ�เ�จได้"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "ไม่สามารถสร้าง�ผ่นข้อมูลได้"
 
-#: ../rpmdrake_.c:941
-msgid "Unable to get source packages, sorry."
-msgstr "ไม่สามารถหา source เพ�เ�จได้"
+#: ../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 "เลือ� source(s) ที่คุณต้อง�ารจะอัพเดท"
 
-#: ../rpmdrake_.c:957
-msgid "Installation failed"
-msgstr "install ไม่สำเร็จ"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please choose the desired mirror."
+msgstr "�รุณาเลือ� 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 ""
-"install ไม่สำเร็จ, ไฟล์บางไฟล์อยู่ไท่ครบ\n"
-"คุณอาจจะต้องอัพเดท�านข้อมูล source ของคุณ"
+"ไม่สามารถพบ mirror ที่เหมาะสมได้\n"
+"\n"
+"ปั�หานี้เ�ิดได้จา�หลายสาเหตุ; ส่วนมา��ล้วจะมาจา��ารที่ architecture ของ\n"
+"หน่วยประมวลผลของคุณไม่ได้สนับสนุนโดย Mandrake Linux Offical Updates"
 
-#: ../rpmdrake_.c:961
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr "�รุณารอสั�ครู่... �ำลังลบเพ�เ�จบางตัวเพื่อให้ตัวอื่นสามารถอัพเ�รดได้"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
+msgstr "ไม่พบ 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 ""
-"install เสร็จสมบูรณ์; %s\n"
+"มีข้อผิดพลาดเ�ิดขึ้นขณะดาวน์โหลดรายชื่อ mirrors:\n"
 "\n"
-"ไฟล์ configuration บางตัวถู�สร้างในชื่อ '.rpmnew' หรือ '.rpmsave', \n"
-"คุณอาจจะต้องตรวจสอบไฟล์เหล่านี้หา�ต้อง�ารทำอย่างอื่นต่อไป"
+"%s\n"
+"ระบบเนตเวิร์� หรือ เวป MandrakeSoft ในขณะนี้อาจจะไม่พร้อมให้บริ�าร �รุณาลองใหม่ภายหลัง"
 
-#: ../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 "�รุณารอสั�ครุ่, �ำลังดาว์นโหลดรายชื่อ mirrors จา�เวป 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 ""
-"ไม่สามารถ install เพ�เ�จบางตัวได้\n"
-"อย่างถู�ต้อง"
+"โปร��รมต้อง�ารติดต่อเวปไซต์ MandrakeSoft เพื่ออ่านรายชื่อ mirrors\n"
+"�รุณาตรวจสอบว่าระบบเนตเวิร์�ของคุณ�ำลังเปิดใช้งานอยู่\n"
+"\n"
+"คุณต้อง�ารจะทำต่อหรือไม่?"
 
-#: ../rpmdrake_.c:983
-msgid "everything was installed correctly"
-msgstr "ทุ�อย่างถู� install เรียบร้อย"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United States"
+msgstr "สหรั�อเมริ�า"
 
-#: ../rpmdrake_.c:985
-msgid "Everything installed successfully"
-msgstr "ทุ�อย่างถู� install เรียบร้อย"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
+msgstr "จีน"
 
-#: ../rpmdrake_.c:986
-msgid "All requested packages were installed successfully."
-msgstr "เพ�เ�จทุ�ตัวที่เลือ�ไว้ถู� install เรียบร้อย"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr "อัง�ฤษ"
 
-#: ../rpmdrake_.c:989
-msgid "Everything already installed."
-msgstr "ทุ�อย่างถู� install ไว้หมด�ล้ว"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "ไต้หวัน"
 
-#: ../rpmdrake_.c:990
-msgid "Everything already installed (is this supposed to happen at all?)."
-msgstr "ทุ�อย่างถู� install ไว้หมด�ล้ว"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "สวีเดน"
 
-#: ../rpmdrake_.c:997
-msgid "Problem during installation"
-msgstr "เ�ิดปั�หาขณะ install"
+#: ../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 ""
-"เ�ิดปั�หาขณะ install:\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
-#, fuzzy
-msgid "Problem during removal"
-msgstr "เ�ิดปั�หาขณะ install"
+#: ../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 ""
-"เ�ิดปั�หาขณะ install:\n"
-"\n"
-"%s"
+#: ../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 ""
-"ยินดีต้อนรับสู่ software removal tool!\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 Update!\n"
-"\n"
-"โปร��รมนี้จะช่วยคุณใน�ารเลือ�ตัวอัพเดทที่คุณต้อง�าร install ลงในเครื่อง"
+#: ../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 ""
-"ยินดีต้อนรับสู่ software installation tool!\n"
-"\n"
-"Mandrake Linux ของคุณมาพร้อม�ับเพ�เ�จโปร��รทเป็นพลายพันตัว\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 "Install โปร��รม"
 
 #: data/rpmdrake-remove.desktop.in.h:1
 msgid "Remove Software"
@@ -882,154 +1216,8 @@ msgstr "ลบโปร��รท"
 msgid "Software Sources Manager"
 msgstr "ตัวจัด�าร Software Sources"
 
-#: data/rpmdrake.desktop.in.h:1
-msgid "Install Software"
-msgstr "Install โปร��รม"
-
-#~ msgid ""
-#~ "There is already a medium by that name, do you\n"
-#~ "really want to replace it?"
-#~ msgstr ""
-#~ "มีสื่อข้อมูลชื่อดัง�ล่าวอยู่�ล้ว\n"
-#~ "คุณต้อง�ารจะเขียนทับหรือไม่?"
-
-#~ 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 ""
-#~ "ยินดีต้อนรับสู่ package source editor!\n"
-#~ "\n"
-#~ "เครื่องมือนี้จะช่วยคุณใน�ารปรับ�ต่ง package sources ที่คุณจะใช้ในเครื่องคอมพิวเตอร์\n"
-#~ "ของคุณ เพื่อที่เพ�เ�จเหล่านี้จะได้พร้อมสำหรับ�าร install หรืออัพเดทต่อไป"
-
-#~ msgid ""
-#~ "I need to contact MandrakeSoft website to get the mirrors list.\n"
-#~ "Please check that your network is currently running.\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "โปร��รมต้อง�ารติดต่อเวปไซต์ MandrakeSoft เพื่ออ่านรายชื่อ mirrors\n"
-#~ "�รุณาตรวจสอบว่าระบบเนตเวิร์�ของคุณ�ำลังเปิดใช้งานอยู่\n"
-#~ "\n"
-#~ "คุณต้อง�ารจะทำต่อหรือไม่?"
-
-#~ msgid ""
-#~ "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 ""
-#~ "มีข้อผิดพลาดเ�ิดขึ้นขณะดาวน์โหลดรายชื่อ mirrors:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "ระบบเนตเวิร์� หรือ เวป MandrakeSoft ในขณะนี้อาจจะไม่พร้อมให้บริ�าร �รุณาลองใหม่ภายหลัง"
-
-#~ msgid ""
-#~ "I can't find any suitable mirror.\n"
-#~ "\n"
-#~ "There can be many reasons for this problem; the most frequent is\n"
-#~ "the case when the architecture of your processor is not supported\n"
-#~ "by Mandrake Linux Official Updates."
-#~ msgstr ""
-#~ "ไม่สามารถพบ mirror ที่เหมาะสมได้\n"
-#~ "\n"
-#~ "ปั�หานี้เ�ิดได้จา�หลายสาเหตุ; ส่วนมา��ล้วจะมาจา��ารที่ architecture ของ\n"
-#~ "หน่วยประมวลผลของคุณไม่ได้สนับสนุนโดย Mandrake Linux Offical Updates"
-
-#~ msgid ""
-#~ "The list of updates is void. This means that either there is\n"
-#~ "no available update for the packages installed on your computer,\n"
-#~ "or you already installed all of them."
-#~ msgstr ""
-#~ "ไม่มีราย�ารที่ต้องอัพเดท หมายความว่าอาจจะยังไม่มีอัพเดทสำหรัับ\n"
-#~ "เพ�เ�จที่อยู่ในเครื่องของคุณหรือไม่�็ถู� install หมด�ล้ว"
-
-#~ msgid ""
-#~ "Warning: it seems that you are attempting to add so much\n"
-#~ "packages that your filesystem may run out of free diskspace,\n"
-#~ "during or after package installation ; this is particularly\n"
-#~ "dangerous and should be considered with care.\n"
-#~ "\n"
-#~ "Do you really want to install all the selected packages?"
-#~ msgstr ""
-#~ "คำเตือน: คุณ�ำลังเพิ่มเพ�เ�จเป็นจำนวนมา�ลงเครื่องของคุณ�ละอาจจะ\n"
-#~ "ทำให้พื้นที่ว่างในระบบหมดไปขณะ หรือ หลัง�ารลงเพ�เ�จ�ล้ว\n"
-#~ "�าร�ระทำนี้อาจเป็นอันตราย�ละควรจะพิจารณาให้ถี่ถ้วน\n"
-#~ "\n"
-#~ "คุณต้อง�ารจะลงเพ�เ�จที่เลือ�ไว้ทั้งหมดหรือไม่?"
-
-#~ msgid ""
-#~ "The following packages have to be removed for others to be upgraded:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "เพ�เ�จเหล่านี้ต้องถู�ลบออ�เพื่อให้เพจเ�จอื่นๆอัพเ�รดได้:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "คุณต้อง�ารทำต่อหรือไม่?"
-
 #~ msgid "-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 ""
-#~ "โปร��รทต้อง�ารติดต่อ�ับ mirror เพื่อหาตัวอัพเดทล่าสุด\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 ""
-#~ "คุณสามารถเลือ� mirror ได้เอง\n"
-#~ "โดยเปิด Software Sources Manager �ล้ว�็เพิ่ม Security updates' source\n"
-#~ "\n"
-#~ "จา�นั้น �็ปิด�ล้วเปิด Mandrake Update อี�ครั้ง"
-
-#~ 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"
-#~ "สาเหตุอาจจะมาจา�ลิง�์ mirror เสีย หรือ ปิดบริ�ารชั่วคราว หรือ เวอร์ชันของ\n"
-#~ "Mandrake Linux ของคุณ (%s) ไม่ได้รับหรือย�เลิ� �ารสนับสนุนจา� Mandrake Linux\n"
-#~ "Offical Updates\n"
-#~ "\n"
-#~ "คุณต้อง�ารจะลอง mirror อื่นหรือไม่?"
-
 #~ msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
 #~ msgstr "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
diff --git a/po/th.pom b/po/th.pom
index 141b0823..20c31dbd 100644
--- a/po/th.pom
+++ b/po/th.pom
@@ -4,175 +4,176 @@ msgstr "เซิร์ฟเวอร์"
 
 # 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 "เครื่องพิมพ์ในระบบ Network (Socket)"
+msgid "Office Workstation"
+msgstr "Workstation ที่ทำงาน"
 
 # 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 "ดี"
+msgid "Workstation"
+msgstr "Workstation ที่ทำงาน"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 #, fuzzy
-msgid "Gnome Workstation"
+msgid "Game station"
 msgstr "Workstation ที่ทำงาน"
 
 # 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
 #, fuzzy
-msgid "Workstation"
-msgstr "Workstation ที่ทำงาน"
+msgid "Multimedia station"
+msgstr "Multimedia - เขียน CD "
 
 # 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 "�ารเชื่อมต่อ�ับ Internet �บบ sharing"
 
 # 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 ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr "เครื่องมือใน�ารอ่าน�ละส่ง mail �ละ news (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 ""
+#, fuzzy
+msgid "Network Computer (client)"
+msgstr "เครื่องพิมพ์ในระบบ Network (Socket)"
 
 # 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 "Clients for different protocols including 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 ""
+#, fuzzy
+msgid "Configuration"
+msgstr "�ารปรับ�ต่ง LAN"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "KDE Workstation"
-msgstr "Workstation ที่ทำงาน"
+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 ""
+msgid "Scientific Workstation"
+msgstr "Workstation ทางวิทยาศาสตร์"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Multimedia - Video"
-msgstr "Multimedia - เขียน CD "
+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 ""
+#, fuzzy
+msgid "KDE Workstation"
+msgstr "Workstation ที่ทำงาน"
 
 # 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
-#, fuzzy
-msgid "Multimedia - Sound"
-msgstr "Multimedia - เขียน CD "
+msgid "Graphical Environment"
+msgstr "�ารทำงาน�บบ�ราฟฟิ�"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 #, fuzzy
-msgid "Documentation"
-msgstr "ตำ�หน่ง"
+msgid "Gnome Workstation"
+msgstr "Workstation ที่ทำงาน"
 
 # 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"
-msgstr ""
+msgid "Other Graphical Desktops"
+msgstr "Graphical Desktops อื่นๆ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Internet station"
-msgstr "�ารเชื่อมต่อ�ับ Internet �บบ sharing"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Multimedia station"
-msgstr "Multimedia - เขียน CD "
+# 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
-#, fuzzy
-msgid "Configuration"
-msgstr "�ารปรับ�ต่ง LAN"
+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 "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Graphical Desktops อื่นๆ"
+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"
+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 ""
 
 # 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 "พัฒนาซอฟท์�วร์ (Development)"
+#: ../../share/compssUsers:999
+msgid "Web/FTP"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -181,32 +182,43 @@ msgstr ""
 
 # 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 "Workstation ที่ทำงาน"
+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 "�ารติดต่อ internet"
+
+# 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
@@ -217,18 +229,18 @@ msgstr "เครื่องพิมพ์ในระบบ Network (Socket)"
 
 # 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 "Workstation ที่ทำงาน"
+msgid "Office"
+msgstr "ดี"
 
 # 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
@@ -239,76 +251,69 @@ msgstr "Multimedia - เขียน CD "
 
 # 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 "เครื่องมือใน�ารอ่าน�ละส่ง mail �ละ news (pine, mutt, tin..) �ละท่องอินเตอร์เน็ต"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "�ารเงินส่วนตัว"
+#, fuzzy
+msgid "Multimedia - Sound"
+msgstr "Multimedia - เขียน CD "
 
 # 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 "Clients for different protocols including ssh"
+#, fuzzy
+msgid "Multimedia - Video"
+msgstr "Multimedia - เขียน CD "
 
 # 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 "�ารติดต่อ internet"
+msgid "Multimedia - CD Burning"
+msgstr "Multimedia - เขียน 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"
+#, fuzzy
+msgid "More Graphical Desktops (Gnome, IceWM)"
 msgstr "Graphical Desktops อื่นๆ"
 
 # 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"
-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 "Multimedia - เขียน CD "
+msgid "Personal Finance"
+msgstr "�ารเงินส่วนตัว"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Workstation ทางวิทยาศาสตร์"
+msgid "Programs to manage your finances, such as gnucash"
+msgstr "โปร��รมที่ช่วยจัด�ารเรื่อง�ารเงิน เช่น gnucash"
 
diff --git a/po/tr.po b/po/tr.po
index fa800315..0a2ad049 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -11,7 +11,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-18 02:34+0200\n"
 "Last-Translator: Ömer Fadıl USTA <omer_fad@hotmail.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -19,874 +19,1218 @@ 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 "Ortam oluşturulamıyor."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Devam etmek için herşey tamam mı ?"
 
-#: ../edit-urpm-sources.pl_.c:44
-msgid "Unable to update medium; it will be automatically disabled."
-msgstr "Ortam güncellenemiyor; otomatik olarak görünmeyecek."
+#: ../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 ""
+"Yazılım yükleme aracına hoşgeldiniz!\n"
+"\n"
+"Mandrake Linux sisteminiz CDROM veya DVD üzerinde bikaç bin yazılım\n"
+"paketiyle birlikte gelir. Bu araç, bilgisayarınıza yüklemek istediğiniz "
+"yazılımları\n"
+"seçmede size yardımcı olacak."
 
-#: ../edit-urpm-sources.pl_.c:54
-msgid "Add a source"
-msgstr "Bir kaynak ekle"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"MandrakeUpdate'e hoÅŸgeldiniz!\n"
+"\n"
+"Bu araç, bilgisayarınıza yüklemek istediğiniz güncellemeleri seçmede size\n"
+"yardımcı olacak."
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Local files"
-msgstr "Yerel dosyalar"
+#: ../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 ""
+"Yazılım kaldırma aracına hoş geldiniz!\n"
+"\n"
+"Bu araç, bilgisayarınızdan kaldırmak istediğiniz uygulamaları seçmede size\n"
+"yardımcı olacak."
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Path:"
-msgstr "Yol:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"Paketlerin kaldırımı sırasında bir problem meydana geldi:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:56
-msgid "FTP server"
-msgstr "FTP sunucu"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during removal"
+msgstr "Kaldırım esnasında problem"
 
-#: ../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 "Lütfen bekleyin, paketler kaldırılıyor..."
 
-#: ../edit-urpm-sources.pl_.c:57
-msgid "HTTP server"
-msgstr "HTTP sunucu"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
+msgstr "Lütfen bekleyin, paket veritabanı okunuyor..."
 
-#: ../edit-urpm-sources.pl_.c:58
-msgid "Path or mount point:"
-msgstr "Yol veya bağlama noktası:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Kurulum esnasında bir problem oldu:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:58
-msgid "Removable device"
-msgstr "Kaldırılabilinir aygıt"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during installation"
+msgstr "Kurulum esnasında problem"
 
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:550
-msgid "Security updates"
-msgstr "Güvenlik güncellemeleri"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
+msgstr "Herşey zaten kurulu (böyle birşey olması bekleniyor muydu?)."
 
-#: ../edit-urpm-sources.pl_.c:70
-msgid "Browse..."
-msgstr "Gözat..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed."
+msgstr "HerÅŸey zaten kurulu."
 
-#: ../edit-urpm-sources.pl_.c:72
-msgid "Choose a mirror..."
-msgstr "Yansı adresini seçin..."
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "İstenen paketler başarılı bir şekilde yüklendi."
 
-#: ../edit-urpm-sources.pl_.c:92
-msgid "Login:"
-msgstr "Kullanıcı adı:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr "Herşey başarılı bir şekilde yüklendi"
 
-#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:231
-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 ""
+"Kurulum tamamlandır; %s.\n"
+"\n"
+"'.rpmnew' veya '.rpmsave' olak bazı yapılandırma dosyaları oluşturuldu.\n"
+"Harekete geçmek için artık birkaçını inceleyebilirsiniz:"
 
-#: ../edit-urpm-sources.pl_.c:97
-msgid "Name:"
-msgstr "Adı:"
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "HerÅŸey kusursuz kuruldu"
 
-#: ../edit-urpm-sources.pl_.c:99 ../edit-urpm-sources.pl_.c:188
-msgid "Relative path to synthesis/hdlist:"
-msgstr "synthesis/hdlist'e göreli yol:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"some packages failed to install\n"
+"correctly"
+msgstr ""
+"bazı paketler doğru düzgün\n"
+"yüklenemedi"
 
-#: ../edit-urpm-sources.pl_.c:107
-msgid "You need to fill up at least the two first entries."
-msgstr "En azından İlk iki girişi doldurmak zorundasınız."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages to allow others to be upgraded..."
+msgstr ""
+"Lütfen bekleyin, diğerlerinin güncellenebilmesi için paketler kaldırılıyor..."
 
-#: ../edit-urpm-sources.pl_.c:120
-msgid "Adding a source:"
-msgstr "Kaynak ekleniyor:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
+msgstr ""
+"Kurulum başarısız, bazı dosyalar eksik.\n"
+"Kaynak veritabanınızı güncellemeyi düşünebilirsiniz."
 
-#: ../edit-urpm-sources.pl_.c:121
-msgid "Type of source:"
-msgstr "Kaynağın türü"
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation failed"
+msgstr "Kurulum başarısız"
 
-#: ../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 "Ä°ptal"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
 msgid "Ok"
 msgstr "Tamam"
 
-#: ../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 "Ä°ptal"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "\"%s\" ismindeki ortamı [%s] aygıtına takın"
 
-#: ../edit-urpm-sources.pl_.c:147
-msgid "Please wait, adding medium..."
-msgstr "Lütfen bekleyin, ortam ekleniyor..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr "Ortam deÄŸiÅŸtir"
 
-#: ../edit-urpm-sources.pl_.c:168
-msgid "Please wait, removing medium..."
-msgstr "Lütfen bekleyin, ortam kaldırılıyor..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
+msgstr "Kaynak paketleri alınamıyor, üzgünüm."
 
-#: ../edit-urpm-sources.pl_.c:181
-msgid "Edit a source"
-msgstr "Kaynağı Düzenle"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages."
+msgstr "Kaynak paketleri alınamıyor."
 
-#: ../edit-urpm-sources.pl_.c:185
+#: ../rpmdrake:1
 #, c-format
-msgid "Editing source \"%s\":"
-msgstr "\"%s\" kaynağı düzenleniyor:"
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr "Gereken bir program (grpmi) bulunamadı. Kurulumunuzu inceleyin."
 
-#: ../edit-urpm-sources.pl_.c:191
-msgid "Save changes"
-msgstr "DeÄŸiÅŸiklikleri kaydet"
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
+msgstr "Program bulunamadı"
 
-#: ../edit-urpm-sources.pl_.c:200
-msgid "You need to insert the medium to continue"
-msgstr "Devam etmek için ortamı takmanız gerekli"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
+msgstr "Ä°ncele..."
 
-#: ../edit-urpm-sources.pl_.c:201
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "Değişiklikleri kaydetmek için ortamı sürücüye takın."
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation finished"
+msgstr "Kurulum tamamlandı"
 
-#: ../edit-urpm-sources.pl_.c:206
-msgid "Please wait, updating medium..."
-msgstr "Lütfen bekleyin, ortam güncelleniyor..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
+msgstr "BirÅŸey yapma"
 
-#: ../edit-urpm-sources.pl_.c:217
-msgid "Configure proxies"
-msgstr "Vekil sunucuları yapılandır"
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
+msgstr "Ana dosya olarak .%s kullan"
 
-#: ../edit-urpm-sources.pl_.c:223
+#: ../rpmdrake:1
+#, c-format
+msgid "Remove .%s"
+msgstr "Kaldır .%s"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "changes:"
+msgstr "deÄŸiÅŸiklikler:"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr "%s inceleniyor"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, finding available packages..."
+msgstr "Lütfen bekleyin, erişilebilir paketler aranıyor..."
+
+#: ../rpmdrake:1
+#, 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 ""
-"Eğer vekil sunucuya ihtiyacınız varsa makina adı ve isteğe bağlı olarak "
-"portu girin (<vekilsunucu[:port]>):"
+"Güncelleme ortamını urpmi ile eklerken hata oluştu.\n"
+"\n"
+"Bunun sebebi kırık veya geçici olarak ulaşılamaz durumdaki yansı olabilir\n"
+"ya da Mandrake Linux sürümünüz (%s) daha/artık Mandrake Linux Resmi\n"
+"Güncellemeleri tarafından desteklenmiyordur.\n"
+"\n"
+"Başka bir yansı denemek istiyor musunuz?"
 
-#: ../edit-urpm-sources.pl_.c:225
-msgid "Proxy hostname:"
-msgstr "Vekil sunucu adı:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
+msgstr "Güncelleme ortamı eklenirken hata"
 
-#: ../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 ""
-"Vekil sunucu kimlik denetimi için kullanıcıadı/parola belirtebilirsiniz:"
-
-#: ../edit-urpm-sources.pl_.c:229
-msgid "User:"
-msgstr "Kullanıcı:"
+"Lütfen bekleyin, güncelleme paketlerini ilklendirmek için yansıya "
+"bağlanılıyor."
 
-#: ../edit-urpm-sources.pl_.c:255
-msgid "Configure sources"
-msgstr "Kaynakları yapılandır"
+#: ../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 ""
+"İstediğiniz yansıyı elle de seçebilirsiniz: bunu yapmak\n"
+"için Yazılım Kaynakları Yöneticisini açın ve sonra\n"
+"'Güvenlik güncellemeleri' kaynağı ekleyin.\n"
+"\n"
+"Daha sonra, MandrakeUpdate'i yeniden çalıştırın."
 
-#: ../edit-urpm-sources.pl_.c:262
-msgid "Enabled?"
-msgstr "Etkin?"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Yansınızı elle nasıl seçersiniz?"
 
-#: ../edit-urpm-sources.pl_.c:263
-msgid "Source"
-msgstr "Kaynak"
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
+msgstr "Paket bilgileri güncellenirken düzeltilemez bir hata oluştu."
 
-#: ../edit-urpm-sources.pl_.c:286 ../rpmdrake_.c:732
-msgid "Remove"
-msgstr "Kaldır"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
+msgstr "Ortam güncellenirken hata oluştu"
 
-#: ../edit-urpm-sources.pl_.c:288
-msgid "Edit"
-msgstr "Düzenle"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
+msgstr ""
+"Lütfen bekleyin, paket bilgilerini güncellemek için yansıya bağlanılıyor."
 
-#: ../edit-urpm-sources.pl_.c:290
-msgid "Add..."
-msgstr "Ekle..."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"En son güncelleme paketlerini almak için yansıya bağlanmam gerekiyor.\n"
+"Ağınızın çalışıp çalışmadığını kontrol edin.\n"
+"\n"
+"Devam etmek için herşey tamam mı?"
 
-#: ../edit-urpm-sources.pl_.c:292
-msgid "Update..."
-msgstr "Güncelle..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Installation"
+msgstr "Yazılım Paketleri Kurulumu"
 
-#: ../edit-urpm-sources.pl_.c:293
-msgid "Proxy..."
-msgstr "Vekil Sunucu..."
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, c-format
+msgid "Mandrake Update"
+msgstr "Mandrake Güncelleme"
 
-#: ../edit-urpm-sources.pl_.c:296
-msgid "Save and quit"
-msgstr "Kaydet ve çık"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
+msgstr "Yazılım Paketleri Kaldırıcı"
 
-#: ../edit-urpm-sources.pl_.c:297 ../rpmdrake_.c:735
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
 msgid "Quit"
 msgstr "Çık"
 
-#: ../rpmdrake.pm_.c:96
-msgid "Yes"
-msgstr "Evet"
-
-#: ../rpmdrake.pm_.c:98
-msgid "No"
-msgstr "Hayır"
-
-#: ../rpmdrake.pm_.c:130
-msgid "Info..."
-msgstr "Hakkında..."
-
-#: ../rpmdrake.pm_.c:183
-msgid "Austria"
-msgstr "Avusturya"
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "Kur"
 
-#: ../rpmdrake.pm_.c:184
-msgid "Australia"
-msgstr "Avusturalya"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "Kaldır"
 
-#: ../rpmdrake.pm_.c:185
-msgid "Belgium"
-msgstr "Belçika"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search"
+msgstr "Ara"
 
-#: ../rpmdrake.pm_.c:186
-msgid "Brazil"
-msgstr "Brezilya"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "Bul:"
 
-#: ../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 ""
+"Diğerlerinin güncellenmesi için şu paketlerin kaldırılması gerekiyor:\n"
+"\n"
+"%s\n"
+"\n"
+"Devam etmek için herşey tamam mı?"
 
-#: ../rpmdrake.pm_.c:188
-msgid "Costa Rica"
-msgstr "Kosta Rika"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "Bazı paketlerin kaldırılması gerekiyor"
 
-#: ../rpmdrake.pm_.c:189
-msgid "Czech Republic"
-msgstr "Çek Cumhuriyeti"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr ""
+"Uyarı: öyle görünüyor ki paket kurulumu sırasında ya da sonrasında\n"
+"dosya sisteminizi dolduracak kadar çok paket eklemek istiyorsunuz.\n"
+"Bu genellikle tehlikelidir ve dikkatle ele alınması gerekir.\n"
+"\n"
+"Bütün seçili paketleri gerçekten yüklemek istiyor musunuz?"
 
-#: ../rpmdrake.pm_.c:190
-msgid "Germany"
-msgstr "Almanya"
+#: ../rpmdrake:1
+#, c-format
+msgid "Too many packages are selected"
+msgstr "Aşırı fazla paket seçildi"
 
-#: ../rpmdrake.pm_.c:191
-msgid "Danmark"
-msgstr "Danimarka"
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
+msgstr "En fazla bilgi"
 
-#: ../rpmdrake.pm_.c:192 ../rpmdrake.pm_.c:196
-msgid "Greece"
-msgstr "Yunanistan"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal information"
+msgstr "Normal bilgi"
 
-#: ../rpmdrake.pm_.c:193
-msgid "Spain"
-msgstr "Ä°spanya"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update source(s)"
+msgstr "Kaynakları güncelle"
 
-#: ../rpmdrake.pm_.c:194
-msgid "Finland"
-msgstr "Finlandiya"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reload the packages list"
+msgstr "Paket listesini yeniden yükle"
 
-#: ../rpmdrake.pm_.c:195
-msgid "France"
-msgstr "Fransa"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
+msgstr "Seçimi sıfırla"
 
-#: ../rpmdrake.pm_.c:197
-msgid "Israel"
-msgstr "Ä°srail"
+#: ../rpmdrake:1
+#, c-format
+msgid "in files"
+msgstr "dosyalarda"
 
-#: ../rpmdrake.pm_.c:198
-msgid "Italy"
-msgstr "Ä°talya"
+#: ../rpmdrake:1
+#, c-format
+msgid "in descriptions"
+msgstr "tanımlarda"
 
-#: ../rpmdrake.pm_.c:199
-msgid "Japan"
-msgstr "Japonya"
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
+msgstr "isimlerde"
 
-#: ../rpmdrake.pm_.c:200
-msgid "Korea"
-msgstr "Kore"
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
+msgstr "güncellenebilirliğine göre"
 
-#: ../rpmdrake.pm_.c:201
-msgid "Netherlands"
-msgstr "Hollanda"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
+msgstr "kaynak deposuna göre"
 
-#: ../rpmdrake.pm_.c:202
-msgid "Norway"
-msgstr "Norveç"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
+msgstr "seçim durumuna göre"
 
-#: ../rpmdrake.pm_.c:203
-msgid "Poland"
-msgstr "Polonya"
+#: ../rpmdrake:1
+#, c-format
+msgid "by size"
+msgstr "boyuta göre"
 
-#: ../rpmdrake.pm_.c:204
-msgid "Portugal"
-msgstr "Portekiz"
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
+msgstr "gruba göre"
 
-#: ../rpmdrake.pm_.c:205
-msgid "Russia"
-msgstr "Rusya"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages,"
+msgstr "Tüm paketler,"
 
-#: ../rpmdrake.pm_.c:206
-msgid "Sweden"
-msgstr "İsveç"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
+msgstr "Tüm paketler, alfabetik"
 
-#: ../rpmdrake.pm_.c:207
-msgid "Taiwan"
-msgstr "Tayvan"
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
+msgstr "Mandrake seçimleri"
 
-#: ../rpmdrake.pm_.c:208
-msgid "United Kingdom"
-msgstr "Birleşik Krallık"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal updates"
+msgstr "Normal güncellemeler"
 
-#: ../rpmdrake.pm_.c:209
-msgid "China"
-msgstr "Çin"
+#: ../rpmdrake:1
+#, c-format
+msgid "Bugfixes updates"
+msgstr "Hata düzeltme güncellemeleri"
 
-#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:211 ../rpmdrake.pm_.c:212
-#: ../rpmdrake.pm_.c:213 ../rpmdrake.pm_.c:264
-msgid "United States"
-msgstr "BirleÅŸik Devletler"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
+msgstr "Güvenlik güncellemeleri"
 
-#: ../rpmdrake.pm_.c:277
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
-"Lütfen bekleyin, yansı adresleri MandrakeSoft'un web sitesinden indiriliyor."
+#: ../rpmdrake:1
+#, c-format
+msgid "Description: "
+msgstr "Tanım: "
 
-#: ../rpmdrake.pm_.c:283
-msgid "Error during download"
-msgstr "İndirme sırasında hata oluştu"
+#: ../rpmdrake:1
+#, c-format
+msgid "Summary: "
+msgstr "Özet: "
 
-#: ../rpmdrake.pm_.c:292
-msgid "No mirror"
-msgstr "Yansı yok"
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "Önem: "
 
-#: ../rpmdrake.pm_.c:310
-msgid "Please choose the desired mirror."
-msgstr "Lütfen istediğiniz yansıyı seçin."
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake.pm_.c:342 ../rpmdrake_.c:629
-msgid "Update source(s)"
-msgstr "Kaynakları güncelle"
+#: ../rpmdrake:1
+#, c-format
+msgid "Size: "
+msgstr "Boyut: "
 
-#: ../rpmdrake.pm_.c:346
-msgid "Select the source(s) you wish to update:"
-msgstr "Lütfen güncellemek istediğiniz kaynakları seçiniz:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Version: "
+msgstr "Sürümü: "
 
-#: ../rpmdrake.pm_.c:350
-msgid "Update"
-msgstr "Güncelle"
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "Adı: "
 
-#: ../rpmdrake.pm_.c:360
-msgid "Please wait, updating media..."
-msgstr "Lütfen bekleyin, ortam güncelleniyor..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "Güncelleme nedeni: "
 
-#: ../rpmdrake_.c:101
-msgid "Other"
-msgstr "DiÄŸer"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
+msgstr "Kurulu olan sürüm: "
 
-#: ../rpmdrake_.c:123 ../rpmdrake_.c:137 ../rpmdrake_.c:229 ../rpmdrake_.c:300
-msgid "(none)"
-msgstr "(hiçbiri)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Source: "
+msgstr "Kaynak: "
 
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:484 ../rpmdrake_.c:485
+#: ../rpmdrake:1
+#, c-format
 msgid "(Not available)"
 msgstr "(EriÅŸilemez)"
 
-#: ../rpmdrake_.c:153 ../rpmdrake_.c:210
-msgid "Search results"
-msgstr "Arama sonuçları"
-
-#: ../rpmdrake_.c:153
-msgid "Search results (none)"
-msgstr "Arama sonuçları (hiçbiri)"
-
-#: ../rpmdrake_.c:163 ../rpmdrake_.c:174
-msgid "Please wait, searching..."
-msgstr "Lütfen bekleyin, aranıyor..."
-
-#: ../rpmdrake_.c:177
-msgid "Stop"
-msgstr "Dur"
-
-#: ../rpmdrake_.c:211 ../rpmdrake_.c:321
-msgid "Addable"
-msgstr "Eklenebilir"
-
-#: ../rpmdrake_.c:211 ../rpmdrake_.c:321
-msgid "Upgradable"
-msgstr "Güncellenebilinir"
-
-#: ../rpmdrake_.c:213
-msgid "Not selected"
-msgstr "Seçili değil"
-
-#: ../rpmdrake_.c:213
-msgid "Selected"
-msgstr "Seçili"
-
-#: ../rpmdrake_.c:242
-msgid "rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake_.c:260 ../rpmdrake_.c:362 ../rpmdrake_.c:364
-msgid "More information on package..."
-msgstr "Paket hakkında daha fazla bilgi..."
-
-#: ../rpmdrake_.c:261
-msgid "One of the following packages is needed:"
-msgstr "Şu paketler birinin yüklenmesi gerekiyor:"
-
-#: ../rpmdrake_.c:261
-msgid "Please choose"
-msgstr "Lütfen seçin"
-
-#: ../rpmdrake_.c:277
-msgid "unknown package "
-msgstr "bilinmeyen paket "
-
-#: ../rpmdrake_.c:287
-msgid "Please wait, listing packages..."
-msgstr "Lütfen bekleyin, paketler listeleniyor..."
-
-#: ../rpmdrake_.c:302
-msgid "No update"
-msgstr "Güncelleme yok"
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
+msgstr "Günlük:\n"
 
-#: ../rpmdrake_.c:355 ../rpmdrake_.c:356
-msgid "More infos"
-msgstr "Daha Bilgi"
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "Dosyalar:\n"
 
-#: ../rpmdrake_.c:357
-msgid "Information on packages"
-msgstr "Paket hakkında daha fazla bilgi"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected size: %d MB"
+msgstr "Seçili boyut: %d MB"
 
-#: ../rpmdrake_.c:378
-msgid "Some additional packages need to be removed"
-msgstr "Bazı ek paketlerin kaldırılması gerekiyor"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Seçili: %d MB / Diskteki boş alan: %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 ""
-"Bağımlılıkları nedeniyle şu paketlerinde kaldırlması gerekiyor:\n"
+"Bağımlılıkları nedeniyle şu paketlerin seçili olmaması gerekiyor:\n"
 "\n"
 
-#: ../rpmdrake_.c:385 ../rpmdrake_.c:393
-msgid "Some packages can't be removed"
-msgstr "Bazı paketler kaldırılamadı"
-
-#: ../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 ""
-"Bu paketleri kaldırmak sisteminizin göçmesine sebeb olabilir, üzgünüm:\n"
+"Üzgünüm, şu paketler seçilemezler:\n"
 "\n"
 
-#: ../rpmdrake_.c:394 ../rpmdrake_.c:453
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "Bazı paketler yüklenemedi"
+
+#: ../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 ""
-"Bağımlılıkları nedeniyle şu paketlerin seçili olmaması gerekiyor:\n"
+"Bağımlılıkları korumak için, şu paketlerin de yüklenmesi\n"
+"gerekiyor:\n"
 "\n"
 
-#: ../rpmdrake_.c:423
+#: ../rpmdrake:1
+#, c-format
 msgid "Additional packages needed"
 msgstr "Ek paketlere ihtiyaç var"
 
-#: ../rpmdrake_.c:424
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be removed"
+msgstr "Bazı paketler kaldırılamadı"
+
+#: ../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 ""
-"Bağımlılıkları korumak için, şu paketlerin de yüklenmesi\n"
-"gerekiyor:\n"
+"Bu paketleri kaldırmak sisteminizin göçmesine sebeb olabilir, üzgünüm:\n"
 "\n"
 
-#: ../rpmdrake_.c:437
-msgid "Some packages can't be installed"
-msgstr "Bazı paketler yüklenemedi"
-
-#: ../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 ""
-"Üzgünüm, şu paketler seçilemezler:\n"
+"Bağımlılıkları nedeniyle şu paketlerinde kaldırlması gerekiyor:\n"
 "\n"
 
-#: ../rpmdrake_.c:452 ../rpmdrake_.c:686
-msgid "Some packages need to be removed"
-msgstr "Bazı paketlerin kaldırılması gerekiyor"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr "Bazı ek paketlerin kaldırılması gerekiyor"
 
-#: ../rpmdrake_.c:474
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Seçili: %d MB / Diskteki boş alan: %d MB"
+msgid "More information on package..."
+msgstr "Paket hakkında daha fazla bilgi..."
 
-#: ../rpmdrake_.c:476
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "Seçili boyut: %d MB"
+msgid "Information on packages"
+msgstr "Paket hakkında daha fazla bilgi"
 
-#: ../rpmdrake_.c:484
-msgid "Files:\n"
-msgstr "Dosyalar:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
+msgstr "Daha Bilgi"
 
-#: ../rpmdrake_.c:485
-msgid "Changelog:\n"
-msgstr "Günlük:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "Addable"
+msgstr "Eklenebilir"
 
-#: ../rpmdrake_.c:488
-msgid "Source: "
-msgstr "Kaynak: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Upgradable"
+msgstr "Güncellenebilinir"
 
-#: ../rpmdrake_.c:489
-msgid "Currently installed version: "
-msgstr "Kurulu olan sürüm: "
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"The list of updates is void. This means that either there is\n"
+"no available update for the packages installed on your computer,\n"
+"or you already installed all of them."
+msgstr ""
+"Güncelleme listesi boş. Bu ya bilgisayarınızda yüklü paketler için\n"
+"güncelleme olmadığı ya da bütün güncellemeleri yüklediğiniz anlamına\n"
+"gelir."
 
-#: ../rpmdrake_.c:493
-msgid "Reason for update: "
-msgstr "Güncelleme nedeni: "
+#: ../rpmdrake:1
+#, c-format
+msgid "No update"
+msgstr "Güncelleme yok"
 
-#: ../rpmdrake_.c:495
-msgid "Name: "
-msgstr "Adı: "
+#: ../rpmdrake:1
+#, c-format
+msgid "(none)"
+msgstr "(hiçbiri)"
 
-#: ../rpmdrake_.c:496
-msgid "Version: "
-msgstr "Sürümü: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, listing packages..."
+msgstr "Lütfen bekleyin, paketler listeleniyor..."
 
-#: ../rpmdrake_.c:497
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "unknown package "
+msgstr "bilinmeyen paket "
 
-#: ../rpmdrake_.c:497
-msgid "Size: "
-msgstr "Boyut: "
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Şu paketler birinin yüklenmesi gerekiyor:"
 
-#: ../rpmdrake_.c:499
-msgid "Importance: "
-msgstr "Önem: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please choose"
+msgstr "Lütfen seçin"
 
-#: ../rpmdrake_.c:500
-msgid "Summary: "
-msgstr "Özet: "
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:501
-msgid "Description: "
-msgstr "Tanım: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Not selected"
+msgstr "Seçili değil"
 
-#: ../rpmdrake_.c:550
-msgid "Bugfixes updates"
-msgstr "Hata düzeltme güncellemeleri"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected"
+msgstr "Seçili"
 
-#: ../rpmdrake_.c:550
-msgid "Normal updates"
-msgstr "Normal güncellemeler"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results"
+msgstr "Arama sonuçları"
 
-#: ../rpmdrake_.c:569
-msgid "Mandrake choices"
-msgstr "Mandrake seçimleri"
+#: ../rpmdrake:1
+#, c-format
+msgid "Stop"
+msgstr "Dur"
 
-#: ../rpmdrake_.c:570
-msgid "All packages, alphabetical"
-msgstr "Tüm paketler, alfabetik"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, searching..."
+msgstr "Lütfen bekleyin, aranıyor..."
 
-#: ../rpmdrake_.c:571
-msgid "All packages,"
-msgstr "Tüm paketler,"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
+msgstr "Arama sonuçları (hiçbiri)"
 
-#: ../rpmdrake_.c:594
-msgid "by group"
-msgstr "gruba göre"
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "DiÄŸer"
 
-#: ../rpmdrake_.c:594
-msgid "by size"
-msgstr "boyuta göre"
+#: ../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 ""
+"Paket kaynağı düzenleyicisine hoşgeldiniz!\n"
+"\n"
+"Bu araç bilgisayarınızda kullanmak istediğiniz paket kaynaklarını "
+"yapılandırmada\n"
+"size yardımcı olacak. Sonra da yeni yazılım paketi yüklemek veya güncelleme\n"
+"yapmak için bunları kullanabileceksiniz."
 
-#: ../rpmdrake_.c:595
-msgid "by selection state"
-msgstr "seçim durumuna göre"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Kaydet ve çık"
 
-#: ../rpmdrake_.c:596
-msgid "by source repository"
-msgstr "kaynak deposuna göre"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy..."
+msgstr "Vekil Sunucu..."
 
-#: ../rpmdrake_.c:596
-msgid "by update availability"
-msgstr "güncellenebilirliğine göre"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
+msgstr "Güncelle..."
 
-#: ../rpmdrake_.c:617
-msgid "in descriptions"
-msgstr "tanımlarda"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "Ekle..."
 
-#: ../rpmdrake_.c:617
-msgid "in files"
-msgstr "dosyalarda"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "Düzenle"
 
-#: ../rpmdrake_.c:617
-msgid "in names"
-msgstr "isimlerde"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Source"
+msgstr "Kaynak"
 
-#: ../rpmdrake_.c:628
-msgid "Reload the packages list"
-msgstr "Paket listesini yeniden yükle"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
+msgstr "Etkin?"
 
-#: ../rpmdrake_.c:628
-msgid "Reset the selection"
-msgstr "Seçimi sıfırla"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure sources"
+msgstr "Kaynakları yapılandır"
 
-#: ../rpmdrake_.c:654
-msgid "Maximum information"
-msgstr "En fazla bilgi"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "Parola:"
 
-#: ../rpmdrake_.c:654
-msgid "Normal information"
-msgstr "Normal bilgi"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
+msgstr "Kullanıcı:"
 
-#: ../rpmdrake_.c:676
-msgid "Too many packages are selected"
-msgstr "Aşırı fazla paket seçildi"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+"Vekil sunucu kimlik denetimi için kullanıcıadı/parola belirtebilirsiniz:"
 
-#: ../rpmdrake_.c:722
-msgid "Find:"
-msgstr "Bul:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "Vekil sunucu adı:"
 
-#: ../rpmdrake_.c:727
-msgid "Search"
-msgstr "Ara"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"Eğer vekil sunucuya ihtiyacınız varsa makina adı ve isteğe bağlı olarak "
+"portu girin (<vekilsunucu[:port]>):"
 
-#: ../rpmdrake_.c:733
-msgid "Install"
-msgstr "Kur"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "Vekil sunucuları yapılandır"
 
-#: ../rpmdrake_.c:740 data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrake Update"
-msgstr "Mandrake Güncelleme"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr "Lütfen bekleyin, ortam güncelleniyor..."
 
-#: ../rpmdrake_.c:740
-msgid "Software Packages Installation"
-msgstr "Yazılım Paketleri Kurulumu"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "Değişiklikleri kaydetmek için ortamı sürücüye takın."
 
-#: ../rpmdrake_.c:740
-msgid "Software Packages Removal"
-msgstr "Yazılım Paketleri Kaldırıcı"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
+msgstr "Devam etmek için ortamı takmanız gerekli"
 
-#: ../rpmdrake_.c:781
-msgid "Please wait, contacting mirror to update packages information."
-msgstr ""
-"Lütfen bekleyin, paket bilgilerini güncellemek için yansıya bağlanılıyor."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save changes"
+msgstr "DeÄŸiÅŸiklikleri kaydet"
 
-#: ../rpmdrake_.c:783
-msgid "Error updating medium"
-msgstr "Ortam güncellenirken hata oluştu"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "synthesis/hdlist'e göreli yol:"
 
-#: ../rpmdrake_.c:784
-msgid "There was an unrecoverable error while updating packages information."
-msgstr "Paket bilgileri güncellenirken düzeltilemez bir hata oluştu."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake_.c:789
-msgid "How to choose manually your mirror"
-msgstr "Yansınızı elle nasıl seçersiniz?"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Editing source \"%s\":"
+msgstr "\"%s\" kaynağı düzenleniyor:"
 
-#: ../rpmdrake_.c:797
-msgid "Please wait, contacting mirror to initialize updates packages."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit a source"
+msgstr "Kaynağı Düzenle"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr "Lütfen bekleyin, ortam kaldırılıyor..."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, adding medium..."
+msgstr "Lütfen bekleyin, ortam ekleniyor..."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of source:"
+msgstr "Kaynağın türü"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Adding a source:"
+msgstr "Kaynak ekleniyor:"
+
+#: ../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 ""
-"Lütfen bekleyin, güncelleme paketlerini ilklendirmek için yansıya "
-"bağlanılıyor."
+"Aynı isme sahip bir başka ortam mevcut, onu\n"
+"deÄŸiÅŸtirmek ister misiniz?"
 
-#: ../rpmdrake_.c:800
-msgid "Error adding update medium"
-msgstr "Güncelleme ortamı eklenirken hata"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to fill up at least the two first entries."
+msgstr "En azından İlk iki girişi doldurmak zorundasınız."
 
-#: ../rpmdrake_.c:831
-msgid "Please wait, finding available packages..."
-msgstr "Lütfen bekleyin, erişilebilir paketler aranıyor..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "Adı:"
 
-#: ../rpmdrake_.c:863
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "%s inceleniyor"
+msgid "Login:"
+msgstr "Kullanıcı adı:"
 
-#: ../rpmdrake_.c:882
-msgid "changes:"
-msgstr "deÄŸiÅŸiklikler:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Yansı adresini seçin..."
 
-#: ../rpmdrake_.c:886
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Kaldır .%s"
+msgid "Browse..."
+msgstr "Gözat..."
 
-#: ../rpmdrake_.c:888
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Ana dosya olarak .%s kullan"
+msgid "Path or mount point:"
+msgstr "Yol veya bağlama noktası:"
 
-#: ../rpmdrake_.c:890
-msgid "Do nothing"
-msgstr "BirÅŸey yapma"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Removable device"
+msgstr "Kaldırılabilinir aygıt"
 
-#: ../rpmdrake_.c:902
-msgid "Installation finished"
-msgstr "Kurulum tamamlandı"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "HTTP server"
+msgstr "HTTP sunucu"
 
-#: ../rpmdrake_.c:912
-msgid "Inspect..."
-msgstr "Ä°ncele..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "FTP sunucu"
 
-#: ../rpmdrake_.c:927
-msgid "Program missing"
-msgstr "Program bulunamadı"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path:"
+msgstr "Yol:"
 
-#: ../rpmdrake_.c:928
-msgid "A required program is missing (grpmi). Check your installation."
-msgstr "Gereken bir program (grpmi) bulunamadı. Kurulumunuzu inceleyin."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "Yerel dosyalar"
 
-#: ../rpmdrake_.c:942
-msgid "Unable to get source packages."
-msgstr "Kaynak paketleri alınamıyor."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add a source"
+msgstr "Bir kaynak ekle"
 
-#: ../rpmdrake_.c:943
-msgid "Unable to get source packages, sorry."
-msgstr "Kaynak paketleri alınamıyor, üzgünüm."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
+msgstr "Ortam güncellenemiyor; otomatik olarak görünmeyecek."
 
-#: ../rpmdrake_.c:950
-msgid "Change medium"
-msgstr "Ortam deÄŸiÅŸtir"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "Ortam oluşturulamıyor."
 
-#: ../rpmdrake_.c:951
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "\"%s\" ismindeki ortamı [%s] aygıtına takın"
+msgid "Please wait, updating media..."
+msgstr "Lütfen bekleyin, ortam güncelleniyor..."
 
-#: ../rpmdrake_.c:959
-msgid "Installation failed"
-msgstr "Kurulum başarısız"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
+msgstr "Güncelle"
 
-#: ../rpmdrake_.c:960
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Select the source(s) you wish to update:"
+msgstr "Lütfen güncellemek istediğiniz kaynakları seçiniz:"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please choose the desired mirror."
+msgstr "Lütfen istediğiniz yansıyı seçin."
+
+#: ../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 ""
-"Kurulum başarısız, bazı dosyalar eksik.\n"
-"Kaynak veritabanınızı güncellemeyi düşünebilirsiniz."
+"Uygun bir yansı bulamıyorum.\n"
+"\n"
+"Bunun birçok nedeni olabilir, en yaygın olan ise işlemci\n"
+"mimarinizin Mandrake Linux Resmi Güncellemeler tarafından\n"
+"desteklenmemesidir."
 
-#: ../rpmdrake_.c:963
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr ""
-"Lütfen bekleyin, diğerlerinin güncellenebilmesi için paketler kaldırılıyor..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
+msgstr "Yansı yok"
 
-#: ../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 ""
-"Kurulum tamamlandır; %s.\n"
+"Yansı adresleri alınırken bir hata oluştu:\n"
 "\n"
-"'.rpmnew' veya '.rpmsave' olak bazı yapılandırma dosyaları oluşturuldu.\n"
-"Harekete geçmek için artık birkaçını inceleyebilirsiniz:"
+"%s\n"
+"Ağ veya MandrakeSoft'un web sayfasını erişilemez durumda\n"
+"olabilir. Lütfen daha sonra tekrar deneyin."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "İndirme sırasında hata oluştu"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
+"Lütfen bekleyin, yansı adresleri MandrakeSoft'un web sitesinden indiriliyor."
 
-#: ../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 ""
-"bazı paketler doğru düzgün\n"
-"yüklenemedi"
+"Yansı adreslerini almak için MandrakeSoft'un web sayfası ile bağlantı\n"
+"kurmam gerekiyor. Ağ bağlantısının çalışıp çalışmadığından emin olun.\n"
+"\n"
+"Devam etmek için herşey tamam mı?"
 
-#: ../rpmdrake_.c:985
-msgid "everything was installed correctly"
-msgstr "HerÅŸey kusursuz kuruldu"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United States"
+msgstr "BirleÅŸik Devletler"
 
-#: ../rpmdrake_.c:987
-msgid "Everything installed successfully"
-msgstr "Herşey başarılı bir şekilde yüklendi"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
+msgstr "Çin"
 
-#: ../rpmdrake_.c:988
-msgid "All requested packages were installed successfully."
-msgstr "İstenen paketler başarılı bir şekilde yüklendi."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr "Birleşik Krallık"
 
-#: ../rpmdrake_.c:991
-msgid "Everything already installed."
-msgstr "HerÅŸey zaten kurulu."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "Tayvan"
 
-#: ../rpmdrake_.c:992
-msgid "Everything already installed (is this supposed to happen at all?)."
-msgstr "Herşey zaten kurulu (böyle birşey olması bekleniyor muydu?)."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "İsveç"
 
-#: ../rpmdrake_.c:999
-msgid "Problem during installation"
-msgstr "Kurulum esnasında problem"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
+msgstr "Rusya"
 
-#: ../rpmdrake_.c:1000
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Kurulum esnasında bir problem oldu:\n"
-"\n"
-"%s"
+msgid "Portugal"
+msgstr "Portekiz"
 
-#: ../rpmdrake_.c:1014
-msgid "Please wait, reading packages database..."
-msgstr "Lütfen bekleyin, paket veritabanı okunuyor..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
+msgstr "Polonya"
 
-#: ../rpmdrake_.c:1055
-msgid "Please wait, removing packages..."
-msgstr "Lütfen bekleyin, paketler kaldırılıyor..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
+msgstr "Norveç"
 
-#: ../rpmdrake_.c:1058
-msgid "Problem during removal"
-msgstr "Kaldırım esnasında problem"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
+msgstr "Hollanda"
 
-#: ../rpmdrake_.c:1059
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Paketlerin kaldırımı sırasında bir problem meydana geldi:\n"
-"\n"
-"%s"
+msgid "Korea"
+msgstr "Kore"
 
-#: ../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 ""
-"Yazılım kaldırma aracına hoş geldiniz!\n"
-"\n"
-"Bu araç, bilgisayarınızdan kaldırmak istediğiniz uygulamaları seçmede size\n"
-"yardımcı olacak."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Japan"
+msgstr "Japonya"
 
-#: ../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 ""
-"MandrakeUpdate'e hoÅŸgeldiniz!\n"
-"\n"
-"Bu araç, bilgisayarınıza yüklemek istediğiniz güncellemeleri seçmede size\n"
-"yardımcı olacak."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Italy"
+msgstr "Ä°talya"
 
-#: ../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 ""
-"Yazılım yükleme aracına hoşgeldiniz!\n"
-"\n"
-"Mandrake Linux sisteminiz CDROM veya DVD üzerinde bikaç bin yazılım\n"
-"paketiyle birlikte gelir. Bu araç, bilgisayarınıza yüklemek istediğiniz "
-"yazılımları\n"
-"seçmede size yardımcı olacak."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Israel"
+msgstr "Ä°srail"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Yunanistan"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "France"
+msgstr "Fransa"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "Finlandiya"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "Ä°spanya"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
+msgstr "Danimarka"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr "Almanya"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
+msgstr "Çek Cumhuriyeti"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Costa Rica"
+msgstr "Kosta Rika"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Canada"
+msgstr "Kanada"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
+msgstr "Brezilya"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Belgium"
+msgstr "Belçika"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Australia"
+msgstr "Avusturalya"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
+msgstr "Avusturya"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Info..."
+msgstr "Hakkında..."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
+msgstr "Hayır"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Evet"
+
+#: data/rpmdrake.desktop.in.h:1
+msgid "Install Software"
+msgstr "Yazılımı Kur"
 
 #: data/rpmdrake-remove.desktop.in.h:1
 msgid "Remove Software"
@@ -896,162 +1240,8 @@ msgstr "Yazılımı Kaldır"
 msgid "Software Sources Manager"
 msgstr "Yazılım Kaynakları Yöneticisi"
 
-#: data/rpmdrake.desktop.in.h:1
-msgid "Install Software"
-msgstr "Yazılımı Kur"
-
-#~ msgid ""
-#~ "There is already a medium by that name, do you\n"
-#~ "really want to replace it?"
-#~ msgstr ""
-#~ "Aynı isme sahip bir başka ortam mevcut, onu\n"
-#~ "deÄŸiÅŸtirmek ister misiniz?"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-#~ "Devam etmek için herşey tamam mı ?"
-
-#~ 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 ""
-#~ "Paket kaynağı düzenleyicisine hoşgeldiniz!\n"
-#~ "\n"
-#~ "Bu araç bilgisayarınızda kullanmak istediğiniz paket kaynaklarını "
-#~ "yapılandırmada\n"
-#~ "size yardımcı olacak. Sonra da yeni yazılım paketi yüklemek veya "
-#~ "güncelleme\n"
-#~ "yapmak için bunları kullanabileceksiniz."
-
-#~ msgid ""
-#~ "I need to contact MandrakeSoft website to get the mirrors list.\n"
-#~ "Please check that your network is currently running.\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "Yansı adreslerini almak için MandrakeSoft'un web sayfası ile bağlantı\n"
-#~ "kurmam gerekiyor. Ağ bağlantısının çalışıp çalışmadığından emin olun.\n"
-#~ "\n"
-#~ "Devam etmek için herşey tamam mı?"
-
-#~ msgid ""
-#~ "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 ""
-#~ "Yansı adresleri alınırken bir hata oluştu:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "Ağ veya MandrakeSoft'un web sayfasını erişilemez durumda\n"
-#~ "olabilir. Lütfen daha sonra tekrar deneyin."
-
-#~ msgid ""
-#~ "I can't find any suitable mirror.\n"
-#~ "\n"
-#~ "There can be many reasons for this problem; the most frequent is\n"
-#~ "the case when the architecture of your processor is not supported\n"
-#~ "by Mandrake Linux Official Updates."
-#~ msgstr ""
-#~ "Uygun bir yansı bulamıyorum.\n"
-#~ "\n"
-#~ "Bunun birçok nedeni olabilir, en yaygın olan ise işlemci\n"
-#~ "mimarinizin Mandrake Linux Resmi Güncellemeler tarafından\n"
-#~ "desteklenmemesidir."
-
-#~ msgid ""
-#~ "The list of updates is void. This means that either there is\n"
-#~ "no available update for the packages installed on your computer,\n"
-#~ "or you already installed all of them."
-#~ msgstr ""
-#~ "Güncelleme listesi boş. Bu ya bilgisayarınızda yüklü paketler için\n"
-#~ "güncelleme olmadığı ya da bütün güncellemeleri yüklediğiniz anlamına\n"
-#~ "gelir."
-
-#~ msgid ""
-#~ "Warning: it seems that you are attempting to add so much\n"
-#~ "packages that your filesystem may run out of free diskspace,\n"
-#~ "during or after package installation ; this is particularly\n"
-#~ "dangerous and should be considered with care.\n"
-#~ "\n"
-#~ "Do you really want to install all the selected packages?"
-#~ msgstr ""
-#~ "Uyarı: öyle görünüyor ki paket kurulumu sırasında ya da sonrasında\n"
-#~ "dosya sisteminizi dolduracak kadar çok paket eklemek istiyorsunuz.\n"
-#~ "Bu genellikle tehlikelidir ve dikkatle ele alınması gerekir.\n"
-#~ "\n"
-#~ "Bütün seçili paketleri gerçekten yüklemek istiyor musunuz?"
-
-#~ msgid ""
-#~ "The following packages have to be removed for others to be upgraded:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "Diğerlerinin güncellenmesi için şu paketlerin kaldırılması gerekiyor:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Devam etmek için herşey tamam mı?"
-
 #~ msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
 #~ msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-9,*-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 ""
-#~ "En son güncelleme paketlerini almak için yansıya bağlanmam gerekiyor.\n"
-#~ "Ağınızın çalışıp çalışmadığını kontrol edin.\n"
-#~ "\n"
-#~ "Devam etmek için herşey tamam mı?"
-
-#~ msgid ""
-#~ "You may also choose your desired mirror manually: to do so,\n"
-#~ "launch the Software Sources Manager, and then add a `Security\n"
-#~ "updates' source.\n"
-#~ "\n"
-#~ "Then, restart MandrakeUpdate."
-#~ msgstr ""
-#~ "İstediğiniz yansıyı elle de seçebilirsiniz: bunu yapmak\n"
-#~ "için Yazılım Kaynakları Yöneticisini açın ve sonra\n"
-#~ "'Güvenlik güncellemeleri' kaynağı ekleyin.\n"
-#~ "\n"
-#~ "Daha sonra, MandrakeUpdate'i yeniden çalıştırın."
-
-#~ msgid ""
-#~ "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 ""
-#~ "Güncelleme ortamını urpmi ile eklerken hata oluştu.\n"
-#~ "\n"
-#~ "Bunun sebebi kırık veya geçici olarak ulaşılamaz durumdaki yansı "
-#~ "olabilir\n"
-#~ "ya da Mandrake Linux sürümünüz (%s) daha/artık Mandrake Linux Resmi\n"
-#~ "Güncellemeleri tarafından desteklenmiyordur.\n"
-#~ "\n"
-#~ "Başka bir yansı denemek istiyor musunuz?"
-
 #~ msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
 #~ msgstr "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
diff --git a/po/tr.pom b/po/tr.pom
index e24ea9a6..7eb4d853 100644
--- a/po/tr.pom
+++ b/po/tr.pom
@@ -4,165 +4,172 @@ msgstr "Sunucu"
 
 # 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 "Ağ Makinası (client)"
+msgid "Office Workstation"
+msgstr "Ofis iÅŸ istasyonu"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS sunucusu, SMB sunucusu, Vekil Sunucu, ssh Sunucu"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Ofis programları: kelime işlemciler (kword, abiword), kspread, gnumeric, pdf "
+"göstericiler, vb.."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Ofis"
+msgid "Workstation"
+msgstr "Ä°ÅŸ istasyonu"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Gnome Ä°ÅŸ istasyonu"
+msgid "Game station"
+msgstr "Oyun Konsolu"
 
 # 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 ya da Visor'unuz için araçlar"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Eğlence programları: kart oyunları, taktik ve strateji, vb.."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Ä°ÅŸ istasyonu"
+msgid "Multimedia station"
+msgstr "Çoklu ortam konsolu"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Güvenlik Kalkanı/Router"
+msgid "Sound and video playing/editing programs"
+msgstr "Ses ve video çalma/düzenleme uygulamaları"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr "Alan adı ve Ağ Bilgileri Sunucusu"
+msgid "Internet station"
+msgstr "Internet konsolu"
 
 # 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 ""
-"Ofis programları: kelime işlemciler (kword, abiword), kspread, gnumeric, pdf "
-"göstericiler, vb.."
+"E-posta alışverişi ve haber grubu istemci programları (pine, mutt, tin..) ve "
+"web istemcileri "
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "Sesle ilgili araçlar: mp3 ya da midi çalıcılar, karıştırıcılar, vb.."
+msgid "Network Computer (client)"
+msgstr "Ağ Makinası (client)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Linux Standartları Temeli. Üçüncü parti uygulama desteği"
+msgid "Clients for different protocols including ssh"
+msgstr "ssh içeren diğer ağ öğeleri için protokoller"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Serbest Yazılım ve Linux üzerine Kitaplar ve Nasıl belgeleri"
+msgid "Configuration"
+msgstr "Yapılandırma"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "KDE Ä°ÅŸ istasyonu"
+msgid "Tools to ease the configuration of your computer"
+msgstr "Sisteminizin ayarlarını düzenleyecek uygulama"
 
 # 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 "Bilimsel Ä°ÅŸ istasyonu"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Çoklu ortam - 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 "E-posta, haber grubu, web, dosya transferi ve sohbet araçları"
+msgid "Console Tools"
+msgstr "Konsol Araçları"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Veritabanı"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Metin düzenleyiciler, kabuklar, dosya araçları, terminaller"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL veya MySQL veritabanı sunucusu"
+msgid "KDE Workstation"
+msgstr "KDE Ä°ÅŸ istasyonu"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Sisteminizin ayarlarını düzenleyecek uygulama"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr "KDE Masaüstü Ortamı, temel grafik ortamla birlikte birleşik araçlar"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "Çoklu ortam - Ses"
+msgid "Graphical Environment"
+msgstr "Grafik Ortamı"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Belgeler"
+msgid "Gnome Workstation"
+msgstr "Gnome Ä°ÅŸ istasyonu"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Konsol Araçları"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+"Kullanıcı dostu uygulamalar ve masaüstü araçlarına sahip görsel bir ortam "
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr "Postfix Posta sunucusu, Inn haber sunucusu"
+msgid "Other Graphical Desktops"
+msgstr "Diğer Görsel Masaüstleri"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Internet konsolu"
+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 "Çoklu ortam konsolu"
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+msgid "Development"
+msgstr "GeliÅŸtirme"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Yapılandırma"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C ve C++ geliştirme kütüphaneleri, programlar ve include dosyaları"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Diğer Grafiksel Masaüstleri (Gnome, IceWM)"
+msgid "Documentation"
+msgstr "Belgeler"
 
 # 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 Masaüstü Ortamı, temel grafik ortamla birlikte birleşik araçlar"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Serbest Yazılım ve Linux üzerine Kitaplar ve Nasıl belgeleri"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Grafik Ortamı"
+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 Standartları Temeli. Üçüncü parti uygulama desteği"
+
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-msgid "Development"
-msgstr "GeliÅŸtirme"
+#: ../../share/compssUsers:999
+msgid "Web/FTP"
+msgstr "Web/FTP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -171,23 +178,33 @@ msgstr "Apache ve 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-R ve CD-RW yazmaya yarayan araçlar"
+msgid "Mail/Groupware/News"
+msgstr "Posta/Posta Listesi/Haberler(News)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Ofis iÅŸ istasyonu"
+msgid "Postfix mail server, Inn news server"
+msgstr "Postfix Posta sunucusu, Inn haber sunucusu"
 
 # 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, vb.."
+msgid "Database"
+msgstr "Veritabanı"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Gimp gibi grafik programları"
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL veya MySQL veritabanı sunucusu"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Firewall/Router"
+msgstr "Güvenlik Kalkanı/Router"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Internet gateway"
+msgstr "Internet ağ geçidi"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -196,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 ve C++ geliştirme kütüphaneleri, programlar ve include dosyaları"
+msgid "Domain Name and Network Information Server"
+msgstr "Alan adı ve Ağ Bilgileri Sunucusu"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -206,18 +223,18 @@ msgstr "Ağ Makinası sunucusu"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "Posta/Posta Listesi/Haberler(News)"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS sunucusu, SMB sunucusu, Vekil Sunucu, ssh Sunucu"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Oyun Konsolu"
+msgid "Office"
+msgstr "Ofis"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Video göstericiler ve düzenleyiciler"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr "E-posta, haber grubu, web, dosya transferi ve sohbet araçları"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -226,78 +243,66 @@ msgstr "Çoklu ortam - Grafik"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Eğlence programları: kart oyunları, taktik ve strateji, vb.."
-
-# 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 ""
-"E-posta alışverişi ve haber grubu istemci programları (pine, mutt, tin..) ve "
-"web istemcileri "
+msgid "Graphics programs such as The Gimp"
+msgstr "Gimp gibi grafik programları"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "KiÅŸisel Finans"
+msgid "Multimedia - Sound"
+msgstr "Çoklu ortam - Ses"
 
 # 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 ""
-"Kullanıcı dostu uygulamalar ve masaüstü araçlarına sahip görsel bir ortam "
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "Sesle ilgili araçlar: mp3 ya da midi çalıcılar, karıştırıcılar, vb.."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "ssh içeren diğer ağ öğeleri için protokoller"
+msgid "Multimedia - Video"
+msgstr "Çoklu ortam - 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 göstericiler ve düzenleyiciler"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Internet ağ geçidi"
+msgid "Multimedia - CD Burning"
+msgstr "Çoklu ortam - CD Yazma"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Ses ve video çalma/düzenleme uygulamaları"
+msgid "Tools to create and burn CD's"
+msgstr "CD-R ve CD-RW yazmaya yarayan araçlar"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Diğer Görsel Masaüstleri"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Diğer Grafiksel Masaüstleri (Gnome, IceWM)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Metin düzenleyiciler, kabuklar, dosya araçları, terminaller"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, vb.."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "Gnucash gibi finans programları"
+msgid "Personal Information Management"
+msgstr "Kişisel Bilgi Yönetimi"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "Kişisel Bilgi Yönetimi"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Palm Pilot ya da Visor'unuz için araçlar"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Çoklu ortam - CD Yazma"
+msgid "Personal Finance"
+msgstr "KiÅŸisel Finans"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Bilimsel Ä°ÅŸ istasyonu"
+msgid "Programs to manage your finances, such as gnucash"
+msgstr "Gnucash gibi finans programları"
 
diff --git a/po/uk.po b/po/uk.po
index c095c4c8..49f9c2ab 100644
--- a/po/uk.po
+++ b/po/uk.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: 2002-12-25 10:05GMT\n"
 "Last-Translator: Gladky Dima <gladimdim@inbox.ru>\n"
 "Language-Team: Ukrainian <linux@linux.org.ua>\n"
@@ -17,876 +17,1218 @@ 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 "îÅÍÏÖÌÉ×Ï ÓÔ×ÏÒÉÔÉ ÆÁÊÌ ÚצÔÕ."
+#: ../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"
+"÷ÁÛÁ ÓÉÓÔÅÍÁ ì¦ÎÕËÓ íÁÎÄÒÅÊË ÐÏÓÔÁÞÁ¤ÔØÓÑ Ú ÔÉÓÑÞÁÍÉ ÐÁËÕÎË¦× ÎÁ cd i dvd "
+"ÄÉÓËÁÈ. ãÑ ÐÒÏÇÒÁÍÁ ÄÏÐÏÍÏÖÅ ×ÁÍ ×ÉÂÒÁÔÉ, Ñ˦ ÐÁËÕÎËÉ ×É \n"
+"ÈÏÞÅÔÅ ×ÓÔÁÎÏ×ÉÔÉ ÎÁ ×ÁÛ ËÏÍÐ'ÀÔÅÒ."
 
-#: ../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 ""
-"úÁÞÅËÁÊÔÅ, ÂÕÄØ ÌÁÓËÁ\n"
-"äÏÂÁ×ÌÑÀÔØÓÑ ÄÖÅÒÅÌÁ"
+"ìÁÓËÁ×Ï ÐÒÏÓÉÍÏ ÄÏ 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 "úÁÞÅËÁÊÔÅ, ÂÕÄØ ÌÁÓËÁ, ÐÏËÉ rpm ÐÒÉÂÉÒÁ¤ æ ÐÁËÅÔÉ:"
 
-#: ../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' ÁÂÏ '.rmpsave',\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:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
 msgstr ""
-"úÁÞÅËÁÊÔÅ, ÂÕÄØ ÌÁÓËÁ\n"
-"äÏÂÁ×ÌÑÀÔØÓÑ ÄÖÅÒÅÌÁ"
+"îÅ ×ÄÁÌÏÓÑ ×ÓÔÁÎÏ×ÉÔÉ, ÄÅÑ˦ ÆÁÊÌÉ ÐÒÏÐÕÝÅÎÏ.\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
+#, 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"
+"×ÅÒÓ¦Ñ Mandrake Linux (%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"
+"ÚÁ×ÁÎÔÁÖÔÅ íÅÎÅÄÖÅÒ ðÁÎÕÎ˦×, Á ÐÏÔ¦Í ÄÏÄÁÊÔÅ 'Security\n"
+"updates' ÄÖÅÒÅÌÏ.\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 "ÐÏÎÏ×ÌÅÎÎÑ Manrake"
 
-#: ../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 ËÂ"
 
-#: ../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 "úÁÞÅËÁÊÔÅ, ÂÕÄØ ÌÁÓËÁ, ÐÏËÉ rpm ÓËÁÎÕ¤ æ ÐÁËÅÔÉ:"
+#: ../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"
+#: ../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 í / ÷¦ÌØÎÏ ÎÁ ÄÉÓËÕ: %d í"
+msgid "(none)"
+msgstr "(ΦÞÏÇÏ)"
 
-#: ../rpmdrake_.c:474
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "òÏÚÍ¦Ò ×ÉÂÒÁÎÏÇÏ: %d í"
+msgid "Please wait, listing packages..."
+msgstr "úÁÞÅËÁÊÔÅ, ÂÕÄØ ÌÁÓËÁ, ÐÏËÉ rpm ÓËÁÎÕ¤ æ ÐÁËÅÔÉ:"
 
-#: ../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 ËÂ"
+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 "צÄÎÏÓÎÉÊ ÛÌÑÈ ÄÏ ÓÐÉÓËÕ ÄÉÓ˦×"
 
-#: ../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 "ÐÏÎÏ×ÌÅÎÎÑ Manrake"
+#: ../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 ""
+"úÁÞÅËÁÊÔÅ, ÂÕÄØ ÌÁÓËÁ\n"
+"äÏÂÁ×ÌÑÀÔØÓÑ ÄÖÅÒÅÌÁ"
 
-#: ../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 ""
+"úÁÞÅËÁÊÔÅ, ÂÕÄØ ÌÁÓËÁ\n"
+"äÏÂÁ×ÌÑÀÔØÓÑ ÄÖÅÒÅÌÁ"
 
-#: ../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 Official Updates."
 
-#: ../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' ÁÂÏ '.rmpsave',\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"
+"ðÒÏÄÏ×ÖÉÔÉ?"
 
-#: ../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 "úÁÞÅËÁÊÔÅ, ÂÕÄØ ÌÁÓËÁ, ÐÏËÉ rpm ÐÒÉÂÉÒÁ¤ æ ÐÁËÅÔÉ:"
+#: ../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"
-"÷ÁÛÁ ÓÉÓÔÅÍÁ ì¦ÎÕËÓ íÁÎÄÒÅÊË ÐÏÓÔÁÞÁ¤ÔØÓÑ Ú ÔÉÓÑÞÁÍÉ ÐÁËÕÎË¦× ÎÁ cd i 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"
@@ -896,163 +1238,8 @@ msgstr "÷ÉÄÁÌÉÔÉ ÐÒÏÇÒÁÍÉ"
 msgid "Software Sources Manager"
 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"
-#~ "ÐÅÒÅÓÕÎÕÔÉ ÊÏÇÏ?"
-
-#~ 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 ""
-#~ "ñ ÍÁÀ Ú'¤ÄÎÁÔÉÓÑ Ú ÒÅÓÕÒÓÏÍ MandrakeSoft, ÝÏ ÏÔÒÉÍÁÔÉ ÐÅÒÅÌ¦Ë ÄÚÅÒËÁÌ.\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"
-#~ "íÅÒÅÖÁ ÁÂÏ ÒÅÓÕÒÓ MandrakeSoft ÎÅÄÏÓÔÕÐΦ.\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"
-#~ "Mandrake Linux Official Updates."
-
-#~ msgid ""
-#~ "The list of updates is void. This means 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"
-#~ "÷É Ä¦ÊÓÎÏ ÈÏÞÅÔÅ ×ÓÔÁÎÏ×ÉÔÉ ×Ó¦ ×ÉÂÒÁΦ ÐÁËÕÎËÉ?"
-
-#~ msgid ""
-#~ "The following packages have to be removed for others to be upgraded:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "îÁÓÔÕÐΦ ÐÁËÕÎËÉ ÍÁÀÔØ ÂÕÔÉ ×ÉÄÁÌÅΦ, ÝÏ ¦ÎÛ¦ ÍÏÇÌÉ ÏÎÏ×ÉÔÉÓØ:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "ðÒÏÄÏ×ÖÉÔÉ?"
-
 #~ msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
 #~ msgstr "-adobe-times-bold-u-normal--25-*-100-100-p-*-iso8859-*,*-u-*"
 
-#~ 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"
-#~ "ÚÁ×ÁÎÔÁÖÔÅ íÅÎÅÄÖÅÒ ðÁÎÕÎ˦×, Á ÐÏÔ¦Í ÄÏÄÁÊÔÅ 'Security\n"
-#~ "updates' ÄÖÅÒÅÌÏ.\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"
-#~ "×ÅÒÓ¦Ñ Mandrake Linux (%s) ÃÅ ÎÅ/×ÖŠЦÄÔÒÉÍÕ¤ÔØÓÑ Mandrake Linux\n"
-#~ "ïƦæÊΦ ÐÏÎÏ×ÌÅÎÎÑ\n"
-#~ "\n"
-#~ "óÐÒÏÂÕ×ÁÔÉ ¦ÎÛÉÊ ÒÅÓÕÒÓ?"
-
 #~ msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
 #~ msgstr "-misc-fixed-medium-u-normal--12-*-*-100--*-*-*-*-*,*"
diff --git a/po/uk.pom b/po/uk.pom
index 98617894..42cdd6e9 100644
--- a/po/uk.pom
+++ b/po/uk.pom
@@ -4,167 +4,175 @@ 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), ÂÕÈÇÁÌÔÅÒÓØ˦\n"
+"ÔÁÂÌÉæ (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, ÐÒÏËÓ¦-ÓÅÒ×ÅÒ, ÓÅÒ×ÅÒ 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 "óÅÒ×ÅÒ ¦ÍÅÎ ÔÁ ÍÅÒÅÖÅ×ÉÊ ¦ÎÆÏÒÍÁæÊÎÉÊ ÓÅÒ×ÅÒ (DNS, NIS)"
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
+"îÁÂ¦Ò ÚÁÓÏÂ¦× ÄÌÑ ÐÒÏÞÉÔÁÎÎÑ ÔÁ ÐÅÒÅÄÁÞ¦ ÅÌÅËÔÒÏÎÎϧ ÐÏÛÔÉ ÔÁ ÇÒÕÐ\n"
+"ÎÏ×ÉÎ (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), ÂÕÈÇÁÌÔÅÒÓØ˦\n"
-"ÔÁÂÌÉæ (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, 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 "îÁÂ¦Ò ÚÁÓÏÂ¦× ÄÌÑ ÐÏÛÔÉ, ÎÏ×ÉÎ, ÔÅÎÅÔ, ÐÅÒÅÄÁÞ¦ ÆÁÊ̦×, ÔÁ \"ÂÁÌÁÞÏË\""
+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 (KDE) - ÏÓÎÏ×ÎÅ ÇÒÁƦÞÎÅ ÓÅÒÅÄÏ×ÉÝÅ Ú ÎÁÂÏÒÏÍ\n"
+"ÄÏÐÏͦÖÎÉÈ ÚÁÓϦ×"
 
 # 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 ""
+"çÒÁƦÞÎÅ ÓÅÒÅÄÏ×ÉÝÅ Ú ÄÒÕÖÎ¦Í ¦ÎÔÅÒÆÅÊÓÏÍ ÔÁ ÐÒÏÇÒÁÍÁÍÉ, ÚÁÓÏÂÉ ÄÌÑ\n"
+"ÒÏÂÏÞÏÇÏ ÓÔÏÌÁ"
 
 # 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, 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++ ÐÒÏÇÒÁÍÉ ÔÁ ÆÁÊÌÉ ÚÁÇÏÌÏ×˦×"
 
 # 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"
+msgid "LSB"
 msgstr ""
-"òÏÂÏÞÅ ÓÅÒÅÄÏ×ÉÝÅ K (KDE) - ÏÓÎÏ×ÎÅ ÇÒÁƦÞÎÅ ÓÅÒÅÄÏ×ÉÝÅ Ú ÎÁÂÏÒÏÍ\n"
-"ÄÏÐÏͦÖÎÉÈ ÚÁÓϦ×"
 
 # 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
@@ -173,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 "úÁÓÏÂÉ ÄÌÑ ÓÔ×ÏÒÅÎÎÑ ÔÁ ÚÁÐÉÓÕ ËÏÍÐÁËÔ-ÄÉÓ˦×"
+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 "Firewall/íÁÒÛÒÕÔÉÚÁÔÏÒ"
+
+# 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
@@ -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 "â¦Â̦ÏÔÅËÉ ÄÌÑ ÐÒÏÇÒÁÍÕ×ÁÎÎÑ × C, C++ ÐÒÏÇÒÁÍÉ ÔÁ ÆÁÊÌÉ ÚÁÇÏÌÏ×˦×"
+msgid "Domain Name and Network Information Server"
+msgstr "óÅÒ×ÅÒ ¦ÍÅÎ ÔÁ ÍÅÒÅÖÅ×ÉÊ ¦ÎÆÏÒÍÁæÊÎÉÊ ÓÅÒ×ÅÒ (DNS, NIS)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -208,18 +226,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
@@ -228,79 +246,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 ""
-"îÁÂ¦Ò ÚÁÓÏÂ¦× ÄÌÑ ÐÒÏÞÉÔÁÎÎÑ ÔÁ ÐÅÒÅÄÁÞ¦ ÅÌÅËÔÒÏÎÎϧ ÐÏÛÔÉ ÔÁ ÇÒÕÐ\n"
-"ÎÏ×ÉÎ (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 ""
-"çÒÁƦÞÎÅ ÓÅÒÅÄÏ×ÉÝÅ Ú ÄÒÕÖÎ¦Í ¦ÎÔÅÒÆÅÊÓÏÍ ÔÁ ÐÒÏÇÒÁÍÁÍÉ, ÚÁÓÏÂÉ ÄÌÑ\n"
-"ÒÏÂÏÞÏÇÏ ÓÔÏÌÁ"
+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 "¶ÎÔÅÒÎÅÔ-ÛÌÀÚ"
+msgid "Multimedia - CD Burning"
+msgstr "íÕÌØÔÉÍÅÄ¦Ñ - ÚÁÐÉÓ ËÏÍÐÁËÔ-ÄÉÓ˦×"
 
 # 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 "úÁÓÏÂÉ ÄÌÑ ÓÔ×ÏÒÅÎÎÑ ÔÁ ÚÁÐÉÓÕ ËÏÍÐÁËÔ-ÄÉÓ˦×"
 
 # 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 "íÕÌØÔÉÍÅÄ¦Ñ - ÚÁÐÉÓ ËÏÍÐÁËÔ-ÄÉÓ˦×"
+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/uz.po b/po/uz.po
index 878291c9..37a74843 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.1\n"
-"POT-Creation-Date: 2003-02-19 17:19+0100\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\n"
 "PO-Revision-Date: 2003-02-18 03:37+0500\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <uz-li@yahoogroups.com>\n"
@@ -14,830 +14,1120 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\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"
-msgstr "Lokal fayllar"
-
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Path:"
-msgstr "Yo'l:"
-
-#: ../edit-urpm-sources.pl_.c:56
-msgid "FTP server"
-msgstr "FTP server"
+#: ../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 ../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 ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:57
-msgid "HTTP server"
-msgstr "HTTP server"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during removal"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:58
-msgid "Path or mount point:"
-msgstr "Yo'l yoki ulash nuqtasi:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages..."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:58
-msgid "Removable device"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:550
-msgid "Security updates"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
 msgstr ""
+"O'rnatish davomida xato ro'y berdi:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:70
-msgid "Browse..."
-msgstr "Tanlash..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during installation"
+msgstr "O'rnatish davomida xato"
 
-#: ../edit-urpm-sources.pl_.c:72
-msgid "Choose a mirror..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:92
-msgid "Login:"
-msgstr "Foydalanuvchi:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed."
+msgstr "Hamma narsa allaqachon o'rnatilgan"
 
-#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:231
-msgid "Password:"
-msgstr "Maxfiy so'z:"
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:97
-msgid "Name:"
-msgstr "Nomi:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr "Hamma narsa muvaffaqiyatli o'rnatildi"
 
-#: ../edit-urpm-sources.pl_.c:99 ../edit-urpm-sources.pl_.c:188
-msgid "Relative path to synthesis/hdlist:"
+#: ../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:107
-msgid "You need to fill up at least the two first entries."
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "hamma narsa to'g'ri o'rnatildi"
+
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"some packages failed to install\n"
+"correctly"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:120
-msgid "Adding a source:"
+#: ../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:"
+#: ../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 "Ok"
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation failed"
+msgstr "O'rnatish muvaffaqiyatsiz tugadi"
 
-#: ../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 "Bekor qilish"
 
-#: ../edit-urpm-sources.pl_.c:147
-msgid "Please wait, adding medium..."
-msgstr ""
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "Ok"
 
-#: ../edit-urpm-sources.pl_.c:168
-msgid "Please wait, removing medium..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:181
-msgid "Edit a source"
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:185
+#: ../rpmdrake:1
 #, c-format
-msgid "Editing source \"%s\":"
+msgid "Unable to get source packages, sorry."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:191
-msgid "Save changes"
-msgstr "O'zgarishlarni saqlash"
-
-#: ../edit-urpm-sources.pl_.c:200
-msgid "You need to insert the medium to continue"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:201
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
+#: ../rpmdrake:1
+#, c-format
+msgid "A required program is missing (grpmi). Check your installation."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:206
-msgid "Please wait, updating medium..."
-msgstr ""
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
+msgstr "Dastur etishmayapti"
 
-#: ../edit-urpm-sources.pl_.c:217
-msgid "Configure proxies"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
 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 "Installation finished"
+msgstr "O'rnatish tugadi"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:225
-msgid "Proxy hostname:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:227
-msgid "You may specify a user/password for the proxy authentication:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Remove .%s"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:229
-msgid "User:"
-msgstr "Foydalanuvchi:"
+#: ../rpmdrake:1
+#, c-format
+msgid "changes:"
+msgstr "o'zgarishlar:"
 
-#: ../edit-urpm-sources.pl_.c:255
-msgid "Configure sources"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:262
-msgid "Enabled?"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, finding available packages..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:263
-msgid "Source"
-msgstr "Manba"
-
-#: ../edit-urpm-sources.pl_.c:286 ../rpmdrake_.c:732
-msgid "Remove"
-msgstr "Olibtashlash"
-
-#: ../edit-urpm-sources.pl_.c:288
-msgid "Edit"
-msgstr "Tuzatish"
-
-#: ../edit-urpm-sources.pl_.c:290
-msgid "Add..."
-msgstr "Qo'shish"
-
-#: ../edit-urpm-sources.pl_.c:292
-msgid "Update..."
-msgstr "Yangilash"
-
-#: ../edit-urpm-sources.pl_.c:293
-msgid "Proxy..."
-msgstr "Proksi"
+#: ../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:296
-msgid "Save and quit"
-msgstr "Saqlash va chiqish"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:297 ../rpmdrake_.c:735
-msgid "Quit"
-msgstr "Chiqish"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
+msgstr ""
 
-#: ../rpmdrake.pm_.c:96
-msgid "Yes"
-msgstr "Ha"
+#: ../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:98
-msgid "No"
-msgstr "Yo'q"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr ""
 
-#: ../rpmdrake.pm_.c:130
-msgid "Info..."
-msgstr "Ma'lumot"
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
+msgstr ""
 
-#: ../rpmdrake.pm_.c:183
-msgid "Austria"
-msgstr "Avstriya"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
+msgstr ""
 
-#: ../rpmdrake.pm_.c:184
-msgid "Australia"
-msgstr "Avstraliya"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
+msgstr ""
 
-#: ../rpmdrake.pm_.c:185
-msgid "Belgium"
-msgstr "Belgiya"
+#: ../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:186
-msgid "Brazil"
-msgstr "Braziliya"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Installation"
+msgstr ""
 
-#: ../rpmdrake.pm_.c:187
-msgid "Canada"
-msgstr "Kanada"
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, c-format
+msgid "Mandrake Update"
+msgstr "Mandrake Update"
 
-#: ../rpmdrake.pm_.c:188
-msgid "Costa Rica"
-msgstr "Kosta Rika"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
+msgstr ""
 
-#: ../rpmdrake.pm_.c:189
-msgid "Czech Republic"
-msgstr "Chex Respublikasi"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Chiqish"
 
-#: ../rpmdrake.pm_.c:190
-msgid "Germany"
-msgstr "Olmoniya"
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "O'rnatish"
 
-#: ../rpmdrake.pm_.c:191
-msgid "Danmark"
-msgstr "Daniya"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "Olibtashlash"
 
-#: ../rpmdrake.pm_.c:192 ../rpmdrake.pm_.c:196
-msgid "Greece"
-msgstr "Gretsiya"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search"
+msgstr "Qidirish"
 
-#: ../rpmdrake.pm_.c:193
-msgid "Spain"
-msgstr "Ispaniya"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "Qidirish:"
 
-#: ../rpmdrake.pm_.c:194
-msgid "Finland"
-msgstr "Finlyandiya"
+#: ../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:195
-msgid "France"
-msgstr "Fratsiya"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr ""
 
-#: ../rpmdrake.pm_.c:197
-msgid "Israel"
-msgstr "Israil"
+#: ../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:198
-msgid "Italy"
-msgstr "Italiya"
+#: ../rpmdrake:1
+#, c-format
+msgid "Too many packages are selected"
+msgstr ""
 
-#: ../rpmdrake.pm_.c:199
-msgid "Japan"
-msgstr "Yaponiya"
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
+msgstr "Eng ko'p ma'lumot"
 
-#: ../rpmdrake.pm_.c:200
-msgid "Korea"
-msgstr "Koreya"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal information"
+msgstr "Oddiy ma'lumot"
 
-#: ../rpmdrake.pm_.c:201
-msgid "Netherlands"
-msgstr "Gollandiya"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update source(s)"
+msgstr ""
 
-#: ../rpmdrake.pm_.c:202
-msgid "Norway"
-msgstr "Norvegiya"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reload the packages list"
+msgstr ""
 
-#: ../rpmdrake.pm_.c:203
-msgid "Poland"
-msgstr "Polsha"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
+msgstr "Tanlashni tiklash"
 
-#: ../rpmdrake.pm_.c:204
-msgid "Portugal"
-msgstr "Portugaliya"
+#: ../rpmdrake:1
+#, c-format
+msgid "in files"
+msgstr "fayllarda"
 
-#: ../rpmdrake.pm_.c:205
-msgid "Russia"
-msgstr "Rossiya"
+#: ../rpmdrake:1
+#, c-format
+msgid "in descriptions"
+msgstr "ta'riflarda"
 
-#: ../rpmdrake.pm_.c:206
-msgid "Sweden"
-msgstr "Shvetsiya"
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
+msgstr "nomlarda"
 
-#: ../rpmdrake.pm_.c:207
-msgid "Taiwan"
-msgstr "Tayvan"
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
+msgstr ""
 
-#: ../rpmdrake.pm_.c:208
-msgid "United Kingdom"
-msgstr "Birlashgan Qirolliklar"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
+msgstr ""
 
-#: ../rpmdrake.pm_.c:209
-msgid "China"
-msgstr "Xitoy"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
+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 "Qo'shma Shtatlar"
+#: ../rpmdrake:1
+#, c-format
+msgid "by size"
+msgstr "hajm bo'yicha"
 
-#: ../rpmdrake.pm_.c:277
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
+msgstr "guruh bo'yicha"
 
-#: ../rpmdrake.pm_.c:283
-msgid "Error during download"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages,"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:292
-msgid "No mirror"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:310
-msgid "Please choose the desired mirror."
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:342 ../rpmdrake_.c:629
-msgid "Update source(s)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal updates"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:346
-msgid "Select the source(s) you wish to update:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Bugfixes updates"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:350
-msgid "Update"
-msgstr "Yangilash"
-
-#: ../rpmdrake.pm_.c:360
-msgid "Please wait, updating media..."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
 msgstr ""
 
-#: ../rpmdrake_.c:101
-msgid "Other"
-msgstr "Boshqa"
-
-#: ../rpmdrake_.c:123 ../rpmdrake_.c:137 ../rpmdrake_.c:229 ../rpmdrake_.c:300
-msgid "(none)"
-msgstr "(hech qanaqa)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Description: "
+msgstr "Ta'rifi: "
 
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:484 ../rpmdrake_.c:485
-msgid "(Not available)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Summary: "
 msgstr ""
 
-#: ../rpmdrake_.c:153 ../rpmdrake_.c:210
-msgid "Search results"
-msgstr "Qidirish natijalari"
-
-#: ../rpmdrake_.c:153
-msgid "Search results (none)"
-msgstr "Qidirish natijalari (hech qanaqa)"
-
-#: ../rpmdrake_.c:163 ../rpmdrake_.c:174
-msgid "Please wait, searching..."
-msgstr "Qidirayapman, iltimos kutib turing..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "Muhimligi: "
 
-#: ../rpmdrake_.c:177
-msgid "Stop"
-msgstr "To'xtatish"
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s Kb"
 
-#: ../rpmdrake_.c:211 ../rpmdrake_.c:321
-msgid "Addable"
-msgstr "Qo'shsa bo'ladi"
+#: ../rpmdrake:1
+#, c-format
+msgid "Size: "
+msgstr "Hajmi: "
 
-#: ../rpmdrake_.c:211 ../rpmdrake_.c:321
-msgid "Upgradable"
-msgstr "Yangilasa bo'ladi"
+#: ../rpmdrake:1
+#, c-format
+msgid "Version: "
+msgstr "Versiyasi: "
 
-#: ../rpmdrake_.c:213
-msgid "Not selected"
-msgstr "Tanlanmagan"
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "Nomi: "
 
-#: ../rpmdrake_.c:213
-msgid "Selected"
-msgstr "Tanlangan"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "Yangilash uchun sabab: "
 
-#: ../rpmdrake_.c:242
-msgid "rpmdrake"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
 msgstr ""
 
-#: ../rpmdrake_.c:260 ../rpmdrake_.c:362 ../rpmdrake_.c:364
-msgid "More information on package..."
-msgstr ""
+#: ../rpmdrake:1
+#, c-format
+msgid "Source: "
+msgstr "Manba: "
 
-#: ../rpmdrake_.c:261
-msgid "One of the following packages is needed:"
+#: ../rpmdrake:1
+#, c-format
+msgid "(Not available)"
 msgstr ""
 
-#: ../rpmdrake_.c:261
-msgid "Please choose"
-msgstr "Iltimos tanlang"
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
+msgstr "Changelog:\n"
 
-#: ../rpmdrake_.c:277
-msgid "unknown package "
-msgstr ""
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "Fayllar:\n"
 
-#: ../rpmdrake_.c:287
-msgid "Please wait, listing packages..."
-msgstr ""
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected size: %d MB"
+msgstr "Tanlangan hajm: %d Mb"
 
-#: ../rpmdrake_.c:302
-msgid "No update"
-msgstr ""
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Tanlangan: %d Mb / Diskdagi bo'sh joy: %d Mb"
 
-#: ../rpmdrake_.c:355 ../rpmdrake_.c:356
-msgid "More infos"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
 msgstr ""
 
-#: ../rpmdrake_.c:357
-msgid "Information on packages"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
 msgstr ""
 
-#: ../rpmdrake_.c:378
-msgid "Some additional packages need to be removed"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be installed"
 msgstr ""
 
-#: ../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 ""
 
-#: ../rpmdrake_.c:385 ../rpmdrake_.c:393
+#: ../rpmdrake:1
+#, c-format
+msgid "Additional packages needed"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 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"
 "\n"
 msgstr ""
 
-#: ../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 ""
 
-#: ../rpmdrake_.c:423
-msgid "Additional packages needed"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some additional packages need to be removed"
 msgstr ""
 
-#: ../rpmdrake_.c:424
-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_.c:437
-msgid "Some packages can't be installed"
+#: ../rpmdrake:1
+#, c-format
+msgid "Information on packages"
 msgstr ""
 
-#: ../rpmdrake_.c:438
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
 msgstr ""
 
-#: ../rpmdrake_.c:452 ../rpmdrake_.c:686
-msgid "Some packages need to be removed"
-msgstr ""
+#: ../rpmdrake:1
+#, c-format
+msgid "Addable"
+msgstr "Qo'shsa bo'ladi"
 
-#: ../rpmdrake_.c:474
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Tanlangan: %d Mb / Diskdagi bo'sh joy: %d Mb"
+msgid "Upgradable"
+msgstr "Yangilasa bo'ladi"
 
-#: ../rpmdrake_.c:476
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "Tanlangan hajm: %d Mb"
+msgid ""
+"The list of updates is void. This means 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:484
-msgid "Files:\n"
-msgstr "Fayllar:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "No update"
+msgstr ""
 
-#: ../rpmdrake_.c:485
-msgid "Changelog:\n"
-msgstr "Changelog:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "(none)"
+msgstr "(hech qanaqa)"
 
-#: ../rpmdrake_.c:488
-msgid "Source: "
-msgstr "Manba: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, listing packages..."
+msgstr ""
 
-#: ../rpmdrake_.c:489
-msgid "Currently installed version: "
+#: ../rpmdrake:1
+#, c-format
+msgid "unknown package "
 msgstr ""
 
-#: ../rpmdrake_.c:493
-msgid "Reason for update: "
-msgstr "Yangilash uchun sabab: "
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr ""
 
-#: ../rpmdrake_.c:495
-msgid "Name: "
-msgstr "Nomi: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please choose"
+msgstr "Iltimos tanlang"
 
-#: ../rpmdrake_.c:496
-msgid "Version: "
-msgstr "Versiyasi: "
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr ""
 
-#: ../rpmdrake_.c:497
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s Kb"
+msgid "Not selected"
+msgstr "Tanlanmagan"
 
-#: ../rpmdrake_.c:497
-msgid "Size: "
-msgstr "Hajmi: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected"
+msgstr "Tanlangan"
 
-#: ../rpmdrake_.c:499
-msgid "Importance: "
-msgstr "Muhimligi: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results"
+msgstr "Qidirish natijalari"
 
-#: ../rpmdrake_.c:500
-msgid "Summary: "
-msgstr ""
+#: ../rpmdrake:1
+#, c-format
+msgid "Stop"
+msgstr "To'xtatish"
 
-#: ../rpmdrake_.c:501
-msgid "Description: "
-msgstr "Ta'rifi: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, searching..."
+msgstr "Qidirayapman, iltimos kutib turing..."
 
-#: ../rpmdrake_.c:550
-msgid "Bugfixes updates"
-msgstr ""
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
+msgstr "Qidirish natijalari (hech qanaqa)"
 
-#: ../rpmdrake_.c:550
-msgid "Normal updates"
-msgstr ""
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Boshqa"
 
-#: ../rpmdrake_.c:569
-msgid "Mandrake choices"
+#: ../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:570
-msgid "All packages, alphabetical"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Saqlash va chiqish"
 
-#: ../rpmdrake_.c:571
-msgid "All packages,"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy..."
+msgstr "Proksi"
 
-#: ../rpmdrake_.c:594
-msgid "by group"
-msgstr "guruh bo'yicha"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
+msgstr "Yangilash"
 
-#: ../rpmdrake_.c:594
-msgid "by size"
-msgstr "hajm bo'yicha"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "Qo'shish"
 
-#: ../rpmdrake_.c:595
-msgid "by selection state"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "Tuzatish"
 
-#: ../rpmdrake_.c:596
-msgid "by source repository"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Source"
+msgstr "Manba"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
 msgstr ""
 
-#: ../rpmdrake_.c:596
-msgid "by update availability"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure sources"
 msgstr ""
 
-#: ../rpmdrake_.c:617
-msgid "in descriptions"
-msgstr "ta'riflarda"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "Maxfiy so'z:"
 
-#: ../rpmdrake_.c:617
-msgid "in files"
-msgstr "fayllarda"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
+msgstr "Foydalanuvchi:"
 
-#: ../rpmdrake_.c:617
-msgid "in names"
-msgstr "nomlarda"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
 
-#: ../rpmdrake_.c:628
-msgid "Reload the packages list"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
 msgstr ""
 
-#: ../rpmdrake_.c:628
-msgid "Reset the selection"
-msgstr "Tanlashni tiklash"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
 
-#: ../rpmdrake_.c:654
-msgid "Maximum information"
-msgstr "Eng ko'p ma'lumot"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr ""
 
-#: ../rpmdrake_.c:654
-msgid "Normal information"
-msgstr "Oddiy ma'lumot"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr ""
 
-#: ../rpmdrake_.c:676
-msgid "Too many packages are selected"
+#: ../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:722
-msgid "Find:"
-msgstr "Qidirish:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
+msgstr ""
 
-#: ../rpmdrake_.c:727
-msgid "Search"
-msgstr "Qidirish"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save changes"
+msgstr "O'zgarishlarni saqlash"
 
-#: ../rpmdrake_.c:733
-msgid "Install"
-msgstr "O'rnatish"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr ""
 
-#: ../rpmdrake_.c:740 data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrake Update"
-msgstr "Mandrake Update"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake_.c:740
-msgid "Software Packages Installation"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Editing source \"%s\":"
 msgstr ""
 
-#: ../rpmdrake_.c:740
-msgid "Software Packages Removal"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit a source"
 msgstr ""
 
-#: ../rpmdrake_.c:781
-msgid "Please wait, contacting mirror to update packages information."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
 msgstr ""
 
-#: ../rpmdrake_.c:783
-msgid "Error updating medium"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, adding medium..."
 msgstr ""
 
-#: ../rpmdrake_.c:784
-msgid "There was an unrecoverable error while updating packages information."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of source:"
 msgstr ""
 
-#: ../rpmdrake_.c:789
-msgid "How to choose manually your mirror"
+#: ../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"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to fill up at least the two first entries."
 msgstr ""
 
-#: ../rpmdrake_.c:831
-msgid "Please wait, finding available packages..."
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "Nomi:"
 
-#: ../rpmdrake_.c:863
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Inspecting %s"
+msgid "Login:"
+msgstr "Foydalanuvchi:"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
 msgstr ""
 
-#: ../rpmdrake_.c:882
-msgid "changes:"
-msgstr "o'zgarishlar:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Browse..."
+msgstr "Tanlash..."
 
-#: ../rpmdrake_.c:886
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove .%s"
-msgstr ""
+msgid "Path or mount point:"
+msgstr "Yo'l yoki ulash nuqtasi:"
 
-#: ../rpmdrake_.c:888
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Use .%s as main file"
+msgid "Removable device"
 msgstr ""
 
-#: ../rpmdrake_.c:890
-msgid "Do nothing"
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "HTTP server"
+msgstr "HTTP server"
 
-#: ../rpmdrake_.c:902
-msgid "Installation finished"
-msgstr "O'rnatish tugadi"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "FTP server"
 
-#: ../rpmdrake_.c:912
-msgid "Inspect..."
-msgstr ""
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path:"
+msgstr "Yo'l:"
 
-#: ../rpmdrake_.c:927
-msgid "Program missing"
-msgstr "Dastur etishmayapti"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "Lokal fayllar"
 
-#: ../rpmdrake_.c:928
-msgid "A required program is missing (grpmi). Check your installation."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add a source"
 msgstr ""
 
-#: ../rpmdrake_.c:942
-msgid "Unable to get source packages."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
 msgstr ""
 
-#: ../rpmdrake_.c:943
-msgid "Unable to get source packages, sorry."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to create medium."
 msgstr ""
 
-#: ../rpmdrake_.c:951
-msgid "Change medium"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, updating media..."
 msgstr ""
 
-#: ../rpmdrake_.c:952
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+msgid "Update"
+msgstr "Yangilash"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Select the source(s) you wish to update:"
 msgstr ""
 
-#: ../rpmdrake_.c:960
-msgid "Installation failed"
-msgstr "O'rnatish muvaffaqiyatsiz tugadi"
+#: ../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..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
 msgstr ""
 
-#: ../rpmdrake_.c:986
+#: ../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:986
+#: ../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.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 ""
 
-#: ../rpmdrake_.c:987
-msgid "everything was installed correctly"
-msgstr "hamma narsa to'g'ri o'rnatildi"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United States"
+msgstr "Qo'shma Shtatlar"
 
-#: ../rpmdrake_.c:989
-msgid "Everything installed successfully"
-msgstr "Hamma narsa muvaffaqiyatli o'rnatildi"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
+msgstr "Xitoy"
 
-#: ../rpmdrake_.c:990
-msgid "All requested packages were installed successfully."
-msgstr ""
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr "Birlashgan Qirolliklar"
 
-#: ../rpmdrake_.c:994
-msgid "Everything already installed."
-msgstr "Hamma narsa allaqachon o'rnatilgan"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "Tayvan"
 
-#: ../rpmdrake_.c:995
-msgid "Everything already installed (is this supposed to happen at all?)."
-msgstr ""
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "Shvetsiya"
 
-#: ../rpmdrake_.c:1002
-msgid "Problem during installation"
-msgstr "O'rnatish davomida xato"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
+msgstr "Rossiya"
 
-#: ../rpmdrake_.c:1003
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"O'rnatish davomida xato ro'y berdi:\n"
-"\n"
-"%s"
+msgid "Portugal"
+msgstr "Portugaliya"
 
-#: ../rpmdrake_.c:1017
-msgid "Please wait, reading packages database..."
-msgstr ""
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
+msgstr "Polsha"
 
-#: ../rpmdrake_.c:1058
-msgid "Please wait, removing packages..."
-msgstr ""
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
+msgstr "Norvegiya"
 
-#: ../rpmdrake_.c:1061
-msgid "Problem during removal"
-msgstr ""
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
+msgstr "Gollandiya"
 
-#: ../rpmdrake_.c:1062
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
+msgid "Korea"
+msgstr "Koreya"
 
-#: ../rpmdrake_.c:1094
-msgid ""
-"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 "Yaponiya"
 
-#: ../rpmdrake_.c:1099
-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 "Italiya"
 
-#: ../rpmdrake_.c:1104
-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 "Israil"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Gretsiya"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "France"
+msgstr "Fratsiya"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "Finlyandiya"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "Ispaniya"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
+msgstr "Daniya"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr "Olmoniya"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
+msgstr "Chex Respublikasi"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Costa Rica"
+msgstr "Kosta Rika"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Canada"
+msgstr "Kanada"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
+msgstr "Braziliya"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Belgium"
+msgstr "Belgiya"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Australia"
+msgstr "Avstraliya"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
+msgstr "Avstriya"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Info..."
+msgstr "Ma'lumot"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
+msgstr "Yo'q"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Ha"
+
+#: data/rpmdrake.desktop.in.h:1
+msgid "Install Software"
+msgstr "Dasturni o'rnatish"
 
 #: data/rpmdrake-remove.desktop.in.h:1
 msgid "Remove Software"
@@ -846,7 +1136,3 @@ msgstr "Dasturni olib tashlash"
 #: data/rpmdrake-sources.desktop.in.h:1
 msgid "Software Sources Manager"
 msgstr ""
-
-#: data/rpmdrake.desktop.in.h:1
-msgid "Install Software"
-msgstr "Dasturni o'rnatish"
diff --git a/po/vi.po b/po/vi.po
index 99de6e73..5821adb4 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2003-01-24 16:31+0100\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\n"
 "PO-Revision-Date: 2003-01-22 21:27+0700\n"
 "Last-Translator: Trinh Minh Thanh <tmthanh@yahoo.com>\n"
 "Language-Team: Gnome-Vi <Gnomevi-list@lists.sourceforge.net>\n"
@@ -13,452 +13,628 @@ 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 "Không thể tạo phương tiện."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Có đồng ý tiếp tục không?"
 
-#: ../edit-urpm-sources.pl_.c:40
-msgid "Unable to update medium; it will be automatically disabled."
-msgstr "Không thể cập nhật phương tiện, nó sẽ tự động tắt."
+#: ../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 ""
+"Chào mừng công cụ cài đặt phần m�m!\n"
+"\n"
+"Hệ thống Mandrake Linux của bạn có vài nghìn gói phần m�m trên đĩa\n"
+"CDROM hay DVD. Công cụ này giúp bạn ch�n phần m�m nào mà bạn\n"
+"muốn cài đặt vào máy tính của bạn."
 
-#: ../edit-urpm-sources.pl_.c:50
-msgid "Add a source"
-msgstr "Thêm nguồn:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Chào mừng MandrakeUpdate!\n"
+"\n"
+"Công cụ này giúp bạn ch�n các cập nhật mà bạn muốn cài đặt lên\n"
+"máy tính."
 
-#: ../edit-urpm-sources.pl_.c:51
-msgid "Local files"
-msgstr "Tập tin cục bộ"
+#: ../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 ""
+"Chào mừng công cụ gỡ b� phần m�m!\n"
+"\n"
+"Công cụ này giúp bạn ch�n phần m�m nào muốn gỡ b� kh�i máy tính\n"
+"của bạn."
 
-#: ../edit-urpm-sources.pl_.c:51
-msgid "Path:"
-msgstr "�ư�ng dẫn: "
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"�ã xảy ra trục trặc trong khi gỡ b� các gói:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:52
-msgid "FTP server"
-msgstr "Máy chủ FTP"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during removal"
+msgstr "Có trục trặc khi gỡ b�"
 
-#: ../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 "Hãy đợi, đang gỡ b� các gói..."
 
-#: ../edit-urpm-sources.pl_.c:53
-msgid "HTTP server"
-msgstr "Máy chủ HTTP"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
+msgstr "Hãy đợi, đang đ�c cơ sở dữ liệu các gói..."
 
-#: ../edit-urpm-sources.pl_.c:54
-msgid "Path or mount point:"
-msgstr "�ư�ng dẫn hoặc điểm gắn kết:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"�ã xảy ra trục trặc trong khi cài đặt:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:54
-msgid "Removable device"
-msgstr "Thiết bị có thể gỡ b�"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during installation"
+msgstr "Có trục trặc trong khi cài đặt"
 
-#: ../edit-urpm-sources.pl_.c:55 ../rpmdrake_.c:548
-msgid "Security updates"
-msgstr "Cập nhật bảo mật"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
+msgstr "M�i thứ đã được cài đặt rồi "
 
-#: ../edit-urpm-sources.pl_.c:66
-msgid "Browse..."
-msgstr "Duyệt..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed."
+msgstr "M�i thứ đã được cài đặt."
 
-#: ../edit-urpm-sources.pl_.c:68
-msgid "Choose a mirror..."
-msgstr "Ch�n một mirror..."
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "M�i gói tin yêu cầu đã được cài đặt thành công."
 
-#: ../edit-urpm-sources.pl_.c:88
-msgid "Login:"
-msgstr "�ăng nhập:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr "M�i thứ đã được cài đặt thành công"
 
-#: ../edit-urpm-sources.pl_.c:88 ../edit-urpm-sources.pl_.c:227
-msgid "Password:"
-msgstr "Mật khẩu:"
+#: ../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 ""
+"Quá trình cài đặt đã kết thúc; %s.\n"
+"\n"
+"Một số tập tin cấu hình được tạo là `.rpmnew' hay `.rpmsave',\n"
+"Bây gi� bạn có thể kiểm tra một số tập tin đó để tạo các hoạt động:"
 
-#: ../edit-urpm-sources.pl_.c:93
-msgid "Name:"
-msgstr "Tên:"
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "m�i thứ đã được cài đặt đúng"
 
-#: ../edit-urpm-sources.pl_.c:95 ../edit-urpm-sources.pl_.c:184
-msgid "Relative path to synthesis/hdlist:"
-msgstr "�ư�ng dẫn liên quan tới synthesis/hdlist:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"some packages failed to install\n"
+"correctly"
+msgstr ""
+"Không cài đặt đúng được một số\n"
+"gói tin"
 
-#: ../edit-urpm-sources.pl_.c:103
-msgid "You need to fill up at least the two first entries."
-msgstr "Bạn cần đi�n ít nhất là hai mục nhập đầu tiên."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages to allow others to be upgraded..."
+msgstr "Hãy đợi, gỡ b� các gói để cho phép nâng cấp các gói khác..."
 
-#: ../edit-urpm-sources.pl_.c:116
-msgid "Adding a source:"
-msgstr "Thêm một nguồn:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
+msgstr ""
+"Cài đặt không được, thiếu một số tập tin.\n"
+"Có thể bạn muốn cập nhật cơ sở dữ liệu v� các nguồn của mình."
 
-#: ../edit-urpm-sources.pl_.c:117
-msgid "Type of source:"
-msgstr "Loại nguồn:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation failed"
+msgstr "Không cài đặt được"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
+msgstr "B� qua"
 
-#: ../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 "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 "B� qua"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Hãy nạp phương tiện có tên \"%s\" trên thiết bị [%s]"
 
-#: ../edit-urpm-sources.pl_.c:143
-msgid "Please wait, adding medium..."
-msgstr "Hãy đợi, đang thêm phương tiện..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr "Thay phương tiện"
 
-#: ../edit-urpm-sources.pl_.c:164
-msgid "Please wait, removing medium..."
-msgstr "Hãy đợi, đang gỡ b� phương tiện..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
+msgstr "Xin lỗi, không thể lấy các gói nguồn."
 
-#: ../edit-urpm-sources.pl_.c:177
-msgid "Edit a source"
-msgstr "Hiệu chỉnh nguồn"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages."
+msgstr "Không thể lấy các gói nguồn."
 
-#: ../edit-urpm-sources.pl_.c:181
+#: ../rpmdrake:1
 #, c-format
-msgid "Editing source \"%s\":"
-msgstr "Hiệu chỉnh nguồn \"%s\":"
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr "Thiếu chương trình được yêu cầu (grpmi). Hãy kiểm tra cài đặt của bạn."
 
-#: ../edit-urpm-sources.pl_.c:187
-msgid "Save changes"
-msgstr "Lưu lại các thay đổi"
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
+msgstr "Thiếu chương trình"
 
-#: ../edit-urpm-sources.pl_.c:196
-msgid "You need to insert the medium to continue"
-msgstr "Cần nạp phương tiện để tiếp tục"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
+msgstr "Thẩm tra..."
 
-#: ../edit-urpm-sources.pl_.c:197
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "�ể lưu các thay đổi, cần nạp phương tiện vào ổ."
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation finished"
+msgstr "Kết thúc cài đặt"
 
-#: ../edit-urpm-sources.pl_.c:202
-msgid "Please wait, updating medium..."
-msgstr "Hãy đợi, đang cập nhật phương tiện..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
+msgstr "Không làm gì"
 
-#: ../edit-urpm-sources.pl_.c:213
-msgid "Configure proxies"
-msgstr "Cấu hình các proxy"
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
+msgstr "Dùng .%s là tập tin chính"
 
-#: ../edit-urpm-sources.pl_.c:219
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
-msgstr ""
-"Nếu cần một proxy, hãy nhập hostname và một cổng (port) tùy ý (cú pháp: "
-"<proxyhost[:port]>):"
+#: ../rpmdrake:1
+#, c-format
+msgid "Remove .%s"
+msgstr "Gỡ B� .%s"
 
-#: ../edit-urpm-sources.pl_.c:221
-msgid "Proxy hostname:"
-msgstr "Proxy hostname:"
+#: ../rpmdrake:1
+#, c-format
+msgid "changes:"
+msgstr "các thay đổi:"
 
-#: ../edit-urpm-sources.pl_.c:223
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "Bạn có thể chỉ định ngư�i dùng/mật khẩu cho xác thực của proxy:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr "Thẩm tra %s"
 
-#: ../edit-urpm-sources.pl_.c:225
-msgid "User:"
-msgstr "Ngư�i dùng:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, finding available packages..."
+msgstr "Hãy đợi, đang tìm các gói sẵn có..."
 
-#: ../edit-urpm-sources.pl_.c:251
-msgid "Configure sources"
-msgstr "Cấu hình các nguồn"
+#: ../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 ""
+"Có một lỗi xảy ra khi đang bổ sung phương tiện cập nhật bằng urpmi.\n"
+"\n"
+"Có thể do mirror tạm th�i không có hay bị ngắt, hoặc khi phiên bản\n"
+"Mandrake Linux (%s) vẫn chưa được hay đã không còn được hỗ trợ bởi Mandrake "
+"Linux\n"
+"Official Updates.\n"
+"\n"
+"Bạn có muốn thử một mirror khác không?"
 
-#: ../edit-urpm-sources.pl_.c:258
-msgid "Enabled?"
-msgstr "Bật ?"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
+msgstr "Lỗi khi thêm phương tiện cập nhật"
 
-#: ../edit-urpm-sources.pl_.c:259
-msgid "Source"
-msgstr "Nguồn"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
+msgstr "Hãy đợi, đang liên lạc với mirror để sơ khởi các gói cập nhật."
 
-#: ../edit-urpm-sources.pl_.c:282 ../rpmdrake_.c:730
-msgid "Remove"
-msgstr "Gỡ B�"
+#: ../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 ""
+"Bạn cũng có thể ch�n thủ công mirror mong muốn. �ể làm vậy,\n"
+"hãy chạy Chương Trình Quản Lý Nguồn Phần M�m và sau đó\n"
+"thêm nguồn `Các cập nhật bảo mật' .\n"
+"\n"
+"Sau đó khởi chạy lại MandrakeUpdate."
 
-#: ../edit-urpm-sources.pl_.c:284
-msgid "Edit"
-msgstr "Hiệu chỉnh"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Cách ch�n thủ công mirror của bạn"
 
-#: ../edit-urpm-sources.pl_.c:286
-msgid "Add..."
-msgstr "Thêm..."
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
+msgstr ""
+"Xảy ra một lỗi không có khả năng phục hồi khi đang cập nhật thông tin v� các "
+"gói cập nhật."
 
-#: ../edit-urpm-sources.pl_.c:288
-msgid "Update..."
-msgstr "Cập nhật..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
+msgstr "Lỗi khi cập nhật phương tiện"
 
-#: ../edit-urpm-sources.pl_.c:289
-msgid "Proxy..."
-msgstr "Proxy..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
+msgstr ""
+"Hãy đợi, đang liên lạc với mirror để cập nhật thông tin v� các gói cập nhật."
 
-#: ../edit-urpm-sources.pl_.c:292
-msgid "Save and quit"
-msgstr "Lưu và Thoát"
+#: ../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 ""
+"Cần liên lạc với mirror để lấy các gói cập nhật mới nhất.\n"
+"Hãy đảm bảo là mạng của bạn đang chạy.\n"
+"\n"
+"Tiếp tục được chưa?"
 
-#: ../edit-urpm-sources.pl_.c:293 ../rpmdrake_.c:733
-msgid "Quit"
-msgstr "Thoát"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Installation"
+msgstr "Cài �ặt Các Gói Phần M�m"
 
-#: ../rpmdrake.pm_.c:96
-msgid "Yes"
-msgstr "Có"
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, c-format
+msgid "Mandrake Update"
+msgstr "Cập Nhật Mandrake"
 
-#: ../rpmdrake.pm_.c:98
-msgid "No"
-msgstr "Không"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
+msgstr "Gỡ B� Các Gói Phần M�m"
 
-#: ../rpmdrake.pm_.c:130
-msgid "Info..."
-msgstr "Thông tin..."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Thoát"
 
-#: ../rpmdrake.pm_.c:183
-msgid "Austria"
-msgstr "�o"
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "Cài đặt"
 
-#: ../rpmdrake.pm_.c:184
-msgid "Australia"
-msgstr "Châu úc"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "Gỡ B�"
 
-#: ../rpmdrake.pm_.c:185
-msgid "Belgium"
-msgstr "Bỉ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search"
+msgstr "Tìm kiếm"
 
-#: ../rpmdrake.pm_.c:186
-msgid "Brazil"
-msgstr "Brazil"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "Tìm:"
 
-#: ../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 ""
+"Các gói sau phải được gỡ b� để nâng cấp các gói khác:\n"
+"\n"
+"%s\n"
+"\n"
+"�ã sẵn sàng tiếp tục?"
 
-#: ../rpmdrake.pm_.c:188
-msgid "Costa Rica"
-msgstr "Costa Rica"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "Một số gói cần được gỡ b�"
 
-#: ../rpmdrake.pm_.c:189
-msgid "Czech Republic"
-msgstr "Czech Republic"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr ""
+"Cảnh báo: có vẻ như bạn đang cố thêm quá nhi�u gói tin\n"
+"làm cho hệ thống tập tin hết cả không gian đĩa trống, trong\n"
+"hay sau khi cài đặt gói tin, đi�u này đặc biệt nguy hiểm và\n"
+"nên thận tr�ng.\n"
+"\n"
+"Bạn có thật sự muốn cài đặt tất cả các gói đã ch�n không?"
 
-#: ../rpmdrake.pm_.c:190
-msgid "Germany"
-msgstr "Germany"
+#: ../rpmdrake:1
+#, c-format
+msgid "Too many packages are selected"
+msgstr "Có quá nhi�u gói tin được ch�n"
 
-#: ../rpmdrake.pm_.c:191
-msgid "Danmark"
-msgstr "Danmark"
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
+msgstr "Thông tin tối đa"
 
-#: ../rpmdrake.pm_.c:192 ../rpmdrake.pm_.c:196
-msgid "Greece"
-msgstr "Hy lạp"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal information"
+msgstr "Thông tin thông thư�ng"
 
-#: ../rpmdrake.pm_.c:193
-msgid "Spain"
-msgstr "Tây ban nha"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update source(s)"
+msgstr "Cập nhật các nguồn"
 
-#: ../rpmdrake.pm_.c:194
-msgid "Finland"
-msgstr "Phần Lan"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reload the packages list"
+msgstr "Nạp lại danh sách các gói"
 
-#: ../rpmdrake.pm_.c:195
-msgid "France"
-msgstr "Pháp"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
+msgstr "Lập lại việc ch�n"
 
-#: ../rpmdrake.pm_.c:197
-msgid "Israel"
-msgstr "Israel"
+#: ../rpmdrake:1
+#, c-format
+msgid "in files"
+msgstr "trong các tập tin"
 
-#: ../rpmdrake.pm_.c:198
-msgid "Italy"
-msgstr "�"
+#: ../rpmdrake:1
+#, c-format
+msgid "in descriptions"
+msgstr "trong các mô tả"
 
-#: ../rpmdrake.pm_.c:199
-msgid "Japan"
-msgstr "Nhật"
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
+msgstr "trong các tên"
 
-#: ../rpmdrake.pm_.c:200
-msgid "Korea"
-msgstr "Nam Tri�u Tiên"
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
+msgstr "theo sự sẵn có để cập nhật"
 
-#: ../rpmdrake.pm_.c:201
-msgid "Netherlands"
-msgstr "Netherlands"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
+msgstr "theo nơi chứa nguồn"
 
-#: ../rpmdrake.pm_.c:202
-msgid "Norway"
-msgstr "Na Uy"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
+msgstr "theo tình trạng ch�n"
 
-#: ../rpmdrake.pm_.c:203
-msgid "Poland"
-msgstr "Ba Lan"
+#: ../rpmdrake:1
+#, c-format
+msgid "by size"
+msgstr "Theo kích thước"
 
-#: ../rpmdrake.pm_.c:204
-msgid "Portugal"
-msgstr "Portugal"
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
+msgstr "theo nhóm"
 
-#: ../rpmdrake.pm_.c:205
-msgid "Russia"
-msgstr "Nga"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages,"
+msgstr "Toàn bộ các gói,"
 
-#: ../rpmdrake.pm_.c:206
-msgid "Sweden"
-msgstr "Thụy �iển"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
+msgstr "M�i gói tin, theo bảng chữ cái"
 
-#: ../rpmdrake.pm_.c:207
-msgid "Taiwan"
-msgstr "�ài Loan"
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
+msgstr "Các lựa ch�n của Mandrake"
 
-#: ../rpmdrake.pm_.c:208
-msgid "United Kingdom"
-msgstr "Liên Hiệp Anh"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal updates"
+msgstr "Cập nhật thông thư�ng"
 
-#: ../rpmdrake.pm_.c:209
-msgid "China"
-msgstr "Trung Quốc"
+#: ../rpmdrake:1
+#, c-format
+msgid "Bugfixes updates"
+msgstr "Cập nhật sửa lỗi"
 
-#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:211 ../rpmdrake.pm_.c:212
-#: ../rpmdrake.pm_.c:213 ../rpmdrake.pm_.c:264
-msgid "United States"
-msgstr "Hoa Kỳ"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
+msgstr "Cập nhật bảo mật"
 
-#: ../rpmdrake.pm_.c:277
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
-"Hãy đợi, đang tải xuống các địa chỉ mirror từ website của MandrakeSoft."
+#: ../rpmdrake:1
+#, c-format
+msgid "Description: "
+msgstr "Mô tả: "
 
-#: ../rpmdrake.pm_.c:283
-msgid "Error during download"
-msgstr "Lỗi khi đang tải xuống"
+#: ../rpmdrake:1
+#, c-format
+msgid "Summary: "
+msgstr "Tóm tắt: "
 
-#: ../rpmdrake.pm_.c:292
-msgid "No mirror"
-msgstr "Không có mirror"
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "Mức độ quan tr�ng: "
 
-#: ../rpmdrake.pm_.c:310
-msgid "Please choose the desired mirror."
-msgstr "Hãy ch�n mirror mong muốn."
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake.pm_.c:342 ../rpmdrake_.c:627
-msgid "Update source(s)"
-msgstr "Cập nhật các nguồn"
+#: ../rpmdrake:1
+#, c-format
+msgid "Size: "
+msgstr "Kích thước: "
 
-#: ../rpmdrake.pm_.c:346
-msgid "Select the source(s) you wish to update:"
-msgstr "Hãy ch�n các nguồn mà bạn muốn cập nhật:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Version: "
+msgstr "Phiên bản: "
 
-#: ../rpmdrake.pm_.c:350
-msgid "Update"
-msgstr "Cập nhật"
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "Tên: "
 
-#: ../rpmdrake.pm_.c:360
-msgid "Please wait, updating media..."
-msgstr "Hãy đợi, đang cập nhật phương tiện..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "Lý do cập nhật:"
 
-#: ../rpmdrake_.c:99
-msgid "Other"
-msgstr "Khác"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
+msgstr "Phiên bản đã cài đặt hiện th�i:"
 
-#: ../rpmdrake_.c:121 ../rpmdrake_.c:135 ../rpmdrake_.c:227 ../rpmdrake_.c:298
-msgid "(none)"
-msgstr "(không có)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Source: "
+msgstr "Nguồn: "
 
-#: ../rpmdrake_.c:141 ../rpmdrake_.c:482 ../rpmdrake_.c:483
+#: ../rpmdrake:1
+#, c-format
 msgid "(Not available)"
 msgstr "(Không có sẵn)"
 
-#: ../rpmdrake_.c:151 ../rpmdrake_.c:208
-msgid "Search results"
-msgstr "Kết quả tìm kiếm"
-
-#: ../rpmdrake_.c:151
-msgid "Search results (none)"
-msgstr "Kết quả tìm kiếm (không)"
-
-#: ../rpmdrake_.c:161 ../rpmdrake_.c:172
-msgid "Please wait, searching..."
-msgstr "Hãy đợi, đang tìm kiếm..."
-
-#: ../rpmdrake_.c:175
-msgid "Stop"
-msgstr "Dừng"
-
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-msgid "Addable"
-msgstr "Có thể thêm vào"
-
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-msgid "Upgradable"
-msgstr "Có thể nâng cấp"
-
-#: ../rpmdrake_.c:211
-msgid "Not selected"
-msgstr "Không được ch�n"
-
-#: ../rpmdrake_.c:211
-msgid "Selected"
-msgstr "�ược ch�n"
-
-#: ../rpmdrake_.c:240
-msgid "rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake_.c:258 ../rpmdrake_.c:360 ../rpmdrake_.c:362
-msgid "More information on package..."
-msgstr "Thêm các thông tin v� gói..."
-
-#: ../rpmdrake_.c:259
-msgid "One of the following packages is needed:"
-msgstr "Cần đến một trong các gói tin sau:"
-
-#: ../rpmdrake_.c:259
-msgid "Please choose"
-msgstr "Hãy ch�n"
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
+msgstr "Bản ghi thay đổi (Changelog):\n"
 
-#: ../rpmdrake_.c:275
-msgid "unknown package "
-msgstr "Gói tin không xác định"
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "Tập tin:\n"
 
-#: ../rpmdrake_.c:285
-msgid "Please wait, listing packages..."
-msgstr "Hãy đợi, đang liệt kê các gói..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected size: %d MB"
+msgstr "Kích thước được ch�n: %d MB"
 
-#: ../rpmdrake_.c:300
-msgid "No update"
-msgstr "Không có cập nhật"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "�ã ch�n: %d MB / Không gian đĩa trống: %d MB"
 
-#: ../rpmdrake_.c:353 ../rpmdrake_.c:354
-msgid "More infos"
-msgstr "Thêm thông tin"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
+msgstr ""
+"Do các phụ thuộc của chúng, các gói sau phải được b� ch�n\n"
+"ngay bây gi�:\n"
+"\n"
 
-#: ../rpmdrake_.c:355
-msgid "Information on packages"
-msgstr "Thông tin v� các gói"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+msgstr ""
+"Xin lỗi, không thể ch�n các gói sau:\n"
+"\n"
 
-#: ../rpmdrake_.c:376
-msgid "Some additional packages need to be removed"
-msgstr "Cần gỡ b� một số gói bổ sung"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "Một số gói không thể cài đặt"
 
-#: ../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 ""
-"Do các phụ thuộc của chúng, mà những gói sau đây cũng cần được gỡ\n"
-"b�:\n"
+"�ể th�a mãn các phụ thuộc, các gói tin sau cũng cần được\n"
+"cài đặt:\n"
 "\n"
 
-#: ../rpmdrake_.c:383 ../rpmdrake_.c:391
+#: ../rpmdrake:1
+#, c-format
+msgid "Additional packages needed"
+msgstr "Cần thêm các gói bổ sung"
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "Không thể gỡ b� một số gói"
 
-#: ../rpmdrake_.c:384
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -466,584 +642,600 @@ msgstr ""
 "Xin lỗi, gỡ b� các gói này sẽ làm h�ng hệ thống của bạn:\n"
 "\n"
 
-#: ../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 ""
-"Do các phụ thuộc của chúng, các gói sau phải được b� ch�n\n"
-"ngay bây gi�:\n"
+"Do các phụ thuộc của chúng, mà những gói sau đây cũng cần được gỡ\n"
+"b�:\n"
 "\n"
 
-#: ../rpmdrake_.c:421
-msgid "Additional packages needed"
-msgstr "Cần thêm các gói bổ sung"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr "Cần gỡ b� một số gói bổ sung"
 
-#: ../rpmdrake_.c:422
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
-msgstr ""
-"�ể th�a mãn các phụ thuộc, các gói tin sau cũng cần được\n"
-"cài đặt:\n"
-"\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
+msgstr "Thêm các thông tin v� gói..."
 
-#: ../rpmdrake_.c:435
-msgid "Some packages can't be installed"
-msgstr "Một số gói không thể cài đặt"
+#: ../rpmdrake:1
+#, c-format
+msgid "Information on packages"
+msgstr "Thông tin v� các gói"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
+msgstr "Thêm thông tin"
 
-#: ../rpmdrake_.c:436
+#: ../rpmdrake:1
+#, c-format
+msgid "Addable"
+msgstr "Có thể thêm vào"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Upgradable"
+msgstr "Có thể nâng cấp"
+
+#: ../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 ""
-"Xin lỗi, không thể ch�n các gói sau:\n"
-"\n"
+"Dah sách các cập nhật trống. Có nghĩa là không có cập nhật\n"
+"nào cho các gói tin đã được cài đặt hoặc là bạn đã cài đặt chúng\n"
+"rồi."
 
-#: ../rpmdrake_.c:450 ../rpmdrake_.c:684
-msgid "Some packages need to be removed"
-msgstr "Một số gói cần được gỡ b�"
+#: ../rpmdrake:1
+#, c-format
+msgid "No update"
+msgstr "Không có cập nhật"
 
-#: ../rpmdrake_.c:472
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "�ã ch�n: %d MB / Không gian đĩa trống: %d MB"
+msgid "(none)"
+msgstr "(không có)"
 
-#: ../rpmdrake_.c:474
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "Kích thước được ch�n: %d MB"
+msgid "Please wait, listing packages..."
+msgstr "Hãy đợi, đang liệt kê các gói..."
 
-#: ../rpmdrake_.c:482
-msgid "Files:\n"
-msgstr "Tập tin:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "unknown package "
+msgstr "Gói tin không xác định"
 
-#: ../rpmdrake_.c:483
-msgid "Changelog:\n"
-msgstr "Bản ghi thay đổi (Changelog):\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Cần đến một trong các gói tin sau:"
 
-#: ../rpmdrake_.c:486
-msgid "Source: "
-msgstr "Nguồn: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please choose"
+msgstr "Hãy ch�n"
 
-#: ../rpmdrake_.c:487
-msgid "Currently installed version: "
-msgstr "Phiên bản đã cài đặt hiện th�i:"
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:491
-msgid "Reason for update: "
-msgstr "Lý do cập nhật:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Not selected"
+msgstr "Không được ch�n"
 
-#: ../rpmdrake_.c:493
-msgid "Name: "
-msgstr "Tên: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected"
+msgstr "�ược ch�n"
 
-#: ../rpmdrake_.c:494
-msgid "Version: "
-msgstr "Phiên bản: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results"
+msgstr "Kết quả tìm kiếm"
 
-#: ../rpmdrake_.c:495
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Stop"
+msgstr "Dừng"
 
-#: ../rpmdrake_.c:495
-msgid "Size: "
-msgstr "Kích thước: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, searching..."
+msgstr "Hãy đợi, đang tìm kiếm..."
 
-#: ../rpmdrake_.c:497
-msgid "Importance: "
-msgstr "Mức độ quan tr�ng: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
+msgstr "Kết quả tìm kiếm (không)"
 
-#: ../rpmdrake_.c:498
-msgid "Summary: "
-msgstr "Tóm tắt: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Khác"
 
-#: ../rpmdrake_.c:499
-msgid "Description: "
-msgstr "Mô tả: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"Welcome to the packages source editor!\n"
+"\n"
+"This tool will help you configure the packages sources you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"Chào mừng trình biên soạn nguồn các gói tin!\n"
+"\n"
+"Công cụ này giúp cấu hình các nguồn gói tin mà bạn muốn dùng trên máy\n"
+"tính này. Chúng sẽ có sẵn để cài đặt các gói phần m�m mới hoặc thực hiện\n"
+"cập nhật."
 
-#: ../rpmdrake_.c:548
-msgid "Bugfixes updates"
-msgstr "Cập nhật sửa lỗi"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Lưu và Thoát"
 
-#: ../rpmdrake_.c:548
-msgid "Normal updates"
-msgstr "Cập nhật thông thư�ng"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy..."
+msgstr "Proxy..."
 
-#: ../rpmdrake_.c:567
-msgid "Mandrake choices"
-msgstr "Các lựa ch�n của Mandrake"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
+msgstr "Cập nhật..."
 
-#: ../rpmdrake_.c:568
-msgid "All packages, alphabetical"
-msgstr "M�i gói tin, theo bảng chữ cái"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "Thêm..."
 
-#: ../rpmdrake_.c:569
-msgid "All packages,"
-msgstr "Toàn bộ các gói,"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "Hiệu chỉnh"
 
-#: ../rpmdrake_.c:592
-msgid "by group"
-msgstr "theo nhóm"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Source"
+msgstr "Nguồn"
 
-#: ../rpmdrake_.c:592
-msgid "by size"
-msgstr "Theo kích thước"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
+msgstr "Bật ?"
 
-#: ../rpmdrake_.c:593
-msgid "by selection state"
-msgstr "theo tình trạng ch�n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure sources"
+msgstr "Cấu hình các nguồn"
 
-#: ../rpmdrake_.c:594
-msgid "by source repository"
-msgstr "theo nơi chứa nguồn"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "Mật khẩu:"
 
-#: ../rpmdrake_.c:594
-msgid "by update availability"
-msgstr "theo sự sẵn có để cập nhật"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
+msgstr "Ngư�i dùng:"
 
-#: ../rpmdrake_.c:615
-msgid "in descriptions"
-msgstr "trong các mô tả"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Bạn có thể chỉ định ngư�i dùng/mật khẩu cho xác thực của proxy:"
 
-#: ../rpmdrake_.c:615
-msgid "in files"
-msgstr "trong các tập tin"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "Proxy hostname:"
 
-#: ../rpmdrake_.c:615
-msgid "in names"
-msgstr "trong các tê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 ""
+"Nếu cần một proxy, hãy nhập hostname và một cổng (port) tùy ý (cú pháp: "
+"<proxyhost[:port]>):"
 
-#: ../rpmdrake_.c:626
-msgid "Reload the packages list"
-msgstr "Nạp lại danh sách các gói"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "Cấu hình các proxy"
 
-#: ../rpmdrake_.c:626
-msgid "Reset the selection"
-msgstr "Lập lại việc ch�n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr "Hãy đợi, đang cập nhật phương tiện..."
 
-#: ../rpmdrake_.c:652
-msgid "Maximum information"
-msgstr "Thông tin tối đa"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "�ể lưu các thay đổi, cần nạp phương tiện vào ổ."
 
-#: ../rpmdrake_.c:652
-msgid "Normal information"
-msgstr "Thông tin thông thư�ng"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
+msgstr "Cần nạp phương tiện để tiếp tục"
 
-#: ../rpmdrake_.c:674
-msgid "Too many packages are selected"
-msgstr "Có quá nhi�u gói tin được ch�n"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save changes"
+msgstr "Lưu lại các thay đổi"
 
-#: ../rpmdrake_.c:720
-msgid "Find:"
-msgstr "Tìm:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "�ư�ng dẫn liên quan tới synthesis/hdlist:"
 
-#: ../rpmdrake_.c:725
-msgid "Search"
-msgstr "Tìm kiếm"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake_.c:731
-msgid "Install"
-msgstr "Cài đặt"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Editing source \"%s\":"
+msgstr "Hiệu chỉnh nguồn \"%s\":"
 
-#: ../rpmdrake_.c:738 data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrake Update"
-msgstr "Cập Nhật Mandrake"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit a source"
+msgstr "Hiệu chỉnh nguồn"
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Installation"
-msgstr "Cài �ặt Các Gói Phần M�m"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr "Hãy đợi, đang gỡ b� phương tiện..."
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Removal"
-msgstr "Gỡ B� Các Gói Phần M�m"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, adding medium..."
+msgstr "Hãy đợi, đang thêm phương tiện..."
 
-#: ../rpmdrake_.c:779
-msgid "Please wait, contacting mirror to update packages information."
-msgstr ""
-"Hãy đợi, đang liên lạc với mirror để cập nhật thông tin v� các gói cập nhật."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of source:"
+msgstr "Loại nguồn:"
 
-#: ../rpmdrake_.c:781
-msgid "Error updating medium"
-msgstr "Lỗi khi cập nhật phương tiện"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Adding a source:"
+msgstr "Thêm một nguồn:"
 
-#: ../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 ""
-"Xảy ra một lỗi không có khả năng phục hồi khi đang cập nhật thông tin v� các "
-"gói cập nhật."
+"�ang có một phương tiện với tên đó rồi, bạn có\n"
+"thật sự muốn thay thế nó?"
 
-#: ../rpmdrake_.c:787
-msgid "How to choose manually your mirror"
-msgstr "Cách ch�n thủ công mirror của bạn"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to fill up at least the two first entries."
+msgstr "Bạn cần đi�n ít nhất là hai mục nhập đầu tiên."
 
-#: ../rpmdrake_.c:795
-msgid "Please wait, contacting mirror to initialize updates packages."
-msgstr "Hãy đợi, đang liên lạc với mirror để sơ khởi các gói cập nhật."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "Tên:"
 
-#: ../rpmdrake_.c:798
-msgid "Error adding update medium"
-msgstr "Lỗi khi thêm phương tiện cập nhật"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
+msgstr "�ăng nhập:"
 
-#: ../rpmdrake_.c:829
-msgid "Please wait, finding available packages..."
-msgstr "Hãy đợi, đang tìm các gói sẵn có..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Ch�n một mirror..."
 
-#: ../rpmdrake_.c:861
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Thẩm tra %s"
+msgid "Browse..."
+msgstr "Duyệt..."
 
-#: ../rpmdrake_.c:880
-msgid "changes:"
-msgstr "các thay đổi:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "�ư�ng dẫn hoặc điểm gắn kết:"
 
-#: ../rpmdrake_.c:884
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Gỡ B� .%s"
+msgid "Removable device"
+msgstr "Thiết bị có thể gỡ b�"
 
-#: ../rpmdrake_.c:886
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Dùng .%s là tập tin chính"
+msgid "HTTP server"
+msgstr "Máy chủ HTTP"
 
-#: ../rpmdrake_.c:888
-msgid "Do nothing"
-msgstr "Không làm gì"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "Máy chủ FTP"
 
-#: ../rpmdrake_.c:900
-msgid "Installation finished"
-msgstr "Kết thúc cài đặt"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path:"
+msgstr "�ư�ng dẫn: "
 
-#: ../rpmdrake_.c:910
-msgid "Inspect..."
-msgstr "Thẩm tra..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "Tập tin cục bộ"
 
-#: ../rpmdrake_.c:925
-msgid "Program missing"
-msgstr "Thiếu chương trình"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add a source"
+msgstr "Thêm nguồn:"
 
-#: ../rpmdrake_.c:926
-msgid "A required program is missing (grpmi). Check your installation."
-msgstr "Thiếu chương trình được yêu cầu (grpmi). Hãy kiểm tra cài đặt của bạn."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
+msgstr "Không thể cập nhật phương tiện, nó sẽ tự động tắt."
 
-#: ../rpmdrake_.c:940
-msgid "Unable to get source packages."
-msgstr "Không thể lấy các gói nguồn."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "Không thể tạo phương tiện."
 
-#: ../rpmdrake_.c:941
-msgid "Unable to get source packages, sorry."
-msgstr "Xin lỗi, không thể lấy các gói nguồn."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, updating media..."
+msgstr "Hãy đợi, đang cập nhật phương tiện..."
 
-#: ../rpmdrake_.c:948
-msgid "Change medium"
-msgstr "Thay phương tiện"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
+msgstr "Cập nhật"
 
-#: ../rpmdrake_.c:949
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Hãy nạp phương tiện có tên \"%s\" trên thiết bị [%s]"
+msgid "Select the source(s) you wish to update:"
+msgstr "Hãy ch�n các nguồn mà bạn muốn cập nhật:"
 
-#: ../rpmdrake_.c:957
-msgid "Installation failed"
-msgstr "Không cài đặt được"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please choose the desired mirror."
+msgstr "Hãy ch�n mirror mong muốn."
 
-#: ../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 ""
-"Cài đặt không được, thiếu một số tập tin.\n"
-"Có thể bạn muốn cập nhật cơ sở dữ liệu v� các nguồn của mình."
+"Không thể tìm được mirror nào thích hợp.\n"
+"\n"
+"Có nhi�u nguyên nhân có thể gây ra, thư�ng gặp nhất là trư�ng hợp\n"
+"kiến trúc của bộ vi xử lý của bạn không được hỗ trợ bởi Cập Nhật\n"
+"Chính Thức Của Mandrake Linux."
 
-#: ../rpmdrake_.c:961
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr "Hãy đợi, gỡ b� các gói để cho phép nâng cấp các gói khác..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
+msgstr "Không có 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 ""
-"Quá trình cài đặt đã kết thúc; %s.\n"
+"Có lỗi xảy ra khi đang tải xuống danh sách mirror:\n"
 "\n"
-"Một số tập tin cấu hình được tạo là `.rpmnew' hay `.rpmsave',\n"
-"Bây gi� bạn có thể kiểm tra một số tập tin đó để tạo các hoạt động:"
+"%s\n"
+"Mạng hay website của MandrakeSoft hiện th�i có thể không có.\n"
+"Xin hãy thử lại sau."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "Lỗi khi đang tải xuống"
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
+"Hãy đợi, đang tải xuống các địa chỉ mirror từ website của MandrakeSoft."
+
+#: ../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 ""
-"Không cài đặt đúng được một số\n"
-"gói tin"
+"Cần liên lạc với website của MandrakeSoft để lấy danh sách mirror.\n"
+"Hãy kiểm tra là mạng của bạn đang chạy.\n"
+"\n"
+"Nó có tốt để tiếp tục không?"
 
-#: ../rpmdrake_.c:983
-msgid "everything was installed correctly"
-msgstr "m�i thứ đã được cài đặt đúng"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United States"
+msgstr "Hoa Kỳ"
 
-#: ../rpmdrake_.c:985
-msgid "Everything installed successfully"
-msgstr "M�i thứ đã được cài đặt thành công"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
+msgstr "Trung Quốc"
 
-#: ../rpmdrake_.c:986
-msgid "All requested packages were installed successfully."
-msgstr "M�i gói tin yêu cầu đã được cài đặt thành công."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr "Liên Hiệp Anh"
 
-#: ../rpmdrake_.c:989
-msgid "Everything already installed."
-msgstr "M�i thứ đã được cài đặt."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "�ài Loan"
 
-#: ../rpmdrake_.c:990
-msgid "Everything already installed (is this supposed to happen at all?)."
-msgstr "M�i thứ đã được cài đặt rồi "
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "Thụy �iển"
 
-#: ../rpmdrake_.c:997
-msgid "Problem during installation"
-msgstr "Có trục trặc trong khi cài đặt"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
+msgstr "Nga"
 
-#: ../rpmdrake_.c:998
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"�ã xảy ra trục trặc trong khi cài đặt:\n"
-"\n"
-"%s"
+msgid "Portugal"
+msgstr "Portugal"
 
-#: ../rpmdrake_.c:1012
-msgid "Please wait, reading packages database..."
-msgstr "Hãy đợi, đang đ�c cơ sở dữ liệu các gói..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
+msgstr "Ba Lan"
 
-#: ../rpmdrake_.c:1053
-msgid "Please wait, removing packages..."
-msgstr "Hãy đợi, đang gỡ b� các gói..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
+msgstr "Na Uy"
 
-#: ../rpmdrake_.c:1056
-msgid "Problem during removal"
-msgstr "Có trục trặc khi gỡ b�"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
+msgstr "Netherlands"
 
-#: ../rpmdrake_.c:1057
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"�ã xảy ra trục trặc trong khi gỡ b� các gói:\n"
-"\n"
-"%s"
+msgid "Korea"
+msgstr "Nam Tri�u Tiên"
 
-#: ../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 ""
-"Chào mừng công cụ gỡ b� phần m�m!\n"
-"\n"
-"Công cụ này giúp bạn ch�n phần m�m nào muốn gỡ b� kh�i máy tính\n"
-"của bạn."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Japan"
+msgstr "Nhật"
 
-#: ../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 ""
-"Chào mừng MandrakeUpdate!\n"
-"\n"
-"Công cụ này giúp bạn ch�n các cập nhật mà bạn muốn cài đặt lên\n"
-"máy tính."
+#: ../rpmdrake.pm:1
+#, 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 ""
-"Chào mừng công cụ cài đặt phần m�m!\n"
-"\n"
-"Hệ thống Mandrake Linux của bạn có vài nghìn gói phần m�m trên đĩa\n"
-"CDROM hay DVD. Công cụ này giúp bạn ch�n phần m�m nào mà bạn\n"
-"muốn cài đặt vào máy tính của bạn."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Israel"
+msgstr "Israel"
 
-#: data/rpmdrake-remove.desktop.in.h:1
-msgid "Remove Software"
-msgstr "Gỡ B� Phần M�m"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Hy lạp"
 
-#: data/rpmdrake-sources.desktop.in.h:1
-msgid "Software Sources Manager"
-msgstr "Chương Trình Quản Lý Nguồn Phần M�m"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "France"
+msgstr "Pháp"
 
-#: data/rpmdrake.desktop.in.h:1
-msgid "Install Software"
-msgstr "Cài đặt Phần m�m"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "Phần Lan"
 
-#~ msgid ""
-#~ "There is already a medium by that name, do you\n"
-#~ "really want to replace it?"
-#~ msgstr ""
-#~ "�ang có một phương tiện với tên đó rồi, bạn có\n"
-#~ "thật sự muốn thay thế nó?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "Tây ban nha"
 
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-#~ "Có đồng ý tiếp tục không?"
+#: ../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 ""
-#~ "Chào mừng trình biên soạn nguồn các gói tin!\n"
-#~ "\n"
-#~ "Công cụ này giúp cấu hình các nguồn gói tin mà bạn muốn dùng trên máy\n"
-#~ "tính này. Chúng sẽ có sẵn để cài đặt các gói phần m�m mới hoặc thực hiện\n"
-#~ "cập nhật."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr "Germany"
 
-#~ msgid ""
-#~ "I need to contact MandrakeSoft website to get the mirrors list.\n"
-#~ "Please check that your network is currently running.\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "Cần liên lạc với website của MandrakeSoft để lấy danh sách mirror.\n"
-#~ "Hãy kiểm tra là mạng của bạn đang chạy.\n"
-#~ "\n"
-#~ "Nó có tốt để tiếp tục không?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
+msgstr "Czech Republic"
 
-#~ 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 ""
-#~ "Có lỗi xảy ra khi đang tải xuống danh sách mirror:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "Mạng hay website của MandrakeSoft hiện th�i có thể không có.\n"
-#~ "Xin hãy thử lại sau."
+#: ../rpmdrake.pm:1
+#, 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 ""
-#~ "Không thể tìm được mirror nào thích hợp.\n"
-#~ "\n"
-#~ "Có nhi�u nguyên nhân có thể gây ra, thư�ng gặp nhất là trư�ng hợp\n"
-#~ "kiến trúc của bộ vi xử lý của bạn không được hỗ trợ bởi Cập Nhật\n"
-#~ "Chính Thức Của Mandrake Linux."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "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 ""
-#~ "Dah sách các cập nhật trống. Có nghĩa là không có cập nhật\n"
-#~ "nào cho các gói tin đã được cài đặt hoặc là bạn đã cài đặt chúng\n"
-#~ "rồi."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "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 ""
-#~ "Cảnh báo: có vẻ như bạn đang cố thêm quá nhi�u gói tin\n"
-#~ "làm cho hệ thống tập tin hết cả không gian đĩa trống, trong\n"
-#~ "hay sau khi cài đặt gói tin, đi�u này đặc biệt nguy hiểm và\n"
-#~ "nên thận tr�ng.\n"
-#~ "\n"
-#~ "Bạn có thật sự muốn cài đặt tất cả các gói đã ch�n không?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Belgium"
+msgstr "Bỉ"
 
-#~ msgid ""
-#~ "The following packages have to be removed for others to be upgraded:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "Các gói sau phải được gỡ b� để nâng cấp các gói khác:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "�ã sẵn sàng tiếp tục?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Australia"
+msgstr "Châu úc"
 
-#~ 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 "�o"
 
-#~ msgid ""
-#~ "I need to contact the mirror to get latest update packages.\n"
-#~ "Please check that your network is currently running.\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "Cần liên lạc với mirror để lấy các gói cập nhật mới nhất.\n"
-#~ "Hãy đảm bảo là mạng của bạn đang chạy.\n"
-#~ "\n"
-#~ "Tiếp tục được chưa?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Info..."
+msgstr "Thông tin..."
 
-#~ msgid ""
-#~ "You may also choose your desired mirror manually: to do so,\n"
-#~ "launch the Software Sources Manager, and then add a `Security\n"
-#~ "updates' source.\n"
-#~ "\n"
-#~ "Then, restart MandrakeUpdate."
-#~ msgstr ""
-#~ "Bạn cũng có thể ch�n thủ công mirror mong muốn. �ể làm vậy,\n"
-#~ "hãy chạy Chương Trình Quản Lý Nguồn Phần M�m và sau đó\n"
-#~ "thêm nguồn `Các cập nhật bảo mật' .\n"
-#~ "\n"
-#~ "Sau đó khởi chạy lại MandrakeUpdate."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
+msgstr "Không"
 
-#~ 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ó một lỗi xảy ra khi đang bổ sung phương tiện cập nhật bằng urpmi.\n"
-#~ "\n"
-#~ "Có thể do mirror tạm th�i không có hay bị ngắt, hoặc khi phiên bản\n"
-#~ "Mandrake Linux (%s) vẫn chưa được hay đã không còn được hỗ trợ bởi "
-#~ "Mandrake Linux\n"
-#~ "Official Updates.\n"
-#~ "\n"
-#~ "Bạn có muốn thử một mirror khác không?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Có"
+
+#: data/rpmdrake.desktop.in.h:1
+msgid "Install Software"
+msgstr "Cài đặt Phần m�m"
+
+#: data/rpmdrake-remove.desktop.in.h:1
+msgid "Remove Software"
+msgstr "Gỡ B� Phần M�m"
+
+#: data/rpmdrake-sources.desktop.in.h:1
+msgid "Software Sources Manager"
+msgstr "Chương Trình Quản Lý Nguồn Phần M�m"
+
+#~ 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/vi.pom b/po/vi.pom
index 543dbf38..3f4bd7a5 100644
--- a/po/vi.pom
+++ b/po/vi.pom
@@ -4,166 +4,173 @@ msgstr "Máy chủ"
 
 # 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 "Máy tính mạng (khách)"
+msgid "Office Workstation"
+msgstr "Trạm làm việc văn phòng"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "Máy chủ NFS, SMB, SSH, ủy nhiệm"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Các chương trình văn phòng: wordprocessors (kword, abiword), spreadsheets "
+"(kspread, gnumeric), pdf viewers, v.v..."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Văn phòng"
+msgid "Workstation"
+msgstr "Trạm làm việc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Trạm làm việc GNOME"
+msgid "Game station"
+msgstr "Trạm trò chơi"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Công cụ cho Palm Pilot hoặc Visor"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Các chương trình giải trí: arcade, boards, strategy, v.v..."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Trạm làm việc"
+msgid "Multimedia station"
+msgstr "Trạm đa phương tiện"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Tư�ng lửa/�ịnh tuyến"
+msgid "Sound and video playing/editing programs"
+msgstr "Các chương trình chơi Audio-Video/soạn thảo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr "Tên của tên vùng và Network Information Server"
+msgid "Internet station"
+msgstr "Trạm 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 ""
-"Các chương trình văn phòng: wordprocessors (kword, abiword), spreadsheets "
-"(kspread, gnumeric), pdf viewers, v.v..."
+"Các công cụ đ�c và gửi thư tín và tin tức (pine, mutt, tin..) và để duyệt 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 "Các công cụ âm thanh: mp3 hay midi players, mixers,v.v..."
+msgid "Network Computer (client)"
+msgstr "Máy tính mạng (khách)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Cơ Sở V� Chuẩn Linux (LSB). Hỗ trợ ứng dụng cho hãng thứ ba."
+msgid "Clients for different protocols including ssh"
+msgstr "Máy khách cho các giao thức khác bao gồm 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ác sách, how-to cho Linux và phần m�m miễn phí"
+msgid "Configuration"
+msgstr "Cấu hình"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "Trạm làm việc KDE"
+msgid "Tools to ease the configuration of your computer"
+msgstr "Công cụ xoá cấu hình máy tính của bạ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, v.v..."
+msgid "Scientific Workstation"
+msgstr "Trạm làm việc khoa h�c"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "�a phương tiện - 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 "Thiết lập công cụ cho thư, tin tức, web, truy�n tập tin, và trò chuyện"
+msgid "Console Tools"
+msgstr "Các công cụ console"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Cơ sở dữ liệu"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Các trình soạn thảo, các tiện ích tập tin, các thiết bị đầu cuối"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL hay MySQL máy chủ cơ sở dữ liệu"
+msgid "KDE Workstation"
+msgstr "Trạm làm việc KDE"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Công cụ xoá cấu hình máy tính của bạn"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"K Desktop Environment, một môi trư�ng đồ h�a với một sưu tập tiện ích đi kèm"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "�a phương tiện-Âm thanh"
+msgid "Graphical Environment"
+msgstr "Môi trư�ng đồ hoạ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Tài liệu"
+msgid "Gnome Workstation"
+msgstr "Trạm làm việc GNOME"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Các công cụ console"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+"Môi trư�ng đồ h�a thân thiện cho các ứng dụng và các tiện ích màn hình n�n"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr "Máy chủ thư Postfix , Máy chủ news Inn"
+msgid "Other Graphical Desktops"
+msgstr "Các màn hình n�n đồ hoạ khác"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Trạm Internet"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, v.v..."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Trạm đa phương tiện"
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+msgid "Development"
+msgstr "Phát triển"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Cấu hình"
+msgid "C and C++ development libraries, programs and include files"
+msgstr ""
+"Các thư viện phát triển C và C++, các chương trình và các tập tin đi kèm"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Thêm màn hình n�n đồ h�a (Gnome, IceWM)"
+msgid "Documentation"
+msgstr "Tài liệ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"
-msgstr ""
-"K Desktop Environment, một môi trư�ng đồ h�a với một sưu tập tiện ích đi kèm"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Các sách, how-to cho Linux và phần m�m miễn phí"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Môi trư�ng đồ hoạ"
+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 "Cơ Sở V� Chuẩn Linux (LSB). Hỗ trợ ứng dụng cho hãng thứ ba."
+
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-msgid "Development"
-msgstr "Phát triển"
+#: ../../share/compssUsers:999
+msgid "Web/FTP"
+msgstr "Web/FTP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -172,23 +179,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 "Các tiện ích tạo và ghi CD"
+msgid "Mail/Groupware/News"
+msgstr "Thư/Phần m�m nhóm/Tin tức"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Trạm làm việc văn phòng"
+msgid "Postfix mail server, Inn news server"
+msgstr "Máy chủ thư Postfix , Máy chủ 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,v.v..."
+msgid "Database"
+msgstr "Cơ sở dữ liệu"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Các chương trình đồ hoạ như là Gimp"
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL hay MySQL máy chủ cơ sở dữ liệu"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Firewall/Router"
+msgstr "Tư�ng lửa/�ịnh tuyến"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Internet gateway"
+msgstr "Cổng kết nối Internet"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -197,9 +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ác thư viện phát triển C và C++, các chương trình và các tập tin đi kèm"
+msgid "Domain Name and Network Information Server"
+msgstr "Tên của tên vùng và Network Information Server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -208,18 +224,18 @@ msgstr "Máy chủ mạng"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "Thư/Phần m�m nhóm/Tin tức"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "Máy chủ NFS, SMB, SSH, ủy nhiệm"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Trạm trò chơi"
+msgid "Office"
+msgstr "Văn phòng"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Các trình chơi Video và soạn thảo"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr "Thiết lập công cụ cho thư, tin tức, web, truy�n tập tin, và trò chuyện"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -228,77 +244,66 @@ msgstr "�a phương tiện-�ồ hoạ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Các chương trình giải trí: arcade, boards, strategy, v.v..."
-
-# 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 ""
-"Các công cụ đ�c và gửi thư tín và tin tức (pine, mutt, tin..) và để duyệt Web"
+msgid "Graphics programs such as The Gimp"
+msgstr "Các chương trình đồ hoạ như là Gimp"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "Tài chính cá nhân"
+msgid "Multimedia - Sound"
+msgstr "�a phương tiện-Âm thanh"
 
 # 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 ""
-"Môi trư�ng đồ h�a thân thiện cho các ứng dụng và các tiện ích màn hình n�n"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "Các công cụ âm thanh: mp3 hay midi players, mixers,v.v..."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Máy khách cho các giao thức khác bao gồm ssh"
+msgid "Multimedia - Video"
+msgstr "�a phương tiện - Video"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
+msgid "Video players and editors"
+msgstr "Các trình chơi Video và soạn thảo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Cổng kết nối Internet"
+msgid "Multimedia - CD Burning"
+msgstr "�a phương tiện - Ghi CD"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Các chương trình chơi Audio-Video/soạn thảo"
+msgid "Tools to create and burn CD's"
+msgstr "Các tiện ích tạo và ghi CD"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Các màn hình n�n đồ hoạ khác"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Thêm màn hình n�n đồ h�a (Gnome, IceWM)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Các trình soạn thảo, các tiện ích tập tin, các thiết bị đầu cuối"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm,v.v..."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "Các chương trình quản lý tài chính của bạn, như là gnucash"
+msgid "Personal Information Management"
+msgstr "Quản lý thông tin cá nhân"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "Quản lý thông tin cá nhân"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Công cụ cho Palm Pilot hoặc Visor"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "�a phương tiện - Ghi CD"
+msgid "Personal Finance"
+msgstr "Tài chính cá nhân"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Trạm làm việc khoa h�c"
+msgid "Programs to manage your finances, such as gnucash"
+msgstr "Các chương trình quản lý tài chính của bạn, như là gnucash"
 
diff --git a/po/wa.po b/po/wa.po
index be3c9e2f..288e4721 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2003-01-19 16:57+0100\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\n"
 "PO-Revision-Date: 1999-08-17 16:56+0200\n"
 "Last-Translator: Lorint Hendschel <LorintHendschel@skynet.be>\n"
 "Language-Team: Walon <linux-wa@chanae.alphanet.ch>\n"
@@ -15,1051 +15,1240 @@ 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 "Dji n' sai askepyî l' sopoirt."
-
-#: ../edit-urpm-sources.pl_.c:40
-msgid "Unable to update medium; it will be automatically disabled."
-msgstr "Dji n' sai mete a djoû l' sopoirt; i srè otomaticmint essocté."
-
-#: ../edit-urpm-sources.pl_.c:51
-msgid "Add a source"
-msgstr "Radjoutant on sourdant"
-
-#: ../edit-urpm-sources.pl_.c:52
-msgid "Local files"
-msgstr "Fitchîs locås"
-
-#: ../edit-urpm-sources.pl_.c:52
-msgid "Path:"
-msgstr "Tchimin:"
-
-#: ../edit-urpm-sources.pl_.c:53
-msgid "FTP server"
-msgstr "Sierveu FTP"
-
-#: ../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 "Hårdêye:"
-
-#: ../edit-urpm-sources.pl_.c:54
-msgid "HTTP server"
-msgstr "Sierveu HTTP"
-
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Path or mount point:"
-msgstr "Tchimin ou pont di montaedje:"
-
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Removable device"
-msgstr "Bodjåve sopoirt"
-
-#: ../edit-urpm-sources.pl_.c:56 ../rpmdrake_.c:548
-msgid "Security updates"
-msgstr "Metaedjes a djoû di såvrité"
-
-#: ../edit-urpm-sources.pl_.c:67
-msgid "Browse..."
-msgstr "Foyter..."
-
-#: ../edit-urpm-sources.pl_.c:69
-msgid "Choose a mirror..."
-msgstr "Tchoezixhoz on muroe..."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"C' est bon di continuwer?"
 
-#: ../edit-urpm-sources.pl_.c:89
-msgid "Login:"
-msgstr "No d' elodjaedje:"
+#: ../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 ""
+"Bénvnowe a l' usteye d' astalaedje di programes!\n"
+"\n"
+"Vosse sistinme Mandrake Linux vént avou sacwants meyes di programes dins\n"
+"des pacaedjes rpm so des plakes lazer. Ciste usteye chal vos aidrè a\n"
+"tchoezi kés programes vos vloz astaler sol copiutrece da vosse."
 
-#: ../edit-urpm-sources.pl_.c:89 ../edit-urpm-sources.pl_.c:215
-msgid "Password:"
-msgstr "Sicret:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Bénvnowe a MandrakeUpdate!\n"
+"\n"
+"Ciste usteye chal vos aidrè a tchoezi les metaedjes a djoû ki vos vloz\n"
+"astaler sol copiutrece da vosse."
 
-#: ../edit-urpm-sources.pl_.c:94
-msgid "Name:"
-msgstr "No:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to the software removal tool!\n"
+"\n"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
+msgstr ""
+"Bénvnow a l' usteye di oistaedje di programes!\n"
+"\n"
+"Ciste usteye chal vos aidrè a tchoezi kés programes ki vos vloz dizastaler\n"
+"di vosse copiutrece."
 
-#: ../edit-urpm-sources.pl_.c:96 ../edit-urpm-sources.pl_.c:176
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Tchimin relatif pol fitchî di sinteze ou hdlist:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"Åk n' a nén stî tins do oistaedje des pacaedjes:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:104
-msgid "You need to fill up at least the two first entries."
-msgstr "Vos dvoz rimpli pol moens les deus prumirès intrêyes."
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during removal"
+msgstr "Åk n' a nén stî tins do oistaedje"
 
-#: ../edit-urpm-sources.pl_.c:116
-msgid "Adding a source:"
-msgstr "Radjoutant on sourdant:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages..."
+msgstr "Tårdjîz on pô s' i vs plait, rpm oisteye les pacaedjes..."
 
-#: ../edit-urpm-sources.pl_.c:117
-msgid "Type of source:"
-msgstr "Sôre di sourdant:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
+msgstr "Tårdjîz on pô s' i vs plait, dji lé li båze di dnêye des pacaedjes..."
 
-#: ../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 "'l est bon"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Åk n' a nén stî tins d' l' astalaedje:\n"
+"\n"
+"%s"
 
-#: ../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 "Rinoncî"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during installation"
+msgstr "Åk n' a nén stî tins d' l' astalaedje"
 
-#: ../edit-urpm-sources.pl_.c:140
-msgid "Please wait, adding medium..."
-msgstr "Tårdjîz on pô s' i vs plait, dji radjoute on sopoirt..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
+msgstr "Tot a ddja stî astalé (est çki çoula n' divreut nén måy ariver?)."
 
-#: ../edit-urpm-sources.pl_.c:158
-msgid "Please wait, removing medium..."
-msgstr "Tårdjîz on pô s' i vs plait, dji oisteye on sopoirt..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed."
+msgstr "Tot a ddja stî astalé."
 
-#: ../edit-urpm-sources.pl_.c:169
-msgid "Edit a source"
-msgstr "Candjî on sourdant"
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "Totes les pacaedjes dimandés ont stî astalés comufåt."
 
-#: ../edit-urpm-sources.pl_.c:173
+#: ../rpmdrake:1
 #, c-format
-msgid "Editing source \"%s\":"
-msgstr "Dji candje li sourdants «%s»:"
+msgid "Everything installed successfully"
+msgstr "Totafwait a stî astalé comufåt"
 
-#: ../edit-urpm-sources.pl_.c:179
-msgid "Save changes"
-msgstr "Schaper les candjmints"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"The installation is finished; %s.\n"
+"\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
+msgstr ""
+"L' astalaedje a fini; %s.\n"
+"\n"
+"Sacwants fitchîs d' apontiaedje ont stî askepyîs dizo des nos\n"
+"avou «.rpmnew» ou «.rpmsave» come cawete, vos les dvrîz rloukî\n"
+"po decider cwè fé avou zels:"
 
-#: ../edit-urpm-sources.pl_.c:185
-msgid "You need to insert the medium to continue"
-msgstr "Vos dvoz mete li sopoirt dins l' lijheu po continuwer"
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "totafwait a stî astalé comufåt"
 
-#: ../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."
-msgstr "Po pleur schaper les candjmints, vos dvoz mete li sopoirt e l' lijheu."
-
-#: ../edit-urpm-sources.pl_.c:191
-msgid "Please wait, updating medium..."
-msgstr "Tårdjîz on pô s' i vs plait, metaedje a djoû do sopoirt..."
+"some packages failed to install\n"
+"correctly"
+msgstr "Des pacaedjes k' i gn a n' ont nén polou esse astalés comufåt"
 
-#: ../edit-urpm-sources.pl_.c:202
-msgid "Configure proxies"
-msgstr "Apontyî les proxies"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages to allow others to be upgraded..."
+msgstr ""
+"Tårdjîz on pô s' i vs plait, dji oisteye des pacaedjes po ds ôtes poleur "
+"esse astalés..."
 
-#: ../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]>):"
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
 msgstr ""
-"Si vos avoz mezåjhe d' on proxy, dinez si no d' lodjoe et motoit ossu li "
-"pôrt a-z eployî (sintacse: <lodjoe_proxy[:pôrt]>):"
+"L' astalaedje a fwait berwete, sacwants fitchîs mankèt.\n"
+"Vos dvoz motoit mete a djoû vosse båze di dnêye des sourdants."
 
-#: ../edit-urpm-sources.pl_.c:209
-msgid "Proxy hostname:"
-msgstr "No d' lodjoe do proxy:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation failed"
+msgstr "L' astalaedje a fwait berwete"
 
-#: ../edit-urpm-sources.pl_.c:211
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "Vos ploz dner èn uzeu et si scret po l' otintifiaedje sol proxy:"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
+msgstr "Rinoncî"
 
-#: ../edit-urpm-sources.pl_.c:213
-msgid "User:"
-msgstr "Uzeu:"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "'l est bon"
 
-#: ../edit-urpm-sources.pl_.c:235
-msgid "Configure sources"
-msgstr "Apontyî les sourdants"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Metoz l' sopoirt lomé «%s» dins l' lijheu [%s]"
 
-#: ../edit-urpm-sources.pl_.c:242
-msgid "Enabled?"
-msgstr "En alaedje?"
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr "Candjî di sopoirt"
 
-#: ../edit-urpm-sources.pl_.c:243
-msgid "Source"
-msgstr "Sourdant"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
+msgstr "Dji n' a nén savou prinde les pacaedjes sourdants, dji rgrete."
 
-#: ../edit-urpm-sources.pl_.c:264 ../rpmdrake_.c:730
-msgid "Remove"
-msgstr "Oister"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages."
+msgstr "Dji n' a nén savou prinde les pacaedjes sourdants."
 
-#: ../edit-urpm-sources.pl_.c:266
-msgid "Edit"
-msgstr "Candjî"
+#: ../rpmdrake:1
+#, c-format
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr ""
+"I manke on programe k' end a mezåjhe (grpm). Verifyîz vosse astalåcion."
 
-#: ../edit-urpm-sources.pl_.c:268
-msgid "Add..."
-msgstr "Radjouter..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
+msgstr "I manke on programe"
 
-#: ../edit-urpm-sources.pl_.c:270
-msgid "Update..."
-msgstr "Mete a djoû..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
+msgstr "Analijhant..."
 
-#: ../edit-urpm-sources.pl_.c:271
-msgid "Proxy..."
-msgstr "Proxy..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation finished"
+msgstr "L' astalaedje a fini"
 
-#: ../edit-urpm-sources.pl_.c:274
-msgid "Save and quit"
-msgstr "Schaper et cwiter"
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
+msgstr "Èn rén fé"
 
-#: ../edit-urpm-sources.pl_.c:275 ../rpmdrake_.c:733
-msgid "Quit"
-msgstr "Moussî foû"
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
+msgstr "Eployî les *.%s come mwaisses fitchîs"
 
-#: ../rpmdrake.pm_.c:93
-msgid "Yes"
-msgstr "Oyi"
+#: ../rpmdrake:1
+#, c-format
+msgid "Remove .%s"
+msgstr "Oister les *.%s"
 
-#: ../rpmdrake.pm_.c:95
-msgid "No"
-msgstr "Neni"
+#: ../rpmdrake:1
+#, c-format
+msgid "changes:"
+msgstr "candjmints:"
 
-#: ../rpmdrake.pm_.c:127
-msgid "Info..."
-msgstr "Informåcions..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr "Analijhant %s"
 
-#: ../rpmdrake.pm_.c:180
-msgid "Austria"
-msgstr "Ôtriche"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, finding available packages..."
+msgstr "Tårdjîz on pô s' i vs plait, dji cwir après les pacaedjes k' i gn a..."
 
-#: ../rpmdrake.pm_.c:181
-msgid "Australia"
-msgstr "Ostraleye"
+#: ../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 ""
+"Åk n' a nén stî tot radjoutant li sopoirt di metaedjes a djoû avou urpmi.\n"
+"\n"
+"Çoula pout esse ki l' muroe est cromb, ou timporairmint nén disponibe,\n"
+"ou co ki vosse modêye di Mandrake Linux (%s) n' est nén co (ou pus waire)\n"
+"sopoirtêye påzès metaedjes a djoû oficirs di Mandrake Linux.\n"
+"\n"
+"Voloz vs sayî avou èn ôte muroe?"
 
-#: ../rpmdrake.pm_.c:182
-msgid "Belgium"
-msgstr "Beljike"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
+msgstr "Åk n' a nén stî tot radjoutant li sopoirt di metaedjes a djoû"
 
-#: ../rpmdrake.pm_.c:183
-msgid "Brazil"
-msgstr "Braezi"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
+msgstr ""
+"Tårdjîz on pô s' i vs plait, dji m' raloye å muroe po vey les pacaedjes di "
+"metaedje a djoû k' i gn a..."
 
-#: ../rpmdrake.pm_.c:184
-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 ""
+"Vos ploz ossu tchoezi l' muroe ki vos vloz al mwin: po çoula,\n"
+"i vs fåt enonder li manaedjeu des sources des programes,\n"
+"et radjouter on sourdant «Metaedjes a djoû di såvrité».\n"
+"\n"
+"Poy, renondez MandrakeUpdate."
 
-#: ../rpmdrake.pm_.c:185
-msgid "Costa Rica"
-msgstr "Costa Rica"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Kimint tchoezi manuwelmint vosse muroe"
 
-#: ../rpmdrake.pm_.c:186
-msgid "Czech Republic"
-msgstr "Tchekeye"
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
+msgstr ""
+"I gn a-st avou ene aroke moirt tot metant a djoû l' informåcion so les "
+"pacaedjes."
 
-#: ../rpmdrake.pm_.c:187
-msgid "Germany"
-msgstr "Almagne"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
+msgstr "Åk n' a nén stî tot metant a djoû li sopoirt"
 
-#: ../rpmdrake.pm_.c:188
-msgid "Danmark"
-msgstr "Daenmåtche"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
+msgstr ""
+"Tårdjîz on pô s' i vs plait, dji m' raloye å muroe po mete a djoû "
+"l' informåcion so les pacaedjes."
 
-#: ../rpmdrake.pm_.c:189 ../rpmdrake.pm_.c:193
-msgid "Greece"
-msgstr "Grece"
+#: ../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 ""
+"Dj' a mezåjhe di m' raloyî sol muroe po prinde les dierins pacaejes\n"
+"di metaedjes a djoû. Verifyîz ki vos estoz bén raloyîs al daegntoele\n"
+"pol moumint, s' i vs plait.\n"
+"\n"
+"C' est bon di continuwer?"
 
-#: ../rpmdrake.pm_.c:190
-msgid "Spain"
-msgstr "Espagne"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Installation"
+msgstr "Astalaedje des pacaedjes di programes"
 
-#: ../rpmdrake.pm_.c:191
-msgid "Finland"
-msgstr "Finlande"
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, c-format
+msgid "Mandrake Update"
+msgstr ""
+"Metaedjes a djoû\n"
+"di Mandrake"
 
-#: ../rpmdrake.pm_.c:192
-msgid "France"
-msgstr "France"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
+msgstr "Oistaedje des pacaedjes di programes"
 
-#: ../rpmdrake.pm_.c:194
-msgid "Israel"
-msgstr "Israyel"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Moussî foû"
 
-#: ../rpmdrake.pm_.c:195
-msgid "Italy"
-msgstr "Itåleye"
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "Astaler"
 
-#: ../rpmdrake.pm_.c:196
-msgid "Japan"
-msgstr "Djapon"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "Oister"
 
-#: ../rpmdrake.pm_.c:197
-msgid "Korea"
-msgstr "Coreye"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search"
+msgstr "Cweri"
 
-#: ../rpmdrake.pm_.c:198
-msgid "Netherlands"
-msgstr "Olande"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "Trover:"
 
-#: ../rpmdrake.pm_.c:199
-msgid "Norway"
-msgstr "Norvedje"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Les pacaedjes ki shuvèt dvèt esse oistés po ds ôtes poleur esse metous a "
+"djoû:\n"
+"\n"
+"%s\n"
+"\n"
+"C' est bon di continuwer?"
 
-#: ../rpmdrake.pm_.c:200
-msgid "Poland"
-msgstr "Pologne"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "Des pacaedjes k' i gn a dvèt esse dizastalés"
 
-#: ../rpmdrake.pm_.c:201
-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 ""
+"Adviertixhmint: i shonne ki vos sayîz d' astaler telmint\n"
+"d' pacaedjes k' i poreut n' pus aveur di plaece di libe\n"
+"so vosse sistinme; çoula est pårticulirmint riskeus et doet\n"
+"esse cossideré avou atincion.\n"
+"\n"
+"Voloz vs vormint astaler tos les pacaedjes tchoezis?"
 
-#: ../rpmdrake.pm_.c:202
-msgid "Russia"
-msgstr "Rûsseye"
+#: ../rpmdrake:1
+#, c-format
+msgid "Too many packages are selected"
+msgstr "Pår trop di pacaedjes ont stî tchoezis"
 
-#: ../rpmdrake.pm_.c:203
-msgid "Sweden"
-msgstr "Suwede"
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
+msgstr "Li pus d' informåcions"
 
-#: ../rpmdrake.pm_.c:204
-msgid "Taiwan"
-msgstr "Taiwan"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal information"
+msgstr "Informåcions normåles"
 
-#: ../rpmdrake.pm_.c:205
-msgid "United Kingdom"
-msgstr "Rweyåme-Uni"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update source(s)"
+msgstr "Mete a djoû sourdant(s)"
 
-#: ../rpmdrake.pm_.c:206
-msgid "China"
-msgstr "Chine"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reload the packages list"
+msgstr "Ritcherdjî li djivêye des pacaedjes"
 
-#: ../rpmdrake.pm_.c:207 ../rpmdrake.pm_.c:208 ../rpmdrake.pm_.c:209
-#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:261
-msgid "United States"
-msgstr "Etats Unis"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
+msgstr "Rifé l' tchuze"
 
-#: ../rpmdrake.pm_.c:274
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
-"Tårdjîz on pô s' i vs plait, dj' aberweteye do waibe da MandrakeSoft les "
-"adresses des muroes."
+#: ../rpmdrake:1
+#, c-format
+msgid "in files"
+msgstr "ezès fitchîs"
 
-#: ../rpmdrake.pm_.c:280
-msgid "Error during download"
-msgstr "Åk n' a nén stî tot-z aberwetant"
+#: ../rpmdrake:1
+#, c-format
+msgid "in descriptions"
+msgstr "ezès discrijhaedjes"
 
-#: ../rpmdrake.pm_.c:289
-msgid "No mirror"
-msgstr "Nou muroe"
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
+msgstr "ezès Nos"
 
-#: ../rpmdrake.pm_.c:307
-msgid "Please choose the desired mirror."
-msgstr "Tchoeziwxhoz les muroes ki vos vloz, s' i vs plait."
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
+msgstr "pa disponibilité di metaedjes a djoû"
 
-#: ../rpmdrake.pm_.c:339 ../rpmdrake_.c:627
-msgid "Update source(s)"
-msgstr "Mete a djoû sourdant(s)"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
+msgstr "pa sourdant d' astalaedje"
 
-#: ../rpmdrake.pm_.c:343
-msgid "Select the source(s) you wish to update:"
-msgstr "Tchoezixhoz les sourdant(s) ki vos vloz mete a djoû:"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
+msgstr "pa l' etat di tchoezixhadje"
 
-#: ../rpmdrake.pm_.c:347
-msgid "Update"
-msgstr "Mete a djoû"
+#: ../rpmdrake:1
+#, c-format
+msgid "by size"
+msgstr "pa grandeu"
 
-#: ../rpmdrake.pm_.c:358
-msgid "Please wait, updating media..."
-msgstr "Tårdjîz on pô s' i vs plait, metaedje a djoû do sopoirt..."
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
+msgstr "pa groupe"
 
-#: ../rpmdrake_.c:99
-msgid "Other"
-msgstr "Ôte"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages,"
+msgstr "Tos les pacaedjes,"
 
-#: ../rpmdrake_.c:121 ../rpmdrake_.c:135 ../rpmdrake_.c:227 ../rpmdrake_.c:298
-msgid "(none)"
-msgstr "(nole)"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
+msgstr "Tos les pacaedjes, relîs alfabeticmint"
 
-#: ../rpmdrake_.c:141 ../rpmdrake_.c:482 ../rpmdrake_.c:483
-msgid "(Not available)"
-msgstr "(Nén disponibe)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
+msgstr "Tchuzes di Mandrake"
 
-#: ../rpmdrake_.c:151 ../rpmdrake_.c:208
-msgid "Search results"
-msgstr "Rizultats do cweraedje"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal updates"
+msgstr "Metaedjes a djoû normås"
 
-#: ../rpmdrake_.c:151
-msgid "Search results (none)"
-msgstr "Rizultats do cweraedje (nouk)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Bugfixes updates"
+msgstr "Metaedjes a djoû di coridjaedje"
 
-#: ../rpmdrake_.c:161 ../rpmdrake_.c:172
-msgid "Please wait, searching..."
-msgstr "Tårdjîz on pô s' i vs plait, dji cwir..."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
+msgstr "Metaedjes a djoû di såvrité"
 
-#: ../rpmdrake_.c:175
-msgid "Stop"
-msgstr "Arester"
+#: ../rpmdrake:1
+#, c-format
+msgid "Description: "
+msgstr "Discrijhaedje: "
 
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-msgid "Addable"
-msgstr "Pout esse radjouté"
+#: ../rpmdrake:1
+#, c-format
+msgid "Summary: "
+msgstr "Rascourti: "
 
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-msgid "Upgradable"
-msgstr "Pout esse metou a djoû"
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "Impôrtance: "
 
-#: ../rpmdrake_.c:211
-msgid "Not selected"
-msgstr "Nén tchoezi"
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s Ko"
 
-#: ../rpmdrake_.c:211
-msgid "Selected"
-msgstr "Tchoezi"
+#: ../rpmdrake:1
+#, c-format
+msgid "Size: "
+msgstr "Grandeu: "
 
-#: ../rpmdrake_.c:240
-msgid "rpmdrake"
-msgstr "rpmdrake"
+#: ../rpmdrake:1
+#, c-format
+msgid "Version: "
+msgstr "Modêye: "
 
-#: ../rpmdrake_.c:258 ../rpmdrake_.c:360 ../rpmdrake_.c:362
-msgid "More information on package..."
-msgstr "Pus d' informåcions sol pacaedje..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "No: "
 
-#: ../rpmdrake_.c:259
-msgid "One of the following packages is needed:"
-msgstr "I gn a mezåjhe d' onk des pacaedjes ki shuvèt:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "Råjhon do metaedje a djoû: "
 
-#: ../rpmdrake_.c:259
-msgid "Please choose"
-msgstr "Tchoezixhoz s' i vs plait"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
+msgstr "Modêye d' astalêye: "
 
-#: ../rpmdrake_.c:275
-msgid "unknown package "
-msgstr "pacaedje nén cnoxhou"
+#: ../rpmdrake:1
+#, c-format
+msgid "Source: "
+msgstr "Sourdant: "
 
-#: ../rpmdrake_.c:285
-msgid "Please wait, listing packages..."
-msgstr "Tårdjîz on pô s' i vs plait, dji fwait l' djivêye des pacaedjes..."
+#: ../rpmdrake:1
+#, c-format
+msgid "(Not available)"
+msgstr "(Nén disponibe)"
 
-#: ../rpmdrake_.c:300
-msgid "No update"
-msgstr "Nou metaedjes a djoû"
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
+msgstr "Djournå des candjmints:\n"
 
-#: ../rpmdrake_.c:353 ../rpmdrake_.c:354
-msgid "More infos"
-msgstr "Po ndè saveur di pus"
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "Fitchîs:\n"
 
-#: ../rpmdrake_.c:355
-msgid "Information on packages"
-msgstr "Informåcions so les pacaedjes"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected size: %d MB"
+msgstr "Grandeu tchoezeye: %d Mo"
 
-#: ../rpmdrake_.c:376
-msgid "Some additional packages need to be removed"
-msgstr "Kékès ôtes pacaedjes divèt esse oistés"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Tchoezi: %d Mo / Plaece libe sol deure plake: %d Mo"
 
-#: ../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 ""
 "Cåze di leu-z aloyances, les pacaedjes ki shuvèt dvèt esse\n"
-"oistés eto:\n"
+"dizastalés asteure:\n"
 "\n"
 
-#: ../rpmdrake_.c:383 ../rpmdrake_.c:391
-msgid "Some packages can't be removed"
-msgstr "Des pacaedjes k' i gn a n' polèt nén esse oistés"
-
-#: ../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 ""
-"Dji rgrete, mins oister ces pacaedjes la va spiyî l' sistinme da vosse:\n"
+"Dji rgrete, les pacaedjes ki shuvèt n' polèt nén esse tchoezis:\n"
 "\n"
 
-#: ../rpmdrake_.c:392 ../rpmdrake_.c:451
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "Des pacaedjes k' i gn a n' polèt nén esse astalés"
+
+#: ../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 ""
-"Cåze di leu-z aloyances, les pacaedjes ki shuvèt dvèt esse\n"
-"dizastalés asteure:\n"
+"Po verifyî les aloyances, les pacaedjes ki shuvèt dvèt esse\n"
+"astalés eto:\n"
 "\n"
 
-#: ../rpmdrake_.c:421
+#: ../rpmdrake:1
+#, c-format
 msgid "Additional packages needed"
 msgstr "Ôtes pacaedjes k' end a mezåjhe"
 
-#: ../rpmdrake_.c:422
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be removed"
+msgstr "Des pacaedjes k' i gn a n' polèt nén esse oistés"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"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 ""
-"Po verifyî les aloyances, les pacaedjes ki shuvèt dvèt esse\n"
-"astalés eto:\n"
+"Dji rgrete, mins oister ces pacaedjes la va spiyî l' sistinme da vosse:\n"
 "\n"
 
-#: ../rpmdrake_.c:435
-msgid "Some packages can't be installed"
-msgstr "Des pacaedjes k' i gn a n' polèt nén esse astalés"
-
-#: ../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 ""
-"Dji rgrete, les pacaedjes ki shuvèt n' polèt nén esse tchoezis:\n"
+"Cåze di leu-z aloyances, les pacaedjes ki shuvèt dvèt esse\n"
+"oistés eto:\n"
 "\n"
 
-#: ../rpmdrake_.c:450 ../rpmdrake_.c:684
-msgid "Some packages need to be removed"
-msgstr "Des pacaedjes k' i gn a dvèt esse dizastalés"
-
-#: ../rpmdrake_.c:472
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Tchoezi: %d Mo / Plaece libe sol deure plake: %d Mo"
+msgid "Some additional packages need to be removed"
+msgstr "Kékès ôtes pacaedjes divèt esse oistés"
 
-#: ../rpmdrake_.c:474
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "Grandeu tchoezeye: %d Mo"
-
-#: ../rpmdrake_.c:482
-msgid "Files:\n"
-msgstr "Fitchîs:\n"
+msgid "More information on package..."
+msgstr "Pus d' informåcions sol pacaedje..."
 
-#: ../rpmdrake_.c:483
-msgid "Changelog:\n"
-msgstr "Djournå des candjmints:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "Information on packages"
+msgstr "Informåcions so les pacaedjes"
 
-#: ../rpmdrake_.c:486
-msgid "Source: "
-msgstr "Sourdant: "
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
+msgstr "Po ndè saveur di pus"
 
-#: ../rpmdrake_.c:487
-msgid "Currently installed version: "
-msgstr "Modêye d' astalêye: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Addable"
+msgstr "Pout esse radjouté"
 
-#: ../rpmdrake_.c:491
-msgid "Reason for update: "
-msgstr "Råjhon do metaedje a djoû: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Upgradable"
+msgstr "Pout esse metou a djoû"
 
-#: ../rpmdrake_.c:493
-msgid "Name: "
-msgstr "No: "
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"The list of updates is void. This means that either there is\n"
+"no available update for the packages installed on your computer,\n"
+"or you already installed all of them."
+msgstr ""
+"Li djivêye des metaedjes a djoû est vude. Çoula vout dire soeye-t i\n"
+"k' i gn a nén di metaedjes a djoû po les pacaedjes astalés\n"
+"so vosse copiutrece, soeye-t i ki vos les avoz ddja astalés."
 
-#: ../rpmdrake_.c:494
-msgid "Version: "
-msgstr "Modêye: "
+#: ../rpmdrake:1
+#, c-format
+msgid "No update"
+msgstr "Nou metaedjes a djoû"
 
-#: ../rpmdrake_.c:495
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s Ko"
+msgid "(none)"
+msgstr "(nole)"
 
-#: ../rpmdrake_.c:495
-msgid "Size: "
-msgstr "Grandeu: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, listing packages..."
+msgstr "Tårdjîz on pô s' i vs plait, dji fwait l' djivêye des pacaedjes..."
 
-#: ../rpmdrake_.c:497
-msgid "Importance: "
-msgstr "Impôrtance: "
+#: ../rpmdrake:1
+#, c-format
+msgid "unknown package "
+msgstr "pacaedje nén cnoxhou"
 
-#: ../rpmdrake_.c:498
-msgid "Summary: "
-msgstr "Rascourti: "
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "I gn a mezåjhe d' onk des pacaedjes ki shuvèt:"
 
-#: ../rpmdrake_.c:499
-msgid "Description: "
-msgstr "Discrijhaedje: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please choose"
+msgstr "Tchoezixhoz s' i vs plait"
 
-#: ../rpmdrake_.c:548
-msgid "Bugfixes updates"
-msgstr "Metaedjes a djoû di coridjaedje"
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:548
-msgid "Normal updates"
-msgstr "Metaedjes a djoû normås"
+#: ../rpmdrake:1
+#, c-format
+msgid "Not selected"
+msgstr "Nén tchoezi"
 
-#: ../rpmdrake_.c:567
-msgid "Mandrake choices"
-msgstr "Tchuzes di Mandrake"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected"
+msgstr "Tchoezi"
 
-#: ../rpmdrake_.c:568
-msgid "All packages, alphabetical"
-msgstr "Tos les pacaedjes, relîs alfabeticmint"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results"
+msgstr "Rizultats do cweraedje"
 
-#: ../rpmdrake_.c:569
-msgid "All packages,"
-msgstr "Tos les pacaedjes,"
+#: ../rpmdrake:1
+#, c-format
+msgid "Stop"
+msgstr "Arester"
 
-#: ../rpmdrake_.c:592
-msgid "by group"
-msgstr "pa groupe"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, searching..."
+msgstr "Tårdjîz on pô s' i vs plait, dji cwir..."
 
-#: ../rpmdrake_.c:592
-msgid "by size"
-msgstr "pa grandeu"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
+msgstr "Rizultats do cweraedje (nouk)"
 
-#: ../rpmdrake_.c:593
-msgid "by selection state"
-msgstr "pa l' etat di tchoezixhadje"
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Ôte"
 
-#: ../rpmdrake_.c:594
-msgid "by source repository"
-msgstr "pa sourdant d' astalaedje"
+#: ../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 ""
+"Bénvnowe a l' aspougneu des sourdants des pacaedjes!\n"
+"\n"
+"Ciste usteye vos aidrè a-z apontyî les sourdants des pacaedjes ki vos vloz\n"
+"eployî e vosse copiutrece. I sront adon disponibes po l' astalaedje di\n"
+"pacaedjes di noveas programes ou po les metaedjes a djoû."
 
-#: ../rpmdrake_.c:594
-msgid "by update availability"
-msgstr "pa disponibilité di metaedjes a djoû"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Schaper et cwiter"
 
-#: ../rpmdrake_.c:615
-msgid "in descriptions"
-msgstr "ezès discrijhaedjes"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy..."
+msgstr "Proxy..."
 
-#: ../rpmdrake_.c:615
-msgid "in files"
-msgstr "ezès fitchîs"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
+msgstr "Mete a djoû..."
 
-#: ../rpmdrake_.c:615
-msgid "in names"
-msgstr "ezès Nos"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "Radjouter..."
 
-#: ../rpmdrake_.c:626
-msgid "Reload the packages list"
-msgstr "Ritcherdjî li djivêye des pacaedjes"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "Candjî"
 
-#: ../rpmdrake_.c:626
-msgid "Reset the selection"
-msgstr "Rifé l' tchuze"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Source"
+msgstr "Sourdant"
 
-#: ../rpmdrake_.c:652
-msgid "Maximum information"
-msgstr "Li pus d' informåcions"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
+msgstr "En alaedje?"
 
-#: ../rpmdrake_.c:652
-msgid "Normal information"
-msgstr "Informåcions normåles"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure sources"
+msgstr "Apontyî les sourdants"
 
-#: ../rpmdrake_.c:674
-msgid "Too many packages are selected"
-msgstr "Pår trop di pacaedjes ont stî tchoezis"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "Sicret:"
 
-#: ../rpmdrake_.c:720
-msgid "Find:"
-msgstr "Trover:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
+msgstr "Uzeu:"
 
-#: ../rpmdrake_.c:725
-msgid "Search"
-msgstr "Cweri"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Vos ploz dner èn uzeu et si scret po l' otintifiaedje sol proxy:"
 
-#: ../rpmdrake_.c:731
-msgid "Install"
-msgstr "Astaler"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "No d' lodjoe do proxy:"
 
-#: ../rpmdrake_.c:738 data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrake 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 ""
-"Metaedjes a djoû\n"
-"di Mandrake"
-
-#: ../rpmdrake_.c:738
-msgid "Software Packages Installation"
-msgstr "Astalaedje des pacaedjes di programes"
+"Si vos avoz mezåjhe d' on proxy, dinez si no d' lodjoe et motoit ossu li "
+"pôrt a-z eployî (sintacse: <lodjoe_proxy[:pôrt]>):"
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Removal"
-msgstr "Oistaedje des pacaedjes di programes"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "Apontyî les proxies"
 
-#: ../rpmdrake_.c:779
-msgid "Please wait, contacting mirror to update packages information."
-msgstr ""
-"Tårdjîz on pô s' i vs plait, dji m' raloye å muroe po mete a djoû "
-"l' informåcion so les pacaedjes."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr "Tårdjîz on pô s' i vs plait, metaedje a djoû do sopoirt..."
 
-#: ../rpmdrake_.c:781
-msgid "Error updating medium"
-msgstr "Åk n' a nén stî tot metant a djoû li sopoirt"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "Po pleur schaper les candjmints, vos dvoz mete li sopoirt e l' lijheu."
 
-#: ../rpmdrake_.c:782
-msgid "There was an unrecoverable error while updating packages information."
-msgstr ""
-"I gn a-st avou ene aroke moirt tot metant a djoû l' informåcion so les "
-"pacaedjes."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
+msgstr "Vos dvoz mete li sopoirt dins l' lijheu po continuwer"
 
-#: ../rpmdrake_.c:787
-msgid "How to choose manually your mirror"
-msgstr "Kimint tchoezi manuwelmint vosse muroe"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save changes"
+msgstr "Schaper les candjmints"
 
-#: ../rpmdrake_.c:795
-msgid "Please wait, contacting mirror to initialize updates packages."
-msgstr ""
-"Tårdjîz on pô s' i vs plait, dji m' raloye å muroe po vey les pacaedjes di "
-"metaedje a djoû k' i gn a..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Tchimin relatif pol fitchî di sinteze ou hdlist:"
 
-#: ../rpmdrake_.c:798
-msgid "Error adding update medium"
-msgstr "Åk n' a nén stî tot radjoutant li sopoirt di metaedjes a djoû"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "Hårdêye:"
 
-#: ../rpmdrake_.c:829
-msgid "Please wait, finding available packages..."
-msgstr "Tårdjîz on pô s' i vs plait, dji cwir après les pacaedjes k' i gn a..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Editing source \"%s\":"
+msgstr "Dji candje li sourdants «%s»:"
 
-#: ../rpmdrake_.c:861
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Analijhant %s"
+msgid "Edit a source"
+msgstr "Candjî on sourdant"
 
-#: ../rpmdrake_.c:880
-msgid "changes:"
-msgstr "candjmints:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr "Tårdjîz on pô s' i vs plait, dji oisteye on sopoirt..."
 
-#: ../rpmdrake_.c:884
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Oister les *.%s"
+msgid "Please wait, adding medium..."
+msgstr "Tårdjîz on pô s' i vs plait, dji radjoute on sopoirt..."
 
-#: ../rpmdrake_.c:886
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Eployî les *.%s come mwaisses fitchîs"
+msgid "Type of source:"
+msgstr "Sôre di sourdant:"
 
-#: ../rpmdrake_.c:888
-msgid "Do nothing"
-msgstr "Èn rén fé"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Adding a source:"
+msgstr "Radjoutant on sourdant:"
 
-#: ../rpmdrake_.c:900
-msgid "Installation finished"
-msgstr "L' astalaedje a fini"
+#: ../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 ""
+"I gn a ddja on sopoirt avou ç' no la,\n"
+"el voloz vs vormint replaecî?"
 
-#: ../rpmdrake_.c:910
-msgid "Inspect..."
-msgstr "Analijhant..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to fill up at least the two first entries."
+msgstr "Vos dvoz rimpli pol moens les deus prumirès intrêyes."
 
-#: ../rpmdrake_.c:925
-msgid "Program missing"
-msgstr "I manke on programe"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "No:"
 
-#: ../rpmdrake_.c:926
-msgid "A required program is missing (grpmi). Check your installation."
-msgstr ""
-"I manke on programe k' end a mezåjhe (grpm). Verifyîz vosse astalåcion."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
+msgstr "No d' elodjaedje:"
 
-#: ../rpmdrake_.c:940
-msgid "Unable to get source packages."
-msgstr "Dji n' a nén savou prinde les pacaedjes sourdants."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Tchoezixhoz on muroe..."
 
-#: ../rpmdrake_.c:941
-msgid "Unable to get source packages, sorry."
-msgstr "Dji n' a nén savou prinde les pacaedjes sourdants, dji rgrete."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Browse..."
+msgstr "Foyter..."
 
-#: ../rpmdrake_.c:948
-msgid "Change medium"
-msgstr "Candjî di sopoirt"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Tchimin ou pont di montaedje:"
 
-#: ../rpmdrake_.c:949
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Metoz l' sopoirt lomé «%s» dins l' lijheu [%s]"
+msgid "Removable device"
+msgstr "Bodjåve sopoirt"
 
-#: ../rpmdrake_.c:957
-msgid "Installation failed"
-msgstr "L' astalaedje a fwait berwete"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "HTTP server"
+msgstr "Sierveu HTTP"
 
-#: ../rpmdrake_.c:958
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
-msgstr ""
-"L' astalaedje a fwait berwete, sacwants fitchîs mankèt.\n"
-"Vos dvoz motoit mete a djoû vosse båze di dnêye des sourdants."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "Sierveu FTP"
 
-#: ../rpmdrake_.c:961
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr ""
-"Tårdjîz on pô s' i vs plait, dji oisteye des pacaedjes po ds ôtes poleur "
-"esse astalés..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path:"
+msgstr "Tchimin:"
 
-#: ../rpmdrake_.c:982
+#: ../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 ""
-"L' astalaedje a fini; %s.\n"
-"\n"
-"Sacwants fitchîs d' apontiaedje ont stî askepyîs dizo des nos\n"
-"avou «.rpmnew» ou «.rpmsave» come cawete, vos les dvrîz rloukî\n"
-"po decider cwè fé avou zels:"
+msgid "Local files"
+msgstr "Fitchîs locås"
 
-#: ../rpmdrake_.c:982
-msgid ""
-"some packages failed to install\n"
-"correctly"
-msgstr "Des pacaedjes k' i gn a n' ont nén polou esse astalés comufåt"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add a source"
+msgstr "Radjoutant on sourdant"
 
-#: ../rpmdrake_.c:983
-msgid "everything was installed correctly"
-msgstr "totafwait a stî astalé comufåt"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
+msgstr "Dji n' sai mete a djoû l' sopoirt; i srè otomaticmint essocté."
 
-#: ../rpmdrake_.c:985
-msgid "Everything installed successfully"
-msgstr "Totafwait a stî astalé comufåt"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "Dji n' sai askepyî l' sopoirt."
 
-#: ../rpmdrake_.c:986
-msgid "All requested packages were installed successfully."
-msgstr "Totes les pacaedjes dimandés ont stî astalés comufåt."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, updating media..."
+msgstr "Tårdjîz on pô s' i vs plait, metaedje a djoû do sopoirt..."
 
-#: ../rpmdrake_.c:989
-msgid "Everything already installed."
-msgstr "Tot a ddja stî astalé."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
+msgstr "Mete a djoû"
 
-#: ../rpmdrake_.c:990
-msgid "Everything already installed (is this supposed to happen at all?)."
-msgstr "Tot a ddja stî astalé (est çki çoula n' divreut nén måy ariver?)."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Select the source(s) you wish to update:"
+msgstr "Tchoezixhoz les sourdant(s) ki vos vloz mete a djoû:"
 
-#: ../rpmdrake_.c:997
-msgid "Problem during installation"
-msgstr "Åk n' a nén stî tins d' l' astalaedje"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please choose the desired mirror."
+msgstr "Tchoeziwxhoz les muroes ki vos vloz, s' i vs plait."
 
-#: ../rpmdrake_.c:998
+#: ../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 ""
-"Åk n' a nén stî tins d' l' astalaedje:\n"
+"Dji n' sai trover d' muroe.\n"
 "\n"
-"%s"
-
-#: ../rpmdrake_.c:1012
-msgid "Please wait, reading packages database..."
-msgstr "Tårdjîz on pô s' i vs plait, dji lé li båze di dnêye des pacaedjes..."
-
-#: ../rpmdrake_.c:1053
-msgid "Please wait, removing packages..."
-msgstr "Tårdjîz on pô s' i vs plait, rpm oisteye les pacaedjes..."
+"Ça pout esse cåze di sacwantès råjhons; li pus cmone c' est cwand\n"
+"l' årtchitecteure di vosse processeu n' est nén sopoirtêye påzès\n"
+"metaedjes a djoû oficirs di Mandrake Linux."
 
-#: ../rpmdrake_.c:1056
-msgid "Problem during removal"
-msgstr "Åk n' a nén stî tins do oistaedje"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
+msgstr "Nou muroe"
 
-#: ../rpmdrake_.c:1057
+#: ../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 ""
-"Åk n' a nén stî tins do oistaedje des pacaedjes:\n"
+"Åk n' a nén stî tot-z aberwetant li djivêye des muroes:\n"
 "\n"
-"%s"
+"%s\n"
+"Motoit ki l' rantoele, ou l' waibe da MandrakeSoft, èn sont nén\n"
+"disponibes pol moumint.\n"
+"Risayîz ene miete pus tård."
 
-#: ../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 ""
-"Bénvnow a l' usteye di oistaedje di programes!\n"
-"\n"
-"Ciste usteye chal vos aidrè a tchoezi kés programes ki vos vloz dizastaler\n"
-"di vosse copiutrece."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "Åk n' a nén stî tot-z aberwetant"
 
-#: ../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 "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
-"Bénvnowe a MandrakeUpdate!\n"
-"\n"
-"Ciste usteye chal vos aidrè a tchoezi les metaedjes a djoû ki vos vloz\n"
-"astaler sol copiutrece da vosse."
+"Tårdjîz on pô s' i vs plait, dj' aberweteye do waibe da MandrakeSoft les "
+"adresses des muroes."
 
-#: ../rpmdrake_.c:1099
+#: ../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 ""
-"Bénvnowe a l' usteye d' astalaedje di programes!\n"
+"Dj' a mezåjhe di m' raloyî sol site waibe da MandrakeSoft po prinde\n"
+"li djivêye des muroes. Verifyîz ki vos estoz bén raloyîs al daegntoele\n"
+"pol moumint, s' i vs plait.\n"
 "\n"
-"Vosse sistinme Mandrake Linux vént avou sacwants meyes di programes dins\n"
-"des pacaedjes rpm so des plakes lazer. Ciste usteye chal vos aidrè a\n"
-"tchoezi kés programes vos vloz astaler sol copiutrece da vosse."
+"C' est bon di continuwer?"
 
-#: data/rpmdrake-remove.desktop.in.h:1
-msgid "Remove Software"
-msgstr "Oister des programes"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United States"
+msgstr "Etats Unis"
 
-#: data/rpmdrake-sources.desktop.in.h:1
-msgid "Software Sources Manager"
-msgstr "Manaedjeu des sourdants d' astalaedje"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
+msgstr "Chine"
 
-#: data/rpmdrake.desktop.in.h:1
-msgid "Install Software"
-msgstr "Astaler des programes"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr "Rweyåme-Uni"
 
-#~ msgid ""
-#~ "There is already a medium by that name, do you\n"
-#~ "really want to replace it?"
-#~ msgstr ""
-#~ "I gn a ddja on sopoirt avou ç' no la,\n"
-#~ "el voloz vs vormint replaecî?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "Taiwan"
 
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-#~ "C' est bon di continuwer?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "Suwede"
 
-#~ msgid ""
-#~ "Welcome to the packages source editor!\n"
-#~ "\n"
-#~ "This tool will help you configure the packages sources you wish to use "
-#~ "on\n"
-#~ "your computer. They will then be available to install new software "
-#~ "package\n"
-#~ "or to perform updates."
-#~ msgstr ""
-#~ "Bénvnowe a l' aspougneu des sourdants des pacaedjes!\n"
-#~ "\n"
-#~ "Ciste usteye vos aidrè a-z apontyî les sourdants des pacaedjes ki vos "
-#~ "vloz\n"
-#~ "eployî e vosse copiutrece. I sront adon disponibes po l' astalaedje di\n"
-#~ "pacaedjes di noveas programes ou po les metaedjes a djoû."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
+msgstr "Rûsseye"
 
-#~ msgid ""
-#~ "I need to contact MandrakeSoft website to get the mirrors list.\n"
-#~ "Please check that your network is currently running.\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "Dj' a mezåjhe di m' raloyî sol site waibe da MandrakeSoft po prinde\n"
-#~ "li djivêye des muroes. Verifyîz ki vos estoz bén raloyîs al daegntoele\n"
-#~ "pol moumint, s' i vs plait.\n"
-#~ "\n"
-#~ "C' est bon di continuwer?"
+#: ../rpmdrake.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 ""
-#~ "Åk n' a nén stî tot-z aberwetant li djivêye des muroes:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "Motoit ki l' rantoele, ou l' waibe da MandrakeSoft, èn sont nén\n"
-#~ "disponibes pol moumint.\n"
-#~ "Risayîz ene miete pus tård."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
+msgstr "Pologne"
 
-#~ msgid ""
-#~ "I can't find any suitable mirror.\n"
-#~ "\n"
-#~ "There can be many reasons for this problem; the most frequent is\n"
-#~ "the case when the architecture of your processor is not supported\n"
-#~ "by Mandrake Linux Official Updates."
-#~ msgstr ""
-#~ "Dji n' sai trover d' muroe.\n"
-#~ "\n"
-#~ "Ça pout esse cåze di sacwantès råjhons; li pus cmone c' est cwand\n"
-#~ "l' årtchitecteure di vosse processeu n' est nén sopoirtêye påzès\n"
-#~ "metaedjes a djoû oficirs di Mandrake Linux."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
+msgstr "Norvedje"
 
-#~ msgid ""
-#~ "The list of updates is void. This means that either there is\n"
-#~ "no available update for the packages installed on your computer,\n"
-#~ "or you already installed all of them."
-#~ msgstr ""
-#~ "Li djivêye des metaedjes a djoû est vude. Çoula vout dire soeye-t i\n"
-#~ "k' i gn a nén di metaedjes a djoû po les pacaedjes astalés\n"
-#~ "so vosse copiutrece, soeye-t i ki vos les avoz ddja astalés."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
+msgstr "Olande"
 
-#~ msgid ""
-#~ "Warning: it seems that you are attempting to add so much\n"
-#~ "packages that your filesystem may run out of free diskspace,\n"
-#~ "during or after package installation ; this is particularly\n"
-#~ "dangerous and should be considered with care.\n"
-#~ "\n"
-#~ "Do you really want to install all the selected packages?"
-#~ msgstr ""
-#~ "Adviertixhmint: i shonne ki vos sayîz d' astaler telmint\n"
-#~ "d' pacaedjes k' i poreut n' pus aveur di plaece di libe\n"
-#~ "so vosse sistinme; çoula est pårticulirmint riskeus et doet\n"
-#~ "esse cossideré avou atincion.\n"
-#~ "\n"
-#~ "Voloz vs vormint astaler tos les pacaedjes tchoezis?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Korea"
+msgstr "Coreye"
 
-#~ msgid ""
-#~ "The following packages have to be removed for others to be upgraded:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "Les pacaedjes ki shuvèt dvèt esse oistés po ds ôtes poleur esse metous a "
-#~ "djoû:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "C' est bon di continuwer?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Japan"
+msgstr "Djapon"
 
-#~ 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åleye"
 
-#~ msgid ""
-#~ "I need to contact the mirror to get latest update packages.\n"
-#~ "Please check that your network is currently running.\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "Dj' a mezåjhe di m' raloyî sol muroe po prinde les dierins pacaejes\n"
-#~ "di metaedjes a djoû. Verifyîz ki vos estoz bén raloyîs al daegntoele\n"
-#~ "pol moumint, s' i vs plait.\n"
-#~ "\n"
-#~ "C' est bon di continuwer?"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Israel"
+msgstr "Israyel"
 
-#~ msgid ""
-#~ "You may also choose your desired mirror manually: to do so,\n"
-#~ "launch the Software Sources Manager, and then add a `Security\n"
-#~ "updates' source.\n"
-#~ "\n"
-#~ "Then, restart MandrakeUpdate."
-#~ msgstr ""
-#~ "Vos ploz ossu tchoezi l' muroe ki vos vloz al mwin: po çoula,\n"
-#~ "i vs fåt enonder li manaedjeu des sources des programes,\n"
-#~ "et radjouter on sourdant «Metaedjes a djoû di såvrité».\n"
-#~ "\n"
-#~ "Poy, renondez MandrakeUpdate."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Grece"
 
-#~ 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 ""
-#~ "Åk n' a nén stî tot radjoutant li sopoirt di metaedjes a djoû avou "
-#~ "urpmi.\n"
-#~ "\n"
-#~ "Çoula pout esse ki l' muroe est cromb, ou timporairmint nén disponibe,\n"
-#~ "ou co ki vosse modêye di Mandrake Linux (%s) n' est nén co (ou pus "
-#~ "waire)\n"
-#~ "sopoirtêye påzès metaedjes a djoû oficirs di Mandrake Linux.\n"
-#~ "\n"
-#~ "Voloz vs sayî avou èn ôte muroe?"
+#: ../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 "Daenmåtche"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr "Almagne"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
+msgstr "Tchekeye"
+
+#: ../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 "Braezi"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Belgium"
+msgstr "Beljike"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Australia"
+msgstr "Ostraleye"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
+msgstr "Ôtriche"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Info..."
+msgstr "Informåcions..."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
+msgstr "Neni"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Oyi"
+
+#: data/rpmdrake.desktop.in.h:1
+msgid "Install Software"
+msgstr "Astaler des programes"
+
+#: data/rpmdrake-remove.desktop.in.h:1
+msgid "Remove Software"
+msgstr "Oister des programes"
+
+#: data/rpmdrake-sources.desktop.in.h:1
+msgid "Software Sources Manager"
+msgstr "Manaedjeu des sourdants d' astalaedje"
+
+#~ 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/wa.pom b/po/wa.pom
index cb3aae55..870b9528 100644
--- a/po/wa.pom
+++ b/po/wa.pom
@@ -4,169 +4,175 @@ msgstr "Sierveu"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Sierveu, Waibe/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Copiutrece rantoele (cliyant)"
+msgid "Office Workstation"
+msgstr "Posse di burô"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "Sierveu NFS, sierveu SMB, sierveu proxy, sierveu SSH"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Programes di burô: aspougneus di tecse (kword, abiwrod), tåvleus (kspread, "
+"gnumeric), håyneus pdf, evnd."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Burô"
+msgid "Workstation"
+msgstr "Posse éndjolrece"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Posse éndjolrece Gnome"
+msgid "Game station"
+msgstr "Posse di djeus"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Usteyes po vosse Palm Pilot ou vosse Visor"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Programes pasmints d' tins: årcåde, plateas, stratedjeye, evnd."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Posse éndjolrece"
+msgid "Multimedia station"
+msgstr "Posse multimedia"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Côpe feu/Roûteu"
+msgid "Sound and video playing/editing programs"
+msgstr "Programes po vey/schoûter/candjî des sons et vidéyos"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr "Sierveu di nos (DNS) et sierveu djaenès pådjes (NIS)"
+msgid "Internet station"
+msgstr "Posse pol rantoele daegnrece"
 
 # 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 di burô: aspougneus di tecse (kword, abiwrod), tåvleus (kspread, "
-"gnumeric), håyneus pdf, evnd."
+"Énsembe d' usteyes po lere et evoyî des messaedjes (pine, mutt, tin...) et "
+"po naivyî so les pådjes waibe"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "Usteyes ki ont a vey avou l' son: djoweus mp3 ou MIDI, maxheus,..."
+msgid "Network Computer (client)"
+msgstr "Copiutrece rantoele (cliyant)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Li «Linux Standard Base». Sopoirt po les programes tîces"
+msgid "Clients for different protocols including ssh"
+msgstr "Cliyants po les protocoles k' i gn a (ssh avou)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Lives et Howtos so GNU/Linux et les libes programes"
+msgid "Configuration"
+msgstr "Apontiaedje"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "Posse éndjolrece KDE"
+msgid "Tools to ease the configuration of your computer"
+msgstr "Usteyes po vos aveur pus åjhey d' apontyî vosse copiutrece"
 
 # 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 "Posse éndjolrece syintifike"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Multimedia - Vidéyo"
+msgid "Scientific applications such as gnuplot"
+msgstr "Programes syintifikes come 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 ""
-"Usteyes pol emilaedje, les copinreyes, naiviaedje waibe, transfer di "
-"fitchîs, eyet li chat"
+msgid "Console Tools"
+msgstr "Usteyes pol conzôle"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Sierveu, båzes di dnêyes"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Aspougneus, shells, usteyes po fitchîs, terminås"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "Sierveu båze di dnêyes PostgreSQL ou MySQL"
+msgid "KDE Workstation"
+msgstr "Posse éndjolrece KDE"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Usteyes po vos aveur pus åjhey d' apontyî vosse copiutrece"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"L' evironmint di scribanne KDE, l' evironmint grafike di båze, avou ene "
+"coleccion d' usteyes ki vnèt avou"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "Multimedia - Son"
+msgid "Graphical Environment"
+msgstr "Evironmint grafike"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Documintåcion"
+msgid "Gnome Workstation"
+msgstr "Posse éndjolrece Gnome"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Usteyes pol conzôle"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+"On evironmint grafike avou on amishtåve hopea di programes et d' usteyes pol "
+"sicribanne"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr "Sierveu d' emilaedje postfix, sierveu di news INN"
+msgid "Other Graphical Desktops"
+msgstr "Ôtes sicribannes grafikes"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Posse pol rantoele daegnrece"
+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 "Posse multimedia"
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+msgid "Development"
+msgstr "Programaedje"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Apontiaedje"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "Livreyes di programaedje C et C++, programes et fitchîs *.h"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Des ôtes scribannes grafikes (Gnome, IceWM)"
+msgid "Documentation"
+msgstr "Documintåcion"
 
 # 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' evironmint di scribanne KDE, l' evironmint grafike di båze, avou ene "
-"coleccion d' usteyes ki vnèt avou"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Lives et Howtos so GNU/Linux et les libes programes"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Evironmint grafike"
+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 "Li «Linux Standard Base». Sopoirt po les programes tîces"
+
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-msgid "Development"
-msgstr "Programaedje"
+#: ../../share/compssUsers:999
+msgid "Web/FTP"
+msgstr "Sierveu, Waibe/FTP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -175,23 +181,33 @@ msgstr "Apache eyet Pro-ftpd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "Usteyes po fé et graver des plakes lazer"
+msgid "Mail/Groupware/News"
+msgstr "Sierveu, Emilaedje/Groupware/News"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Posse di burô"
+msgid "Postfix mail server, Inn news server"
+msgstr "Sierveu d' emilaedje postfix, sierveu di news INN"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgid "Database"
+msgstr "Sierveu, båzes di dnêyes"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Programes grafikes come li Gimp"
+msgid "PostgreSQL or MySQL database server"
+msgstr "Sierveu båze di dnêyes PostgreSQL ou MySQL"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Firewall/Router"
+msgstr "Côpe feu/Roûteu"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Internet gateway"
+msgstr "Pasrele pol rantoele daegnrece"
 
 # 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 "Livreyes di programaedje C et C++, programes et fitchîs *.h"
+msgid "Domain Name and Network Information Server"
+msgstr "Sierveu di nos (DNS) et sierveu djaenès pådjes (NIS)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -210,18 +226,20 @@ msgstr "Copiutrece sierveu sol rantoele"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "Sierveu, Emilaedje/Groupware/News"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "Sierveu NFS, sierveu SMB, sierveu proxy, sierveu SSH"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Posse di djeus"
+msgid "Office"
+msgstr "Burô"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Djoweus et aspougneus di vidéyo"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr ""
+"Usteyes pol emilaedje, les copinreyes, naiviaedje waibe, transfer di "
+"fitchîs, eyet li chat"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -230,79 +248,66 @@ msgstr "Multimedia - Grafikes"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Programes pasmints d' tins: årcåde, plateas, stratedjeye, evnd."
-
-# 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 ""
-"Énsembe d' usteyes po lere et evoyî des messaedjes (pine, mutt, tin...) et "
-"po naivyî so les pådjes waibe"
+msgid "Graphics programs such as The Gimp"
+msgstr "Programes grafikes come li Gimp"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "Personelès finances"
+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 ""
-"On evironmint grafike avou on amishtåve hopea di programes et d' usteyes pol "
-"sicribanne"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "Usteyes ki ont a vey avou l' son: djoweus mp3 ou MIDI, maxheus,..."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Cliyants po les protocoles k' i gn a (ssh avou)"
+msgid "Multimedia - Video"
+msgstr "Multimedia - Vidéyo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
+msgid "Video players and editors"
+msgstr "Djoweus et aspougneus di vidéyo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Pasrele pol rantoele daegnrece"
+msgid "Multimedia - CD Burning"
+msgstr "Multimedia - Gravaedje di plakes lazer"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Programes po vey/schoûter/candjî des sons et vidéyos"
+msgid "Tools to create and burn CD's"
+msgstr "Usteyes po fé et graver des plakes lazer"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Ôtes sicribannes grafikes"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Des ôtes scribannes grafikes (Gnome, IceWM)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Aspougneus, shells, usteyes po fitchîs, terminås"
+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 po vos manaedjî vos çanses, come li gnucash"
+msgid "Personal Information Management"
+msgstr "Manaedjmint des finances personéles"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "Manaedjmint des finances personéles"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Usteyes po vosse Palm Pilot ou vosse Visor"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multimedia - Gravaedje di plakes lazer"
+msgid "Personal Finance"
+msgstr "Personelès finances"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Posse éndjolrece syintifike"
+msgid "Programs to manage your finances, such as gnucash"
+msgstr "Programes po vos manaedjî vos çanses, come li gnucash"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index cef3f059..47b312f9 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2003-01-30 11:22+0100\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\n"
 "PO-Revision-Date: 2003-02-10 19:49+0800\n"
 "Last-Translator: Shiyu Tang <shiyutang@netscape.net>\n"
 "Language-Team: Mandrake Simplified Chinese <mandrake@en2china.com>\n"
@@ -15,867 +15,1157 @@ msgstr ""
 "Content-Type: text/plain; charset=gb2312\n"
 "Content-Transfer-Encoding: 8bit\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 "¿ÉÒƶ¯É豸"
-
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:550
-msgid "Security updates"
-msgstr "°²È«¸üÐÂ"
-
-#: ../edit-urpm-sources.pl_.c:70
-msgid "Browse..."
-msgstr "ä¯ÀÀ..."
-
-#: ../edit-urpm-sources.pl_.c:72
-msgid "Choose a mirror..."
-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:92
-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"
+"Õâ¸ö¹¤¾ß°ïÖúÄúÑ¡ÔñҪΪÄúµÄµçÄÔ°²×°µÄÈí¼þ°ü¡£"
 
-#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:231
-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:97
-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:99 ../edit-urpm-sources.pl_.c:188
-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:107
-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:120
-msgid "Adding a source:"
-msgstr "Ìí¼ÓÒ»¸öÀ´Ô´£º"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages..."
+msgstr "ÕýÔÚɾ³ýÈí¼þ°ü£¬ÇëÉÔºò..."
 
-#: ../edit-urpm-sources.pl_.c:121
-msgid "Type of source:"
-msgstr "À´Ô´ÀàÐÍ£º"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages 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:952
-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: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 "È¡Ïû"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during installation"
+msgstr "ÔÚ°²×°¹ý³ÌÖз¢ÉúÎÊÌâ"
 
-#: ../edit-urpm-sources.pl_.c:147
-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:168
-msgid "Please wait, removing medium..."
-msgstr "ÕýÔÚɾ³ý½éÖÊ£¬ÇëÉÔºò..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed."
+msgstr "ËùÓÐÈí¼þ°üÒѾ­°²×°ÁË¡£"
 
-#: ../edit-urpm-sources.pl_.c:181
-msgid "Edit a source"
-msgstr "±à¼­À´Ô´"
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "ËùÓÐÒªÇóµÄÈí¼þ°ü¶¼Òѳɹ¦°²×°¡£"
 
-#: ../edit-urpm-sources.pl_.c:185
+#: ../rpmdrake:1
 #, c-format
-msgid "Editing source \"%s\":"
-msgstr "±à¼­À´Ô´¡°%s¡±£º"
+msgid "Everything installed successfully"
+msgstr "ËùÓÐÈí¼þ°ü¶¼Òѳɹ¦°²×°"
 
-#: ../edit-urpm-sources.pl_.c:191
-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:200
-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:201
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "Òª±£´æ¸Ä±ä£¬Äú±ØÐëÔÚÇý¶¯Æ÷ÖвåÈë½éÖÊ¡£"
-
-#: ../edit-urpm-sources.pl_.c:206
-msgid "Please wait, updating medium..."
-msgstr "ÕýÔÚ¸üнéÖÊ£¬ÇëÉÔºò..."
+"some packages failed to install\n"
+"correctly"
+msgstr ""
+"ÓÐЩÈí¼þ°ü³öÏÖ°²×°\n"
+"ʧ°Ü"
 
-#: ../edit-urpm-sources.pl_.c:217
-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: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]>£©£º"
+"°²×°Ê§°Ü£¬È±ÉÙijЩÎļþ¡£\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 "Mandrake ¸üÐÂ"
 
-#: ../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 "ÕýÔÚ´Ó 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 "¸üÐÂÈÕÖ¾£º\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"
 "\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"
 "\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 MB / Ê£Óà´ÅÅ̿ռ䣺%d MB"
+msgid "More information on package..."
+msgstr "¸ÃÈí¼þ°üµÄ¸ü¶àÐÅÏ¢..."
 
-#: ../rpmdrake_.c:476
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "Ñ¡ÖдóС£º%d MB"
+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"
-msgstr "¸üÐÂÈÕÖ¾£º\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "Addable"
+msgstr "¿ÉÌí¼Ó"
 
-#: ../rpmdrake_.c:488
-msgid "Source: "
-msgstr "À´Ô´£º"
+#: ../rpmdrake:1
+#, c-format
+msgid "Upgradable"
+msgstr "¿ÉÉý¼¶"
 
-#: ../rpmdrake_.c:489
-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 ""
 
-#: ../rpmdrake_.c:493
-msgid "Reason for update: "
-msgstr "¸üÐÂÔ­Òò£º"
+#: ../rpmdrake:1
+#, c-format
+msgid "No update"
+msgstr "ûÓиüÐÂ"
 
-#: ../rpmdrake_.c:495
-msgid "Name: "
-msgstr "Ãû³Æ£º"
+#: ../rpmdrake:1
+#, c-format
+msgid "(none)"
+msgstr "£¨ÎÞ£©"
 
-#: ../rpmdrake_.c:496
-msgid "Version: "
-msgstr "°æ±¾£º"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, listing packages..."
+msgstr "ÕýÔÚÁгöÈí¼þ°ü£¬ÇëÉÔºò..."
 
-#: ../rpmdrake_.c:497
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "unknown package "
+msgstr "δ֪Èí¼þ°ü"
 
-#: ../rpmdrake_.c:497
-msgid "Size: "
-msgstr "´óС£º"
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "ÐèÒªÏÂÁÐÈí¼þÖ®Ò»£º"
 
-#: ../rpmdrake_.c:499
-msgid "Importance: "
-msgstr "ÖØÒªÐÔ£º"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please choose"
+msgstr "ÇëÑ¡Ôñ"
 
-#: ../rpmdrake_.c:500
-msgid "Summary: "
-msgstr "ͻ񻣼"
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:501
-msgid "Description: "
-msgstr "ÃèÊö£º"
+#: ../rpmdrake:1
+#, c-format
+msgid "Not selected"
+msgstr "δѡÖÐ"
 
-#: ../rpmdrake_.c:550
-msgid "Bugfixes updates"
-msgstr "ȱÏÝÐÞÕý¸üÐÂ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected"
+msgstr "Ñ¡ÖÐ"
 
-#: ../rpmdrake_.c:550
-msgid "Normal updates"
-msgstr "Õý³£¸üÐÂ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results"
+msgstr "ËÑË÷½á¹û"
 
-#: ../rpmdrake_.c:569
-msgid "Mandrake choices"
-msgstr "Mandrake ¾«Ñ¡"
+#: ../rpmdrake:1
+#, c-format
+msgid "Stop"
+msgstr "Í£Ö¹"
 
-#: ../rpmdrake_.c:570
-msgid "All packages, alphabetical"
-msgstr "È«²¿Èí¼þ°ü£¬°´×Öĸ´ÎÐò"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, searching..."
+msgstr "ÕýÔÚËÑË÷£¬ÇëÉÔºò..."
 
-#: ../rpmdrake_.c:571
-msgid "All packages,"
-msgstr "È«²¿Èí¼þ°ü£¬"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
+msgstr "ËÑË÷½á¹û£¨ÎÞ£©"
 
-#: ../rpmdrake_.c:594
-msgid "by group"
-msgstr "°´ÕÕ×é±ð"
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "ÆäËû"
 
-#: ../rpmdrake_.c:594
-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 ""
 
-#: ../rpmdrake_.c:595
-msgid "by selection state"
-msgstr "°´ÕÕÑ¡Ôñ״̬"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "±£´æ²¢Í˳ö"
 
-#: ../rpmdrake_.c:596
-msgid "by source repository"
-msgstr "°´ÕÕÀ´Ô´¿â"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy..."
+msgstr "´úÀí·þÎñÆ÷..."
 
-#: ../rpmdrake_.c:596
-msgid "by update availability"
-msgstr "°´ÕÕÊÇ·ñ¿É¸üÐÂ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
+msgstr "¸üÐÂ..."
 
-#: ../rpmdrake_.c:617
-msgid "in descriptions"
-msgstr "ÔÚÃèÊöÖÐ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "Ìí¼Ó..."
 
-#: ../rpmdrake_.c:617
-msgid "in files"
-msgstr "ÔÚÎļþÖÐ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "±à¼­"
 
-#: ../rpmdrake_.c:617
-msgid "in names"
-msgstr "ÔÚÃû³ÆÖÐ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Source"
+msgstr "À´Ô´"
 
-#: ../rpmdrake_.c:628
-msgid "Reload the packages list"
-msgstr "ÖØÐÂ×°ÈëÈí¼þ°üÇåµ¥"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
+msgstr "ÆôÓÃÂð£¿"
 
-#: ../rpmdrake_.c:628
-msgid "Reset the selection"
-msgstr "ÖØÖÃÑ¡ÖÐ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure sources"
+msgstr "ÅäÖÃÀ´Ô´"
 
-#: ../rpmdrake_.c:654
-msgid "Maximum information"
-msgstr "×î¶àÐÅÏ¢"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "¿ÚÁ"
 
-#: ../rpmdrake_.c:654
-msgid "Normal information"
-msgstr "Õý³£ÐÅÏ¢"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
+msgstr "Óû§Ãû£º"
 
-#: ../rpmdrake_.c:676
-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:722
-msgid "Find:"
-msgstr "²éÕÒ£º"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "´úÀí·þÎñÆ÷Ö÷»úÃû£º"
 
-#: ../rpmdrake_.c:727
-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 ""
+"Èç¹ûÄúÐèÒªÓôúÀí·þÎñÆ÷£¬ÇëÊäÈëÖ÷»úÃûºÍ¶Ë¿Ú£¨Óï·¨£º<proxyhost[:port]>£©£º"
 
-#: ../rpmdrake_.c:733
-msgid "Install"
-msgstr "°²×°"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "ÅäÖôúÀí·þÎñÆ÷"
 
-#: ../rpmdrake_.c:740 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:740
-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:740
-msgid "Software Packages Removal"
-msgstr "Èí¼þ°üɾ³ý"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
+msgstr "Äú±ØÐë²åÈë½éÖʲÅÄܼÌÐø"
 
-#: ../rpmdrake_.c:781
-msgid "Please wait, contacting mirror to update packages information."
-msgstr "ÕýÔÚÁ¬½Ó¾µÏñ·þÎñÆ÷ÒԵõ½×îеĸüÐÂÈí¼þ°ü£¬ÇëÉÔºò¡£"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save changes"
+msgstr "±£´æÐÞ¸Ä"
 
-#: ../rpmdrake_.c:783
-msgid "Error updating medium"
-msgstr "¸üнéÖʳö´í"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Ïà¶Ô synthesis/hdlist µÄ·¾¶£º"
 
-#: ../rpmdrake_.c:784
-msgid "There was an unrecoverable error while updating packages information."
-msgstr "¸üÐÂÈí¼þ°üÐÅϢʱ·¢Éú²»¿É»Ö¸´µÄ´íÎó¡£"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL£º"
 
-#: ../rpmdrake_.c:789
-msgid "How to choose manually your mirror"
-msgstr "ÈçºÎÊÖ¹¤ÌôÑ¡ÄúµÄ¾µÏñ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Editing source \"%s\":"
+msgstr "±à¼­À´Ô´¡°%s¡±£º"
 
-#: ../rpmdrake_.c:797
-msgid "Please wait, contacting mirror to initialize updates packages."
-msgstr "ÕýÔÚÁªÏµ·þÎñÆ÷À´³õʼ»¯¸üÐÂÈí¼þ°ü£¬ÇëÉÔºò¡£"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit a source"
+msgstr "±à¼­À´Ô´"
 
-#: ../rpmdrake_.c:800
-msgid "Error adding update medium"
-msgstr "Ìí¼Ó¸üнéÖʳö´í"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr "ÕýÔÚɾ³ý½éÖÊ£¬ÇëÉÔºò..."
 
-#: ../rpmdrake_.c:831
-msgid "Please wait, finding available packages..."
-msgstr "ÕýÔÚÑ°ÕÒ¿ÉÓõÄÈí¼þ°ü£¬ÇëÉÔºò..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, adding medium..."
+msgstr "ÕýÔÚÌí¼Ó½éÖÊ£¬ÇëÉÔºò..."
 
-#: ../rpmdrake_.c:863
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "ÕýÔÚ¼ì²é %s"
+msgid "Type of source:"
+msgstr "À´Ô´ÀàÐÍ£º"
 
-#: ../rpmdrake_.c:882
-msgid "changes:"
-msgstr "¸ü¸Ä£º"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Adding a source:"
+msgstr "Ìí¼ÓÒ»¸öÀ´Ô´£º"
 
-#: ../rpmdrake_.c:886
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove .%s"
-msgstr "ɾ³ý .%s"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
 
-#: ../rpmdrake_.c:888
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "ʹÓà .%s ×÷ΪÖ÷Îļþ"
+msgid "You need to fill up at least the two first entries."
+msgstr "ÄúÖÁÉÙÒªÌîдͷÁ½Ïî¡£"
 
-#: ../rpmdrake_.c:890
-msgid "Do nothing"
-msgstr "²»×öÈκÎÊÂ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "Ãû³Æ£º"
 
-#: ../rpmdrake_.c:902
-msgid "Installation finished"
-msgstr "°²×°Íê³É"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
+msgstr "µÇ¼Ãû£º"
 
-#: ../rpmdrake_.c:912
-msgid "Inspect..."
-msgstr "¼ì²é..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Ñ¡Ôñ¾µÏñ..."
 
-#: ../rpmdrake_.c:927
-msgid "Program missing"
-msgstr "ȱÉÙ³ÌÐò"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Browse..."
+msgstr "ä¯ÀÀ..."
 
-#: ../rpmdrake_.c:928
-msgid "A required program is missing (grpmi). Check your installation."
-msgstr "ȱÉÙÒ»¸öÐèÒªµÄ³ÌÐò£¨grpmi£©¡£Çë¼ì²éÄúµÄ°²×°¡£"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "·¾¶»ò×°Ôص㣺"
 
-#: ../rpmdrake_.c:942
-msgid "Unable to get source packages."
-msgstr "Ô´Èí¼þ°üδÕÒµ½¡£"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Removable device"
+msgstr "¿ÉÒƶ¯É豸"
 
-#: ../rpmdrake_.c:943
-msgid "Unable to get source packages, sorry."
-msgstr "¶Ô²»Æð£¬ÎÞ·¨µÃµ½Ô´Èí¼þ°ü¡£"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "HTTP server"
+msgstr "HTTP ·þÎñÆ÷"
 
-#: ../rpmdrake_.c:950
-msgid "Change medium"
-msgstr "¸ü»»½éÖÊ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "FTP ·þÎñÆ÷"
 
-#: ../rpmdrake_.c:951
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Çë°Ñ±ê¼ÇΪ¡°%s¡±µÄ½éÖʷŽøÉ豸 [%s]"
+msgid "Path:"
+msgstr "·¾¶£º"
 
-#: ../rpmdrake_.c:959
-msgid "Installation failed"
-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_.c:960
+#: ../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 ""
-"°²×°Ê§°Ü£¬È±ÉÙijЩÎļþ¡£\n"
-"Äú¿ÉÄÜÐèÒª¸üÐÂÄúµÄÀ´Ô´Êý¾Ý¿â¡£"
 
-#: ../rpmdrake_.c:963
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr "ΪÁËÉý¼¶Èí¼þ°ü£¬ÕýÔÚɾ³ý¾ÉµÄÈí¼þ°ü£¬ÇëÉÔºò..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
+msgstr "ûÓоµÏñ"
 
-#: ../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 ""
-"°²×°Íê³É£»%s¡£\n"
-"\n"
-"һЩÅäÖÃÎļþ±»±£´æΪ¡°.rpmnew¡±»ò¡°.rpmsave¡±£¬\n"
-"ÔÚÖ´Ðж¯×÷ÒÔÇ°£¬ÄúÐèÒª¼ì²éһϣº"
 
-#: ../rpmdrake_.c:984
+#: ../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"
-"ʧ°Ü"
 
-#: ../rpmdrake_.c:985
-msgid "everything was installed correctly"
-msgstr "ËùÓÐÈí¼þ°ü¶¼ÒÑÕýÈ·°²×°"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United States"
+msgstr "ÃÀ¹ú"
 
-#: ../rpmdrake_.c:987
-msgid "Everything installed successfully"
-msgstr "ËùÓÐÈí¼þ°ü¶¼Òѳɹ¦°²×°"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
+msgstr "Öйú"
 
-#: ../rpmdrake_.c:988
-msgid "All requested packages were installed successfully."
-msgstr "ËùÓÐÒªÇóµÄÈí¼þ°ü¶¼Òѳɹ¦°²×°¡£"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr "Ó¢¹ú"
 
-#: ../rpmdrake_.c:991
-msgid "Everything already installed."
-msgstr "ËùÓÐÈí¼þ°üÒѾ­°²×°ÁË¡£"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "Öйų́Íå"
 
-#: ../rpmdrake_.c:992
-msgid "Everything already installed (is this supposed to happen at all?)."
-msgstr "ËùÓÐÈí¼þ°üÒѾ­°²×°ÁË£¨ÕâÊÇÄúÏ£ÍûµÄÂ𣿣©¡£"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "Èðµä"
 
-#: ../rpmdrake_.c:999
-msgid "Problem during installation"
-msgstr "ÔÚ°²×°¹ý³ÌÖз¢ÉúÎÊÌâ"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
+msgstr "¶íÂÞ˹"
 
-#: ../rpmdrake_.c:1000
+#: ../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:1014
-msgid "Please wait, reading packages database..."
-msgstr "ÕýÔÚ¶ÁÈ¡Èí¼þ°üÊý¾Ý¿â£¬ÇëÉÔºò..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
+msgstr "²¨À¼"
 
-#: ../rpmdrake_.c:1055
-msgid "Please wait, removing packages..."
-msgstr "ÕýÔÚɾ³ýÈí¼þ°ü£¬ÇëÉÔºò..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
+msgstr "ŲÍþ"
 
-#: ../rpmdrake_.c:1058
-msgid "Problem during removal"
-msgstr "ÔÚɾ³ý¹ý³ÌÖз¢ÉúÎÊÌâ"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
+msgstr "ºÉÀ¼"
 
-#: ../rpmdrake_.c:1059
+#: ../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: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 ""
-"»¶Ó­Ê¹ÓÃÈí¼þ°üɾ³ý¹¤¾ß£¡\n"
-"\n"
-"Õâ¸ö¹¤¾ß°ïÖúÄúÑ¡ÔñÏëÒª´ÓÄúµÄµçÄÔÖÐɾ³ý\n"
-"µÄÈí¼þ°ü¡£"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Japan"
+msgstr "ÈÕ±¾"
 
-#: ../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 ""
-"»¶Ó­Ê¹Óà MandrakeUpdate ×Ô¶¯¸üй¤¾ß£¡\n"
-"\n"
-"Õâ¸ö¹¤¾ß°ïÖúÄúΪÄúµÄµçÄÔÖа²×°\n"
-"¸üеÄÈí¼þ°ü¡£"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Italy"
+msgstr "Òâ´óÀû"
 
-#: ../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 ""
-"»¶Ó­Ê¹ÓÃÈí¼þ°ü°²×°¹¤¾ß£¡\n"
-"\n"
-"ÄúµÄ Mandrake Linux µÄ°²×°¹âÅÌ°üº¬ÓÐÊýǧ¸öÈí¼þ°ü¡£\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"
@@ -884,7 +1174,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/zh_CN.pom b/po/zh_CN.pom
index daf99c0f..cbe1ac59 100644
--- a/po/zh_CN.pom
+++ b/po/zh_CN.pom
@@ -4,165 +4,169 @@ 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 ""
+"°ì¹«³ÌÐò: ×Ö´¦Àí (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 Îļþ·þÎñÆ÷, 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 "·À»ðǽ/·ÓÉÆ÷"
+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 "ÓòÃûºÍÍøÂçÐÅÏ¢·þÎñ DNS/NIS"
+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 "Linux Standard Base. µÚÈý·½Ó¦ÓóÌÐòÖ§³Ö"
+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 "ÓÐ¹Ø 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 "Ò»×éÓÃÓÚ Óʼþ, ÐÂÎÅ, Îļþ´«Êä, ÁÄÌìµÄ¹¤¾ß"
+msgid "Editors, shells, file tools, terminals"
+msgstr "±à¼­Æ÷, shell, Îļþ¹¤¾ß, ÖÕ¶Ë"
 
 # 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 "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 "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, 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++¿ª·¢¿â, ³ÌÐò¼°Í·Îļþ"
 
 # 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 "ÓÐ¹Ø 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"
-msgstr "KDE ×ÀÃæ»·¾³, »ù±¾µÄͼÐλ·¾³ºÍÒ»×éÅäÌ׵Ť¾ß"
+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 "Linux Standard Base. µÚÈý·½Ó¦ÓóÌÐòÖ§³Ö"
 
 # 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
@@ -171,23 +175,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 "ͼÏñ´¦Àí ³ÌÐò Èç 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 "ÓòÃûºÍÍøÂçÐÅÏ¢·þÎñ DNS/NIS"
 
 # 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 Îļþ·þÎñÆ÷, 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
@@ -226,74 +240,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 "ͼÏñ´¦Àí ³ÌÐò Èç 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 "LSB"
+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 "±à¼­Æ÷, shell, Îļþ¹¤¾ß, ÖÕ¶Ë"
+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 "ÅäºÏ Palm Pilot, Visor µÈÊÖ³ÖÉ豸µÄ¹¤¾ß"
 
 # 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/zh_TW.po b/po/zh_TW.po
index bc57fa30..cbe16b00 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2003-01-19 16:57+0100\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\n"
 "PO-Revision-Date: 2002-09-13 05:50-+800\n"
 "Last-Translator: Kenduest Lee <kenduest@i18n.linux.org.tw>\n"
 "Language-Team: Chinese <zh-l10n@linux.org.tw>\n"
@@ -15,1019 +15,1206 @@ msgstr ""
 "Content-Type: text/plain; charset=big5\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl_.c:39
-msgid "Unable to create medium."
-msgstr "µLªk«Ø¥ß´C¤¶¶µ¥Ø¡C"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"±z­nÄ~Äò¶Ü¡H"
 
-#: ../edit-urpm-sources.pl_.c:40
-msgid "Unable to update medium; it will be automatically disabled."
-msgstr "µLªk§ó·s´C¤¶¡A¸Ó¶µ¥Ø±N·|¼È®É¦Û°ÊÃö³¬¡C"
+#: ../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 ""
+"Mandrake Linux ¨t²Î´£¨Ñ¤F¥]ù¸U¶Hªº³nÅé®M¥ó¡A\n"
+"³o¨Ç®M¥ó³£¦ì©óCD ¬Æ¦Ü DVD¥úºÐ¤º¡C\n"
+"±µ¤U¨Óµ{¦¡±N·|¨ó§U±z§¹¦¨¦w¸Ë¤W±z©Ò»Ý­nªº®M¥ó¶µ¥Ø¡C"
 
-#: ../edit-urpm-sources.pl_.c:51
-#, fuzzy
-msgid "Add a source"
-msgstr "·s¼W¨Ó·½¡G"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Åwªï¨Ó¨ì®M¥ó§ó·sµ{¦¡!\n"
+"±µ¤U¨Óµ{¦¡±N·|¤Þ¾É§A§¹¦¨®M¥ó§ó·s»P¦w¸Ë¡C"
 
-#: ../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 ""
+"Åwªï¨Ó¨ì®M¥ó²¾°£µ{¦¡!\n"
+"\n"
+"±µ¤U¨Óµ{¦¡±N·|¤Þ¾É§A§¹¦¨²¾°£±z»{¬°¤£»Ý­nªº®M¥ó¶µ¥Ø¡C"
 
-#: ../edit-urpm-sources.pl_.c:52
-msgid "Path:"
-msgstr "¸ô®|¡G"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"¦w¸Ë¹Lµ{®Éµo¥Í¿ù»~¡G\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:53
-msgid "FTP server"
-msgstr "FTP ¥D¾÷"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during removal"
+msgstr "¦w¸Ë®Éµo¥Í°ÝÃD"
 
-#: ../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¡G"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages..."
+msgstr "½Ðµy­Ô¡A¥¿¦b²¾°£®M¥ó..."
 
-#: ../edit-urpm-sources.pl_.c:54
-msgid "HTTP server"
-msgstr "HTTP ¥D¾÷"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
+msgstr "½Ðµy«á¡AŪ¨ú®M¥ó¸ê®Æ®w¸ê°T¤¤..."
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Path or mount point:"
-msgstr "¸ô®|©Î¬O±¾¸üÂI¡G"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"¦w¸Ë¹Lµ{®Éµo¥Í¿ù»~¡G\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Removable device"
-msgstr "¥i²¾°£¸Ë¸m"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during installation"
+msgstr "¦w¸Ë®Éµo¥Í°ÝÃD"
 
-#: ../edit-urpm-sources.pl_.c:56 ../rpmdrake_.c:548
-msgid "Security updates"
-msgstr "¦w¥þ§ó·s"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
+msgstr "©Ò¦³®M¥ó¤w¸g¦w¸Ë¤W¡C"
 
-#: ../edit-urpm-sources.pl_.c:67
-msgid "Browse..."
-msgstr "ÂsÄý..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed."
+msgstr "©Ò¦³®M¥ó¤w¸g¦w¸Ë¤W¡C"
 
-#: ../edit-urpm-sources.pl_.c:69
-msgid "Choose a mirror..."
-msgstr "¿ï¾Ü¬M®g¦a§}..."
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "¤w¸g¦¨¥\¦a¦w¸Ë±z»Ý­nªº®M¥ó¡C"
 
-#: ../edit-urpm-sources.pl_.c:89
-msgid "Login:"
-msgstr "µn¤J¡G"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr "©Ò¦³¶µ¥Ø¤w¸g³£¦w¸Ë¦¨¥\¤F¡C"
 
-#: ../edit-urpm-sources.pl_.c:89 ../edit-urpm-sources.pl_.c:215
-msgid "Password:"
-msgstr "±K½X¡G"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"The installation is finished; %s.\n"
+"\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
+msgstr ""
+"¤w¸g§¹¦¨¦w¸Ë %s ®M¥ó¤F¡C\n"
+"\n"
+"½Ðª`·N¤@¤U¡A¸Ó®M¥ó¥i¯à¥t¥~²£¥Í¤F '.rpmnew' ·sª©¥»³]©wÀɮסA\n"
+"©ÎªÌ¬O§â­ì¥»³]©wÀÉ®×­«·s©R¦W¬° '.rpmsave'¡A¬°¤F¯à°÷Åýµ{¦¡\n"
+"¯à°÷¥¿±`°õ¦æ¤u§@¡A±z»Ý­nÀ˵ø¤U­±ªº¨BÆJ¡G"
 
-#: ../edit-urpm-sources.pl_.c:94
-msgid "Name:"
-msgstr "¦WºÙ¡G"
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "©Ò¦³¶µ¥Ø¤w¸g³£¦w¸Ë¦¨¥\¤F¡C"
 
-#: ../edit-urpm-sources.pl_.c:96 ../edit-urpm-sources.pl_.c:176
-msgid "Relative path to synthesis/hdlist:"
-msgstr "synthesis/hdlist Àɮתº¬Û¹ï¸ô®|¡G"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"some packages failed to install\n"
+"correctly"
+msgstr "¬Y¨Ç®M¥óµLªk¦w¸Ë¤W"
 
-#: ../edit-urpm-sources.pl_.c:104
-msgid "You need to fill up at least the two first entries."
-msgstr "±z¦Ü¤Ö»Ý­n¿é¤J«e­±¨â­Ó¶µ¥Ø¡C"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages to allow others to be upgraded..."
+msgstr "½Ðµy«á¡A²¾°£¤@¨Ç®M¥ó¶µ¥Ø¡A¥H«K©ó¯à°÷¶i¦æ¨ä¥L®M¥óªº§ó·s..."
 
-#: ../edit-urpm-sources.pl_.c:116
-msgid "Adding a source:"
-msgstr "·s¼W¨Ó·½¡G"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
+msgstr ""
+"¦w¸Ë¥¢±Ñ¡C¦w¸Ëµ{¦¡§ä¤£¨ì¤@¨Ç­n¦w¸Ë¤Wªºµ{¦¡®M¥ó¡C\n"
+"¤]³\¬O¨t²Î¸ê®Æ®w¤Ó¤F¡A½Ð¥ý§ó·s¸ê®Æ®w«á¦AÄ~Äò¡C"
 
-#: ../edit-urpm-sources.pl_.c:117
-msgid "Type of source:"
-msgstr "¨Ó·½Ãþ§O¡G"
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation failed"
+msgstr "¦w¸Ë¥¢±Ñ"
+
+#: ../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 "½T©w"
 
-#: ../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 "½Ð¸m¤J´C¤¶¦WºÙ¬° \"%s\" ªº¶µ¥Ø©ñ¸m©ó %s ¸Ë¸m"
 
-#: ../edit-urpm-sources.pl_.c:140
-msgid "Please wait, adding medium..."
-msgstr "½Ðµy«á¡A¥¿¦b¥[¤J´C¤¶¨Ó·½..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr "Åܧó´C¤¶"
 
-#: ../edit-urpm-sources.pl_.c:158
-msgid "Please wait, removing medium..."
-msgstr "½Ðµy«á¡A¥¿¦b²¾°£´C¤¶¨Ó·½..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
+msgstr "¯u©êºp¡AµLªk¨ú±o­ì©l®M¥ó"
 
-#: ../edit-urpm-sources.pl_.c:169
-msgid "Edit a source"
-msgstr "½s¿è®M¥ó¨Ó·½"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages."
+msgstr "¤j¥ó¨Æ¡AµLªk¨ú±o­ì©l®M¥ó"
 
-#: ../edit-urpm-sources.pl_.c:173
+#: ../rpmdrake:1
 #, c-format
-msgid "Editing source \"%s\":"
-msgstr "½s¿è¨Ó·½ \"%s\"¡G"
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr "µLªk©I¥s grpmi µ{¦¡¡A¤]³\µ{¦¡¿ò¥¢©ÎªÌ¬O¤£¥¿½T¡C"
 
-#: ../edit-urpm-sources.pl_.c:179
-msgid "Save changes"
-msgstr "Àx¦sÅܧó"
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
+msgstr "§ä¤£¨ì©Ò»Ý­nªºµ{¦¡"
 
-#: ../edit-urpm-sources.pl_.c:185
-msgid "You need to insert the medium to continue"
-msgstr "½Ð´¡¤J´C¤¶¸Ë¸m«áÄ~Äò"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
+msgstr "Àˬd..."
 
-#: ../edit-urpm-sources.pl_.c:186
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "¬°¤F¯à°÷Àx¦sÅܧó¡A½Ð¸m¤J¸Ó´C¤¶¸Ë¸m«á©óºÏºÐ¾÷Ä~Äò¡C"
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation finished"
+msgstr "¦w¸Ë§¹¦¨"
 
-#: ../edit-urpm-sources.pl_.c:191
-msgid "Please wait, updating medium..."
-msgstr "½Ðµy«á¡A§ó·s´C¤¶¤¤..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
+msgstr "¨S¦³¶i¦æ¥ô¦ó°Ê§@"
 
-#: ../edit-urpm-sources.pl_.c:202
-msgid "Configure proxies"
-msgstr "³]©w¥N²z¦øªA¾¹"
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
+msgstr "¨Ï¥Î .%s ¬°¥D­nÀÉ®×"
 
-#: ../edit-urpm-sources.pl_.c:207
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
-msgstr ""
-"¦pªG±z»Ý­n³z¹L¥N²z¦øªA¾¹³s½u¡A½Ð¿é¤J¸Ó¥D¾÷¦WºÙ»P³sµ²°ð°ð¸¹(¤ñ¤è proxy.hinet."
-"net:80)¡G"
+#: ../rpmdrake:1
+#, c-format
+msgid "Remove .%s"
+msgstr "²¾°£ .%s"
 
-#: ../edit-urpm-sources.pl_.c:209
-msgid "Proxy hostname:"
-msgstr "¥N²z¦øªA¾¹¡G"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "changes:"
+msgstr "Àx¦sÅܧó"
 
-#: ../edit-urpm-sources.pl_.c:211
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "±z»Ý­n«ü©w¨Ï¥ÎªÌ±b¸¹/±K½X¡A¥H«K©ó¯à°÷¨Ï¥Î¥N²z¦øªA¾¹»{ÃÒ¡G"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr "¥¿¦bÀˬd %s"
 
-#: ../edit-urpm-sources.pl_.c:213
-msgid "User:"
-msgstr "¨Ï¥ÎªÌ¦WºÙ¡G"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, finding available packages..."
+msgstr "½Ðµy«á¡A¥¿¦b´M§ä¥i¥Îªº®M¥ó²M³æ..."
 
-#: ../edit-urpm-sources.pl_.c:235
-msgid "Configure sources"
-msgstr "³]©w®M¥ó¨Ó·½¦ì¸m¡H"
+#: ../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 ·s¼W§ó·s¨Ó·½´C¤¶¶µ¥Ø®Éµo¥Í¿ù»~¡C\n"
+"\n"
+"¤]³\¬O¹ï¤è¬M®g¯¸¥x¼È®ÉµLªkÁpô¤W¡A©ÎªÌ¬O¹ï¤èªºÀɮפw¸g·´·l¡A\n"
+"©ÎªÌ¬OMandrake Linux ©x¤è§ó·sÁÙ¤£¤ä´©±zªº Mandrake Linux ª©¥» (%s)¡C\n"
+"\n"
+"±z­n¥t¥~¹Á¸Õ¨Ï¥Î¨ä¥L§ó·s¯¸¥x¶Ü¡H"
 
-#: ../edit-urpm-sources.pl_.c:242
-msgid "Enabled?"
-msgstr "¶}±Ò"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
+msgstr "·s¼W§ó·s´C¤¶®Éµo¥Í¿ù»~"
 
-#: ../edit-urpm-sources.pl_.c:243
-msgid "Source"
-msgstr "¨Ó·½"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
+msgstr "½Ðµy«á¡A¥¿³s½u¨ì¬M®g¯¸¥xªì©lµe´£¨Ñ§ó·sªº®M¥ó¶µ¥Ø¡C"
 
-#: ../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 ""
+"±z¤w¸g¤â°Ê¿ï¾Ü±z»Ý­nªº¬M®g¯¸¥x¤F¡A«Øij±z½Ðµy«á¤â°Ê°õ¦æ\n"
+"®M¥ó¨Ó·½ºÞ²z­û¡A°w¹ï±zªº¬M®g¯¸¥x¥t¥~¥[¤J¡u¦w¥þ­×¥¿¡v¶µ¥Ø¡C\n"
+"\n"
+"§¹¦¨«á¡A½Ð­«·s±Ò°Ê MandrakeUpdate µ{¦¡¡C"
 
-#: ../edit-urpm-sources.pl_.c:266
-msgid "Edit"
-msgstr "½s¿è"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "¦p¦ó¤â°Ê¿ï¾Ü±z»Ý­nªº¬M®g¯¸¥x"
 
-#: ../edit-urpm-sources.pl_.c:268
-msgid "Add..."
-msgstr "·s¼W..."
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
+msgstr "¦b§ó·s®M¥ó¸ê°T®Éµo¥Í¤FµLªk§ó¥¿ªº¿ù»~±¡ªp¡C"
 
-#: ../edit-urpm-sources.pl_.c:270
-msgid "Update..."
-msgstr "§ó·s..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
+msgstr "§ó·s´C¤¶®Éµo¥Í¿ù»~"
 
-#: ../edit-urpm-sources.pl_.c:271
-msgid "Proxy..."
-msgstr "¥N²z..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
+msgstr "½Ðµy«á¡A¥¿¦b¨ú±o¥i¨Ñ§ó·sªº®M¥ó²M³æ¸ê°T"
 
-#: ../edit-urpm-sources.pl_.c:274
-msgid "Save and quit"
-msgstr "Àx¦s¨ÃÂ÷¶}"
+#: ../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 ""
+"¦w¸Ëµ{¦¡»Ý­n³s½u¨ì¬M®g¯¸¥x¥H«K©ó¨ú¦^³Ì·sªº§ó·s®M¥ó¡C\n"
+"½Ð½T©w±z¥Ø«eªººô¸ô¯à°÷¥¿±`³s½u¨ì¥~­±¡C\n"
+"\n"
+"±z²{¦b­nÄ~Äò¶Ü¡H"
 
-#: ../edit-urpm-sources.pl_.c:275 ../rpmdrake_.c:733
-msgid "Quit"
-msgstr "Â÷¶}"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Installation"
+msgstr "¦w¸Ë®M¥óµ{¦¡"
 
-#: ../rpmdrake.pm_.c:93
-msgid "Yes"
-msgstr "¬O"
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, c-format
+msgid "Mandrake Update"
+msgstr "Mandrake §ó·s"
 
-#: ../rpmdrake.pm_.c:95
-msgid "No"
-msgstr "§_"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
+msgstr "²¾°£®M¥óµ{¦¡"
 
-#: ../rpmdrake.pm_.c:127
-msgid "Info..."
-msgstr "¸ê°T..."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Â÷¶}"
 
-#: ../rpmdrake.pm_.c:180
-msgid "Austria"
-msgstr "¶ø¦a§Q"
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "¦w¸Ë"
 
-#: ../rpmdrake.pm_.c:181
-msgid "Australia"
-msgstr "¿D¬w"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "²¾°£"
 
-#: ../rpmdrake.pm_.c:182
-msgid "Belgium"
-msgstr "¤ñ§Q®É"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search"
+msgstr "´M§ä"
 
-#: ../rpmdrake.pm_.c:183
-msgid "Brazil"
-msgstr "¤Ú¦è"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "´M§ä¡G"
 
-#: ../rpmdrake.pm_.c:184
-msgid "Canada"
-msgstr "¥[®³¤j"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"¤U¦Cªº®M¥ó»Ý­n¶¶«K²¾°£¡A¥H«K©ó¯à°÷¶i¦æ¨ä¥L®M¥óªº¦w¸Ë§ó·s¡G\n"
+"\n"
+"%s\n"
+"\n"
+"±z½T©w­nÄ~Äò¶Ü¡H"
 
-#: ../rpmdrake.pm_.c:185
-msgid "Costa Rica"
-msgstr "­ô´µ¤j¾¤¥["
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "¬Y¨Ç®M¥ó»Ý­n¶¶«K²¾°£"
 
-#: ../rpmdrake.pm_.c:186
-msgid "Czech Republic"
-msgstr "±¶§J¦@©M°ê"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr ""
+"ĵ§i¡G ±z¿ï¨ú¤F³\¦h­n¦w¸Ë§ó·sªº®M¥ó¡A¤£¹L±zªººÏºÐªÅ¶¡\n"
+"¦ü¥G¤w¸g¤£¼Å¨Ï¥Î¡A«Øij±z¥ý¾ã²z®¿¥X¥i¥ÎªºªÅ¶¡¦A¶i¦æ¤U­±\n"
+"ªº¦w¸Ë¡A¥HÁקK¥ô¦ó°ÝÃDµo¥Í¡C\n"
+"±z½T©wÁÙ¬O­n¦w¸Ë±z©Ò¿ï¨úªº®M¥ó¶Ü¡H"
 
-#: ../rpmdrake.pm_.c:187
-msgid "Germany"
-msgstr "¼w°ê"
+#: ../rpmdrake:1
+#, c-format
+msgid "Too many packages are selected"
+msgstr "¿ï¨ú¤Ó¦h¤F®M¥ó¶µ¥Ø"
 
-#: ../rpmdrake.pm_.c:188
-msgid "Danmark"
-msgstr "¤¦³Á"
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
+msgstr "§¹¾ã¸ê°T"
 
-#: ../rpmdrake.pm_.c:189 ../rpmdrake.pm_.c:193
-msgid "Greece"
-msgstr "§Æþ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal information"
+msgstr "¤@¯ë¸ê°T"
 
-#: ../rpmdrake.pm_.c:190
-msgid "Spain"
-msgstr "¦è¯Z¤ú"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update source(s)"
+msgstr "§ó·s¨Ó·½"
 
-#: ../rpmdrake.pm_.c:191
-msgid "Finland"
-msgstr "ªâÄõ"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reload the packages list"
+msgstr "­«·s¸ü¤J®M¥ó²M³æ"
 
-#: ../rpmdrake.pm_.c:192
-msgid "France"
-msgstr "ªk°ê"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
+msgstr "­«¸m¿ï¨ú¶µ¥Ø"
 
-#: ../rpmdrake.pm_.c:194
-msgid "Israel"
-msgstr "¥H¦â¦C"
+#: ../rpmdrake:1
+#, c-format
+msgid "in files"
+msgstr "¨ÌÀÉ®×"
 
-#: ../rpmdrake.pm_.c:195
-msgid "Italy"
-msgstr "¸q¤j§Q"
+#: ../rpmdrake:1
+#, c-format
+msgid "in descriptions"
+msgstr "¨Ì´y­z"
 
-#: ../rpmdrake.pm_.c:196
-msgid "Japan"
-msgstr "¤é¥»"
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
+msgstr "¨Ì¦WºÙ"
 
-#: ../rpmdrake.pm_.c:197
-msgid "Korea"
-msgstr "Áú°ê"
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
+msgstr "¨Ì¥i¨Ñ§ó·s¤ÀÃþ"
 
-#: ../rpmdrake.pm_.c:198
-msgid "Netherlands"
-msgstr "²üÄõ"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
+msgstr "¨Ì¨Ó·½­ÜÀx¤ÀÃþ"
 
-#: ../rpmdrake.pm_.c:199
-msgid "Norway"
-msgstr "®¿«Â"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
+msgstr "¨Ì¿ï¾Üª¬ºA¤ÀÃþ"
 
-#: ../rpmdrake.pm_.c:200
-msgid "Poland"
-msgstr "ªiÄõ"
+#: ../rpmdrake:1
+#, c-format
+msgid "by size"
+msgstr "¨Ì¤j¤p¤ÀÃþ"
 
-#: ../rpmdrake.pm_.c:201
-msgid "Portugal"
-msgstr "¸²µå¤ú"
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
+msgstr "¨Ì¸s²Õ¤ÀÃþ"
 
-#: ../rpmdrake.pm_.c:202
-msgid "Russia"
-msgstr "Ĭ«X"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages,"
+msgstr "©Ò¦³®M¥ó¡A"
 
-#: ../rpmdrake.pm_.c:203
-msgid "Sweden"
-msgstr "·ç¨å"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
+msgstr "©Ò¦³®M¥ó¡A¨Ì·Ó¦r¥À¶¶§Ç¤ÀÃþ"
 
-#: ../rpmdrake.pm_.c:204
-msgid "Taiwan"
-msgstr "¥xÆW"
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
+msgstr "Mandrake ¤ÀÃþ"
 
-#: ../rpmdrake.pm_.c:205
-msgid "United Kingdom"
-msgstr "Áp¦X°ê"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal updates"
+msgstr "¤@¯ë§ó·s"
 
-#: ../rpmdrake.pm_.c:206
-msgid "China"
-msgstr "¤¤°ê¤j³°"
+#: ../rpmdrake:1
+#, c-format
+msgid "Bugfixes updates"
+msgstr "¯äÂΧó·s"
 
-#: ../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 "¦w¥þ§ó·s"
 
-#: ../rpmdrake.pm_.c:274
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr "½Ðµy«á¡A¥¿¦b¥Ñ MandrakeSoft Á`³¡¨ú¦^¬M®g¯¸¥x²M³æ¡C"
+#: ../rpmdrake:1
+#, c-format
+msgid "Description: "
+msgstr "´y­z¡G "
 
-#: ../rpmdrake.pm_.c:280
-msgid "Error during download"
-msgstr "¤U¸üµo¥Í¿ù»~"
+#: ../rpmdrake:1
+#, c-format
+msgid "Summary: "
+msgstr "²¤¶¡G "
 
-#: ../rpmdrake.pm_.c:289
-msgid "No mirror"
-msgstr "µL¬M®g¯¸¥x"
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "­«­n©Ê¡G "
 
-#: ../rpmdrake.pm_.c:307
-msgid "Please choose the desired mirror."
-msgstr "½Ð¿ï¾Ü§ó·sªº¦a§}¶µ¥Ø"
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake.pm_.c:339 ../rpmdrake_.c:627
-msgid "Update source(s)"
-msgstr "§ó·s¨Ó·½"
+#: ../rpmdrake:1
+#, c-format
+msgid "Size: "
+msgstr "¤j¤p¡G "
 
-#: ../rpmdrake.pm_.c:343
-msgid "Select the source(s) you wish to update:"
-msgstr "½Ð¿ï¾Ü±z­n§ó·sªº¨Ó·½¡G"
+#: ../rpmdrake:1
+#, c-format
+msgid "Version: "
+msgstr "ª©¥»¡G "
 
-#: ../rpmdrake.pm_.c:347
-msgid "Update"
-msgstr "§ó·s"
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "¦WºÙ¡G "
 
-#: ../rpmdrake.pm_.c:358
-msgid "Please wait, updating media..."
-msgstr "½Ðµy«á¡A§ó·s´C¤¶¤¤..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "§ó·sªº­ì¦]¡G "
 
-#: ../rpmdrake_.c:99
-msgid "Other"
-msgstr "¨ä¥L"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
+msgstr "¥Ø«e¤w¦w¸Ëªºª©¥»¡G"
 
-#: ../rpmdrake_.c:121 ../rpmdrake_.c:135 ../rpmdrake_.c:227 ../rpmdrake_.c:298
-msgid "(none)"
-msgstr "(µL)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Source: "
+msgstr "¨Ó·½¡G "
 
-#: ../rpmdrake_.c:141 ../rpmdrake_.c:482 ../rpmdrake_.c:483
+#: ../rpmdrake:1
+#, c-format
 msgid "(Not available)"
 msgstr "(µLªk¨Ï¥Î)"
 
-#: ../rpmdrake_.c:151 ../rpmdrake_.c:208
-msgid "Search results"
-msgstr "·j´Mµ²ªG"
-
-#: ../rpmdrake_.c:151
-msgid "Search results (none)"
-msgstr "·j´Mµ²ªG (µL¥ô¦ó²Å¦Xªº¶µ¥Ø)"
-
-#: ../rpmdrake_.c:161 ../rpmdrake_.c:172
-msgid "Please wait, searching..."
-msgstr "½Ðµy­Ô¡A·j´M¤¤..."
-
-#: ../rpmdrake_.c:175
-msgid "Stop"
-msgstr "°±¤î"
-
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-msgid "Addable"
-msgstr "¥i¨Ñ¥[¤J"
-
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
-msgid "Upgradable"
-msgstr "¥i¨Ñ§ó·s"
-
-#: ../rpmdrake_.c:211
-msgid "Not selected"
-msgstr "¥¼¿ï"
-
-#: ../rpmdrake_.c:211
-msgid "Selected"
-msgstr "¤w¿ï"
-
-#: ../rpmdrake_.c:240
-msgid "rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake_.c:258 ../rpmdrake_.c:360 ../rpmdrake_.c:362
-msgid "More information on package..."
-msgstr "§ó¦h¸Ó®M¥ó¸ê°T..."
-
-#: ../rpmdrake_.c:259
-msgid "One of the following packages is needed:"
-msgstr "±N»Ý­n¤U¦Cªº¨ä¤¤¤§¤@®M¥ó¡G"
-
-#: ../rpmdrake_.c:259
-msgid "Please choose"
-msgstr "½Ð¿ï¾Ü"
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
+msgstr "Åܧó¬ö¿ý¡G\n"
 
-#: ../rpmdrake_.c:275
-msgid "unknown package "
-msgstr "¤£©úªº®M¥ó"
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "ÀɮסG\n"
 
-#: ../rpmdrake_.c:285
-msgid "Please wait, listing packages..."
-msgstr "½Ðµy­Ô¡A¥¿¦b¦C¥X®M¥ó..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected size: %d MB"
+msgstr "¿ï¨úªº¤j¤p¡G%d MB"
 
-#: ../rpmdrake_.c:300
-msgid "No update"
-msgstr "µL§ó·s"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "¤w¿ï¾Ü¡G%d MB / ¥i¥ÎºÏºÐªÅ¶¡¡G%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¨D¡A¤U­±ªº®M¥ó±N·|¨ú®ø¿ï¨ú¥H«K©ó¯à°÷Ä~Äò¶i¦æ¤U¥h¡G\n"
+"\n"
 
-#: ../rpmdrake_.c:355
-#, fuzzy
-msgid "Information on packages"
-msgstr "§ó¦h¸Ó®M¥ó¸ê°T..."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+msgstr ""
+"©êºp¡A¤U­±ªº®M¥ó¶µ¥Ø±N¤£¯à°÷³Q¿ï¨ú¡G\n"
+"\n"
 
-#: ../rpmdrake_.c:376
-msgid "Some additional packages need to be removed"
-msgstr "¬°¤F¥i¥H¥þ­±¹B§@¥¿±`³o¨ÇÃB¥~ªº®M¥ó¥²¶·¤@¦P¦w¸Ë"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "¬Y¨Ç®M¥óµLªk¦w¸Ë¤W"
 
-#: ../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 ""
-"¬°¤F­nº¡¨¬¬Û¨Ì©Ê»Ý¨D¡A³o¨Ç®M¥ó»Ý­n³Q²¾°£¡G\n"
+"¬°¤F¯à°÷º¡¨¬¬Û¨Ì©Êªº­n¨D¡A¤U­±ªº®M¥ó¤]¥²¶·¤@¦P¦w¸Ë¤W¡G\n"
 "\n"
 
-#: ../rpmdrake_.c:383 ../rpmdrake_.c:391
+#: ../rpmdrake:1
+#, c-format
+msgid "Additional packages needed"
+msgstr "»Ý­nÃB¥~ªº®M¥ó¶µ¥Ø"
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "¬Y¨Ç®M¥óµLªk³Q²¾°£"
 
-#: ../rpmdrake_.c:384
-#, fuzzy
+#: ../rpmdrake:1
+#, fuzzy, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
 msgstr "©êºp¡A­Y¬O²¾°£¤U­±³o¨Ç®M¥ó¥i¯à·|Åý±zªº¨t²Î¥X¿ù¡G\n"
 
-#: ../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¨D¡A¤U­±ªº®M¥ó±N·|¨ú®ø¿ï¨ú¥H«K©ó¯à°÷Ä~Äò¶i¦æ¤U¥h¡G\n"
+"¬°¤F­nº¡¨¬¬Û¨Ì©Ê»Ý¨D¡A³o¨Ç®M¥ó»Ý­n³Q²¾°£¡G\n"
 "\n"
 
-#: ../rpmdrake_.c:421
-msgid "Additional packages needed"
-msgstr "»Ý­nÃB¥~ªº®M¥ó¶µ¥Ø"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr "¬°¤F¥i¥H¥þ­±¹B§@¥¿±`³o¨ÇÃB¥~ªº®M¥ó¥²¶·¤@¦P¦w¸Ë"
 
-#: ../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 "§ó¦h¸Ó®M¥ó¸ê°T..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Information on packages"
+msgstr "§ó¦h¸Ó®M¥ó¸ê°T..."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
 msgstr ""
-"¬°¤F¯à°÷º¡¨¬¬Û¨Ì©Êªº­n¨D¡A¤U­±ªº®M¥ó¤]¥²¶·¤@¦P¦w¸Ë¤W¡G\n"
-"\n"
 
-#: ../rpmdrake_.c:435
-msgid "Some packages can't be installed"
-msgstr "¬Y¨Ç®M¥óµLªk¦w¸Ë¤W"
+#: ../rpmdrake:1
+#, c-format
+msgid "Addable"
+msgstr "¥i¨Ñ¥[¤J"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Upgradable"
+msgstr "¥i¨Ñ§ó·s"
 
-#: ../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 ""
-"©êºp¡A¤U­±ªº®M¥ó¶µ¥Ø±N¤£¯à°÷³Q¿ï¨ú¡G\n"
-"\n"
+"§ó·sªº²M³æ¶µ¥Ø¬OªÅªº¡A¤]³\¬O±z©|¥¼·s¼W¥ô¦ó§ó·sªº´C¤¶¶µ¥Ø¡A\n"
+"©ÎªÌ¬O±zªº¨t²Î¥Ø«e³£¤w¸g¦w¸Ë¤W³Ì·sªº®M¥ó¤F¡C"
 
-#: ../rpmdrake_.c:450 ../rpmdrake_.c:684
-msgid "Some packages need to be removed"
-msgstr "¬Y¨Ç®M¥ó»Ý­n¶¶«K²¾°£"
+#: ../rpmdrake:1
+#, c-format
+msgid "No update"
+msgstr "µL§ó·s"
 
-#: ../rpmdrake_.c:472
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "¤w¿ï¾Ü¡G%d MB / ¥i¥ÎºÏºÐªÅ¶¡¡G%d MB"
+msgid "(none)"
+msgstr "(µL)"
 
-#: ../rpmdrake_.c:474
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "¿ï¨úªº¤j¤p¡G%d MB"
+msgid "Please wait, listing packages..."
+msgstr "½Ðµy­Ô¡A¥¿¦b¦C¥X®M¥ó..."
 
-#: ../rpmdrake_.c:482
-msgid "Files:\n"
-msgstr "ÀɮסG\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "unknown package "
+msgstr "¤£©úªº®M¥ó"
 
-#: ../rpmdrake_.c:483
-msgid "Changelog:\n"
-msgstr "Åܧó¬ö¿ý¡G\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "±N»Ý­n¤U¦Cªº¨ä¤¤¤§¤@®M¥ó¡G"
 
-#: ../rpmdrake_.c:486
-msgid "Source: "
-msgstr "¨Ó·½¡G "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please choose"
+msgstr "½Ð¿ï¾Ü"
 
-#: ../rpmdrake_.c:487
-msgid "Currently installed version: "
-msgstr "¥Ø«e¤w¦w¸Ëªºª©¥»¡G"
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:491
-msgid "Reason for update: "
-msgstr "§ó·sªº­ì¦]¡G "
+#: ../rpmdrake:1
+#, c-format
+msgid "Not selected"
+msgstr "¥¼¿ï"
 
-#: ../rpmdrake_.c:493
-msgid "Name: "
-msgstr "¦WºÙ¡G "
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected"
+msgstr "¤w¿ï"
 
-#: ../rpmdrake_.c:494
-msgid "Version: "
-msgstr "ª©¥»¡G "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results"
+msgstr "·j´Mµ²ªG"
 
-#: ../rpmdrake_.c:495
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Stop"
+msgstr "°±¤î"
 
-#: ../rpmdrake_.c:495
-msgid "Size: "
-msgstr "¤j¤p¡G "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, searching..."
+msgstr "½Ðµy­Ô¡A·j´M¤¤..."
 
-#: ../rpmdrake_.c:497
-msgid "Importance: "
-msgstr "­«­n©Ê¡G "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
+msgstr "·j´Mµ²ªG (µL¥ô¦ó²Å¦Xªº¶µ¥Ø)"
 
-#: ../rpmdrake_.c:498
-msgid "Summary: "
-msgstr "²¤¶¡G "
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "¨ä¥L"
 
-#: ../rpmdrake_.c:499
-msgid "Description: "
-msgstr "´y­z¡G "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"Welcome to the packages source editor!\n"
+"\n"
+"This tool will help you configure the packages sources you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"Åwªï¨Ó¨ì®M¥ó¨Ó·½½s¿èµ{¦¡!\n"
+"\n"
+"±µ¤U¨Óµ{¦¡±N·|¤Þ¾É§A§¹¦¨½s¿è®M¥ó¨Ó·½ªº¶µ¥Ø¡A\n"
+"¥H«K©ó´£¨Ñ±z¯à°÷¨Ï¥Î±z©Ò³]©wªº¶µ¥Ø¶i¦æ³nÅ骺¦w¸Ë»P§ó·s¡C"
 
-#: ../rpmdrake_.c:548
-msgid "Bugfixes updates"
-msgstr "¯äÂΧó·s"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Àx¦s¨ÃÂ÷¶}"
 
-#: ../rpmdrake_.c:548
-msgid "Normal updates"
-msgstr "¤@¯ë§ó·s"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy..."
+msgstr "¥N²z..."
 
-#: ../rpmdrake_.c:567
-msgid "Mandrake choices"
-msgstr "Mandrake ¤ÀÃþ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
+msgstr "§ó·s..."
 
-#: ../rpmdrake_.c:568
-msgid "All packages, alphabetical"
-msgstr "©Ò¦³®M¥ó¡A¨Ì·Ó¦r¥À¶¶§Ç¤ÀÃþ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "·s¼W..."
 
-#: ../rpmdrake_.c:569
-msgid "All packages,"
-msgstr "©Ò¦³®M¥ó¡A"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "½s¿è"
 
-#: ../rpmdrake_.c:592
-msgid "by group"
-msgstr "¨Ì¸s²Õ¤ÀÃþ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Source"
+msgstr "¨Ó·½"
 
-#: ../rpmdrake_.c:592
-msgid "by size"
-msgstr "¨Ì¤j¤p¤ÀÃþ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
+msgstr "¶}±Ò"
 
-#: ../rpmdrake_.c:593
-msgid "by selection state"
-msgstr "¨Ì¿ï¾Üª¬ºA¤ÀÃþ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure sources"
+msgstr "³]©w®M¥ó¨Ó·½¦ì¸m¡H"
 
-#: ../rpmdrake_.c:594
-msgid "by source repository"
-msgstr "¨Ì¨Ó·½­ÜÀx¤ÀÃþ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "±K½X¡G"
 
-#: ../rpmdrake_.c:594
-msgid "by update availability"
-msgstr "¨Ì¥i¨Ñ§ó·s¤ÀÃþ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
+msgstr "¨Ï¥ÎªÌ¦WºÙ¡G"
 
-#: ../rpmdrake_.c:615
-msgid "in descriptions"
-msgstr "¨Ì´y­z"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "±z»Ý­n«ü©w¨Ï¥ÎªÌ±b¸¹/±K½X¡A¥H«K©ó¯à°÷¨Ï¥Î¥N²z¦øªA¾¹»{ÃÒ¡G"
 
-#: ../rpmdrake_.c:615
-msgid "in files"
-msgstr "¨ÌÀÉ®×"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "¥N²z¦øªA¾¹¡G"
 
-#: ../rpmdrake_.c:615
-msgid "in names"
-msgstr "¨Ì¦WºÙ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"¦pªG±z»Ý­n³z¹L¥N²z¦øªA¾¹³s½u¡A½Ð¿é¤J¸Ó¥D¾÷¦WºÙ»P³sµ²°ð°ð¸¹(¤ñ¤è proxy.hinet."
+"net:80)¡G"
 
-#: ../rpmdrake_.c:626
-msgid "Reload the packages list"
-msgstr "­«·s¸ü¤J®M¥ó²M³æ"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "³]©w¥N²z¦øªA¾¹"
 
-#: ../rpmdrake_.c:626
-msgid "Reset the selection"
-msgstr "­«¸m¿ï¨ú¶µ¥Ø"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr "½Ðµy«á¡A§ó·s´C¤¶¤¤..."
 
-#: ../rpmdrake_.c:652
-msgid "Maximum information"
-msgstr "§¹¾ã¸ê°T"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "¬°¤F¯à°÷Àx¦sÅܧó¡A½Ð¸m¤J¸Ó´C¤¶¸Ë¸m«á©óºÏºÐ¾÷Ä~Äò¡C"
 
-#: ../rpmdrake_.c:652
-msgid "Normal information"
-msgstr "¤@¯ë¸ê°T"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
+msgstr "½Ð´¡¤J´C¤¶¸Ë¸m«áÄ~Äò"
 
-#: ../rpmdrake_.c:674
-msgid "Too many packages are selected"
-msgstr "¿ï¨ú¤Ó¦h¤F®M¥ó¶µ¥Ø"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save changes"
+msgstr "Àx¦sÅܧó"
 
-#: ../rpmdrake_.c:720
-msgid "Find:"
-msgstr "´M§ä¡G"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "synthesis/hdlist Àɮתº¬Û¹ï¸ô®|¡G"
 
-#: ../rpmdrake_.c:725
-msgid "Search"
-msgstr "´M§ä"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL¡G"
 
-#: ../rpmdrake_.c:731
-msgid "Install"
-msgstr "¦w¸Ë"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Editing source \"%s\":"
+msgstr "½s¿è¨Ó·½ \"%s\"¡G"
 
-#: ../rpmdrake_.c:738 data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrake Update"
-msgstr "Mandrake §ó·s"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit a source"
+msgstr "½s¿è®M¥ó¨Ó·½"
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Installation"
-msgstr "¦w¸Ë®M¥óµ{¦¡"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr "½Ðµy«á¡A¥¿¦b²¾°£´C¤¶¨Ó·½..."
 
-#: ../rpmdrake_.c:738
-msgid "Software Packages Removal"
-msgstr "²¾°£®M¥óµ{¦¡"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, adding medium..."
+msgstr "½Ðµy«á¡A¥¿¦b¥[¤J´C¤¶¨Ó·½..."
 
-#: ../rpmdrake_.c:779
-msgid "Please wait, contacting mirror to update packages information."
-msgstr "½Ðµy«á¡A¥¿¦b¨ú±o¥i¨Ñ§ó·sªº®M¥ó²M³æ¸ê°T"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of source:"
+msgstr "¨Ó·½Ãþ§O¡G"
 
-#: ../rpmdrake_.c:781
-msgid "Error updating medium"
-msgstr "§ó·s´C¤¶®Éµo¥Í¿ù»~"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Adding a source:"
+msgstr "·s¼W¨Ó·½¡G"
 
-#: ../rpmdrake_.c:782
-msgid "There was an unrecoverable error while updating packages information."
-msgstr "¦b§ó·s®M¥ó¸ê°T®Éµo¥Í¤FµLªk§ó¥¿ªº¿ù»~±¡ªp¡C"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"¸Ó´C¤¶¸Ë¸m¶µ¥Ø¤w¸g¦s¦b¤F¡A\n"
+"±z½T©w­n¸m´«­ì¥»¶µ¥Ø¶Ü¡H"
 
-#: ../rpmdrake_.c:787
-msgid "How to choose manually your mirror"
-msgstr "¦p¦ó¤â°Ê¿ï¾Ü±z»Ý­nªº¬M®g¯¸¥x"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to fill up at least the two first entries."
+msgstr "±z¦Ü¤Ö»Ý­n¿é¤J«e­±¨â­Ó¶µ¥Ø¡C"
 
-#: ../rpmdrake_.c:795
-msgid "Please wait, contacting mirror to initialize updates packages."
-msgstr "½Ðµy«á¡A¥¿³s½u¨ì¬M®g¯¸¥xªì©lµe´£¨Ñ§ó·sªº®M¥ó¶µ¥Ø¡C"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "¦WºÙ¡G"
 
-#: ../rpmdrake_.c:798
-msgid "Error adding update medium"
-msgstr "·s¼W§ó·s´C¤¶®Éµo¥Í¿ù»~"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
+msgstr "µn¤J¡G"
 
-#: ../rpmdrake_.c:829
-msgid "Please wait, finding available packages..."
-msgstr "½Ðµy«á¡A¥¿¦b´M§ä¥i¥Îªº®M¥ó²M³æ..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "¿ï¾Ü¬M®g¦a§}..."
 
-#: ../rpmdrake_.c:861
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "¥¿¦bÀˬd %s"
+msgid "Browse..."
+msgstr "ÂsÄý..."
 
-#: ../rpmdrake_.c:880
-#, fuzzy
-msgid "changes:"
-msgstr "Àx¦sÅܧó"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "¸ô®|©Î¬O±¾¸üÂI¡G"
 
-#: ../rpmdrake_.c:884
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove .%s"
-msgstr "²¾°£ .%s"
+msgid "Removable device"
+msgstr "¥i²¾°£¸Ë¸m"
 
-#: ../rpmdrake_.c:886
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "¨Ï¥Î .%s ¬°¥D­nÀÉ®×"
+msgid "HTTP server"
+msgstr "HTTP ¥D¾÷"
 
-#: ../rpmdrake_.c:888
-msgid "Do nothing"
-msgstr "¨S¦³¶i¦æ¥ô¦ó°Ê§@"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "FTP ¥D¾÷"
 
-#: ../rpmdrake_.c:900
-msgid "Installation finished"
-msgstr "¦w¸Ë§¹¦¨"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path:"
+msgstr "¸ô®|¡G"
 
-#: ../rpmdrake_.c:910
-msgid "Inspect..."
-msgstr "Àˬd..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "¥»¾÷ÀÉ®×"
 
-#: ../rpmdrake_.c:925
-msgid "Program missing"
-msgstr "§ä¤£¨ì©Ò»Ý­nªºµ{¦¡"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a source"
+msgstr "·s¼W¨Ó·½¡G"
 
-#: ../rpmdrake_.c:926
-msgid "A required program is missing (grpmi). Check your installation."
-msgstr "µLªk©I¥s grpmi µ{¦¡¡A¤]³\µ{¦¡¿ò¥¢©ÎªÌ¬O¤£¥¿½T¡C"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
+msgstr "µLªk§ó·s´C¤¶¡A¸Ó¶µ¥Ø±N·|¼È®É¦Û°ÊÃö³¬¡C"
 
-#: ../rpmdrake_.c:940
-msgid "Unable to get source packages."
-msgstr "¤j¥ó¨Æ¡AµLªk¨ú±o­ì©l®M¥ó"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "µLªk«Ø¥ß´C¤¶¶µ¥Ø¡C"
 
-#: ../rpmdrake_.c:941
-msgid "Unable to get source packages, sorry."
-msgstr "¯u©êºp¡AµLªk¨ú±o­ì©l®M¥ó"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, updating media..."
+msgstr "½Ðµy«á¡A§ó·s´C¤¶¤¤..."
 
-#: ../rpmdrake_.c:948
-msgid "Change medium"
-msgstr "Åܧó´C¤¶"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
+msgstr "§ó·s"
 
-#: ../rpmdrake_.c:949
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "½Ð¸m¤J´C¤¶¦WºÙ¬° \"%s\" ªº¶µ¥Ø©ñ¸m©ó %s ¸Ë¸m"
+msgid "Select the source(s) you wish to update:"
+msgstr "½Ð¿ï¾Ü±z­n§ó·sªº¨Ó·½¡G"
 
-#: ../rpmdrake_.c:957
-msgid "Installation failed"
-msgstr "¦w¸Ë¥¢±Ñ"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please choose the desired mirror."
+msgstr "½Ð¿ï¾Ü§ó·sªº¦a§}¶µ¥Ø"
 
-#: ../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 ""
-"¦w¸Ë¥¢±Ñ¡C¦w¸Ëµ{¦¡§ä¤£¨ì¤@¨Ç­n¦w¸Ë¤Wªºµ{¦¡®M¥ó¡C\n"
-"¤]³\¬O¨t²Î¸ê®Æ®w¤Ó¤F¡A½Ð¥ý§ó·s¸ê®Æ®w«á¦AÄ~Äò¡C"
+"¦w¸Ëµ{¦¡§ä¤£¨ì¾A¦Xªº¬M®g¯¸¥x¡C\n"
+"\n"
+"·|µo¥Í³o­Ó°ÝÃDªº±¡ªp¬Û·í¦h¡A¤ñ¤è Mandrake Linux\n"
+"§ó·s¯¸¥x¥Ø«e©|¤£¤ä´©±z¥Ø«e¥Îªº¾÷¾¹¥­¥x¡C"
 
-#: ../rpmdrake_.c:961
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr "½Ðµy«á¡A²¾°£¤@¨Ç®M¥ó¶µ¥Ø¡A¥H«K©ó¯à°÷¶i¦æ¨ä¥L®M¥óªº§ó·s..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
+msgstr "µL¬M®g¯¸¥x"
 
-#: ../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 ""
-"¤w¸g§¹¦¨¦w¸Ë %s ®M¥ó¤F¡C\n"
+"¨ú¦^¬M®g¯¸¥x²M³æ®Éµo¥Í¿ù»~¡G\n"
 "\n"
-"½Ðª`·N¤@¤U¡A¸Ó®M¥ó¥i¯à¥t¥~²£¥Í¤F '.rpmnew' ·sª©¥»³]©wÀɮסA\n"
-"©ÎªÌ¬O§â­ì¥»³]©wÀÉ®×­«·s©R¦W¬° '.rpmsave'¡A¬°¤F¯à°÷Åýµ{¦¡\n"
-"¯à°÷¥¿±`°õ¦æ¤u§@¡A±z»Ý­nÀ˵ø¤U­±ªº¨BÆJ¡G"
+"%s\n"
+"¤]³\¬Oºô¸ô³s½u¥¢±Ñ¡A©ÎªÌ¬O MandrakeSoft ¯¸¥x¼È®ÉµLªkÁpô¤W¡A\n"
+"½Ðµy«á¦A¸Õ¡C"
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "¤U¸üµo¥Í¿ù»~"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "½Ðµy«á¡A¥¿¦b¥Ñ MandrakeSoft Á`³¡¨ú¦^¬M®g¯¸¥x²M³æ¡C"
+
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"some packages failed to install\n"
-"correctly"
-msgstr "¬Y¨Ç®M¥óµLªk¦w¸Ë¤W"
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"¦w¸Ëµ{¦¡»Ý­n³s½u¨ì MandrakeSoft Á`³¡¨ú¦^¬M®g¯¸¥xªº²M³æÀɮסC\n"
+"½Ð½T©w±z¥Ø«eºô¸ô¯à°÷¥¿±`³s½u¥X¥h¡C\n"
+"\n"
+"±z­nÄ~Äò¶Ü¡H"
 
-#: ../rpmdrake_.c:983
-msgid "everything was installed correctly"
-msgstr "©Ò¦³¶µ¥Ø¤w¸g³£¦w¸Ë¦¨¥\¤F¡C"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United States"
+msgstr "¬ü°ê"
 
-#: ../rpmdrake_.c:985
-msgid "Everything installed successfully"
-msgstr "©Ò¦³¶µ¥Ø¤w¸g³£¦w¸Ë¦¨¥\¤F¡C"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
+msgstr "¤¤°ê¤j³°"
 
-#: ../rpmdrake_.c:986
-msgid "All requested packages were installed successfully."
-msgstr "¤w¸g¦¨¥\¦a¦w¸Ë±z»Ý­nªº®M¥ó¡C"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr "Áp¦X°ê"
 
-#: ../rpmdrake_.c:989
-msgid "Everything already installed."
-msgstr "©Ò¦³®M¥ó¤w¸g¦w¸Ë¤W¡C"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "¥xÆW"
 
-#: ../rpmdrake_.c:990
-msgid "Everything already installed (is this supposed to happen at all?)."
-msgstr "©Ò¦³®M¥ó¤w¸g¦w¸Ë¤W¡C"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "·ç¨å"
 
-#: ../rpmdrake_.c:997
-msgid "Problem during installation"
-msgstr "¦w¸Ë®Éµo¥Í°ÝÃD"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
+msgstr "Ĭ«X"
 
-#: ../rpmdrake_.c:998
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"¦w¸Ë¹Lµ{®Éµo¥Í¿ù»~¡G\n"
-"\n"
-"%s"
+msgid "Portugal"
+msgstr "¸²µå¤ú"
 
-#: ../rpmdrake_.c:1012
-msgid "Please wait, reading packages database..."
-msgstr "½Ðµy«á¡AŪ¨ú®M¥ó¸ê®Æ®w¸ê°T¤¤..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
+msgstr "ªiÄõ"
 
-#: ../rpmdrake_.c:1053
-msgid "Please wait, removing packages..."
-msgstr "½Ðµy­Ô¡A¥¿¦b²¾°£®M¥ó..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
+msgstr "®¿«Â"
 
-#: ../rpmdrake_.c:1056
-#, fuzzy
-msgid "Problem during removal"
-msgstr "¦w¸Ë®Éµo¥Í°ÝÃD"
+#: ../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 ""
-"¦w¸Ë¹Lµ{®Éµo¥Í¿ù»~¡G\n"
-"\n"
-"%s"
+#: ../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 ""
-"Åwªï¨Ó¨ì®M¥ó²¾°£µ{¦¡!\n"
-"\n"
-"±µ¤U¨Óµ{¦¡±N·|¤Þ¾É§A§¹¦¨²¾°£±z»{¬°¤£»Ý­nªº®M¥ó¶µ¥Ø¡C"
+#: ../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 ""
-"Åwªï¨Ó¨ì®M¥ó§ó·sµ{¦¡!\n"
-"±µ¤U¨Óµ{¦¡±N·|¤Þ¾É§A§¹¦¨®M¥ó§ó·s»P¦w¸Ë¡C"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Italy"
+msgstr "¸q¤j§Q"
 
-#: ../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 ""
-"Mandrake Linux ¨t²Î´£¨Ñ¤F¥]ù¸U¶Hªº³nÅé®M¥ó¡A\n"
-"³o¨Ç®M¥ó³£¦ì©óCD ¬Æ¦Ü DVD¥úºÐ¤º¡C\n"
-"±µ¤U¨Óµ{¦¡±N·|¨ó§U±z§¹¦¨¦w¸Ë¤W±z©Ò»Ý­nªº®M¥ó¶µ¥Ø¡C"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Israel"
+msgstr "¥H¦â¦C"
 
-#: data/rpmdrake-remove.desktop.in.h:1
-msgid "Remove Software"
-msgstr "²¾°£®M¥ó"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "§Æþ"
 
-#: data/rpmdrake-sources.desktop.in.h:1
-msgid "Software Sources Manager"
-msgstr "®M¥ó¨Ó·½ºÞ²z­û"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "France"
+msgstr "ªk°ê"
 
-#: data/rpmdrake.desktop.in.h:1
-msgid "Install Software"
-msgstr "¦w¸Ë®M¥ó"
+#: ../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 ""
-#~ "¸Ó´C¤¶¸Ë¸m¶µ¥Ø¤w¸g¦s¦b¤F¡A\n"
-#~ "±z½T©w­n¸m´«­ì¥»¶µ¥Ø¶Ü¡H"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "¦è¯Z¤ú"
 
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-#~ "±z­nÄ~Äò¶Ü¡H"
+#: ../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 ""
-#~ "Åwªï¨Ó¨ì®M¥ó¨Ó·½½s¿èµ{¦¡!\n"
-#~ "\n"
-#~ "±µ¤U¨Óµ{¦¡±N·|¤Þ¾É§A§¹¦¨½s¿è®M¥ó¨Ó·½ªº¶µ¥Ø¡A\n"
-#~ "¥H«K©ó´£¨Ñ±z¯à°÷¨Ï¥Î±z©Ò³]©wªº¶µ¥Ø¶i¦æ³nÅ骺¦w¸Ë»P§ó·s¡C"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr "¼w°ê"
 
-#~ msgid ""
-#~ "I need to contact MandrakeSoft website to get the mirrors list.\n"
-#~ "Please check that your network is currently running.\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "¦w¸Ëµ{¦¡»Ý­n³s½u¨ì MandrakeSoft Á`³¡¨ú¦^¬M®g¯¸¥xªº²M³æÀɮסC\n"
-#~ "½Ð½T©w±z¥Ø«eºô¸ô¯à°÷¥¿±`³s½u¥X¥h¡C\n"
-#~ "\n"
-#~ "±z­nÄ~Äò¶Ü¡H"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
+msgstr "±¶§J¦@©M°ê"
 
-#~ msgid ""
-#~ "There was an error downloading the mirrors list:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "The network, or MandrakeSoft website, are maybe unavailable.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "¨ú¦^¬M®g¯¸¥x²M³æ®Éµo¥Í¿ù»~¡G\n"
-#~ "\n"
-#~ "%s\n"
-#~ "¤]³\¬Oºô¸ô³s½u¥¢±Ñ¡A©ÎªÌ¬O MandrakeSoft ¯¸¥x¼È®ÉµLªkÁpô¤W¡A\n"
-#~ "½Ðµy«á¦A¸Õ¡C"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Costa Rica"
+msgstr "­ô´µ¤j¾¤¥["
 
-#~ msgid ""
-#~ "I can't find any suitable mirror.\n"
-#~ "\n"
-#~ "There can be many reasons for this problem; the most frequent is\n"
-#~ "the case when the architecture of your processor is not supported\n"
-#~ "by Mandrake Linux Official Updates."
-#~ msgstr ""
-#~ "¦w¸Ëµ{¦¡§ä¤£¨ì¾A¦Xªº¬M®g¯¸¥x¡C\n"
-#~ "\n"
-#~ "·|µo¥Í³o­Ó°ÝÃDªº±¡ªp¬Û·í¦h¡A¤ñ¤è Mandrake Linux\n"
-#~ "§ó·s¯¸¥x¥Ø«e©|¤£¤ä´©±z¥Ø«e¥Îªº¾÷¾¹¥­¥x¡C"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Canada"
+msgstr "¥[®³¤j"
 
-#~ msgid ""
-#~ "The list of updates is void. This means that either there is\n"
-#~ "no available update for the packages installed on your computer,\n"
-#~ "or you already installed all of them."
-#~ msgstr ""
-#~ "§ó·sªº²M³æ¶µ¥Ø¬OªÅªº¡A¤]³\¬O±z©|¥¼·s¼W¥ô¦ó§ó·sªº´C¤¶¶µ¥Ø¡A\n"
-#~ "©ÎªÌ¬O±zªº¨t²Î¥Ø«e³£¤w¸g¦w¸Ë¤W³Ì·sªº®M¥ó¤F¡C"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "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 ""
-#~ "ĵ§i¡G ±z¿ï¨ú¤F³\¦h­n¦w¸Ë§ó·sªº®M¥ó¡A¤£¹L±zªººÏºÐªÅ¶¡\n"
-#~ "¦ü¥G¤w¸g¤£¼Å¨Ï¥Î¡A«Øij±z¥ý¾ã²z®¿¥X¥i¥ÎªºªÅ¶¡¦A¶i¦æ¤U­±\n"
-#~ "ªº¦w¸Ë¡A¥HÁקK¥ô¦ó°ÝÃDµo¥Í¡C\n"
-#~ "±z½T©wÁÙ¬O­n¦w¸Ë±z©Ò¿ï¨úªº®M¥ó¶Ü¡H"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Belgium"
+msgstr "¤ñ§Q®É"
 
-#~ msgid ""
-#~ "The following packages have to be removed for others to be upgraded:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "¤U¦Cªº®M¥ó»Ý­n¶¶«K²¾°£¡A¥H«K©ó¯à°÷¶i¦æ¨ä¥L®M¥óªº¦w¸Ë§ó·s¡G\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "±z½T©w­nÄ~Äò¶Ü¡H"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Australia"
+msgstr "¿D¬w"
 
-#~ 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 "¶ø¦a§Q"
 
-#~ msgid ""
-#~ "I need to contact the mirror to get latest update packages.\n"
-#~ "Please check that your network is currently running.\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "¦w¸Ëµ{¦¡»Ý­n³s½u¨ì¬M®g¯¸¥x¥H«K©ó¨ú¦^³Ì·sªº§ó·s®M¥ó¡C\n"
-#~ "½Ð½T©w±z¥Ø«eªººô¸ô¯à°÷¥¿±`³s½u¨ì¥~­±¡C\n"
-#~ "\n"
-#~ "±z²{¦b­nÄ~Äò¶Ü¡H"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Info..."
+msgstr "¸ê°T..."
 
-#~ msgid ""
-#~ "You may also choose your desired mirror manually: to do so,\n"
-#~ "launch the Software Sources Manager, and then add a `Security\n"
-#~ "updates' source.\n"
-#~ "\n"
-#~ "Then, restart MandrakeUpdate."
-#~ msgstr ""
-#~ "±z¤w¸g¤â°Ê¿ï¾Ü±z»Ý­nªº¬M®g¯¸¥x¤F¡A«Øij±z½Ðµy«á¤â°Ê°õ¦æ\n"
-#~ "®M¥ó¨Ó·½ºÞ²z­û¡A°w¹ï±zªº¬M®g¯¸¥x¥t¥~¥[¤J¡u¦w¥þ­×¥¿¡v¶µ¥Ø¡C\n"
-#~ "\n"
-#~ "§¹¦¨«á¡A½Ð­«·s±Ò°Ê MandrakeUpdate µ{¦¡¡C"
+#: ../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 ·s¼W§ó·s¨Ó·½´C¤¶¶µ¥Ø®Éµo¥Í¿ù»~¡C\n"
-#~ "\n"
-#~ "¤]³\¬O¹ï¤è¬M®g¯¸¥x¼È®ÉµLªkÁpô¤W¡A©ÎªÌ¬O¹ï¤èªºÀɮפw¸g·´·l¡A\n"
-#~ "©ÎªÌ¬OMandrake Linux ©x¤è§ó·sÁÙ¤£¤ä´©±zªº Mandrake Linux ª©¥» (%s)¡C\n"
-#~ "\n"
-#~ "±z­n¥t¥~¹Á¸Õ¨Ï¥Î¨ä¥L§ó·s¯¸¥x¶Ü¡H"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "¬O"
+
+#: data/rpmdrake.desktop.in.h:1
+msgid "Install Software"
+msgstr "¦w¸Ë®M¥ó"
+
+#: data/rpmdrake-remove.desktop.in.h:1
+msgid "Remove Software"
+msgstr "²¾°£®M¥ó"
+
+#: data/rpmdrake-sources.desktop.in.h:1
+msgid "Software Sources Manager"
+msgstr "®M¥ó¨Ó·½ºÞ²z­û"
+
+#~ 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/zh_TW.pom b/po/zh_TW.pom
index a9fbda32..839e9085 100644
--- a/po/zh_TW.pom
+++ b/po/zh_TW.pom
@@ -4,165 +4,170 @@ msgstr "¦øªA¾¹¥­¥x"
 
 # 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 "¿ì¤½³nÅ饭¥x"
 
 # 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¡BSMB server¡BProxy server¡BSsh server"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"¿ì¤½³nÅé¡G ¤å®Ñ³B²z³nÅé (kword¡Babiword), ¸Õºâªí (kspread¡Bgnumeric), pdf ¾\"
+"Ūµ{¦¡µ¥µ¥"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Office ³nÅé"
+msgid "Workstation"
+msgstr "¤u§@¯¸¥­¥x"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Gnome Àô¹Ò"
+msgid "Game station"
+msgstr "¹CÀ¸¥­¥x"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Palm¡BVisor ¬ÛÃö¤u¨ã"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "®T¼Öªº¤@¨Çµ{¦¡¡G ¯ÈµP¡B¯q´¼¡B°Ê§@¡Bµ¦²¤ µ¥"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "¤u§@¯¸¥­¥x"
+msgid "Multimedia station"
+msgstr "¦h´CÅ饭¥x"
 
 # 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 "­µ®Ä¥H¤Î¼v¹³¼·©ñ½s¿èµ{¦¡"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr "DNS »P NIS ¦øªA¾¹"
+msgid "Internet station"
+msgstr "Internet ¥­¥x"
 
 # 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 ""
-"¿ì¤½³nÅé¡G ¤å®Ñ³B²z³nÅé (kword¡Babiword), ¸Õºâªí (kspread¡Bgnumeric), pdf ¾\"
-"Ūµ{¦¡µ¥µ¥"
+"¥]§tŪ«H¡B¼g«H¥H¤Î¾\Ūºô¸ô½×¾Âªº¤u¨ã (pine¡Bmutt¡Btin ..) »P¤Î web ÂsÄý¤u¨ã"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "»PÁn­µ¡B­µ®Ä¦³Ãöªº¤u¨ã¡G mp3¡Bmidi¡Bmixer µ¥¬ÛÃöµ{¦¡"
+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 "LSB ªº¤ä´©¡A¥]§t²Ä¤TÃþ¨ó¤O¼t°Ó³nÅé¤ä´©"
+msgid "Clients for different protocols including ssh"
+msgstr "¥]§t ssh µ¥¨ä¥L¤£¦P³q°T¨ó©wªº¥Î¤áºÝµ{¦¡"
 
 # 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 ¨t²Î»P¤@¨Ç§K¶O³nÅ骺®ÑÄy¡BHOWTO ¤å¥ó"
+msgid "Configuration"
+msgstr "²ÕºA³]©w"
 
 # 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 "Åý±z¤è«K³]©w±z¨t²Îªº¤u¨ã"
 
 # 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, µ¥µ¥ºÞ²zµ{¦¡"
+msgid "Scientific Workstation"
+msgstr "¬ì¾Ç­pºâ¥­¥x"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "¦h´CÅé - ¼v¹³"
+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 "mail¡Bnews¡Bweb¡Bftp client »P chat µ¥¤u¨ã"
+msgid "Console Tools"
+msgstr "Console ¤u¨ã"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "¸ê®Æ®w³nÅé"
+msgid "Editors, shells, file tools, terminals"
+msgstr "½s¿è¾¹, shell, Àɮפu¨ã, ²×ºÝ¾÷"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL¡BMySQL ¸ê®Æ®w"
+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 "Åý±z¤è«K³]©w±z¨t²Îªº¤u¨ã"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr "KDE ¹Ï§Î®à­±¤¶­±Àô¹Ò¡A¥]§t³\¦h¦n¥Îªº¹Ï«¬¤¶­±¤u¨ãµ{¦¡"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "¦h´CÅé - ­µ®Ä"
+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 "Console ¤u¨ã"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr "¥]§t¤Íµ½ªºÀ³¥Îµ{¦¡¡B®à­±³nÅ骺¹Ï«¬¤Æ¨Ï¥ÎÀô¹Ò"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr "Postfix MTA ³nÅé¡BINN ·s»D¸s²Õ³nÅé"
+msgid "Other Graphical Desktops"
+msgstr "¨ä¥L¹Ï«¬®à­±³nÅé"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Internet ¥­¥x"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, µ¥µ¥ºÞ²zµ{¦¡"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "¦h´CÅ饭¥x"
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+msgid "Development"
+msgstr "µ{¦¡¶}µo¥­¥x"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "²ÕºA³]©w"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C/C++ µo®iÀô¹Ò¡A¥]§t½sĶ¾¹¡Bµ{¦¡®w»P¤Î¤@¨Ç¤Þ¤JÀÉ®×"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "§ó¦h¹Ï§Î¤Æªº®à­±ºÞ²zµ{¦¡ (Gnome¡BICEWM)"
+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 ¹Ï§Î®à­±¤¶­±Àô¹Ò¡A¥]§t³\¦h¦n¥Îªº¹Ï«¬¤¶­±¤u¨ãµ{¦¡"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Linux ¨t²Î»P¤@¨Ç§K¶O³nÅ骺®ÑÄy¡BHOWTO ¤å¥ó"
 
 # 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 "LSB ªº¤ä´©¡A¥]§t²Ä¤TÃþ¨ó¤O¼t°Ó³nÅé¤ä´©"
+
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-msgid "Development"
-msgstr "µ{¦¡¶}µo¥­¥x"
+#: ../../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¡BProFTPD"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "«Ø¥ß»P¶i¦æ CD ¿N¿ýµ¥¤u¨ã"
+msgid "Mail/Groupware/News"
+msgstr "¶l¥ó/¸s²Õ³nÅé/·s»D¸s²Õ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "¿ì¤½³nÅ饭¥x"
+msgid "Postfix mail server, Inn news server"
+msgstr "Postfix MTA ³nÅé¡BINN ·s»D¸s²Õ³nÅé"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome¡BIcewm¡B Window Maker¡BEnlightenment¡BFvwm µ¥µ¥¶µ¥Ø"
+msgid "Database"
+msgstr "¸ê®Æ®w³nÅé"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "gimp µ¥Ã¸¹Ï³nÅéµ{¦¡"
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL¡BMySQL ¸ê®Æ®w"
+
+# 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 "Internet ¹h¹D¾¹"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -196,8 +211,8 @@ msgstr "DNS/NIS ªA°È"
 
 # 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++ µo®iÀô¹Ò¡A¥]§t½sĶ¾¹¡Bµ{¦¡®w»P¤Î¤@¨Ç¤Þ¤JÀÉ®×"
+msgid "Domain Name and Network Information Server"
+msgstr "DNS »P NIS ¦øªA¾¹"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -206,18 +221,18 @@ msgstr "ºô¸ô¦øªA¾¹"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "¶l¥ó/¸s²Õ³nÅé/·s»D¸s²Õ"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS server¡BSMB server¡BProxy server¡BSsh server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "¹CÀ¸¥­¥x"
+msgid "Office"
+msgstr "Office ³nÅé"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "¼v¹³¼·©ñµ{¦¡¥H¤Î½s¿èµ{¦¡"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr "mail¡Bnews¡Bweb¡Bftp client »P chat µ¥¤u¨ã"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -226,76 +241,66 @@ msgstr "¦h´CÅé - ø¹Ï"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "®T¼Öªº¤@¨Çµ{¦¡¡G ¯ÈµP¡B¯q´¼¡B°Ê§@¡Bµ¦²¤ µ¥"
-
-# 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 ""
-"¥]§tŪ«H¡B¼g«H¥H¤Î¾\Ūºô¸ô½×¾Âªº¤u¨ã (pine¡Bmutt¡Btin ..) »P¤Î web ÂsÄý¤u¨ã"
+msgid "Graphics programs such as The Gimp"
+msgstr "gimp µ¥Ã¸¹Ï³nÅéµ{¦¡"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "­Ó¤H²z°]"
+msgid "Multimedia - Sound"
+msgstr "¦h´CÅé - ­µ®Ä"
 
 # 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 "¥]§t¤Íµ½ªºÀ³¥Îµ{¦¡¡B®à­±³nÅ骺¹Ï«¬¤Æ¨Ï¥ÎÀô¹Ò"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "»PÁn­µ¡B­µ®Ä¦³Ãöªº¤u¨ã¡G mp3¡Bmidi¡Bmixer µ¥¬ÛÃöµ{¦¡"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "¥]§t ssh µ¥¨ä¥L¤£¦P³q°T¨ó©wªº¥Î¤áºÝµ{¦¡"
+msgid "Multimedia - Video"
+msgstr "¦h´CÅé - ¼v¹³"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
+msgid "Video players and editors"
+msgstr "¼v¹³¼·©ñµ{¦¡¥H¤Î½s¿èµ{¦¡"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Internet ¹h¹D¾¹"
+msgid "Multimedia - CD Burning"
+msgstr "¦h´CÅé - CD ¿N¿ý"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "­µ®Ä¥H¤Î¼v¹³¼·©ñ½s¿èµ{¦¡"
+msgid "Tools to create and burn CD's"
+msgstr "«Ø¥ß»P¶i¦æ CD ¿N¿ýµ¥¤u¨ã"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "¨ä¥L¹Ï«¬®à­±³nÅé"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "§ó¦h¹Ï§Î¤Æªº®à­±ºÞ²zµ{¦¡ (Gnome¡BICEWM)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "½s¿è¾¹, shell, Àɮפu¨ã, ²×ºÝ¾÷"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome¡BIcewm¡B Window Maker¡BEnlightenment¡BFvwm µ¥µ¥¶µ¥Ø"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "¨ÓºÞ²z±z°]°Èª÷¿úªº¤u¨ã¡A¤ñ¤è¹³¬O gnucash"
+msgid "Personal Information Management"
+msgstr "­Ó¤H¸ê°TºÞ²z"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "­Ó¤H¸ê°TºÞ²z"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Palm¡BVisor ¬ÛÃö¤u¨ã"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "¦h´CÅé - CD ¿N¿ý"
+msgid "Personal Finance"
+msgstr "­Ó¤H²z°]"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "¬ì¾Ç­pºâ¥­¥x"
+msgid "Programs to manage your finances, such as gnucash"
+msgstr "¨ÓºÞ²z±z°]°Èª÷¿úªº¤u¨ã¡A¤ñ¤è¹³¬O gnucash"